Fixed changing editable column value doesn't show save button + dont show custom columns in column value selector

raheeliftikhar5 · raheeliftikhar5 · commit a6e34bdbf2c5 · 2024-02-07T12:04:44.000+05:00
diff --git a/client/packages/lowcoder/src/comps/comps/tableComp/column/tableColumnComp.tsx b/client/packages/lowcoder/src/comps/comps/tableComp/column/tableColumnComp.tsx
@@ -90,7 +90,6 @@ export const columnChildrenMap = {
   isCustom: valueComp<boolean>(false),
   // If it is a data column, it must be the name of the column and cannot be duplicated as a react key
   dataIndex: valueComp<string>(""),
-  columnsList: valueComp<Array<JSONValue>>([]),
   hide: BoolControl,
   sortable: BoolControl,
   width: NumberControl,
@@ -207,7 +206,7 @@ export class ColumnComp extends ColumnInitComp {
         })}
         <Dropdown
           showSearch={true}
-          value={columnValue}
+          defaultValue={columnValue}
           options={initialColumns}
           label={trans("table.dataMapping")}
           onChange={(value) => {
diff --git a/client/packages/lowcoder/src/comps/comps/tableComp/tableUtils.tsx b/client/packages/lowcoder/src/comps/comps/tableComp/tableUtils.tsx
@@ -250,13 +250,21 @@ function renderTitle(props: { title: string; editable: boolean }) {
   );
 }
 
-function getInitialColumns(columnsAggrData: ColumnsAggrData) {
-  const initialColumns = Object.keys(columnsAggrData).map(column => ({
-    label: <span style={{textTransform: 'capitalize'}}>{column}</span>,
-    value: `{{currentRow.${column}}}`
-  }))
+function getInitialColumns(
+  columnsAggrData: ColumnsAggrData,
+  customColumns: string[],
+) {
+  let initialColumns = [];
+  Object.keys(columnsAggrData).forEach(column => {
+    if(customColumns.includes(column)) return;
+    initialColumns.push({
+      // label: <span style={{textTransform: 'capitalize'}}>{column}</span>,
+      label: column,
+      value: `{{currentRow.${column}}}`
+    });
+  });
   initialColumns.push({
-    label: <span>Select with handlebars</span>,
+    label: 'Select with handlebars',
     value: '{{currentCell}}',
   })
   return initialColumns;
@@ -283,7 +291,8 @@ export function columnsToAntdFormat(
   columnsAggrData: ColumnsAggrData,
   onTableEvent: (eventName: any) => void,
 ): Array<CustomColumnType<RecordType>> {
-  const initialColumns = getInitialColumns(columnsAggrData);
+  const customColumns = columns.filter(col => col.isCustom).map(col => col.dataIndex);
+  const initialColumns = getInitialColumns(columnsAggrData, customColumns);
   const sortMap: Map<string | undefined, SortOrder> = new Map(
     sort.map((s) => [s.column, s.desc ? "descend" : "ascend"])
   );
diff --git a/client/packages/lowcoder/src/comps/generators/withParams.tsx b/client/packages/lowcoder/src/comps/generators/withParams.tsx
@@ -34,7 +34,7 @@ export const paramsEqual = (
   params1: Record<string, unknown> | undefined,
   params2: Record<string, unknown> | undefined
 ) => {
-  return depthEqual(params1, params2, 3);
+  return depthEqual(params1, params2, 4);
 };
 
 export function withParams<TCtor extends MultiCompConstructor>(
