Merge pull request baidu#9575 from zhangtao07/master

fix: 修复crud2自定义显示列不生效问题
lhtuling · Feb 2, 2024 · d6208f8 · d6208f8
2 parents 8039d31 + 2d39ba9
commit d6208f8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/packages/amis/src/renderers/CRUD2.tsx b/packages/amis/src/renderers/CRUD2.tsx
@@ -1097,13 +1097,14 @@ export default class CRUD2 extends React.Component<CRUD2Props, any> {
   }
 
   @autobind
-  toggleToggle(toggled: boolean, index: number) {
+  toggleToggle(index: number) {
     const {store} = this.props;
-
+    const column = store.columns[index];
+    const toggled = column.toggled;
     store.updateColumns(
       store.columns.map((c: any, i: number) => ({
         ...c,
-        toggled: index === i ? toggled : c.toggled !== false
+        toggled: index === i ? !toggled : c.toggled !== false
       }))
     );
   }

diff --git a/packages/amis/src/renderers/Table2/ColumnToggler.tsx b/packages/amis/src/renderers/Table2/ColumnToggler.tsx
@@ -81,7 +81,8 @@ export class ColumnTogglerRenderer extends React.Component<ColumnTogglerRenderer
             className={cx('ColumnToggler-menuItem')}
             key={'selectAll'}
             onClick={() => {
-              toggleAllColumns && toggleAllColumns();
+              toggleAllColumns &&
+                toggleAllColumns(activeToggaleColumns?.length <= 0);
             }}
           >
             <Checkbox