fix(table): when checkable=false, no render all select boxs

close #7356
ant-design · Jul 16, 2023 · 5421e41 · 5421e41
1 parent 5b746b3
commit 5421e41
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 15 deletions.
diff --git a/packages/card/src/components/StatisticCard/demos/basic.tsx b/packages/card/src/components/StatisticCard/demos/basic.tsx
@@ -1,16 +1,17 @@
 import { EllipsisOutlined, RightOutlined } from '@ant-design/icons';
 import { StatisticCard } from '@ant-design/pro-components';
-import { Space } from 'antd';
+import { Space, theme } from 'antd';
 
 const { Statistic } = StatisticCard;
 
 export default () => {
+  const { token } = theme.useToken();
   return (
     <StatisticCard
       title={
         <Space>
           <span>部门一</span>
-          <RightOutlined style={{ color: 'rgba(0,0,0,0.65)' }} />
+          <RightOutlined style={{ color: token.colorTextHeading }} />
         </Space>
       }
       extra={<EllipsisOutlined />}

diff --git a/packages/table/src/components/ColumnSetting/index.tsx b/packages/table/src/components/ColumnSetting/index.tsx
@@ -237,6 +237,7 @@ const CheckboxList: React.FC<{
   if (!show) {
     return null;
   }
+
   const listDom = (
     <Tree
       itemHeight={24}
@@ -446,18 +447,22 @@ function ColumnSetting<T>(props: ColumnSettingProps<T>) {
       arrow={false}
       title={
         <div className={`${className}-title ${hashId}`.trim()}>
-          <Checkbox
-            indeterminate={indeterminate}
-            checked={
-              unCheckedKeys.length === 0 &&
-              unCheckedKeys.length !== localColumns.length
-            }
-            onChange={(e) => {
-              checkedAll(e);
-            }}
-          >
-            {intl.getMessage('tableToolBar.columnDisplay', '列展示')}
-          </Checkbox>
+          {props.checkable === false ? (
+            <div />
+          ) : (
+            <Checkbox
+              indeterminate={indeterminate}
+              checked={
+                unCheckedKeys.length === 0 &&
+                unCheckedKeys.length !== localColumns.length
+              }
+              onChange={(e) => {
+                checkedAll(e);
+              }}
+            >
+              {intl.getMessage('tableToolBar.columnDisplay', '列展示')}
+            </Checkbox>
+          )}
           {checkedReset ? (
             <a
               onClick={clearClick}

diff --git a/tests/card/__snapshots__/demo.test.ts.snap b/tests/card/__snapshots__/demo.test.ts.snap
@@ -2767,7 +2767,7 @@ exports[`card demos 📸 renders ./packages/card/src/components/StatisticCard/de
               aria-label="right"
               class="anticon anticon-right"
               role="img"
-              style="color: rgba(0, 0, 0, 0.65);"
+              style="color: rgba(0, 0, 0, 0.88);"
             >
               <svg
                 aria-hidden="true"