Merge branch 'dev' of https://github.com/th37rose/lowcoder_dev1 into feature/bundle

Sebastian Reid · Sebastian Reid · commit 750880717380 · 2024-05-23T01:59:44.000-04:00
diff --git a/client/packages/lowcoder/src/components/table/EditableCell.tsx b/client/packages/lowcoder/src/components/table/EditableCell.tsx
@@ -131,17 +131,19 @@ export function EditableCell<T extends JSONValue>(props: EditableCellProps<T>) {
       {status === "toSave" && !isEditing && <EditableChip />}
       {normalView}
       {/* overlay on normal view to handle double click for editing */}
-      <div
-        style={{
-          position: 'absolute',
-          top: 0,
-          left: 0,
-          width: '100%',
-          height: '100%',
-        }}
-        onDoubleClick={enterEditFn}
-      >
-      </div>
+      {editable && (
+        <div
+          style={{
+            position: 'absolute',
+            top: 0,
+            left: 0,
+            width: '100%',
+            height: '100%',
+          }}
+          onDoubleClick={enterEditFn}
+        >
+        </div>
+      )}
     </ColumnTypeView>
   );
 }
diff --git a/client/packages/lowcoder/src/comps/comps/tableComp/tableComp.tsx b/client/packages/lowcoder/src/comps/comps/tableComp/tableComp.tsx
@@ -807,5 +807,17 @@ export const TableComp = withExposingConfigs(TableTmpComp, [
     },
     trans("table.filterDesc")
   ),
+  new DepsConfig(
+    "selectedCell",
+    (children) => {
+      return {
+        selectedCell: children.selectedCell.node(),
+      };
+    },
+    (input) => {
+      return input.selectedCell;
+    },
+    trans("table.selectedCellDesc")
+  ),
   new NameConfig("data", trans("table.dataDesc")),
 ]);
diff --git a/client/packages/lowcoder/src/comps/comps/tableComp/tableCompView.tsx b/client/packages/lowcoder/src/comps/comps/tableComp/tableCompView.tsx
@@ -477,6 +477,7 @@ type CustomTableProps<RecordType> = Omit<TableProps<RecordType>, "components" |
   columnsStyle: TableColumnStyleType;
   size?: string;
   rowAutoHeight?: boolean;
+  onCellClick: (columnName: string, dataIndex: string) => void;
 };
 
 function TableCellView(props: {
@@ -631,6 +632,9 @@ function ResizeableTable<RecordType extends object>(props: CustomTableProps<Reco
         linkStyle,
         tableSize: props.size,
         autoHeight: props.rowAutoHeight,
+        onClick: () => {
+          props.onCellClick(col.titleText, String(col.dataIndex));
+        }
       }),
       onHeaderCell: () => ({
         width: resizeWidth,
@@ -868,6 +872,12 @@ export function TableCompView(props: {
                 (compChildren.data as any).isLoading()) ||
               compChildren.loading.getView()
             }
+            onCellClick={(columnName: string, dataIndex: string) => {
+              comp.children.selectedCell.dispatchChangeValueAction({
+                name: columnName,
+                dataIndex: dataIndex,
+              });
+            }}
           />
 
           <SlotConfigContext.Provider value={{ modalWidth: width && Math.max(width, 300) }}>
diff --git a/client/packages/lowcoder/src/comps/comps/tableComp/tableTypes.tsx b/client/packages/lowcoder/src/comps/comps/tableComp/tableTypes.tsx
@@ -225,6 +225,7 @@ const tableChildrenMap = {
   // todo: support object config
   dynamicColumnConfig: ArrayStringControl,
   expansion: ExpansionControl,
+  selectedCell: stateComp<JSONObject>({}),
 };
 
 export const TableInitComp = (function () {
diff --git a/client/packages/lowcoder/src/i18n/locales/en.ts b/client/packages/lowcoder/src/i18n/locales/en.ts
@@ -1969,6 +1969,7 @@ export const en = {
     "expandable": "Expandable",
     "configExpandedView": "Configure Expanded View",
     "toUpdateRowsDesc": "An Array of Objects for Rows to Be Updated in Editable Tables.",
+    "selectedCellDesc": "Selected Cell",
     "empty": "Empty",
     "falseValues": "Text When False",
     "iconTrue": "Icon When True",
