@zhenliang/sheet 0.0.8 → 0.1.0

package/dist/core/table/index.js

@@ -1,14 +1,14 @@
 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); }
 var _excluded = ["sheetInstance", "columns", "dataSource", "rowKey", "rowSelection", "groupConfig", "onChange", "handleAdd", "draggable", "eventHandler"];
+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 _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); }
@@ -17,7 +17,8 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-import { Sheet } from "../..";
+import { Sheet, useSetState } from "../..";
+import { WidthContext } from "../../hooks/useWidthConfig";
 import { Button } from 'antd';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { SheetEvent } from "../sheet/Event";
@@ -26,11 +27,13 @@ import { TableShell } from "../shell/tableShell";
 import { groupConfigToGroupMap } from "../util";
 import { CheckViewer } from "../viewer/checkViewer";
 import { GroupViewer } from "../viewer/groupViewer";
+import { GroupEvent, SelectionEvent } from "./events";
 import { useGroupConfig } from "./useGroupConfig";
 import { useRowSelection } from "./useRowSelection";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var Table = function Table(_ref) {
+  var _rowGroupConfig$group;
   var sheetRef = _ref.sheetInstance,
     columns = _ref.columns,
     dataSource = _ref.dataSource,
@@ -47,19 +50,23 @@ var Table = function Table(_ref) {
     data = _useState2[0],
     setData = _useState2[1];
   var _sheetInstance = useRef(null);
+  var _useSetState = useSetState({}),
+    _useSetState2 = _slicedToArray(_useSetState, 2),
+    widths = _useSetState2[0],
+    setWidth = _useSetState2[1];
   var sheetInstance = sheetRef || _sheetInstance;
-  var hasChildren = dataSource === null || dataSource === void 0 ? void 0 : dataSource.some(function (item) {
+  var hasChildren = (dataSource === null || dataSource === void 0 ? void 0 : dataSource.some(function (item) {
     var _item$children;
     return (item === null || item === void 0 ? void 0 : (_item$children = item.children) === null || _item$children === void 0 ? void 0 : _item$children.length) > 0;
-  });
-  var hasControl = hasChildren || rowSelection;
+  })) || !!groupConfig;
+  var hasControl = hasChildren || !!rowSelection;
   var _useRowSelection = useRowSelection(dataSource, rowSelection, hasChildren),
     _useRowSelection2 = _slicedToArray(_useRowSelection, 2),
     checkedRow = _useRowSelection2[0],
     setCheckedRow = _useRowSelection2[1];
-  var _useGroupConfig = useGroupConfig(dataSource, {
+  var _useGroupConfig = useGroupConfig(dataSource, _objectSpread({
       defaultOpen: true
-    }, hasChildren),
+    }, groupConfig), hasChildren),
     _useGroupConfig2 = _slicedToArray(_useGroupConfig, 2),
     rowGroupConfig = _useGroupConfig2[0],
     setGroupConfig = _useGroupConfig2[1];
@@ -81,22 +88,24 @@ var Table = function Table(_ref) {
         groupList = [item].concat(_toConsumableArray(item.children));
       }
       groupList.forEach(function (itemRow) {
-        var _groupMap$get, _groupMap$get2;
+        var _columns$, _columns$2, _columns$3, _columns$4, _groupMap$get, _groupMap$get2;
         var dataRow = [];
-        var rowId = item.key || item.id || String(currentIndex);
+        var rowId = itemRow.id || itemRow.key || String(currentIndex);
         if (rowKey) {
           if (rowKey instanceof Function) {
-            rowId = rowKey(item, row);
+            rowId = rowKey(itemRow, row);
           } else {
-            rowId = item[rowKey];
+            rowId = itemRow[rowKey];
           }
         }
         dataRow.push({
           id: rowId,
           row: currentIndex,
           col: -1,
-          editable: false,
+          editable: !((columns === null || columns === void 0 ? void 0 : columns[0].editable) instanceof Function) ? columns === null || columns === void 0 ? void 0 : (_columns$ = columns[0]) === null || _columns$ === void 0 ? void 0 : _columns$.editable : columns === null || columns === void 0 ? void 0 : (_columns$2 = columns[0]) === null || _columns$2 === void 0 ? void 0 : _columns$2.editable('', itemRow, currentIndex),
+          readonly: !((columns === null || columns === void 0 ? void 0 : columns[0].readonly) instanceof Function) ? columns === null || columns === void 0 ? void 0 : (_columns$3 = columns[0]) === null || _columns$3 === void 0 ? void 0 : _columns$3.readonly : columns === null || columns === void 0 ? void 0 : (_columns$4 = columns[0]) === null || _columns$4 === void 0 ? void 0 : _columns$4.readonly('', itemRow, currentIndex),
           align: 'center',
+          fixed: 'unset',
           value: groupMap.get(currentIndex) && ((_groupMap$get = groupMap.get(currentIndex)) === null || _groupMap$get === void 0 ? void 0 : _groupMap$get.isStart),
           record: {
             open: groupMap.get(currentIndex) && ((_groupMap$get2 = groupMap.get(currentIndex)) === null || _groupMap$get2 === void 0 ? void 0 : _groupMap$get2.isOpen)
@@ -105,6 +114,7 @@ var Table = function Table(_ref) {
           className: 'sheet-control'
         });
         columns.forEach(function (colInfo, col) {
+          var _colInfo$cellConfig, _colInfo$cellConfig2, _colInfo$cellConfig3;
           var value = itemRow[colInfo.dataIndex || ''];
           dataRow.push({
             id: rowId,
@@ -113,10 +123,11 @@ var Table = function Table(_ref) {
             readonly: !(colInfo.readonly instanceof Function) ? colInfo.readonly : colInfo.readonly(value, itemRow, currentIndex),
             align: colInfo.align,
             fixed: colInfo.fixed,
-            editable: colInfo.editable,
+            editable: !(colInfo.editable instanceof Function) ? colInfo.editable : colInfo.editable(value, itemRow, currentIndex),
             valueViewer: colInfo.render ? colInfo.render : undefined,
             dataEditor: colInfo.editor ? colInfo.editor : undefined,
             row: currentIndex,
+            className: !(((_colInfo$cellConfig = colInfo.cellConfig) === null || _colInfo$cellConfig === void 0 ? void 0 : _colInfo$cellConfig.className) instanceof Function) ? (_colInfo$cellConfig2 = colInfo.cellConfig) === null || _colInfo$cellConfig2 === void 0 ? void 0 : _colInfo$cellConfig2.className : (_colInfo$cellConfig3 = colInfo.cellConfig) === null || _colInfo$cellConfig3 === void 0 ? void 0 : _colInfo$cellConfig3.className(value, itemRow, currentIndex),
             col: col
           });
         });
@@ -130,7 +141,7 @@ var Table = function Table(_ref) {
     if (hasChildren) return;
     if (!dataSource || !columns) return;
     setData(dataSource.map(function (item, row) {
-      var rowId = String(row);
+      var rowId = item.id || item.key || String(row);
       if (rowKey) {
         if (rowKey instanceof Function) {
           rowId = rowKey(item, row);
@@ -152,6 +163,7 @@ var Table = function Table(_ref) {
         });
       }
       columns.forEach(function (colInfo, col) {
+        var _colInfo$cellConfig4, _colInfo$cellConfig5, _colInfo$cellConfig6;
         var value = item[colInfo.dataIndex || ''];
         rows.push({
           id: rowId,
@@ -160,9 +172,10 @@ var Table = function Table(_ref) {
           readonly: !(colInfo.readonly instanceof Function) ? colInfo.readonly : colInfo.readonly(value, item, row),
           align: colInfo.align,
           fixed: colInfo.fixed,
-          editable: colInfo.editable,
+          editable: !(colInfo.editable instanceof Function) ? colInfo.editable : colInfo.editable(value, item, row),
           valueViewer: colInfo.render ? colInfo.render : undefined,
           dataEditor: colInfo.editor ? colInfo.editor : undefined,
+          className: !(((_colInfo$cellConfig4 = colInfo.cellConfig) === null || _colInfo$cellConfig4 === void 0 ? void 0 : _colInfo$cellConfig4.className) instanceof Function) ? (_colInfo$cellConfig5 = colInfo.cellConfig) === null || _colInfo$cellConfig5 === void 0 ? void 0 : _colInfo$cellConfig5.className : (_colInfo$cellConfig6 = colInfo.cellConfig) === null || _colInfo$cellConfig6 === void 0 ? void 0 : _colInfo$cellConfig6.className(value, item, row),
           row: row,
           col: col
         });
@@ -175,7 +188,7 @@ var Table = function Table(_ref) {
       setData([[]]);
     }
   }, [dataSource, columns]);
-  var handleChanges = useCallback(function (changes) {
+  var handleChanges = useCallback(function (changes, extChange) {
     onChange && onChange(changes.map(function (item) {
       return {
         row: item.row,
@@ -183,6 +196,13 @@ var Table = function Table(_ref) {
         key: columns[hasControl ? item.col - 1 : item.col].dataIndex,
         value: item.value
       };
+    }), extChange === null || extChange === void 0 ? void 0 : extChange.map(function (item) {
+      return {
+        row: item.row,
+        id: item.id,
+        key: columns[hasControl ? item.col - 1 : item.col].dataIndex,
+        value: item.value
+      };
     }));
   }, [columns, onChange, hasControl]);
   var handleReverse = useCallback(function (value) {
@@ -202,15 +222,19 @@ var Table = function Table(_ref) {
   }, [data, groupConfig]);
   var handleRowSelect = useCallback(function (value) {
     if (!sheetInstance.current) return;
+    var currentRow = value;
     // sheetInstance.current?.selectRow(value as number);
     var newChecked = Array(checkedRow.length).fill(false);
-    newChecked[value] = !newChecked[value];
+    newChecked[currentRow] = !newChecked[currentRow];
     setCheckedRow(newChecked);
   }, [sheetInstance, checkedRow]);
+  var headGroupOpen = !(rowGroupConfig !== null && rowGroupConfig !== void 0 && (_rowGroupConfig$group = rowGroupConfig.groupOpen) !== null && _rowGroupConfig$group !== void 0 && _rowGroupConfig$group.some(function (value) {
+    return !value;
+  }));
+  var headSelection = !!rowSelection;
   var WrappedTableShell = useMemo(function () {
-    var _rowGroupConfig$group2;
+    console.log('shell-render', '损耗性能大');
     if (draggable) {
-      var _rowGroupConfig$group;
       return DraggableShell({
         columns: columns,
         className: 'baseTable',
@@ -218,9 +242,7 @@ var Table = function Table(_ref) {
         showSelect: !!rowSelection,
         controlProps: {
           group: {
-            open: !(rowGroupConfig !== null && rowGroupConfig !== void 0 && (_rowGroupConfig$group = rowGroupConfig.groupOpen) !== null && _rowGroupConfig$group !== void 0 && _rowGroupConfig$group.some(function (value) {
-              return !value;
-            }))
+            open: headGroupOpen
           },
           check: {
             checked: false
@@ -235,97 +257,54 @@ var Table = function Table(_ref) {
       showSelect: !!rowSelection,
       controlProps: {
         group: {
-          open: !(rowGroupConfig !== null && rowGroupConfig !== void 0 && (_rowGroupConfig$group2 = rowGroupConfig.groupOpen) !== null && _rowGroupConfig$group2 !== void 0 && _rowGroupConfig$group2.some(function (value) {
-            return !value;
-          }))
+          open: headGroupOpen
         },
         check: {
           checked: false
         }
       }
     });
-  }, [columns, draggable, rowSelection, hasChildren, rowGroupConfig]);
-  return /*#__PURE__*/_jsxs(Sheet, _objectSpread(_objectSpread({}, args), {}, {
-    sheetInstance: sheetInstance,
-    sheetRenderer: WrappedTableShell,
-    groupConfig: rowGroupConfig,
-    data: data,
-    onCellsChanged: handleChanges,
-    children: [!hasChildren && rowSelection ? [/*#__PURE__*/_jsx(SheetEvent, {
-      name: "row-select",
-      handler: handleRowSelect
-    }, "row-select"), /*#__PURE__*/_jsx(SheetEvent, {
-      name: "row-select-title",
-      handler: handleRowSelect
-    }, "row-select-title")] : null, hasChildren ? [/*#__PURE__*/_jsx(SheetEvent, {
-      name: "group-open",
-      handler: function handler(e) {
-        var _ref5 = e,
-          row = _ref5.row;
-        var index = groups.findIndex(function (item) {
-          return item.groupStart === row;
-        });
-        if (index >= 0) {
-          var _sheetInstance$curren;
-          var _groupOpen = _toConsumableArray(rowGroupConfig.groupOpen);
-          _groupOpen[index] = !rowGroupConfig.groupOpen[index];
-          setGroupConfig(_objectSpread(_objectSpread({}, rowGroupConfig), {}, {
-            groupOpen: _groupOpen
-          }));
-          var newGrid = _toConsumableArray(data);
-          newGrid[row] = _toConsumableArray(newGrid[row]);
-          newGrid[row][0] = _objectSpread(_objectSpread({}, newGrid[row][0]), {}, {
-            record: {
-              open: !!_groupOpen[index]
-            }
-          });
-          setData(newGrid);
-          (_sheetInstance$curren = sheetInstance.current) === null || _sheetInstance$curren === void 0 ? void 0 : _sheetInstance$curren.pushToHistory({
-            type: 'Custom',
-            changes: [],
-            extraInfo: {
-              extraType: 'group',
-              groupConfig: rowGroupConfig,
-              data: data
-            }
-          });
-        }
-      }
-    }, "group-open"), /*#__PURE__*/_jsx(SheetEvent, {
-      name: "group-open-title",
-      handler: function handler(value) {
-        var _sheetInstance$curren2;
-        setGroupConfig(_objectSpread(_objectSpread({}, rowGroupConfig), {}, {
-          groupOpen: Array(rowGroupConfig.groupOpen.length).fill(value)
-        }));
-        (_sheetInstance$curren2 = sheetInstance.current) === null || _sheetInstance$curren2 === void 0 ? void 0 : _sheetInstance$curren2.pushToHistory({
-          type: 'Custom',
-          changes: [],
-          extraInfo: {
-            extraType: 'group',
-            groupConfig: rowGroupConfig,
-            data: data
-          }
-        });
-      }
-    }, "group-open-title")] : null, /*#__PURE__*/_jsx(SheetEvent, {
-      name: "reverse",
-      handler: handleReverse
-    }, "_reverse"), Object.keys(eventHandler || {}).map(function (key) {
-      return /*#__PURE__*/_jsx(SheetEvent, {
-        name: key,
-        handler: eventHandler === null || eventHandler === void 0 ? void 0 : eventHandler[key]
-      }, key);
-    }), handleAdd ? /*#__PURE__*/_jsx(Button, {
-      type: "dashed",
-      style: {
-        width: '100%',
-        height: 32
-      },
-      onClick: handleAdd,
-      children: "+ \u6DFB\u52A0"
-    }) : null]
-  }));
+  }, [columns.length, draggable, headSelection, hasChildren, headGroupOpen]);
+  return /*#__PURE__*/_jsx(WidthContext.Provider, {
+    value: {
+      widths: widths,
+      onChange: setWidth
+    },
+    children: /*#__PURE__*/_jsxs(Sheet, _objectSpread(_objectSpread({}, args), {}, {
+      sheetInstance: sheetInstance,
+      sheetRenderer: WrappedTableShell,
+      groupConfig: rowGroupConfig,
+      data: data,
+      onCellsChanged: handleChanges,
+      children: [/*#__PURE__*/_jsx(SelectionEvent, {
+        hasChildren: hasChildren,
+        rowSelection: rowSelection,
+        onChange: handleRowSelect
+      }), /*#__PURE__*/_jsx(GroupEvent, {
+        hasChildren: hasChildren,
+        data: data,
+        rowGroupConfig: rowGroupConfig,
+        sheetInstance: sheetInstance.current,
+        onGridChange: setData,
+        onGroupChange: setGroupConfig
+      }), /*#__PURE__*/_jsx(SheetEvent, {
+        name: "reverse",
+        handler: handleReverse
+      }, "_reverse"), Object.keys(eventHandler || {}).map(function (key) {
+        return /*#__PURE__*/_jsx(SheetEvent, {
+          name: key,
+          handler: eventHandler === null || eventHandler === void 0 ? void 0 : eventHandler[key]
+        }, key);
+      }), handleAdd ? /*#__PURE__*/_jsx(Button, {
+        type: "dashed",
+        style: {
+          width: '100%',
+          height: 32
+        },
+        onClick: handleAdd,
+        children: "+ \u6DFB\u52A0"
+      }) : null]
+    }))
+  });
 };
-export default Table;
-//# sourceMappingURL=index.js.map
+export default Table;

package/dist/core/table/useGroupConfig.js

@@ -4,7 +4,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 { useEffect, useRef, useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { dataSourceToRowConfig } from "./util";
 export var useGroupConfig = function useGroupConfig(dataSource, tableGroupConfig, hasChildren) {
   var _useState = useState(),
@@ -12,13 +12,26 @@ export var useGroupConfig = function useGroupConfig(dataSource, tableGroupConfig
     groupConfig = _useState2[0],
     setGroupConfig = _useState2[1];
   var groupConfigRef = useRef();
+  var childrenLength = useMemo(function () {
+    if (!(dataSource !== null && dataSource !== void 0 && dataSource.length)) return 0;
+    var data = dataSource;
+    var childrenCount = data.filter(function (item) {
+      var _item$children;
+      return !!((_item$children = item.children) !== null && _item$children !== void 0 && _item$children.length);
+    }).reduce(function (count, _ref) {
+      var children = _ref.children;
+      return count + (children === null || children === void 0 ? void 0 : children.length) ? children.length : 0;
+    }, 0);
+    return childrenCount;
+  }, [dataSource]);
   useEffect(function () {
     if (!hasChildren) return;
+    console.log('groupConfigEffect', dataSource.length);
     var rowConfig = dataSourceToRowConfig(dataSource, tableGroupConfig === null || tableGroupConfig === void 0 ? void 0 : tableGroupConfig.defaultOpen);
     if (groupConfigRef.current) {
-      groupConfigRef.current.groups.forEach(function (_ref, index) {
+      groupConfigRef.current.groups.forEach(function (_ref2, index) {
         var _groupConfigRef$curre;
-        var groupName = _ref.groupName;
+        var groupName = _ref2.groupName;
         var rowIndex = rowConfig.groups.findIndex(function (item) {
           return item.groupName === groupName;
         });
@@ -26,8 +39,12 @@ export var useGroupConfig = function useGroupConfig(dataSource, tableGroupConfig
       });
     }
     setGroupConfig(rowConfig);
+    console.log('groupConfigEffect', rowConfig.groups, rowConfig.groupOpen);
     groupConfigRef.current = rowConfig;
-  }, [dataSource, hasChildren]);
-  return [groupConfig, setGroupConfig];
-};
-//# sourceMappingURL=useGroupConfig.js.map
+  }, [dataSource.length, childrenLength, hasChildren]);
+  var handleGroupChange = useCallback(function (value) {
+    setGroupConfig(value);
+    groupConfigRef.current = value;
+  }, [setGroupConfig]);
+  return [groupConfig, handleGroupChange];
+};

package/dist/core/table/useRowSelection.d.ts

@@ -1 +1,2 @@
-export declare const useRowSelection: (dataSource: Record<string, unknown>[], rowSelection?: any, hasChildren?: boolean) => [boolean[], (value: boolean[]) => void];
+import { SheetTableType } from "../..";
+export declare const useRowSelection: (dataSource: Record<string, unknown>[], rowSelection?: SheetTableType.TableRowSelection, hasChildren?: boolean) => [boolean[], (value: boolean[]) => void];

package/dist/core/table/useRowSelection.js

@@ -21,5 +21,4 @@ export var useRowSelection = function useRowSelection(dataSource, rowSelection,
     checkedRowRef.current = currentEmpty;
   }, [dataSource.length, hasChildren, rowSelection]);
   return [checkedRow, setCheckedRow];
-};
-//# sourceMappingURL=useRowSelection.js.map
+};

package/dist/core/table/util.js

@@ -13,7 +13,7 @@ export var dataSourceToRowConfig = function dataSourceToRowConfig(dataSource) {
     if ((children === null || children === void 0 ? void 0 : children.length) > 0) {
       groups.push({
         groupStart: currentIndex,
-        groupEnd: currentIndex + children.length + 1,
+        groupEnd: currentIndex + children.length,
         // 默认 key 或者 id 是行数据的唯一标识
         groupName: "".concat(item.key || item.id || index, "group")
       });
@@ -26,5 +26,4 @@ export var dataSourceToRowConfig = function dataSourceToRowConfig(dataSource) {
     groups: groups,
     groupOpen: groupOpen
   };
-};
-//# sourceMappingURL=util.js.map
+};

package/dist/core/util.d.ts

@@ -29,7 +29,10 @@ export declare function formatDataToCell({ start, editing, end, data, pasteData,
 } | undefined;
 export declare const defaultValueRenderer: (cell: SheetType.Cell) => string | number | null | undefined;
 export declare function renderValue(cell: SheetType.Cell): string | number;
-export declare const optionsTransferToValue: (options: SheetType.OptionsType[], val: string) => string[];
+export declare const optionsToValuesFromLabelOrValue: (options: SheetType.OptionsType[], val: string) => string[];
+export declare const optionsTransferToValue: (options: SheetType.OptionsType[], val: string, key?: string) => string[];
+export declare const optionsTransferToValue2: (options?: SheetType.OptionsType[], value?: string, path?: string[]) => string[];
+export declare const valuesTransferToLabel: (options?: SheetType.OptionsType[], value?: string) => string | null;
 export declare const groupConfigToGroupMap: (rowGroupConfig?: SheetType.RowGroupConfig) => Map<number, SheetType.RowGroup & {
     isStart: boolean;
     isOpen: boolean;
@@ -43,7 +46,7 @@ export declare const getRowHeight: (container: HTMLSpanElement) => number;
 export declare const getNextVisibleRow: (row: number, maxRow: number, groupMap?: Map<number, SheetType.RowGroup & {
     isStart: boolean;
     isOpen: boolean;
-}>) => number | null;
+}>, up?: number) => number | null;
 export declare const calcMenuPosition: ({ tableElement, menuElement, x, y, }: {
     tableElement: SheetType.refAssertion | null;
     menuElement?: Element | null | undefined;