Merge branch 'dev' into doubleClick_event_component

kamal-qureshi · kamal-qureshi · commit a0190a5ba4f3 · 2025-06-12T15:58:31.000+05:00
diff --git a/client/packages/lowcoder/src/comps/comps/tableComp/selectionControl.tsx b/client/packages/lowcoder/src/comps/comps/tableComp/selectionControl.tsx
@@ -7,6 +7,11 @@ import { TableOnEventView } from "./tableTypes";
 import { OB_ROW_ORI_INDEX, RecordType } from "comps/comps/tableComp/tableUtils";
 import { ControlNodeCompBuilder } from "comps/generators/controlCompBuilder";
 
+// double-click detection constants
+const DOUBLE_CLICK_THRESHOLD = 300; // ms
+let lastClickTime = 0;
+let clickTimer: ReturnType<typeof setTimeout>;
+
 const modeOptions = [
   {
     label: trans("selectionControl.single"),
@@ -38,8 +43,9 @@ export function getSelectedRowKeys(
       return [selection.children.selectedRowKey.getView()];
     case "multiple":
       return selection.children.selectedRowKeys.getView();
+    default:
+      return [];
   }
-  return [];
 }
 
 export const SelectionControl = (function () {
@@ -50,40 +56,52 @@ export const SelectionControl = (function () {
   };
   return new ControlNodeCompBuilder(childrenMap, (props, dispatch) => {
     const changeSelectedRowKey = (record: RecordType) => {
-      if (getKey(record) !== props.selectedRowKey) {
-        dispatch(changeChildAction("selectedRowKey", getKey(record), false));
+      const key = getKey(record);
+      if (key !== props.selectedRowKey) {
+        dispatch(changeChildAction("selectedRowKey", key, false));
       }
     };
+
     return (onEvent: TableOnEventView) => {
+      const handleClick = (record: RecordType) => {
+        return () => {
+          const now = Date.now();
+          clearTimeout(clickTimer);
+          if (now - lastClickTime < DOUBLE_CLICK_THRESHOLD) {
+            
+            changeSelectedRowKey(record);
+            onEvent("doubleClick");
+            if (getKey(record) !== props.selectedRowKey) {
+              onEvent("rowSelectChange");
+            }
+          } else {
+            clickTimer = setTimeout(() => {
+              changeSelectedRowKey(record);
+              onEvent("rowClick");
+              if (getKey(record) !== props.selectedRowKey) {
+                onEvent("rowSelectChange");
+              }
+            }, DOUBLE_CLICK_THRESHOLD);
+          }
+          lastClickTime = now;
+        };
+      };
+
       if (props.mode === "single" || props.mode === "close") {
         return {
           rowKey: getKey,
           rowClassName: (record: RecordType, index: number, indent: number) => {
-            // Turn off row selection mode, only do visual shutdown, selectedRow still takes effect
             if (props.mode === "close") {
               return "";
             }
             return getKey(record) === props.selectedRowKey ? "ant-table-row-selected" : "";
           },
-          onRow: (record: RecordType, index: number | undefined) => {
-            return {
-              onClick: () => {
-                changeSelectedRowKey(record);
-                onEvent("rowClick");
-                if (getKey(record) !== props.selectedRowKey) {
-                  onEvent("rowSelectChange");
-                }
-              },
-              onDoubleClick: () => {
-                onEvent("doubleClick");
-                if (getKey(record) !== props.selectedRowKey) {
-                  onEvent("rowSelectChange");
-                }
-              }
-            };
-          },
+          onRow: (record: RecordType, index: number | undefined) => ({
+            onClick: handleClick(record),
+          }),
         };
       }
+
       const result: TableRowSelection<any> = {
         type: "checkbox",
         selectedRowKeys: props.selectedRowKeys,
@@ -92,7 +110,6 @@ export const SelectionControl = (function () {
           dispatch(changeChildAction("selectedRowKeys", selectedRowKeys as string[], false));
           onEvent("rowSelectChange");
         },
-        // click checkbox also trigger row click event
         onSelect: (record: RecordType) => {
           changeSelectedRowKey(record);
           onEvent("rowClick");
@@ -101,18 +118,9 @@ export const SelectionControl = (function () {
       return {
         rowKey: getKey,
         rowSelection: result,
-        onRow: (record: RecordType) => {
-          return {
-            onClick: () => {
-              changeSelectedRowKey(record);
-              onEvent("rowClick");
-            },
-            onDoubleClick: () => {
-              changeSelectedRowKey(record);
-              onEvent("doubleClick");
-            }
-          };
-        },
+        onRow: (record: RecordType) => ({
+          onClick: handleClick(record),
+        }),
       };
     };
   })
@@ -123,4 +131,4 @@ export const SelectionControl = (function () {
       })
     )
     .build();
-})();
+})();
diff --git a/client/packages/lowcoder/src/comps/comps/tableComp/tableSummaryComp.tsx b/client/packages/lowcoder/src/comps/comps/tableComp/tableSummaryComp.tsx
@@ -203,7 +203,7 @@ export const TableSummary = memo(function TableSummary(props: {
 
   const visibleColumns = useMemo(() => {
     let cols = columns.filter(col => !col.getView().hide);
-    if (dynamicColumn) {
+    if (dynamicColumn && dynamicColumnConfig?.length) {
       cols = cols.filter(col => {
         const colView = col.getView();
         return dynamicColumnConfig.includes(colView.isCustom ? colView.title : colView.dataIndex)
diff --git a/client/packages/lowcoder/src/i18n/locales/en.ts b/client/packages/lowcoder/src/i18n/locales/en.ts
@@ -591,6 +591,7 @@ export const en = {
     "chartBorderColor": "Border Color",
     "chartTextColor": "Text Color",
     "detailSize": "Detail Size",
+    "hideColumn": "Hide Column",
 
     "radiusTip": "Specifies the radius of the element's corners. Example: 5px, 50%, or 1em.",
     "gapTip": "Specifies the gap between rows and columns in a grid or flex container. Example: 10px, 1rem, or 5%.",
