@aloudata/aloudata-design 2.19.7 → 2.19.9

package/dist/LogicTree/components/LogicItem/index.js

@@ -327,8 +327,7 @@ export default function LogicItem(_ref) {
       size: "small",
       popupMatchSelectWidth: false,
       value: _logicType,
-      onChange: onChangeRelation,
-      disabled: nodes.length <= 1
+      onChange: onChangeRelation
     }), /*#__PURE__*/React.createElement(DragPreviewImage, {
       connect: preview,
       src: dargPreviewImg

package/dist/Table/components/Footer/index.js

@@ -31,8 +31,8 @@ export default function TableFooter(props) {
   var btnItems = [{
     key: '$UN_SELECT_ALL$',
     label: t.Table.cancelSelect,
-    onClick: function onClick(e) {
-      return rowSelectionInfo.unSelectAll(e);
+    onClick: function onClick() {
+      return rowSelectionInfo.unSelectAll();
     }
   }].concat(_toConsumableArray(items));
   var rowSelectionNode = isShowRowSelectionInFooter && /*#__PURE__*/React.createElement("div", {

package/dist/Table/hooks/useRowSelection.d.ts

@@ -1,16 +1,17 @@
 import React from 'react';
-import { ITableProps } from '../types';
+import { IRowSelection, ITableProps } from '../types';
 export default function useRowSelection<TDataItem extends object>(props: ITableProps<TDataItem> & {
     isExpandable?: boolean;
     flattenData?: TDataItem[];
 }): IRowSelectionInfo<TDataItem>;
+export declare function getCheckboxAllStatus<TDataItem extends object>(data: TDataItem[], selectedRowKeys: string[], rowKey: ITableProps<TDataItem>['rowKey'], getCheckboxProps?: IRowSelection<TDataItem>['getCheckboxProps']): 'all' | 'none' | 'indeterminate';
 export interface IRowSelectionInfo<TDataItem extends object> {
     columns: ITableProps<TDataItem>['columns'];
     isRowSelectionEnabled: boolean;
     getCheckboxAllNode: ((children?: React.ReactNode) => React.ReactNode) | null;
     selectedRowKeys: string[];
     selectedRowKeysInCurrPage: string[];
-    unSelectAll: (e: React.MouseEvent) => void;
+    unSelectAll: () => void;
     isShowRowSelectionInFooter: boolean;
     items: {
         key: string;

package/dist/Table/hooks/useRowSelection.js

@@ -64,11 +64,12 @@ export default function useRowSelection(props) {
   }, [getAllSelectedRows, rowSelection]);
   var checkboxAllStatus = getCheckboxAllStatus(allDataForSelection, selectedRowKeys, rowKey, rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.getCheckboxProps);
   var selectAll = useCallback(function () {
-    var newKeys = allDataForSelection.map(function (record) {
+    // 仅选中未禁用项；禁用项不允许进入选中态
+    var newKeys = getDataWithoutDisabled(allDataForSelection, rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.getCheckboxProps).map(function (record) {
       return getRowKey(record, rowKey);
     });
     changeSelectedRowKeys(newKeys);
-  }, [allDataForSelection, rowKey, changeSelectedRowKeys]);
+  }, [allDataForSelection, rowKey, rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.getCheckboxProps, changeSelectedRowKeys]);
   var unSelectAll = useCallback(function () {
     changeSelectedRowKeys([]);
   }, [changeSelectedRowKeys]);
@@ -176,21 +177,21 @@ export default function useRowSelection(props) {
     onChange: changeSelectedRowKeys
   };
 }
-function getCheckboxAllStatus(data, selectedRowKeys, rowKey, getCheckboxProps) {
-  var selectedKeysInData = data.map(function (record) {
-    var key = getRowKey(record, rowKey);
-    if (selectedRowKeys.includes(key)) {
-      return key;
-    }
-    return null;
-  }).filter(function (key) {
-    return key !== null;
-  });
-  if (selectedKeysInData.length === 0) {
+export function getCheckboxAllStatus(data, selectedRowKeys, rowKey, getCheckboxProps) {
+  // 全选状态只由「未禁用」项决定：禁用项无论是否预选都不影响全选/半选/未选的判定，
+  // 否则会出现「全部可选项已勾选 + 1 个禁用预选」被错算成 indeterminate，
+  // 或者「全部可选项中某项已取消 + 1 个禁用预选」被错算成 all 的情况。
+  var enabledData = getDataWithoutDisabled(data, getCheckboxProps);
+  if (enabledData.length === 0) {
+    return 'none';
+  }
+  var selectedEnabledCount = enabledData.filter(function (record) {
+    return selectedRowKeys.includes(getRowKey(record, rowKey));
+  }).length;
+  if (selectedEnabledCount === 0) {
     return 'none';
   }
-  var dataWithoutDisabled = getDataWithoutDisabled(data, getCheckboxProps);
-  if (selectedKeysInData.length === dataWithoutDisabled.length) {
+  if (selectedEnabledCount === enabledData.length) {
     return 'all';
   }
   return 'indeterminate';

package/dist/Table/style/index.less

@@ -366,6 +366,32 @@
   height: 100%;
 }
 
+// 加深 rowSelection checkbox disabled 态的可见度：默认 Checkbox 的 disabled
+// 背景/边框与正常态一致（都是表单底色 + 默认描边），单看一行根本看不出来这是禁
+// 用项。这里仅在 Table 选择列内覆盖，避免影响其他场景。仅处理 unchecked+disabled，
+// checked+disabled 与 indeterminate+disabled 保留组件原本样式。
+//
+// 注：直接用 semantic 层 token 而非 --alias-colors-bg-disabled / --alias-colors-border-disabled，
+// 是因为这两个 alias token 都是 rgba(0,0,0,0.06)，边框几乎透明，套上去等于没改 ——
+// 也正是这次 bug 的根因。等设计系统把 disabled alias 加深后再切回 alias 层即可。
+//
+// `[class][class]` 是为了把选择符特异度抬到比 Checkbox/style/index.less 里
+// `.ald-checkbox.ald-checkbox.ant-checkbox-wrapper .ant-checkbox-disabled
+//   .ant-checkbox-inner[class][class]` 更高，否则覆盖不掉。
+.ald-table-row-selection-all,
+.ald-table-row-selection-item {
+  .ald-checkbox.ant-checkbox-wrapper-disabled {
+    .ant-checkbox-disabled:not(.ant-checkbox-checked):not(
+        .ant-checkbox-indeterminate
+      ) {
+      .ant-checkbox-inner[class][class] {
+        background-color: var(--semantic-neutral-100);
+        border-color: var(--semantic-neutral-300);
+      }
+    }
+  }
+}
+
 /** Footer **/
 .ald-table-footer {
   padding: 16px;