@aloudata/aloudata-design 2.18.0 → 2.18.1

package/dist/InputSearch/index.d.ts

@@ -9,6 +9,7 @@ interface IProps {
     size?: 'small' | 'middle' | 'large';
     initWidth?: number;
     defaultValue?: string;
+    value?: string;
     inputMode?: boolean;
     style?: React.CSSProperties;
 }

package/dist/InputSearch/index.js

@@ -1,4 +1,5 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 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; }
@@ -36,6 +37,7 @@ export default function InputSearch(props) {
     _props$size = props.size,
     size = _props$size === void 0 ? 'small' : _props$size,
     defaultValue = props.defaultValue,
+    value = props.value,
     _props$inputMode = props.inputMode,
     inputMode = _props$inputMode === void 0 ? false : _props$inputMode,
     style = props.style,
@@ -58,10 +60,16 @@ export default function InputSearch(props) {
       return DEFAULT_LARGE_WIDTH;
     }
   }, [locale, size]);
+
+  // 判断是否为受控模式
+  var isControlled = value !== undefined;
   var _useState = useState(defaultValue || ''),
     _useState2 = _slicedToArray(_useState, 2),
     searchValue = _useState2[0],
     setSearchValue = _useState2[1];
+
+  // 获取当前值：受控模式使用 value，非受控模式使用内部状态
+  var currentValue = isControlled ? value : searchValue;
   var isComposing = useRef(false);
   var onPressEnter = useCallback(function (e) {
     if (!isComposing.current) {
@@ -79,7 +87,11 @@ export default function InputSearch(props) {
     debounceSearch = _useDebounceFn.run;
   var onChangeValue = useCallback(function (e) {
     var newValue = e.target.value;
-    setSearchValue(newValue);
+
+    // 非受控模式才更新内部状态
+    if (!isControlled) {
+      setSearchValue(newValue);
+    }
     if (!isComposing.current) {
       if (debounce) {
         debounceSearch(newValue);
@@ -87,7 +99,7 @@ export default function InputSearch(props) {
         onSearch(newValue);
       }
     }
-  }, [debounce, debounceSearch, onSearch]);
+  }, [debounce, debounceSearch, onSearch, isControlled]);
   var handleCompositionStart = useCallback(function () {
     isComposing.current = true;
   }, []);
@@ -112,8 +124,8 @@ export default function InputSearch(props) {
     style: _objectSpread(_objectSpread({}, style), {}, {
       '--init-width': (props.initWidth || defaultWidth) + 'px'
     })
-  }, /*#__PURE__*/React.createElement(Input, {
-    className: classnames((_classnames2 = {}, _defineProperty(_classnames2, 'input-search-has-value', searchValue.length !== 0 || inputMode), _defineProperty(_classnames2, 'inputMode', inputMode), _classnames2)),
+  }, /*#__PURE__*/React.createElement(Input, _extends({
+    className: classnames((_classnames2 = {}, _defineProperty(_classnames2, 'input-search-has-value', currentValue.length !== 0 || inputMode), _defineProperty(_classnames2, 'inputMode', inputMode), _classnames2)),
     size: size
     // @ts-ignore
     ,
@@ -126,12 +138,16 @@ export default function InputSearch(props) {
       size: iconSize
     }),
     placeholder: placeholder || t.InputSearch.search,
-    allowClear: true,
-    defaultValue: defaultValue,
+    allowClear: true
+  }, isControlled ? {
+    value: currentValue
+  } : {
+    defaultValue: defaultValue
+  }, {
     onBlur: function onBlur(e) {
       if (_onBlur) {
-        _onBlur(searchValue, e);
+        _onBlur(currentValue, e);
       }
     }
-  }));
+  })));
 }

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

@@ -24,6 +24,7 @@ export default function TableFooter(props) {
   // 选择行
   var getCheckboxAllNode = rowSelectionInfo.getCheckboxAllNode,
     selectedRowKeys = rowSelectionInfo.selectedRowKeys,
+    selectedRowKeysInCurrPage = rowSelectionInfo.selectedRowKeysInCurrPage,
     items = rowSelectionInfo.items,
     isShowRowSelectionInFooter = rowSelectionInfo.isShowRowSelectionInFooter,
     changeSelectedRowKeys = rowSelectionInfo.onChange;
@@ -73,7 +74,7 @@ export default function TableFooter(props) {
   }, pagination, {
     onChange: onChangePage
   })));
-  var isShowRowSelection = rowSelectionInfo.isRowSelectionEnabled && selectedRowKeys.length > 0;
+  var isShowRowSelection = rowSelectionInfo.isRowSelectionEnabled && selectedRowKeysInCurrPage.length > 0;
   var isShowFooter = isShowPagination || isShowRowSelection;
   return isShowFooter ? /*#__PURE__*/React.createElement("div", {
     className: prefixCls('footer')

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

@@ -6,6 +6,7 @@ export interface IExpandableInfo<TDataItem extends object> {
     onExpand: (record: TDataItem, isExpanded: boolean) => void;
     isExpandable: boolean;
     data: TDataItem[];
+    flattenData?: TDataItem[];
 }
 export interface IExpandItem {
     isLeaf: boolean;

package/dist/Table/hooks/useExpandable.js

@@ -85,14 +85,16 @@ export default function useExpandable(props) {
       expandItemMap: {},
       onExpand: function onExpand() {},
       isExpandable: false,
-      data: data
+      data: data,
+      flattenData: undefined
     };
   }
   return {
     expandItemMap: expandItemMap,
     onExpand: onExpand,
     isExpandable: true,
-    data: visibleList
+    data: visibleList,
+    flattenData: flattenList
   };
 }
 function getListItemsByTree(currNode, expandedKeys, isRenderCustomExpandRow,

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

@@ -1,11 +1,15 @@
 import React from 'react';
 import { ITableProps } from '../types';
-export default function useRowSelection<TDataItem extends object>(props: ITableProps<TDataItem>): IRowSelectionInfo<TDataItem>;
+export default function useRowSelection<TDataItem extends object>(props: ITableProps<TDataItem> & {
+    isExpandable?: boolean;
+    flattenData?: TDataItem[];
+}): IRowSelectionInfo<TDataItem>;
 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;
     isShowRowSelectionInFooter: boolean;
     items: {
@@ -15,3 +19,46 @@ export interface IRowSelectionInfo<TDataItem extends object> {
     }[];
     onChange: (selectedRowKeys: string[]) => void;
 }
+/**
+ * 获取节点的所有子孙节点keys
+ * @param parentKey 父节点key
+ * @param isExpandable 是否启用展开功能
+ * @param flattenData 扁平化后的数据（包含所有节点，包括子节点）
+ * @param rowKey 行key获取函数
+ * @returns 子孙节点keys数组
+ */
+export declare function getNodeDescendants<TDataItem extends object>(parentKey: string, isExpandable?: boolean, flattenData?: TDataItem[], rowKey?: ITableProps<TDataItem>['rowKey']): string[];
+/**
+ * 获取节点的所有祖先节点keys
+ * @param targetKey 目标节点key
+ * @param isExpandable 是否启用展开功能
+ * @param flattenData 扁平化后的数据
+ * @param rowKey 行key获取函数
+ * @returns 祖先节点keys数组（从直接父节点到根节点）
+ */
+export declare function getNodeAncestors<TDataItem extends object>(targetKey: string, isExpandable?: boolean, flattenData?: TDataItem[], rowKey?: ITableProps<TDataItem>['rowKey']): string[];
+/**
+ * 计算级联选择后的keys（包含向上级联）
+ * @param targetKey 被操作的节点key
+ * @param isChecked 当前是否选中
+ * @param currentSelectedKeys 当前已选中的keys
+ * @param checkStrictly 是否严格模式
+ * @param isExpandable 是否启用展开功能
+ * @param getDescendantKeys 获取子孙节点keys的函数
+ * @param getAncestorKeys 获取祖先节点keys的函数
+ * @returns 新的选中keys
+ */
+export declare function calculateCascadeSelection(targetKey: string, isChecked: boolean, currentSelectedKeys: string[], checkStrictly?: boolean, isExpandable?: boolean, getDescendantKeys?: (nodeKey: string) => string[], getAncestorKeys?: (nodeKey: string) => string[]): string[];
+/**
+ * 计算节点的选择状态（考虑子节点状态）
+ * @param nodeKey 节点key
+ * @param selectedRowKeys 已选中的keys
+ * @param checkStrictly 是否严格模式
+ * @param isExpandable 是否启用展开功能
+ * @param getDescendantKeys 获取子孙节点keys的函数
+ * @returns 节点的选择状态
+ */
+export declare function calculateNodeCheckStatus(nodeKey: string, selectedRowKeys: string[], checkStrictly?: boolean, isExpandable?: boolean, getDescendantKeys?: (nodeKey: string) => string[]): {
+    checked: boolean;
+    indeterminate: boolean;
+};

package/dist/Table/hooks/useRowSelection.js

@@ -1,21 +1,22 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function (_e2) { function e(_x2) { return _e2.apply(this, arguments); } e.toString = function () { return _e2.toString(); }; return e; }(function (e) { throw e; }), f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function (_e3) { function e(_x3) { return _e3.apply(this, arguments); } e.toString = function () { return _e3.toString(); }; return e; }(function (e) { didErr = true; err = e; }), f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+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); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 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); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useCallback, useState } from 'react';
+import React, { useCallback, useMemo, useState } from 'react';
 import Checkbox from "../../Checkbox";
 import { getRowKey, hasFixedLeftColumn, prefixCls } from "../helper";
 export default function useRowSelection(props) {
@@ -23,7 +24,9 @@ export default function useRowSelection(props) {
   var columns = props.columns,
     rowSelection = props.rowSelection,
     rowKey = props.rowKey,
-    data = props.data;
+    data = props.data,
+    isExpandable = props.isExpandable,
+    flattenData = props.flattenData;
   var _useState = useState((rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRowKeys) || (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.defaultSelectedRowKeys) || []),
     _useState2 = _slicedToArray(_useState, 2),
     selectedRowKeysState = _useState2[0],
@@ -34,25 +37,38 @@ export default function useRowSelection(props) {
       return rowKeys.includes(getRowKey(record, rowKey));
     });
   }, [data, rowKey]);
+
+  // 获取用于全选状态计算和数据获取的完整数据
+  var allDataForSelection = useMemo(function () {
+    // 如果开启了 expandable，使用扁平化后的数据
+    if (isExpandable && flattenData) {
+      return flattenData;
+    }
+    // 否则使用原始数据
+    return data;
+  }, [isExpandable, flattenData, data]);
+
+  // 从完整数据中获取选中的行
+  var getAllSelectedRows = useCallback(function (rowKeys) {
+    return allDataForSelection.filter(function (record) {
+      return rowKeys.includes(getRowKey(record, rowKey));
+    });
+  }, [allDataForSelection, rowKey]);
   var changeSelectedRowKeys = useCallback(function (newSelectedRowKeys) {
     var _rowSelection$onChang;
-    // 过滤出存在于 data 中的 selectedRowKeys
-    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);
-    });
-    setSelectedRowKeysState(visibleSelectedRowKeys);
-    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, rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.getCheckboxProps);
+    setSelectedRowKeysState(newSelectedRowKeys);
+
+    // 获取所有选中的行数据（包括被折叠的子项）
+    var allSelectedRows = getAllSelectedRows(newSelectedRowKeys);
+    rowSelection === null || rowSelection === void 0 ? void 0 : (_rowSelection$onChang = rowSelection.onChange) === null || _rowSelection$onChang === void 0 ? void 0 : _rowSelection$onChang.call(rowSelection, newSelectedRowKeys, allSelectedRows);
+  }, [getAllSelectedRows, rowSelection]);
+  var checkboxAllStatus = getCheckboxAllStatus(allDataForSelection, selectedRowKeys, rowKey, rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.getCheckboxProps);
   var selectAll = useCallback(function () {
-    var newKeys = data.map(function (record) {
+    var newKeys = allDataForSelection.map(function (record) {
       return getRowKey(record, rowKey);
     });
     changeSelectedRowKeys(newKeys);
-  }, [data, rowKey, changeSelectedRowKeys]);
+  }, [allDataForSelection, rowKey, changeSelectedRowKeys]);
   var unSelectAll = useCallback(function () {
     changeSelectedRowKeys([]);
   }, [changeSelectedRowKeys]);
@@ -63,14 +79,27 @@ export default function useRowSelection(props) {
       selectAll();
     }
   }, [checkboxAllStatus, unSelectAll, selectAll]);
+
+  // 获取节点的所有子孙节点keys
+  var getDescendantKeys = useCallback(function (parentKey) {
+    return getNodeDescendants(parentKey, isExpandable, flattenData, rowKey);
+  }, [isExpandable, flattenData, rowKey]);
+
+  // 获取节点的所有祖先节点keys
+  var getAncestorKeys = useCallback(function (targetKey) {
+    return getNodeAncestors(targetKey, isExpandable, flattenData, rowKey);
+  }, [isExpandable, flattenData, rowKey]);
+
+  // 获取节点的选择状态（考虑子节点状态）
+  var getNodeCheckStatus = useCallback(function (nodeKey) {
+    return calculateNodeCheckStatus(nodeKey, selectedRowKeys, rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.checkStrictly, isExpandable, getDescendantKeys);
+  }, [selectedRowKeys, rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.checkStrictly, isExpandable, getDescendantKeys]);
   var onClickCheckbox = useCallback(function (key, isChecked) {
     return function () {
-      var newKeys = isChecked ? selectedRowKeys.filter(function (keyItem) {
-        return keyItem !== key;
-      }) : [].concat(_toConsumableArray(selectedRowKeys), [key]);
+      var newKeys = calculateCascadeSelection(key, isChecked, selectedRowKeys, rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.checkStrictly, isExpandable, getDescendantKeys, getAncestorKeys);
       changeSelectedRowKeys(newKeys);
     };
-  }, [selectedRowKeys, changeSelectedRowKeys]);
+  }, [selectedRowKeys, changeSelectedRowKeys, rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.checkStrictly, isExpandable, getDescendantKeys, getAncestorKeys]);
 
   // 全选按钮
   var getCheckboxAllNode = function getCheckboxAllNode(children) {
@@ -88,6 +117,7 @@ export default function useRowSelection(props) {
       isRowSelectionEnabled: false,
       getCheckboxAllNode: getCheckboxAllNode,
       selectedRowKeys: [],
+      selectedRowKeysInCurrPage: [],
       unSelectAll: unSelectAll,
       isShowRowSelectionInFooter: false,
       items: [],
@@ -107,13 +137,14 @@ export default function useRowSelection(props) {
     render: function render(text, record) {
       var _rowSelection$getChec;
       var key = getRowKey(record, rowKey);
-      var isChecked = !!(selectedRowKeys !== null && selectedRowKeys !== void 0 && selectedRowKeys.includes(key));
+      var nodeStatus = getNodeCheckStatus(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, _extends({
-        onClick: onClickCheckbox(key, isChecked),
-        checked: isChecked
+        onClick: onClickCheckbox(key, nodeStatus.checked || nodeStatus.indeterminate),
+        checked: nodeStatus.checked,
+        indeterminate: nodeStatus.indeterminate
       }, checkboxProps)));
     },
     fixed: fixed ? 'left' : undefined
@@ -135,7 +166,10 @@ export default function useRowSelection(props) {
     columns: [rowSelectionColumn].concat(_toConsumableArray(columns)),
     isRowSelectionEnabled: true,
     getCheckboxAllNode: getCheckboxAllNode,
-    selectedRowKeys: selectedRowKeysInCurrPage,
+    selectedRowKeys: selectedRowKeys,
+    // 返回完整的选中项列表
+    selectedRowKeysInCurrPage: selectedRowKeysInCurrPage,
+    // 当前页面可见的选中项
     unSelectAll: unSelectAll,
     isShowRowSelectionInFooter: isShowRowSelectionInFooter,
     items: items,
@@ -167,4 +201,202 @@ function getDataWithoutDisabled(data, getCheckboxProps) {
     var disabled = checkboxProps.disabled;
     return !disabled;
   });
+}
+/**
+ * 获取节点的所有子孙节点keys
+ * @param parentKey 父节点key
+ * @param isExpandable 是否启用展开功能
+ * @param flattenData 扁平化后的数据（包含所有节点，包括子节点）
+ * @param rowKey 行key获取函数
+ * @returns 子孙节点keys数组
+ */
+export function getNodeDescendants(parentKey, isExpandable, flattenData, rowKey) {
+  if (!isExpandable || !flattenData || !rowKey) return [];
+  var descendants = [];
+
+  // 找到父节点在flattenData中的记录
+  var parentNode = flattenData.find(function (item) {
+    return getRowKey(item, rowKey) === parentKey;
+  });
+  if (!parentNode) return [];
+
+  // 从原始节点的children中收集所有子孙节点
+  var collectDescendants = function collectDescendants(node) {
+    var children = node.children || [];
+    children.forEach(function (child) {
+      var childKey = getRowKey(child, rowKey);
+      descendants.push(childKey);
+      collectDescendants(child);
+    });
+  };
+  collectDescendants(parentNode);
+  return descendants;
+}
+
+/**
+ * 获取节点的所有祖先节点keys
+ * @param targetKey 目标节点key
+ * @param isExpandable 是否启用展开功能
+ * @param flattenData 扁平化后的数据
+ * @param rowKey 行key获取函数
+ * @returns 祖先节点keys数组（从直接父节点到根节点）
+ */
+export function getNodeAncestors(targetKey, isExpandable, flattenData, rowKey) {
+  if (!isExpandable || !flattenData || !rowKey) return [];
+  var ancestors = [];
+
+  // 找到目标节点的直接父节点
+  var findDirectParent = function findDirectParent(childKey) {
+    var _iterator = _createForOfIteratorHelper(flattenData),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var item = _step.value;
+        var _children = item.children || [];
+        if (_children.some(function (child) {
+          return getRowKey(child, rowKey) === childKey;
+        })) {
+          return item;
+        }
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+    return null;
+  };
+  var currentKey = targetKey;
+  while (true) {
+    var parent = findDirectParent(currentKey);
+    if (!parent) break;
+    var parentKey = getRowKey(parent, rowKey);
+    ancestors.push(parentKey);
+    currentKey = parentKey;
+  }
+  return ancestors;
+}
+
+/**
+ * 计算级联选择后的keys（包含向上级联）
+ * @param targetKey 被操作的节点key
+ * @param isChecked 当前是否选中
+ * @param currentSelectedKeys 当前已选中的keys
+ * @param checkStrictly 是否严格模式
+ * @param isExpandable 是否启用展开功能
+ * @param getDescendantKeys 获取子孙节点keys的函数
+ * @param getAncestorKeys 获取祖先节点keys的函数
+ * @returns 新的选中keys
+ */
+export function calculateCascadeSelection(targetKey, isChecked, currentSelectedKeys, checkStrictly, isExpandable, getDescendantKeys, getAncestorKeys) {
+  if (checkStrictly || !isExpandable || !getDescendantKeys || !getAncestorKeys) {
+    // 严格模式，不进行级联
+    return isChecked ? currentSelectedKeys.filter(function (key) {
+      return key !== targetKey;
+    }) : [].concat(_toConsumableArray(currentSelectedKeys), [targetKey]);
+  }
+  var newKeys = _toConsumableArray(currentSelectedKeys);
+  if (isChecked) {
+    // 取消选择：移除目标节点和所有子孙节点
+    newKeys = newKeys.filter(function (key) {
+      return key !== targetKey;
+    });
+    var descendants = getDescendantKeys(targetKey);
+    newKeys = newKeys.filter(function (key) {
+      return !descendants.includes(key);
+    });
+
+    // 向上级联：检查父节点是否需要取消选择
+    var ancestors = getAncestorKeys(targetKey);
+    ancestors.forEach(function (ancestorKey) {
+      var ancestorDescendants = getDescendantKeys(ancestorKey);
+      var selectedDescendantsCount = ancestorDescendants.filter(function (key) {
+        return newKeys.includes(key);
+      }).length;
+
+      // 如果子孙节点没有全部选中，则父节点也应该取消选择
+      if (selectedDescendantsCount < ancestorDescendants.length) {
+        newKeys = newKeys.filter(function (key) {
+          return key !== ancestorKey;
+        });
+      }
+    });
+  } else {
+    // 选择：添加目标节点和所有子孙节点
+    if (!newKeys.includes(targetKey)) {
+      newKeys.push(targetKey);
+    }
+    var _descendants = getDescendantKeys(targetKey);
+    _descendants.forEach(function (descendantKey) {
+      if (!newKeys.includes(descendantKey)) {
+        newKeys.push(descendantKey);
+      }
+    });
+
+    // 向上级联：检查父节点是否需要选择
+    var _ancestors = getAncestorKeys(targetKey);
+    _ancestors.forEach(function (ancestorKey) {
+      var ancestorDescendants = getDescendantKeys(ancestorKey);
+      var selectedDescendantsCount = ancestorDescendants.filter(function (key) {
+        return newKeys.includes(key);
+      }).length;
+
+      // 如果所有子孙节点都被选中，则父节点也应该被选中
+      if (selectedDescendantsCount === ancestorDescendants.length && !newKeys.includes(ancestorKey)) {
+        newKeys.push(ancestorKey);
+      }
+    });
+  }
+  return newKeys;
+}
+
+/**
+ * 计算节点的选择状态（考虑子节点状态）
+ * @param nodeKey 节点key
+ * @param selectedRowKeys 已选中的keys
+ * @param checkStrictly 是否严格模式
+ * @param isExpandable 是否启用展开功能
+ * @param getDescendantKeys 获取子孙节点keys的函数
+ * @returns 节点的选择状态
+ */
+export function calculateNodeCheckStatus(nodeKey, selectedRowKeys, checkStrictly, isExpandable, getDescendantKeys) {
+  if (checkStrictly || !isExpandable || !getDescendantKeys) {
+    // 严格模式下或非展开模式，直接返回节点本身的选择状态
+    return {
+      checked: selectedRowKeys.includes(nodeKey),
+      indeterminate: false
+    };
+  }
+  var descendants = getDescendantKeys(nodeKey);
+
+  // 如果没有子节点，直接返回本身状态
+  if (descendants.length === 0) {
+    return {
+      checked: selectedRowKeys.includes(nodeKey),
+      indeterminate: false
+    };
+  }
+  var selectedDescendants = descendants.filter(function (key) {
+    return selectedRowKeys.includes(key);
+  });
+  var isNodeSelected = selectedRowKeys.includes(nodeKey);
+  if (isNodeSelected && selectedDescendants.length === descendants.length) {
+    // 节点本身选中且所有子节点都选中
+    return {
+      checked: true,
+      indeterminate: false
+    };
+  } else if (!isNodeSelected && selectedDescendants.length === 0) {
+    // 节点本身未选中且所有子节点都未选中
+    return {
+      checked: false,
+      indeterminate: false
+    };
+  } else {
+    // 部分选中的情况：节点选中但子节点未全选，或节点未选中但部分子节点选中
+    return {
+      checked: false,
+      indeterminate: true
+    };
+  }
 }

package/dist/Table/index.js

@@ -90,7 +90,11 @@ function Table(props, ref) {
     rowKey: rowKey
   });
   var expandableConfig = getExpandableConfig(expandable);
-  var rowSelectionInfo = useRowSelection(props);
+  var rowSelectionInfo = useRowSelection(_objectSpread(_objectSpread({}, props), {}, {
+    data: expandableInfo.data,
+    isExpandable: expandableInfo.isExpandable,
+    flattenData: expandableInfo.flattenData
+  }));
   var rowDndInfo = useRowDnd(_objectSpread(_objectSpread({}, props), {}, {
     columns: rowSelectionInfo.columns,
     data: expandableInfo.data
@@ -306,13 +310,13 @@ function Table(props, ref) {
       style: _objectSpread({
         width: cell.column.getSize()
       }, fixedStyle)
-    }, expandableInfo.isExpandable && colIndex === 0 ? /*#__PURE__*/React.createElement(ExpandCell, {
+    }, expandableInfo.isExpandable && colIndex === (rowSelectionInfo.isRowSelectionEnabled ? 1 : 0) ? /*#__PURE__*/React.createElement(ExpandCell, {
       expandableInfo: expandableInfo,
       expandable: expandable,
       data: row.original,
       rowKey: rowKey
     }, tdContent) : tdContent);
-  }, [expandableInfo, expandable, rowKey, getColumnFixedInfo]);
+  }, [expandableInfo, expandable, rowKey, getColumnFixedInfo, rowSelectionInfo.isRowSelectionEnabled]);
 
   // 渲染 body
   var bodyContent = /*#__PURE__*/React.createElement("div", {

package/dist/Table/types.d.ts

@@ -59,6 +59,7 @@ export interface IRowSelection<TDataItem extends object> {
     selectedRowKeys?: string[];
     defaultSelectedRowKeys?: string[];
     items?: IRowSelectionBtnItem<TDataItem>[];
+    checkStrictly?: boolean;
     onChange?: (selectedRowKeys: string[], selectedRows: TDataItem[]) => void;
     getCheckboxProps?: (record: TDataItem) => Pick<ICheckboxProps, 'disabled' | 'indeterminate' | 'checked'>;
 }

package/package.json

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