@aloudata/aloudata-design 2.8.6 → 2.8.7

package/dist/Dropdown/index.js

@@ -62,10 +62,7 @@ export default function Dropdown(props) {
       return;
     }
     if (!isOpenControlled) {
-      // 修复关闭 dropdown 后，再次点击无法打开 dropdown 的问题，经测试 setTimeout 0 后可以修复
-      setTimeout(function () {
-        setDropdownOpen(false);
-      }, 0);
+      setDropdownOpen(false);
     }
   }, [isOpenControlled, menu]);
   var onDropdownOpenChange = useCallback(function (isDropdownOpen) {

package/dist/Table/hooks/useRowSelection.js

@@ -4,6 +4,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
@@ -36,7 +37,7 @@ export default function useRowSelection(props) {
   var changeSelectedRowKeys = useCallback(function (newSelectedRowKeys) {
     var _rowSelection$onChang;
     // 过滤出存在于 data 中的 selectedRowKeys
-    var visibleSelectedRowKeys = data.map(function (record) {
+    var visibleSelectedRowKeys = getDataWithoutDisabled(data, rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.getCheckboxProps).map(function (record) {
       return getRowKey(record, rowKey);
     }).filter(function (key) {
       return newSelectedRowKeys.includes(key);
@@ -45,7 +46,7 @@ export default function useRowSelection(props) {
     var selectedRows = getSelectedRows(visibleSelectedRowKeys);
     rowSelection === null || rowSelection === void 0 ? void 0 : (_rowSelection$onChang = rowSelection.onChange) === null || _rowSelection$onChang === void 0 ? void 0 : _rowSelection$onChang.call(rowSelection, visibleSelectedRowKeys, selectedRows);
   }, [getSelectedRows, rowSelection, data, rowKey]);
-  var checkboxAllStatus = getCheckboxAllStatus(data, selectedRowKeys, rowKey);
+  var checkboxAllStatus = getCheckboxAllStatus(data, selectedRowKeys, rowKey, rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.getCheckboxProps);
   var selectAll = useCallback(function () {
     var newKeys = data.map(function (record) {
       return getRowKey(record, rowKey);
@@ -101,18 +102,20 @@ export default function useRowSelection(props) {
     title: getCheckboxAllNode(),
     width: 48,
     render: function render(text, record) {
+      var _rowSelection$getChec;
       var key = getRowKey(record, rowKey);
       var isChecked = !!(selectedRowKeys !== null && selectedRowKeys !== void 0 && selectedRowKeys.includes(key));
+      var checkboxProps = ((_rowSelection$getChec = rowSelection.getCheckboxProps) === null || _rowSelection$getChec === void 0 ? void 0 : _rowSelection$getChec.call(rowSelection, record)) || {};
       return /*#__PURE__*/React.createElement("div", {
         className: prefixCls('row-selection-item')
-      }, /*#__PURE__*/React.createElement(Checkbox, {
+      }, /*#__PURE__*/React.createElement(Checkbox, _extends({
         onClick: onClickCheckbox(key, isChecked),
         checked: isChecked
-      }));
+      }, checkboxProps)));
     },
     fixed: rowSelection.fixed ? 'left' : undefined
   };
-  var selectedRowKeysInCurrPage = data.map(function (record) {
+  var selectedRowKeysInCurrPage = getDataWithoutDisabled(data, rowSelection.getCheckboxProps).map(function (record) {
     return getRowKey(record, rowKey);
   }).filter(function (key) {
     return selectedRowKeys.includes(key);
@@ -136,7 +139,7 @@ export default function useRowSelection(props) {
     onChange: changeSelectedRowKeys
   };
 }
-function getCheckboxAllStatus(data, selectedRowKeys, rowKey) {
+function getCheckboxAllStatus(data, selectedRowKeys, rowKey, getCheckboxProps) {
   var selectedKeysInData = data.map(function (record) {
     var key = getRowKey(record, rowKey);
     if (selectedRowKeys.includes(key)) {
@@ -149,8 +152,16 @@ function getCheckboxAllStatus(data, selectedRowKeys, rowKey) {
   if (selectedKeysInData.length === 0) {
     return 'none';
   }
-  if (selectedKeysInData.length === data.length) {
+  var dataWithoutDisabled = getDataWithoutDisabled(data, getCheckboxProps);
+  if (selectedKeysInData.length === dataWithoutDisabled.length) {
     return 'all';
   }
   return 'indeterminate';
+}
+function getDataWithoutDisabled(data, getCheckboxProps) {
+  return data.filter(function (record) {
+    var checkboxProps = (getCheckboxProps === null || getCheckboxProps === void 0 ? void 0 : getCheckboxProps(record)) || {};
+    var disabled = checkboxProps.disabled;
+    return !disabled;
+  });
 }

package/dist/Table/types.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { ICheckboxProps } from '../Checkbox/type';
 import { IPaginationProps } from '../Pagination/types';
 export interface ITableProps<TDataItem extends object> {
     columns: ITableColumn<TDataItem>[];
@@ -52,6 +53,7 @@ export interface IRowSelection<TDataItem extends object> {
     defaultSelectedRowKeys?: string[];
     items?: IRowSelectionBtnItem<TDataItem>[];
     onChange?: (selectedRowKeys: string[], selectedRows: TDataItem[]) => void;
+    getCheckboxProps?: (record: TDataItem) => Pick<ICheckboxProps, 'disabled' | 'indeterminate' | 'checked'>;
 }
 export interface IRowSelectionBtnItem<TDataItem extends object> {
     key: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aloudata/aloudata-design",
-  "version": "2.8.6",
+  "version": "2.8.7",
   "description": "",
   "license": "MIT",
   "module": "dist/index.js",