linkmore-design 1.0.100 → 1.1.0

package/dist/LmFilter/filterFns/index.d.ts

@@ -1,4 +1,4 @@
-export function initLocalization(props: any): {
+export declare const initLocalization: (props: any) => {
     searchFilter: any;
     searchQuery: {};
     basicFilter: any;
@@ -6,12 +6,11 @@ export function initLocalization(props: any): {
     customFilter: any;
     customQuery: {};
 };
-export default useCoreOptions;
-declare function useCoreOptions({ state, dispatch, props }: {
+declare const useCoreOptions: ({ state, dispatch, props }: {
     state: any;
     dispatch: any;
     props: any;
-}): {
+}) => {
     CoreMethods: {
         onQuery: ({ complexFilter, type, basicFilter, basicQuery, searchFilter, searchQuery, customFilter, }?: {
             complexFilter?: {};
@@ -23,7 +22,7 @@ declare function useCoreOptions({ state, dispatch, props }: {
             customFilter?: any;
         }) => void;
         setCustomFilter: (val: any) => void;
-        setSearchFilter: (itemValue: any, item: any) => void;
+        setSearchFilter: (itemValue: any) => void;
     };
     RefMethods: {
         getState: () => any;
@@ -58,3 +57,4 @@ declare function useCoreOptions({ state, dispatch, props }: {
         onClearChange: () => void;
     };
 };
+export default useCoreOptions;

package/dist/LmTable/util.d.ts

@@ -2,20 +2,20 @@
  * 列分组数据转换
  * @param columns 表格的columns属性值
  * @param dataSource 表格数据源
- * @param columnKeys 列分组的keys
+ * @param groupColKeys 列分组的keys
  * @returns
  */
-export function transformWithColGroup(columns: any, dataSource: any, columnKeys: any): {
+export function transformWithColGroup(columns: any, dataSource: any, groupColKeys: any): {
     columns: any;
     dataSource: any;
 };
 /**
  * 行分组
  * @param {Array} dataSource 数据源
- * @param {Array} groupInfo 行分组的keys
+ * @param {Array} groupRowKeys 行分组的keys
  * @returns
  */
-export function transformWithRowGroup(dataSource: any[], groupInfo: any[]): any;
+export function transformWithRowGroup(dataSource: any[], groupRowKeys: any[]): any;
 export function checkIsSelectd(i: any, j: any, start?: {}, end?: {}): boolean;
 export function checkStatus(i: any, j: any, commiting: any): {
     /** 是否有效拉伸 */
@@ -44,4 +44,10 @@ export function getSelectionRowText({ selection, columnsKeysList, dataSource }:
  * @returns {Array}
  */
 export function getSelectionColText({ selection, columns, dataSource }: any): any[];
+/**
+ * 获取key所对应的原始数据的索引
+ * @param {Object} {key, dataSource}
+ * @returns {number}
+ */
+export function getDataSourceIndex({ key, dataSource }: any): number;
 export function range(start: number, end: number): Array<number>;

package/dist/index.umd.js

@@ -92727,7 +92727,8 @@
         dataSource = props.dataSource,
         searchKey = props.searchKey,
         searchConfig = props.searchConfig,
-        customOptions = props.customOptions; // 转换一级查询结构 object => array
+        customOptions = props.customOptions,
+        enableAutoString = props.enableAutoString; // 转换一级查询结构 object => array
 
     var tranformGlobalQuery = React.useCallback(function (obj) {
       var _Object$keys3;
@@ -92756,8 +92757,7 @@
     var tranformQuery = React.useCallback(function (_ref2) {
       var _Object$keys4, _Object$keys5;
 
-      var _ref2$customFilter = _ref2.customFilter,
-          customFilter = _ref2$customFilter === void 0 ? {} : _ref2$customFilter,
+      var customFilter = _ref2.customFilter,
           _ref2$searchQuery = _ref2.searchQuery,
           searchQuery = _ref2$searchQuery === void 0 ? {} : _ref2$searchQuery,
           _ref2$basicQuery = _ref2.basicQuery,
@@ -93053,15 +93053,17 @@
       var field = item.field;
 
       if (field) {
-        // 基础查询数据(受控数据)
-        var basicFilter = _objectSpread(_objectSpread({}, state.basicFilter), {}, _defineProperty$1({}, field, itemValue)); // 外部查询数据结构
+        // 将结果转换为字符串
+        var stringValue = enableAutoString ? String(itemValue) : itemValue; // 基础查询数据(受控数据)
+
+        var basicFilter = _objectSpread(_objectSpread({}, state.basicFilter), {}, _defineProperty$1({}, field, stringValue)); // 外部查询数据结构
 
 
         var basicQuery = _objectSpread(_objectSpread({}, state.basicQuery), {}, _defineProperty$1({}, field, {
           fieldName: field,
           fieldType: item.valueType || 'string',
           type: item.type,
-          value: Array.isArray(itemValue) ? itemValue : [itemValue],
+          value: Array.isArray(stringValue) ? stringValue : [stringValue],
           operator: item.operator || 'equal'
         })); // 数据清除时不返回结构体
 
@@ -93126,7 +93128,7 @@
       });
     }, [props]); // 模糊查询结构
 
-    var setSearchFilter = React.useCallback(function (itemValue, item) {
+    var setSearchFilter = React.useCallback(function (itemValue) {
       var searchFilter = searchKey === null || searchKey === void 0 ? void 0 : searchKey.reduce(function (pre, cur) {
         pre[cur] = itemValue;
         return pre;
@@ -93427,6 +93429,8 @@
       // 是否启用自定义筛选
       enableClear: true,
       // 是否展示一件清空
+      enableAutoString: true,
+      // 是否自动将筛选结构值转换为字符串
       size: 'middle',
       // 尺寸
       searchKey: 'search',
@@ -232941,13 +232945,16 @@
 
     var renderEditor = function renderEditor() {
       if (isEditing) {
+        console.log(isEditing, '-----isEditing-----');
         var Editor = (col === null || col === void 0 ? void 0 : col.dataEditor) || InputDataEdit;
         return /*#__PURE__*/React__default['default'].createElement(Editor, {
           cell: col,
           row: rowIndex,
           col: colIndex,
           value: value,
-          onChange: setValue,
+          onChange: function onChange(value) {
+            setValue(value);
+          },
           handleSave: saveRenderValue
         });
       }
@@ -232959,12 +232966,11 @@
     var content = renderComponent() || renderEditor() || renderViewer;
     return /*#__PURE__*/React__default['default'].createElement("td", _objectSpread(_objectSpread({}, lodash.omit(clearProps, ['commitIng', 'editIng'])), {}, {
       // style={{ userSelect: 'none' }}
-      className: classnames('unselection', sd && selectIng && 'selected', isEnd && 'end', isRightEnd && 'right_end', isEditing && 'editing', isVaildCommit && 'commiting'),
+      className: classnames(colIndex === undefined && 'row_selection_td', 'unselection', sd && selectIng && 'selected', isEnd && 'end', isRightEnd && 'right_end', isEditing && 'editing', isVaildCommit && 'commiting'),
       onMouseDown: handleMouseDown,
       onMouseOver: handleMouseOver,
       onContextMenu: handleContextMenu,
       onDoubleClick: handleDoubleClick,
-      // onKeyUp={onKeyUp}
       key: "".concat(rowIndex, "_").concat(colIndex)
     }), content, isRightEnd && isEnd && !isEditing && /*#__PURE__*/React__default['default'].createElement("div", {
       ref: endCellRef,
@@ -303603,13 +303609,13 @@
    * 列分组数据转换
    * @param columns 表格的columns属性值
    * @param dataSource 表格数据源
-   * @param columnKeys 列分组的keys
+   * @param groupColKeys 列分组的keys
    * @returns
    */
 
 
-  function transformWithColGroup(columns, dataSource, columnKeys) {
-    if (!Array.isArray(columnKeys) || !columnKeys.length) {
+  function transformWithColGroup(columns, dataSource, groupColKeys) {
+    if (!Array.isArray(groupColKeys) || !groupColKeys.length) {
       return {
         columns: columns,
         dataSource: dataSource
@@ -303621,7 +303627,7 @@
     var dataSourceCopy = lodash.cloneDeep(dataSource); // 去重
 
 
-    var columnKeysCopy = _toConsumableArray$1(new Set(columnKeys));
+    var groupColKeysCopy = _toConsumableArray$1(new Set(groupColKeys));
     /**
      * @param {Array} source source数据源，树状结构，行分组会有children子级结构
      * @param {Array} columns 列数据，用于表头，当列分组时会有children子级结构
@@ -303639,7 +303645,7 @@
         source.forEach(function (souItem, i) {
           handledColumns = handledColumns.concat(columns.filter(function (c) {
             // 过滤掉（表头操作） 使用列分组作为key的项
-            return columnKeysCopy.indexOf(c.dataIndex) === -1;
+            return groupColKeysCopy.indexOf(c.dataIndex) === -1;
           }).map(function (item) {
             return _objectSpread(_objectSpread({}, item), {}, {
               dataIndex: "".concat(markStr, "_").concat(item.dataIndex, "_").concat(i)
@@ -303664,7 +303670,7 @@
       });
     };
 
-    var tempColumns = groupBy(dataSourceCopy, columnsCopy, columnKeysCopy, null);
+    var tempColumns = groupBy(dataSourceCopy, columnsCopy, groupColKeysCopy, null);
     var keyMap = new Map();
 
     var dataSourceBy = function dataSourceBy(source) {
@@ -303680,7 +303686,7 @@
         } else {
           var str = ''; // 根据筛选条件生成对应的前缀key值，比如[name, age] => 'name_xiaoming_age_18'
 
-          columnKeysCopy.forEach(function (dataIndex, i) {
+          groupColKeysCopy.forEach(function (dataIndex, i) {
             if (i !== 0) {
               str += '_';
             }
@@ -303701,6 +303707,7 @@
             }
 
             sItem[newKey] = sItem[key];
+            sItem["".concat(newKey, "_originIndex")] = sItem.__index;
           });
         }
 
@@ -303721,31 +303728,43 @@
   /**
    * 行分组
    * @param {Array} dataSource 数据源
-   * @param {Array} groupInfo 行分组的keys
+   * @param {Array} groupRowKeys 行分组的keys
    * @returns
    */
 
-  function transformWithRowGroup(dataSource, groupInfo) {
-    var groupBy = function groupBy(lastFilter, oGroup) {
+  function transformWithRowGroup(dataSource, groupRowKeys) {
+    var groupBy = function groupBy(lastFilter, oGroup, preKey) {
       if (!(oGroup === null || oGroup === void 0 ? void 0 : oGroup.length)) return lastFilter;
       var group = oGroup.slice();
-      var filterKey = group.shift();
+      var filterKey = group.shift(); // i:保证顺序
+
+      var i = 0;
       var map = lastFilter.reduce(function (acc, el) {
+        el.__index = i;
+        i += 1;
         var value = el[filterKey];
         acc[value] = [].concat(_toConsumableArray$1(acc[value] || []), [el]);
         return acc;
       }, {});
       return Object.keys(map).map(function (item) {
+        var key;
+
+        if (preKey) {
+          key = "".concat(preKey, "_").concat(filterKey, "_").concat(item);
+        } else {
+          key = "".concat(filterKey, "_").concat(item);
+        }
+
         return {
           type: filterKey,
           _group: item,
-          key: "".concat(item, "_").concat(filterKey),
-          children: groupBy(map[item], group)
+          key: key,
+          children: groupBy(map[item], group, key)
         };
       });
     };
 
-    return groupBy(dataSource, groupInfo);
+    return groupBy(dataSource, groupRowKeys);
   }
   function checkIsSelectd(i, j) {
     var start = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
@@ -303777,10 +303796,10 @@
   function getSkipList(dataSourceWithGroup) {
     var skipList = dataSourceWithGroup.reduce(function (prev, cur) {
       if (!prev.length) {
-        return cur.group ? [1] : [0];
+        return cur._group ? [1] : [0];
       }
 
-      if (cur.group) {
+      if (cur._group) {
         return [].concat(_toConsumableArray$1(prev), [prev[prev.length - 1] + 1]);
       }
 
@@ -303842,6 +303861,44 @@
     });
     return coltext;
   }
+  /**
+   * 获取key所对应的原始数据的索引
+   * @param {Object} {key, dataSource}
+   * @returns {number}
+   */
+
+  function getDataSourceIndex(_ref3) {
+    var key = _ref3.key,
+        _ref3$dataSource = _ref3.dataSource,
+        dataSource = _ref3$dataSource === void 0 ? [] : _ref3$dataSource;
+    var index = -1;
+
+    var dfs = function dfs(arr) {
+      if (!Array.isArray(arr)) {
+        return;
+      }
+
+      if (index !== -1) {
+        return;
+      }
+
+      for (var i = 0; i < arr.length; i += 1) {
+        var item = arr[i];
+
+        if (item["".concat(key, "_originIndex")] !== undefined) {
+          index = item["".concat(key, "_originIndex")];
+          return;
+        }
+
+        if (item.children) {
+          dfs(item.children);
+        }
+      }
+    };
+
+    dfs(dataSource);
+    return index;
+  }
 
   // 表格基础配置文件
   // 行选择
@@ -304113,7 +304170,7 @@
     }), fixedColumns.fixedRight);
   });
 
-  var _excluded$29 = ["columns", "dataSource", "autoSize", "rowClick", "onDoubleClick", "checkConfig", "summary", "pagination", "hiddenPage", "loading", "virtual", "sortOpen", "colSortOpen", "resizeable", "customCheck", "components", "rowSelection", "columnsState", "onChange", "filterChange", "tableRowType", "size", "openSheet", "editSheet", "dataChange", "groupInfo", "emptyProps", "columnKeys"],
+  var _excluded$29 = ["columns", "dataSource", "autoSize", "rowClick", "onDoubleClick", "checkConfig", "summary", "pagination", "hiddenPage", "loading", "virtual", "sortOpen", "colSortOpen", "resizeable", "customCheck", "components", "rowSelection", "columnsState", "onChange", "filterChange", "tableRowType", "size", "openSheet", "editSheet", "dataChange", "groupRowKeys", "groupColKeys", "emptyProps"],
       _excluded2$w = ["className", "style"],
       _excluded3$7 = ["onResize", "width", "onResizeStop"];
   var Summary$1 = ProviderWarp.Summary;
@@ -304184,9 +304241,9 @@
         _props$editSheet = props.editSheet,
         editSheet = _props$editSheet === void 0 ? false : _props$editSheet,
         dataChange = props.dataChange,
-        groupInfo = props.groupInfo,
+        groupRowKeys = props.groupRowKeys,
+        groupColKeys = props.groupColKeys,
         emptyProps = props.emptyProps,
-        columnKeys = props.columnKeys,
         resetProps = _objectWithoutProperties$1(props, _excluded$29);
 
     var _resetProps$rowKey = resetProps.rowKey,
@@ -304225,6 +304282,12 @@
 
     var deepDataSourceRef = React.useRef([]);
     var deepColumnsRef = React.useRef([]);
+    /** 行分组表格对应数据的隐藏数列表 */
+
+    var hideListRef = React.useRef([]);
+    /** 行分组的空行列表数据 */
+
+    var skipListRef = React.useRef([]);
     /** 记录最原始数据 */
 
     React.useEffect(function () {
@@ -304233,30 +304296,33 @@
     /** 行分组 */
 
     var groupDataSource = React.useMemo(function () {
-      if (!(groupInfo === null || groupInfo === void 0 ? void 0 : groupInfo.length)) {
+      if (!(groupRowKeys === null || groupRowKeys === void 0 ? void 0 : groupRowKeys.length)) {
         return customizeDataSource;
       }
 
-      return transformWithRowGroup(customizeDataSource, groupInfo);
-    }, [customizeDataSource, groupInfo]);
+      return transformWithRowGroup(customizeDataSource, groupRowKeys);
+    }, [customizeDataSource, groupRowKeys]);
     /** 列分组 */
 
     var _useMemo = React.useMemo(function () {
-      if (!(columnKeys === null || columnKeys === void 0 ? void 0 : columnKeys.length)) {
+      if (!(groupColKeys === null || groupColKeys === void 0 ? void 0 : groupColKeys.length)) {
         return {
           dataSource: groupDataSource,
           columns: customizeColumns
         };
       }
 
-      return transformWithColGroup(customizeColumns, groupDataSource, columnKeys);
-    }, [customizeColumns, groupDataSource, columnKeys]),
+      return transformWithColGroup(customizeColumns, groupDataSource, groupColKeys);
+    }, [customizeColumns, groupDataSource, groupColKeys]),
         columns = _useMemo.columns,
         dataSource = _useMemo.dataSource;
 
     React.useEffect(function () {
       setExpandedRowKeys([]);
-    }, [groupInfo]);
+      deepDataSourceRef.current = [];
+      deepColumnsRef.current = [];
+      hideListRef.current = [];
+    }, [groupRowKeys]);
     /** sheel数据的表格 */
 
     var _useState9 = React.useState({
@@ -304340,18 +304406,46 @@
     React.useEffect(function () {
       var source = [];
 
+      var dfs = function dfs(children) {
+        var num = 0;
+        children.forEach(function (item) {
+          if (item.children) {
+            num += dfs(item.children);
+          } else {
+            num += 1;
+          }
+        });
+        return num;
+      };
+
+      var hideList = [];
+
       var deepChildren = function deepChildren(arr) {
         arr.forEach(function (item) {
           source.push(lodash.omit(item, 'children'));
+          var prev = hideList.length ? hideList[hideList.length - 1] : 0; // 展开
 
           if ((item === null || item === void 0 ? void 0 : item.children) && expandedRowKeys.includes(item.key)) {
+            hideList.push(prev);
             deepChildren(item === null || item === void 0 ? void 0 : item.children);
+          } // 隐藏
+
+
+          if ((item === null || item === void 0 ? void 0 : item.children) && !expandedRowKeys.includes(item.key)) {
+            var count = dfs(item.children);
+            hideList.push(count + prev);
+          }
+
+          if (!(item === null || item === void 0 ? void 0 : item.children)) {
+            hideList.push(prev);
           }
         });
       };
 
       deepChildren(dataSource);
       deepDataSourceRef.current = source;
+      hideListRef.current = hideList;
+      skipListRef.current = getSkipList((groupRowKeys === null || groupRowKeys === void 0 ? void 0 : groupRowKeys.length) ? deepDataSourceRef.current : dataSource);
     }, [dataSource, expandedRowKeys]); // 列分组数据铺平，在框选时获取数据使用
 
     React.useEffect(function () {
@@ -304369,7 +304463,7 @@
 
       deepChildren(columns);
       deepColumnsRef.current = source;
-    }, [columns, columnKeys]);
+    }, [columns, groupColKeys]);
 
     var onSortEnd = function onSortEnd(_ref) {
       var oldIndex = _ref.oldIndex,
@@ -304475,8 +304569,8 @@
         return range$1(start.j, end.j).map(function (j) {
           var _columns$j, _columns$j2;
 
-          var columnKey = (columnKeys === null || columnKeys === void 0 ? void 0 : columnKeys.length) ? deepColumnsRef.current[j].dataIndex : (_columns$j = columns[j]) === null || _columns$j === void 0 ? void 0 : _columns$j.dataIndex;
-          var dataItem = (groupInfo === null || groupInfo === void 0 ? void 0 : groupInfo.length) ? deepDataSourceRef.current[i] : dataSource[i];
+          var columnKey = (groupColKeys === null || groupColKeys === void 0 ? void 0 : groupColKeys.length) ? deepColumnsRef.current[j].dataIndex : (_columns$j = columns[j]) === null || _columns$j === void 0 ? void 0 : _columns$j.dataIndex;
+          var dataItem = (groupRowKeys === null || groupRowKeys === void 0 ? void 0 : groupRowKeys.length) ? deepDataSourceRef.current[i] : dataSource[i];
           var cell = dataItem === null || dataItem === void 0 ? void 0 : dataItem[columnKey];
 
           if ((_columns$j2 = columns[j]) === null || _columns$j2 === void 0 ? void 0 : _columns$j2.render) {
@@ -304573,14 +304667,13 @@
             end = _shellStatusRef$curre10.end,
             commiting = _shellStatusRef$curre10.commiting; //
 
-        var innerColumns = (columnKeys === null || columnKeys === void 0 ? void 0 : columnKeys.length) ? deepColumnsRef.current : columns;
-        var innerDataSource = (groupInfo === null || groupInfo === void 0 ? void 0 : groupInfo.length) ? deepDataSourceRef.current : dataSource; //
+        var innerColumns = (groupColKeys === null || groupColKeys === void 0 ? void 0 : groupColKeys.length) ? deepColumnsRef.current : columns;
+        var innerDataSource = (groupRowKeys === null || groupRowKeys === void 0 ? void 0 : groupRowKeys.length) ? deepDataSourceRef.current : dataSource; //
 
         var columnsKeysList = innerColumns.map(function (item) {
           return item.dataIndex;
-        }); //
+        }); // 空行值数组
 
-        var skipList = getSkipList(innerDataSource);
         var rowtext = getSelectionRowText({
           selection: commiting,
           columnsKeysList: columnsKeysList,
@@ -304633,9 +304726,20 @@
 
             if ((_isSelected = isSelected(tri, tdj)) === null || _isSelected === void 0 ? void 0 : _isSelected.isSelected) {
               var key = columnsKeysList[tdj];
-              var sourceIndex = tri - skipList[tri];
+              var sourceIndex; // 列分组的情况下
 
-              if (sourceIndex < 0) {
+              if (groupColKeys === null || groupColKeys === void 0 ? void 0 : groupColKeys.length) {
+                sourceIndex = getDataSourceIndex({
+                  key: key,
+                  dataSource: dataSource
+                });
+                var arr = key.split('_');
+                key = arr[arr.length - 2];
+              } else {
+                sourceIndex = tri - skipListRef.current[tri] + hideListRef.current[tri];
+              }
+
+              if (sourceIndex < 0 || sourceIndex >= data.length) {
                 return;
               } // 行替换
 
@@ -304721,9 +304825,8 @@
           pasteData = parse(window.clipboardData.getData('Text'));
         } else if (e.clipboardData && e.clipboardData.getData) {
           pasteData = parse(e.clipboardData.getData('text/plain'));
-        }
+        } // in order of preference
 
-        var data = dataSourceRef.current; // in order of preference
 
         var resultEnd = [];
         pasteData.forEach(function (row, i) {
@@ -304900,8 +305003,10 @@
     };
 
     var dataSourceChange = function dataSourceChange(i, j, newRecord) {
+      // 表格中的行数 转化为 对应的数据源索引
+      var rowIndex = i - skipListRef.current[i] + hideListRef.current[i];
       var res = fn(dataSourceRef.current, function (draft) {
-        draft[i] = newRecord;
+        draft[rowIndex] = newRecord;
       });
       dataChange === null || dataChange === void 0 ? void 0 : dataChange(res);
       shellStatusRef.current = _objectSpread(_objectSpread({}, shellStatusRef.current), {}, {
@@ -304974,18 +305079,19 @@
       var innerColumns = lodash.cloneDeep(useColumns);
       traverseColumns(innerColumns);
 
-      if (groupInfo === null || groupInfo === void 0 ? void 0 : groupInfo.length) {
+      if (groupRowKeys === null || groupRowKeys === void 0 ? void 0 : groupRowKeys.length) {
         /** 如果是进行了行分组，则会生成一列dataIndex为Group的Col, 如果需要修改此处，请备注原因 */
         innerColumns = [{
           type: 'name',
           title: '分组',
+          dataIndex: '_group',
           key: '_group',
-          dataIndex: '_group'
+          width: 100
         }].concat(_toConsumableArray$1(innerColumns));
       }
 
       return sortOpen ? [sortDefaultColumnItem].concat(_toConsumableArray$1(innerColumns)) : innerColumns;
-    }, [useColumns, sortOpen, selectIng, dataSource, groupInfo, commitIng]);
+    }, [useColumns, sortOpen, selectIng, dataSource, groupRowKeys, commitIng]);
     React.useEffect(function () {
       setColumns(columns);
     }, [columns]); // 行点击事件
@@ -305077,8 +305183,8 @@
           }),
 
           /** 如果开启了行分组，则需要把checkStrictly关闭，变成受控模式 */
-          checkStrictly: !groupInfo.length,
-          onChange: function onChange(selectedRowKeys, selectedRows, t, s) {
+          checkStrictly: !(groupRowKeys === null || groupRowKeys === void 0 ? void 0 : groupRowKeys.length),
+          onChange: function onChange(selectedRowKeys, selectedRows) {
             console.log(selectedRows, '----selectedRows');
             setSelectedRows({
               selectedRows: selectedRows
@@ -305088,7 +305194,7 @@
         }, rowSelection),
         onRow: function onRow(record) {
           return {
-            onClick: function onClick(e) {
+            onClick: function onClick() {
               onRecord(record);
             },
             onDoubleClick: function onDoubleClick() {
@@ -305290,7 +305396,7 @@
       dataSource: dataSource,
       components: tableComponents,
       onChange: onTableChange,
-      expandable: {
+      expandable: (resetProps === null || resetProps === void 0 ? void 0 : resetProps.expandable) || {
         onExpand: function onExpand() {
           shellStatusRef.current = {
             start: {},
@@ -305316,7 +305422,7 @@
       dataSource: dataSource,
       components: tableComponents,
       onChange: onTableChange,
-      expandable: {
+      expandable: (resetProps === null || resetProps === void 0 ? void 0 : resetProps.expandable) || {
         onExpand: function onExpand() {
           shellStatusRef.current = {
             start: {},
@@ -305428,8 +305534,7 @@
       return h;
     }, [props.hiddenPage, props.customCheck, props.columns, tableSize]);
     var throttleSize = React.useCallback(function () {
-      var width = tableSize.width,
-          height = tableSize.height;
+      var width = tableSize.width;
       return /*#__PURE__*/React__default['default'].createElement(ResetTable, _extends$2({
         ref: defaultRef
       }, props, {