@zhenliang/sheet 0.1.6 → 0.1.7-3.beta.0

package/dist/core/table/events.js

@@ -1,19 +1,21 @@
-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 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 _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 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 _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 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 _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 _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 _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; }
+/* eslint-disable @typescript-eslint/no-unused-vars */
+import { useGroup } from "../../hooks/useGroupConfig";
 import { SheetEvent } from "../sheet/Event";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { Fragment as _Fragment } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx } from "../../../node_modules/@types/react/jsx-runtime";
+import { Fragment as _Fragment } from "../../../node_modules/@types/react/jsx-runtime";
+import { jsxs as _jsxs } from "../../../node_modules/@types/react/jsx-runtime";
 export var SelectionEvent = function SelectionEvent(props) {
   var hasChildren = props.hasChildren,
     rowSelection = props.rowSelection,
@@ -31,44 +33,34 @@ export var SelectionEvent = function SelectionEvent(props) {
 };
 export var GroupEvent = function GroupEvent(props) {
   var hasChildren = props.hasChildren,
-    rowGroupConfig = props.rowGroupConfig,
-    data = props.data,
-    sheetInstance = props.sheetInstance,
-    onGroupChange = props.onGroupChange,
-    onGridChange = props.onGridChange;
+    sheetInstance = props.sheetInstance;
+  var _useGroup = useGroup(),
+    _useGroup$config = _useGroup.config,
+    rowGroupConfig = _useGroup$config === void 0 ? {} : _useGroup$config,
+    onGroupChange = _useGroup.onChange;
   if (!hasChildren) return null;
-  var _ref = rowGroupConfig || {},
-    groups = _ref.groups;
+  var groups = rowGroupConfig.groups;
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsx(SheetEvent, {
       name: "group-open",
       handler: function handler(e) {
-        var _ref2 = e,
-          row = _ref2.row;
-        var index = groups.findIndex(function (item) {
+        var _ref = e,
+          row = _ref.row;
+        var index = groups === null || groups === void 0 ? void 0 : groups.findIndex(function (item) {
           return item.groupStart === row;
         });
         if (index >= 0) {
-          var groupOpen = _toConsumableArray(rowGroupConfig.groupOpen);
-          groupOpen[index] = !rowGroupConfig.groupOpen[index];
+          var groupOpen = _toConsumableArray(rowGroupConfig === null || rowGroupConfig === void 0 ? void 0 : rowGroupConfig.groupOpen);
+          groupOpen[index] = !(rowGroupConfig !== null && rowGroupConfig !== void 0 && rowGroupConfig.groupOpen[index]);
           onGroupChange && onGroupChange(_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]
-            }
-          });
-          onGridChange && onGridChange(newGrid);
-          sheetInstance === null || sheetInstance === void 0 ? void 0 : sheetInstance.pushToHistory({
+          sheetInstance === null || sheetInstance === void 0 || sheetInstance.pushToHistory({
             type: 'Custom',
             changes: [],
             extraInfo: {
               extraType: 'group',
-              groupConfig: rowGroupConfig,
-              data: data
+              groupConfig: rowGroupConfig
             }
           });
         }
@@ -76,17 +68,19 @@ export var GroupEvent = function GroupEvent(props) {
     }, "group-open"), /*#__PURE__*/_jsx(SheetEvent, {
       name: "group-open-title",
       handler: function handler(value) {
+        if (!(rowGroupConfig !== null && rowGroupConfig !== void 0 && rowGroupConfig.groupOpen.some(function (item) {
+          return item !== value;
+        }))) return;
         onGroupChange && onGroupChange(_objectSpread(_objectSpread({}, rowGroupConfig), {}, {
           groupOpen: Array(rowGroupConfig === null || rowGroupConfig === void 0 ? void 0 : rowGroupConfig.groupOpen.length).fill(value),
           defaultOpen: !groups.length ? value : undefined
         }));
-        sheetInstance === null || sheetInstance === void 0 ? void 0 : sheetInstance.pushToHistory({
+        sheetInstance === null || sheetInstance === void 0 || sheetInstance.pushToHistory({
           type: 'Custom',
           changes: [],
           extraInfo: {
             extraType: 'group',
-            groupConfig: rowGroupConfig,
-            data: data
+            groupConfig: rowGroupConfig
           }
         });
       }

package/dist/core/table/index.js

@@ -1,39 +1,33 @@
-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 _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+var _excluded = ["sheetInstance", "columns", "dataSource", "rowKey", "rowSelection", "groupConfig", "onChange", "handleAdd", "handleBatchAdd", "draggable", "eventHandler"];
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 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 _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 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 _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 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, useSetState } from "../..";
+import { GroupContext } from "../../hooks/useGroupConfig";
 import { WidthContext } from "../../hooks/useWidthConfig";
-import { Button } from 'antd';
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { ConfigProvider, Empty } from 'antd';
+import { useCallback, useEffect, useMemo, useRef, useState } from "../../../node_modules/@types/react";
 import { SheetEvent } from "../sheet/Event";
 import { DraggableShell } from "../shell/draggableShell";
 import { TableShell } from "../shell/tableShell";
-import { groupConfigToGroupMap } from "../util";
-import { CheckViewer } from "../viewer/checkViewer";
-import { GroupViewer } from "../viewer/groupViewer";
+import { AddButton } from "./addButton";
 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";
+import { formatGroupData, useGroupConfig } from "./useGroupConfig";
+import { formatSelectionData, useRowSelection } from "./useRowSelection";
+import { jsx as _jsx } from "../../../node_modules/@types/react/jsx-runtime";
+import { jsxs as _jsxs } from "../../../node_modules/@types/react/jsx-runtime";
 var Table = function Table(_ref) {
-  var _rowGroupConfig$group, _rowGroupConfig$group2;
   var sheetRef = _ref.sheetInstance,
     columns = _ref.columns,
     dataSource = _ref.dataSource,
@@ -42,6 +36,7 @@ var Table = function Table(_ref) {
     groupConfig = _ref.groupConfig,
     onChange = _ref.onChange,
     handleAdd = _ref.handleAdd,
+    handleBatchAdd = _ref.handleBatchAdd,
     draggable = _ref.draggable,
     eventHandler = _ref.eventHandler,
     args = _objectWithoutProperties(_ref, _excluded);
@@ -55,11 +50,14 @@ var Table = function Table(_ref) {
     widths = _useSetState2[0],
     setWidth = _useSetState2[1];
   var sheetInstance = sheetRef || _sheetInstance;
-  var hasChildren = (dataSource === null || dataSource === void 0 ? void 0 : dataSource.some(function (item) {
+  var dataHasChildren = 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;
-  })) || !!groupConfig;
+    return (item === null || item === void 0 || (_item$children = item.children) === null || _item$children === void 0 ? void 0 : _item$children.length) > 0;
+  });
+  var configWithChildren = !!groupConfig && !!dataSource.length;
+  var hasChildren = dataHasChildren || configWithChildren;
   var hasControl = hasChildren || !!rowSelection;
+  var offset = hasControl ? 2 : 1;
   var _useRowSelection = useRowSelection(dataSource, rowSelection, hasChildren),
     _useRowSelection2 = _slicedToArray(_useRowSelection, 2),
     checkedRow = _useRowSelection2[0],
@@ -70,119 +68,26 @@ var Table = function Table(_ref) {
     _useGroupConfig2 = _slicedToArray(_useGroupConfig, 2),
     rowGroupConfig = _useGroupConfig2[0],
     setGroupConfig = _useGroupConfig2[1];
-  var _ref2 = rowGroupConfig || {},
-    groups = _ref2.groups,
-    groupOpen = _ref2.groupOpen;
   useEffect(function () {
     if (!hasChildren) return;
     if (!dataSource || !columns) return;
-    var data = [];
-    var groupMap = groupConfigToGroupMap({
-      groups: groups,
-      groupOpen: groupOpen
-    });
-    var currentIndex = 0;
-    dataSource.forEach(function (item, row) {
-      var groupList = [item];
-      if (item.children) {
-        groupList = [item].concat(_toConsumableArray(item.children));
-      }
-      groupList.forEach(function (itemRow) {
-        var _columns$, _columns$2, _columns$3, _columns$4, _groupMap$get, _groupMap$get2;
-        var dataRow = [];
-        var rowId = itemRow.id || itemRow.key || String(currentIndex);
-        if (rowKey) {
-          if (rowKey instanceof Function) {
-            rowId = rowKey(itemRow, row);
-          } else {
-            rowId = itemRow[rowKey];
-          }
-        }
-        dataRow.push({
-          id: rowId,
-          row: currentIndex,
-          col: -1,
-          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)
-          },
-          valueViewer: GroupViewer,
-          className: 'sheet-control'
-        });
-        columns.forEach(function (colInfo, col) {
-          var _colInfo$cellConfig, _colInfo$cellConfig2, _colInfo$cellConfig3;
-          var value = itemRow[colInfo.dataIndex || ''];
-          dataRow.push({
-            id: rowId,
-            value: value,
-            record: itemRow,
-            readonly: !(colInfo.readonly instanceof Function) ? colInfo.readonly : colInfo.readonly(value, itemRow, currentIndex),
-            align: colInfo.align,
-            fixed: colInfo.fixed,
-            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
-          });
-        });
-        data.push(dataRow);
-        currentIndex++;
-      });
-    });
-    setData(data);
-  }, [dataSource, columns, groups, hasChildren, rowGroupConfig]);
+    setData(formatGroupData({
+      dataSource: dataSource,
+      columns: columns,
+      rowKey: rowKey
+    }));
+  }, [dataSource, columns, hasChildren, rowKey]);
   useEffect(function () {
     if (hasChildren) return;
     if (!dataSource || !columns) return;
-    setData(dataSource.map(function (item, row) {
-      var rowId = item.id || item.key || String(row);
-      if (rowKey) {
-        if (rowKey instanceof Function) {
-          rowId = rowKey(item, row);
-        } else {
-          rowId = item[rowKey];
-        }
-      }
-      var rows = [];
-      if (rowSelection) {
-        rows.push({
-          id: rowId,
-          row: row,
-          col: -1,
-          readonly: true,
-          align: 'center',
-          value: checkedRow[row],
-          valueViewer: CheckViewer,
-          className: 'sheet-control'
-        });
-      }
-      columns.forEach(function (colInfo, col) {
-        var _colInfo$cellConfig4, _colInfo$cellConfig5, _colInfo$cellConfig6;
-        var value = item[colInfo.dataIndex || ''];
-        rows.push({
-          id: rowId,
-          value: value,
-          record: item,
-          readonly: !(colInfo.readonly instanceof Function) ? colInfo.readonly : colInfo.readonly(value, item, row),
-          align: colInfo.align,
-          fixed: colInfo.fixed,
-          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
-        });
-      });
-      return rows;
+    setData(formatSelectionData({
+      dataSource: dataSource,
+      columns: columns,
+      checked: checkedRow,
+      rowKey: rowKey,
+      rowSelection: rowSelection
     }));
-  }, [dataSource, columns, checkedRow, hasChildren]);
+  }, [dataSource, columns, checkedRow, hasChildren, rowKey, rowSelection]);
   useEffect(function () {
     if (!dataSource || !columns) {
       setData([[]]);
@@ -191,32 +96,32 @@ var Table = function Table(_ref) {
   var handleChanges = useCallback(function (changes, extChange) {
     onChange && onChange(changes.map(function (item) {
       return {
+        col: item.col,
         row: item.row,
         id: item.id,
-        key: columns[hasControl ? item.col - 1 : item.col].dataIndex,
+        key: item.key || columns[item.col - offset].dataIndex,
         value: item.value
       };
     }), extChange === null || extChange === void 0 ? void 0 : extChange.map(function (item) {
       return {
+        col: item.col,
         row: item.row,
         id: item.id,
-        key: columns[hasControl ? item.col - 1 : item.col].dataIndex,
+        key: item.key || columns[item.col - offset].dataIndex,
         value: item.value
       };
     }));
   }, [columns, onChange, hasControl]);
   var handleReverse = useCallback(function (value) {
-    var _ref3 = value,
-      type = _ref3.type,
-      extraInfo = _ref3.extraInfo;
+    var _ref2 = value,
+      type = _ref2.type,
+      extraInfo = _ref2.extraInfo;
     if (type === 'Custom') {
-      var _ref4 = extraInfo,
-        _groupConfig = _ref4.groupConfig,
-        extraType = _ref4.extraType,
-        lastData = _ref4.data;
+      var _ref3 = extraInfo,
+        _groupConfig = _ref3.groupConfig,
+        extraType = _ref3.extraType;
       if (extraType === 'group') {
         setGroupConfig(_groupConfig);
-        setData(lastData);
       }
     }
   }, [data, groupConfig]);
@@ -228,13 +133,15 @@ var Table = function Table(_ref) {
     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.length) ? !!(rowGroupConfig !== null && rowGroupConfig !== void 0 && rowGroupConfig.defaultOpen) : !(rowGroupConfig !== null && rowGroupConfig !== void 0 && (_rowGroupConfig$group2 = rowGroupConfig.groupOpen) !== null && _rowGroupConfig$group2 !== void 0 && _rowGroupConfig$group2.some(function (value) {
-    return !value;
-  }));
   var headSelection = !!rowSelection;
-  console.log('shell-render', rowGroupConfig === null || rowGroupConfig === void 0 ? void 0 : rowGroupConfig.defaultOpen, headGroupOpen);
+  var columnsTitle = useMemo(function () {
+    return columns.filter(function (item) {
+      return typeof item.title === 'string';
+    }).map(function (item) {
+      return item.title;
+    }).join('_');
+  }, [columns]);
   var WrappedTableShell = useMemo(function () {
-    console.log('shell-render', '损耗性能大');
     if (draggable) {
       return DraggableShell({
         columns: columns,
@@ -242,9 +149,6 @@ var Table = function Table(_ref) {
         showGroup: hasChildren,
         showSelect: !!rowSelection,
         controlProps: {
-          group: {
-            open: headGroupOpen
-          },
           check: {
             checked: false
           }
@@ -257,55 +161,58 @@ var Table = function Table(_ref) {
       showGroup: hasChildren,
       showSelect: !!rowSelection,
       controlProps: {
-        group: {
-          open: headGroupOpen
-        },
         check: {
           checked: false
         }
       }
     });
-  }, [columns.length, draggable, headSelection, hasChildren, headGroupOpen]);
-  return /*#__PURE__*/_jsx(WidthContext.Provider, {
-    value: {
-      widths: widths,
-      onChange: setWidth
+  }, [columns.length, columnsTitle, draggable, headSelection, hasChildren]);
+  return /*#__PURE__*/_jsx(ConfigProvider, {
+    renderEmpty: function renderEmpty() {
+      return /*#__PURE__*/_jsx(Empty, {
+        image: Empty.PRESENTED_IMAGE_SIMPLE
+      });
     },
-    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
+    children: /*#__PURE__*/_jsx(WidthContext.Provider, {
+      value: {
+        widths: widths,
+        onChange: setWidth
+      },
+      children: /*#__PURE__*/_jsx(GroupContext.Provider, {
+        value: {
+          config: rowGroupConfig,
+          onChange: setGroupConfig
         },
-        onClick: handleAdd,
-        children: "+ \u6DFB\u52A0"
-      }) : null]
-    }))
+        children: /*#__PURE__*/_jsxs(Sheet, _objectSpread(_objectSpread({}, args), {}, {
+          sheetInstance: sheetInstance,
+          sheetRenderer: WrappedTableShell,
+          data: data,
+          onCellsChanged: handleChanges,
+          handleAdd: handleAdd,
+          children: [/*#__PURE__*/_jsx(SelectionEvent, {
+            hasChildren: hasChildren,
+            rowSelection: rowSelection,
+            onChange: handleRowSelect
+          }), /*#__PURE__*/_jsx(GroupEvent, {
+            hasChildren: hasChildren,
+            data: data,
+            sheetInstance: sheetInstance.current,
+            onGridChange: setData
+          }), /*#__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);
+          }), /*#__PURE__*/_jsx(AddButton, {
+            handleAdd: handleAdd,
+            handleBatchAdd: handleBatchAdd
+          })]
+        }))
+      })
+    })
   });
 };
 export default Table;

package/dist/core/table/index.less

@@ -0,0 +1,12 @@
+
+.batch-add-pop{
+  .ant-popover-inner{
+    .ant-popover-inner-content{
+      padding: 0;
+
+      .batch-add-pop-content{
+        padding: 14px 16px;
+      }
+    }
+  }
+}

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

@@ -1,2 +1,5 @@
 import type { SheetTableType, SheetType } from "../../type";
-export declare const useGroupConfig: (dataSource: Record<string, unknown>[], tableGroupConfig?: SheetTableType.TableGroupConfig, hasChildren?: boolean) => [SheetType.RowGroupConfig, (value: SheetType.RowGroupConfig) => void];
+export declare const useGroupConfig: (dataSource: Record<string, unknown>[], tableGroupConfig?: SheetTableType.TableGroupConfig, hasChildren?: boolean) => [SheetType.RowGroupConfig & {
+    configMap: SheetType.GroupMap;
+}, (value: SheetType.RowGroupConfig) => void];
+export declare const formatGroupData: (param: Pick<SheetTableType.TableProps, 'dataSource' | 'columns' | 'rowKey'>) => SheetType.Cell[][];