linkmore-design 1.1.1 → 1.1.2

package/dist/index.umd.js

@@ -129972,12 +129972,12 @@
                       return reject(err);
                   }
               }
-              let sock;
               // Shuffle proxies
               if (options.randomizeChain) {
                   (0, util$1.shuffleArray)(options.proxies);
               }
               try {
+                  let sock;
                   for (let i = 0; i < options.proxies.length; i++) {
                       const nextProxy = options.proxies[i];
                       // If we've reached the last proxy in the chain, the destination is the actual destination, otherwise it's the next proxy.
@@ -129993,12 +129993,10 @@
                           command: 'connect',
                           proxy: nextProxy,
                           destination: nextDestination,
-                          // Initial connection ignores this as sock is undefined. Subsequent connections re-use the first proxy socket to form a chain.
+                          existing_socket: sock,
                       });
                       // If sock is undefined, assign it here.
-                      if (!sock) {
-                          sock = result.socket;
-                      }
+                      sock = sock || result.socket;
                   }
                   if (typeof callback === 'function') {
                       callback(null, { socket: sock });
@@ -221460,12 +221458,14 @@
 
   var _excluded$1T = ["children"];
   var Item$4 = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
+    var _children$props;
+
     var children = _ref.children,
         props = _objectWithoutProperties$1(_ref, _excluded$1T);
 
     return /*#__PURE__*/React__default['default'].createElement("th", _extends$2({}, props, {
       ref: ref
-    }), children);
+    }), (children === null || children === void 0 ? void 0 : (_children$props = children.props) === null || _children$props === void 0 ? void 0 : _children$props.children) || children);
   });
   function SortableItem(props) {
     var _useSortable = useSortable({
@@ -222080,7 +222080,7 @@
 
     var _ref = (isSelected === null || isSelected === void 0 ? void 0 : isSelected(rowIndex, colIndex)) || {},
         _ref$isSelected = _ref.isSelected,
-        sd = _ref$isSelected === void 0 ? false : _ref$isSelected,
+        _selected = _ref$isSelected === void 0 ? false : _ref$isSelected,
         _ref$isEnd = _ref.isEnd,
         isEnd = _ref$isEnd === void 0 ? false : _ref$isEnd,
         _ref$isRightEnd = _ref.isRightEnd,
@@ -222088,7 +222088,9 @@
         _ref$isEditing = _ref.isEditing,
         isEditing = _ref$isEditing === void 0 ? false : _ref$isEditing,
         _ref$isVaildCommit = _ref.isVaildCommit,
-        isVaildCommit = _ref$isVaildCommit === void 0 ? false : _ref$isVaildCommit;
+        isVaildCommit = _ref$isVaildCommit === void 0 ? false : _ref$isVaildCommit,
+        _ref$selectedReadonly = _ref.selectedReadonly,
+        selectedReadonly = _ref$selectedReadonly === void 0 ? false : _ref$selectedReadonly;
 
     var _useState = React.useState((record === null || record === void 0 ? void 0 : record[col === null || col === void 0 ? void 0 : col.dataIndex]) || ''),
         _useState2 = _slicedToArray$1(_useState, 2),
@@ -222156,13 +222158,12 @@
 
     var saveRenderValue = function saveRenderValue() {
       if (valueRef.current !== (record === null || record === void 0 ? void 0 : record[col === null || col === void 0 ? void 0 : col.dataIndex])) {
-        dataSourceChange === null || dataSourceChange === void 0 ? void 0 : dataSourceChange(rowIndex, colIndex, _objectSpread(_objectSpread({}, record), {}, _defineProperty$1({}, col.dataIndex, valueRef.current)));
+        dataSourceChange === null || dataSourceChange === void 0 ? void 0 : dataSourceChange(rowIndex, colIndex, valueRef.current, _objectSpread(_objectSpread({}, record), {}, _defineProperty$1({}, col.dataIndex, valueRef.current)));
       }
     };
 
     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,
@@ -222183,13 +222184,16 @@
     var content = renderComponent() || renderEditor() || renderViewer;
     return /*#__PURE__*/React__default['default'].createElement("td", _objectSpread(_objectSpread({}, lodash.omit(clearProps, ['commitIng', 'editIng'])), {}, {
       // style={{ userSelect: 'none' }}
-      className: _classnames_2_3_2_classnames(colIndex === undefined && 'row_selection_td', 'unselection', sd && selectIng && 'selected', isEnd && 'end', isRightEnd && 'right_end', isEditing && 'editing', isVaildCommit && 'commiting'),
+      className: _classnames_2_3_2_classnames(colIndex === undefined && 'row_selection_td', 'unselection', _selected && selectIng && 'selected', isEnd && 'end', isRightEnd && 'right_end', isEditing && 'editing', isVaildCommit && 'commiting', selectedReadonly && 'readonly_red'),
       onMouseDown: handleMouseDown,
       onMouseOver: handleMouseOver,
       onContextMenu: handleContextMenu,
       onDoubleClick: handleDoubleClick,
       key: "".concat(rowIndex, "_").concat(colIndex)
-    }), content);
+    }), content, isRightEnd && isEnd && !isEditing && /*#__PURE__*/React__default['default'].createElement("div", {
+      ref: endCellRef,
+      className: 'lmtable_cell_end_icon'
+    }));
   };
 
   var isArrayLike$1 = function (value) {
@@ -236814,31 +236818,6 @@
       return ShapeAnnotation;
   }(GroupComponent));
 
-  var CONTAINER_CLASS = 'g2-tooltip';
-  var CONTAINER_CLASS_CUSTOM = 'g2-tooltip-custom';
-  var TITLE_CLASS = 'g2-tooltip-title';
-  var LIST_CLASS = 'g2-tooltip-list';
-  var LIST_ITEM_CLASS = 'g2-tooltip-list-item';
-  var MARKER_CLASS = 'g2-tooltip-marker';
-  var VALUE_CLASS = 'g2-tooltip-value';
-  var NAME_CLASS = 'g2-tooltip-name';
-  var CROSSHAIR_X = 'g2-tooltip-crosshair-x';
-  var CROSSHAIR_Y = 'g2-tooltip-crosshair-y';
-
-  var CssConst = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    CONTAINER_CLASS: CONTAINER_CLASS,
-    CONTAINER_CLASS_CUSTOM: CONTAINER_CLASS_CUSTOM,
-    TITLE_CLASS: TITLE_CLASS,
-    LIST_CLASS: LIST_CLASS,
-    LIST_ITEM_CLASS: LIST_ITEM_CLASS,
-    MARKER_CLASS: MARKER_CLASS,
-    VALUE_CLASS: VALUE_CLASS,
-    NAME_CLASS: NAME_CLASS,
-    CROSSHAIR_X: CROSSHAIR_X,
-    CROSSHAIR_Y: CROSSHAIR_Y
-  });
-
   var HtmlComponent = /** @class */ (function (_super) {
       __extends(HtmlComponent, _super);
       function HtmlComponent() {
@@ -236971,17 +236950,10 @@
           }
       };
       HtmlComponent.prototype.applyChildrenStyles = function (element, styles) {
-          var _this = this;
           each$2(styles, function (style, name) {
               var elements = element.getElementsByClassName(name);
               each$2(elements, function (el) {
-                  var containerClassName = _this.get('containerClassName');
-                  // 在自定义容器下, 可以渲染 g2-tooltip 的样式, 以兼容线上场景, 但是不应该设置 visibility
-                  var newStyle = style;
-                  if (hasClass(el, CONTAINER_CLASS) && containerClassName === CONTAINER_CLASS_CUSTOM) {
-                      newStyle = __assign(__assign({}, style), { visibility: 'unset', position: 'unset' });
-                  }
-                  modifyCSS(el, newStyle);
+                  modifyCSS(el, style);
               });
           });
       };
@@ -238673,14 +238645,14 @@
       return LineCrosshair;
   }(CrosshairBase));
 
-  var CONTAINER_CLASS$1 = 'g2-crosshair';
-  var CROSSHAIR_LINE = CONTAINER_CLASS$1 + "-line";
-  var CROSSHAIR_TEXT = CONTAINER_CLASS$1 + "-text";
+  var CONTAINER_CLASS = 'g2-crosshair';
+  var CROSSHAIR_LINE = CONTAINER_CLASS + "-line";
+  var CROSSHAIR_TEXT = CONTAINER_CLASS + "-text";
 
   var _a$1;
   var HtmlTheme = (_a$1 = {},
       // css style for tooltip
-      _a$1["" + CONTAINER_CLASS$1] = {
+      _a$1["" + CONTAINER_CLASS] = {
           position: 'relative'
       },
       _a$1["" + CROSSHAIR_LINE] = {
@@ -238701,7 +238673,7 @@
       }
       HtmlCrosshair.prototype.getDefaultCfg = function () {
           var cfg = _super.prototype.getDefaultCfg.call(this);
-          return __assign(__assign({}, cfg), { name: 'crosshair', type: 'html', locationType: 'region', start: { x: 0, y: 0 }, end: { x: 0, y: 0 }, capture: false, text: null, containerTpl: "<div class=\"" + CONTAINER_CLASS$1 + "\"></div>", crosshairTpl: "<div class=\"" + CROSSHAIR_LINE + "\"></div>", textTpl: "<span class=\"" + CROSSHAIR_TEXT + "\">{content}</span>", domStyles: null, containerClassName: CONTAINER_CLASS$1, defaultStyles: HtmlTheme, defaultCfg: {
+          return __assign(__assign({}, cfg), { name: 'crosshair', type: 'html', locationType: 'region', start: { x: 0, y: 0 }, end: { x: 0, y: 0 }, capture: false, text: null, containerTpl: "<div class=\"" + CONTAINER_CLASS + "\"></div>", crosshairTpl: "<div class=\"" + CROSSHAIR_LINE + "\"></div>", textTpl: "<span class=\"" + CROSSHAIR_TEXT + "\">{content}</span>", domStyles: null, containerClassName: CONTAINER_CLASS, defaultStyles: HtmlTheme, defaultCfg: {
                   text: {
                       position: 'start',
                       content: null,
@@ -240546,10 +240518,33 @@
       return ContinueLegend;
   }(LegendBase));
 
+  var CONTAINER_CLASS$1 = 'g2-tooltip';
+  var TITLE_CLASS = 'g2-tooltip-title';
+  var LIST_CLASS = 'g2-tooltip-list';
+  var LIST_ITEM_CLASS = 'g2-tooltip-list-item';
+  var MARKER_CLASS = 'g2-tooltip-marker';
+  var VALUE_CLASS = 'g2-tooltip-value';
+  var NAME_CLASS = 'g2-tooltip-name';
+  var CROSSHAIR_X = 'g2-tooltip-crosshair-x';
+  var CROSSHAIR_Y = 'g2-tooltip-crosshair-y';
+
+  var CssConst = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    CONTAINER_CLASS: CONTAINER_CLASS$1,
+    TITLE_CLASS: TITLE_CLASS,
+    LIST_CLASS: LIST_CLASS,
+    LIST_ITEM_CLASS: LIST_ITEM_CLASS,
+    MARKER_CLASS: MARKER_CLASS,
+    VALUE_CLASS: VALUE_CLASS,
+    NAME_CLASS: NAME_CLASS,
+    CROSSHAIR_X: CROSSHAIR_X,
+    CROSSHAIR_Y: CROSSHAIR_Y
+  });
+
   var _a$2;
   var TooltipTheme = (_a$2 = {},
       // css style for tooltip
-      _a$2["" + CONTAINER_CLASS] = {
+      _a$2["" + CONTAINER_CLASS$1] = {
           position: 'absolute',
           visibility: 'visible',
           // @2018-07-25 by blue.lb 这里去掉浮动，火狐上存在样式错位
@@ -240567,13 +240562,6 @@
           lineHeight: '20px',
           padding: '10px 10px 6px 10px',
       },
-      _a$2["" + CONTAINER_CLASS_CUSTOM] = {
-          position: 'absolute',
-          zIndex: 8,
-          transition: 'visibility 0.2s cubic-bezier(0.23, 1, 0.32, 1), ' +
-              'left 0.4s cubic-bezier(0.23, 1, 0.32, 1), ' +
-              'top 0.4s cubic-bezier(0.23, 1, 0.32, 1)',
-      },
       _a$2["" + TITLE_CLASS] = {
           marginBottom: '4px',
       },
@@ -240718,14 +240706,14 @@
       }
       Tooltip.prototype.getDefaultCfg = function () {
           var cfg = _super.prototype.getDefaultCfg.call(this);
-          return __assign(__assign({}, cfg), { name: 'tooltip', type: 'html', x: 0, y: 0, items: [], customContent: null, containerTpl: "<div class=\"" + CONTAINER_CLASS + "\"><div class=\"" + TITLE_CLASS + "\"></div><ul class=\"" + LIST_CLASS + "\"></ul></div>", itemTpl: "<li class=\"" + LIST_ITEM_CLASS + "\" data-index={index}>\n          <span class=\"" + MARKER_CLASS + "\" style=\"background:{color}\"></span>\n          <span class=\"" + NAME_CLASS + "\">{name}</span>:\n          <span class=\"" + VALUE_CLASS + "\">{value}</span>\n        </li>", xCrosshairTpl: "<div class=\"" + CROSSHAIR_X + "\"></div>", yCrosshairTpl: "<div class=\"" + CROSSHAIR_Y + "\"></div>", title: null, showTitle: true, 
+          return __assign(__assign({}, cfg), { name: 'tooltip', type: 'html', x: 0, y: 0, items: [], customContent: null, containerTpl: "<div class=\"" + CONTAINER_CLASS$1 + "\"><div class=\"" + TITLE_CLASS + "\"></div><ul class=\"" + LIST_CLASS + "\"></ul></div>", itemTpl: "<li class=\"" + LIST_ITEM_CLASS + "\" data-index={index}>\n          <span class=\"" + MARKER_CLASS + "\" style=\"background:{color}\"></span>\n          <span class=\"" + NAME_CLASS + "\">{name}</span>:\n          <span class=\"" + VALUE_CLASS + "\">{value}</span>\n        </li>", xCrosshairTpl: "<div class=\"" + CROSSHAIR_X + "\"></div>", yCrosshairTpl: "<div class=\"" + CROSSHAIR_Y + "\"></div>", title: null, showTitle: true, 
               /**
                * tooltip 限制的区域
                * @type {Region}
                */
               region: null, 
               // crosshair 的限制区域
-              crosshairsRegion: null, containerClassName: CONTAINER_CLASS, 
+              crosshairsRegion: null, containerClassName: CONTAINER_CLASS$1, 
               // x, y, xy
               crosshairs: null, offset: 10, position: 'right', domStyles: null, defaultStyles: TooltipTheme });
       };
@@ -240795,12 +240783,6 @@
                   display: display,
               });
       };
-      Tooltip.prototype.setCustomContainer = function () {
-          var customContainer = document.createElement('div');
-          customContainer.className = CONTAINER_CLASS_CUSTOM;
-          this.set('container', customContainer);
-          this.set('containerClassName', CONTAINER_CLASS_CUSTOM);
-      };
       // 如有 customContent 则根据 customContent 设置 container
       Tooltip.prototype.initContainer = function () {
           _super.prototype.initContainer.call(this);
@@ -240808,11 +240790,9 @@
               if (this.get('container')) {
                   this.get('container').remove();
               }
-              this.setCustomContainer();
-              var newContainer = this.getHtmlContentNode();
-              var customContainer = this.get('container');
-              customContainer.appendChild(newContainer);
-              this.get('parent').appendChild(customContainer);
+              var container = this.getHtmlContentNode();
+              this.get('parent').appendChild(container);
+              this.set('container', container);
               this.resetStyles();
               this.applyStyles();
           }
@@ -240867,22 +240847,16 @@
       };
       // 根据 customContent 渲染
       Tooltip.prototype.renderCustomContent = function () {
-          var newContainer = this.getHtmlContentNode();
-          var oldContainer = this.get('container');
-          // 如果一个图表的 tooltip 一开始是默认的, 而后手动设置了 customContent 方法, 则会导致 oldContainer 是 'g2-tooltip', 但其实应该 'g2-tooltip-custom'
-          var existG2TooltipClass = hasClass(oldContainer, CONTAINER_CLASS);
-          if (existG2TooltipClass) {
-              this.setCustomContainer();
-              oldContainer = this.get('container');
-              var parent_1 = this.get('parent');
-              var target = parent_1.querySelector("." + CONTAINER_CLASS);
-              parent_1.removeChild(target);
+          var node = this.getHtmlContentNode();
+          var parent = this.get('parent');
+          var curContainer = this.get('container');
+          if (curContainer && curContainer.parentNode === parent) {
+              parent.replaceChild(node, curContainer);
           }
-          oldContainer.innerHTML = '';
-          oldContainer.appendChild(newContainer);
-          if (existG2TooltipClass) {
-              this.get('parent').appendChild(oldContainer);
+          else {
+              parent.appendChild(node);
           }
+          this.set('container', node);
           this.resetStyles();
           this.applyStyles();
       };
@@ -245717,7 +245691,7 @@
                   },
                   // tooltip dom 样式
                   domStyles: (_a = {},
-                      _a["".concat(CONTAINER_CLASS)] = {
+                      _a["".concat(CONTAINER_CLASS$1)] = {
                           position: 'absolute',
                           visibility: 'hidden',
                           zIndex: 8,
@@ -268427,7 +268401,7 @@
               crosshairs: null,
               domStyles: __assign({}, deepMix({}, tooltipStyles, (_a = {},
                   // 超长的时候，tooltip tip 最大宽度为 50%，然后可以换行
-                  _a[CONTAINER_CLASS] = { 'max-width': '50%' },
+                  _a[CONTAINER_CLASS$1] = { 'max-width': '50%' },
                   _a[TITLE_CLASS] = { 'word-break': 'break-all' },
                   _a))),
           });
@@ -269919,7 +269893,7 @@
       ListRadio.prototype.renderTooltip = function () {
           var _a;
           var tooltipStyles = (_a = {},
-              _a[CONTAINER_CLASS] = {
+              _a[CONTAINER_CLASS$1] = {
                   padding: '6px 8px',
                   transform: 'translate(-50%, -80%)',
                   background: 'rgba(0,0,0,0.75)',
@@ -271380,7 +271354,7 @@
           this.tooltip.update({
               title: text || '',
               customContent: function () {
-                  return "\n          <div class=\"".concat(CONTAINER_CLASS, "\" style={").concat(descriptionTooltipStyle, "}>\n            <div class=\"").concat(TITLE_CLASS, "\">\n              \u5B57\u6BB5\u8BF4\u660E\uFF1A").concat(description, "\n            </div>\n          </div>\n        ");
+                  return "\n          <div class=\"".concat(CONTAINER_CLASS$1, "\" style={").concat(descriptionTooltipStyle, "}>\n            <div class=\"").concat(TITLE_CLASS, "\">\n              \u5B57\u6BB5\u8BF4\u660E\uFF1A").concat(description, "\n            </div>\n          </div>\n        ");
               },
               x: x,
               y: y,
@@ -271409,7 +271383,7 @@
               containerId: AXIS_DESCRIPTION_TOOLTIP,
               domStyles: __assign({}, deepMix({}, (_a = {},
                   // 超长的时候，tooltip tip 最大宽度为 50%，然后可以换行
-                  _a[CONTAINER_CLASS] = {
+                  _a[CONTAINER_CLASS$1] = {
                       'max-width': '50%',
                       padding: '10px',
                       'line-height': '15px',
@@ -292666,8 +292640,16 @@
         onCancel = props.onCancel,
         data = props.data,
         columns = props.columns,
-        selectInfo = props.selectInfo;
+        selectInfo = props.selectInfo,
+        rowKey = props.rowKey,
+        deepDataSource = props.deepDataSource;
+    console.log(data, columns, '---props---', rowKey);
+    var keyByCol = React.useMemo(function () {
+      return lodash.keyBy(columns, 'dataIndex');
+    }, [columns]);
     var resultData = React.useMemo(function () {
+      var _ref;
+
       var start = selectInfo.start,
           end = selectInfo.end;
       var rCol = columns === null || columns === void 0 ? void 0 : columns.filter(function (item, index) {
@@ -292684,14 +292666,14 @@
       });
       var maxi = Math.max(start.i, end.i);
       var mini = Math.min(start.i, end.i);
-      var rDataSource = data === null || data === void 0 ? void 0 : data.filter(function (item, index) {
+      var rDataSource = (_ref = deepDataSource || data) === null || _ref === void 0 ? void 0 : _ref.filter(function (item, index) {
         if (index >= mini && index <= maxi) {
           return true;
         }
 
         return false;
       }).map(function (item) {
-        return lodash.pick(item, rCol);
+        return lodash.pick(item, [].concat(_toConsumableArray$1(rCol), [rowKey]));
       });
       return {
         rDataSource: rDataSource,
@@ -292716,6 +292698,7 @@
         yField: yField
       };
     }, [resultData, getTypeCol]);
+    console.log(Field, '--Field--', resultData);
     var config = React.useMemo(function () {
       if (type === 'pie') {
         return {
@@ -292727,8 +292710,8 @@
           label: {
             type: 'inner',
             offset: '-30%',
-            content: function content(_ref) {
-              var percent = _ref.percent;
+            content: function content(_ref2) {
+              var percent = _ref2.percent;
               return "".concat((percent * 100).toFixed(0), "%");
             },
             style: {
@@ -292744,7 +292727,7 @@
 
       return {
         data: resultData.rDataSource,
-        xField: Field.xField,
+        xField: rowKey,
         yField: Field.yField,
         label: {
           position: 'middle',
@@ -292753,8 +292736,24 @@
             opacity: 0.6
           }
         },
+        tooltip: {
+          title: Field.xField,
+          formatter: function formatter(datum) {
+            var _keyByCol$Field$yFiel, _keyByCol$Field$yFiel2;
+
+            return {
+              name: ((_keyByCol$Field$yFiel = keyByCol[Field.yField]) === null || _keyByCol$Field$yFiel === void 0 ? void 0 : _keyByCol$Field$yFiel.title) || ((_keyByCol$Field$yFiel2 = keyByCol[Field.yField]) === null || _keyByCol$Field$yFiel2 === void 0 ? void 0 : _keyByCol$Field$yFiel2.dataIndex),
+              value: datum === null || datum === void 0 ? void 0 : datum[Field.yField]
+            };
+          }
+        },
         xAxis: {
           label: {
+            formatter: function formatter(text, item, index) {
+              var _resultData$rDataSour, _resultData$rDataSour2;
+
+              return ((_resultData$rDataSour = resultData.rDataSource) === null || _resultData$rDataSour === void 0 ? void 0 : (_resultData$rDataSour2 = _resultData$rDataSour[index]) === null || _resultData$rDataSour2 === void 0 ? void 0 : _resultData$rDataSour2[Field.xField]) || text;
+            },
             autoHide: true,
             autoRotate: false
           }
@@ -292888,6 +292887,7 @@
 
     var tempColumns = groupBy(dataSourceCopy, columnsCopy, groupColKeysCopy, null);
     var keyMap = new Map();
+    var __index = 0;
 
     var dataSourceBy = function dataSourceBy(source) {
       return [source.reduce(function (prev, sItem) {
@@ -292911,6 +292911,10 @@
           }); // 对dataSource的key值进行更改：例如：'name' => 'name_xiaoming_age_18_address'
 
           Object.keys(sItem).forEach(function (key) {
+            if (key === '__index') {
+              return;
+            }
+
             var newKey = "".concat(str, "_").concat(key);
 
             if (keyMap.has(newKey)) {
@@ -292923,8 +292927,9 @@
             }
 
             sItem[newKey] = sItem[key];
-            sItem["".concat(newKey, "_originIndex")] = sItem.__index;
+            sItem["".concat(newKey, "_originIndex")] = sItem.__index === undefined ? __index : sItem.__index;
           });
+          __index += 1;
         }
 
         if (!prev) {
@@ -292952,14 +292957,15 @@
     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(); // i:保证顺序
+      var filterKey = group.shift(); // 记录数据原来的位置索引信息
 
       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]);
+        acc[value] = [].concat(_toConsumableArray$1(acc[value] || []), [_objectSpread(_objectSpread({}, el), {}, {
+          __index: i
+        })]);
+        i += 1;
         return acc;
       }, {});
       return Object.keys(map).map(function (item) {
@@ -293003,26 +293009,6 @@
       isVaildCommit: mini <= i && maxi >= i || minj <= j && maxj >= j
     };
   }
-  /**
-   * 获取空行列表值数组
-   * @param {Array} dataSourceWithGroup
-   * @returns {Array}
-   */
-
-  function getSkipList(dataSourceWithGroup) {
-    var skipList = dataSourceWithGroup.reduce(function (prev, cur) {
-      if (!prev.length) {
-        return cur._group ? [1] : [0];
-      }
-
-      if (cur._group) {
-        return [].concat(_toConsumableArray$1(prev), [prev[prev.length - 1] + 1]);
-      }
-
-      return [].concat(_toConsumableArray$1(prev), [prev[prev.length - 1]]);
-    }, []);
-    return skipList;
-  }
   /**
    * 获取选中行文本
    * @param {Object}
@@ -293115,6 +293101,84 @@
     dfs(dataSource);
     return index;
   }
+  /**
+   * 框选是否跨行分组
+   * @param {number} i
+   * @param {React.Ref} shellStatusRef
+   * @param {React.Ref} deepDataSourceRef
+   * @returns
+   */
+
+  function isSelectCrossRowGroup(i, shellStatusRef, deepDataSourceRef) {
+    var _shellStatusRef$curre;
+
+    var x;
+    var y;
+
+    if ((shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre = shellStatusRef.current) === null || _shellStatusRef$curre === void 0 ? void 0 : _shellStatusRef$curre.commiting.start.i) < i) {
+      var _shellStatusRef$curre2;
+
+      x = shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre2 = shellStatusRef.current) === null || _shellStatusRef$curre2 === void 0 ? void 0 : _shellStatusRef$curre2.commiting.start.i;
+      y = i;
+    } else {
+      var _shellStatusRef$curre3;
+
+      x = i;
+      y = shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre3 = shellStatusRef.current) === null || _shellStatusRef$curre3 === void 0 ? void 0 : _shellStatusRef$curre3.commiting.start.i;
+    }
+
+    for (; x <= y; x += 1) {
+      var _deepDataSourceRef$cu;
+
+      if ((deepDataSourceRef === null || deepDataSourceRef === void 0 ? void 0 : (_deepDataSourceRef$cu = deepDataSourceRef.current) === null || _deepDataSourceRef$cu === void 0 ? void 0 : _deepDataSourceRef$cu.length) && (deepDataSourceRef === null || deepDataSourceRef === void 0 ? void 0 : deepDataSourceRef.current[x]._group)) {
+        return true;
+      }
+    }
+
+    return false;
+  }
+  /**
+   * 不允许跨无效列
+   * @param {number} i
+   * @param {number} j
+   * @param {React.Ref} shellStatusRef
+   * @param {React.Ref} deepDataSourceRef
+   * @param {React.Ref} deepColumnsRef
+   * @returns
+   */
+
+  function isSelectCrossInvalidCol(i, j, shellStatusRef, deepDataSourceRef, deepColumnsRef) {
+    var _shellStatusRef$curre4;
+
+    var x;
+    var y;
+
+    if ((shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre4 = shellStatusRef.current) === null || _shellStatusRef$curre4 === void 0 ? void 0 : _shellStatusRef$curre4.commiting.start.j) < j) {
+      var _shellStatusRef$curre5;
+
+      x = shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre5 = shellStatusRef.current) === null || _shellStatusRef$curre5 === void 0 ? void 0 : _shellStatusRef$curre5.commiting.start.j;
+      y = j;
+    } else {
+      var _shellStatusRef$curre6;
+
+      x = j;
+      y = shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre6 = shellStatusRef.current) === null || _shellStatusRef$curre6 === void 0 ? void 0 : _shellStatusRef$curre6.commiting.start.j;
+    }
+
+    for (; x <= y; x += 1) {
+      var _deepColumnsRef$curre, _deepDataSourceRef$cu2;
+
+      if ((deepColumnsRef === null || deepColumnsRef === void 0 ? void 0 : (_deepColumnsRef$curre = deepColumnsRef.current) === null || _deepColumnsRef$curre === void 0 ? void 0 : _deepColumnsRef$curre.length) && (deepDataSourceRef === null || deepDataSourceRef === void 0 ? void 0 : (_deepDataSourceRef$cu2 = deepDataSourceRef.current) === null || _deepDataSourceRef$cu2 === void 0 ? void 0 : _deepDataSourceRef$cu2.length)) {
+        var key = deepColumnsRef === null || deepColumnsRef === void 0 ? void 0 : deepColumnsRef.current[x].dataIndex;
+
+        if (!(key in (deepDataSourceRef === null || deepDataSourceRef === void 0 ? void 0 : deepDataSourceRef.current[i]))) {
+          return true;
+        }
+      }
+    }
+
+    return false;
+  }
 
   // 表格基础配置文件
   // 行选择
@@ -293397,6 +293461,12 @@
     return ((_Object$keys = Object.keys(obj || {})) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length) === 0;
   };
 
+  var defaultParsePaste = function defaultParsePaste(str) {
+    return str.split(/\r\n|\n|\r/).map(function (row) {
+      return row.split('\t');
+    });
+  }; // const DragHandle = SortableHandle(() => <MenuOutlined style={{ cursor: 'grab', color: '#999' }} />);
+
 
   var DragHandle = sortableHandle(function () {
     return /*#__PURE__*/React__default['default'].createElement(IconFont, {
@@ -293492,12 +293562,6 @@
 
     var deepDataSourceRef = React.useRef([]);
     var deepColumnsRef = React.useRef([]);
-    /** 行分组表格对应数据的隐藏数列表 */
-
-    var hideListRef = React.useRef([]);
-    /** 行分组的空行列表数据 */
-
-    var skipListRef = React.useRef([]);
     /** 记录最原始数据 */
 
     React.useEffect(function () {
@@ -293531,8 +293595,7 @@
       setExpandedRowKeys([]);
       deepDataSourceRef.current = [];
       deepColumnsRef.current = [];
-      hideListRef.current = [];
-    }, [groupRowKeys]);
+    }, [groupRowKeys, groupColKeys]);
     /** sheel数据的表格 */
 
     var _useState9 = React.useState({
@@ -293616,46 +293679,18 @@
     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; // 展开
+          source.push(lodash.omit(item, 'children')); // 展开
 
           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 () {
@@ -293768,7 +293803,11 @@
         isEditing: (editing === null || editing === void 0 ? void 0 : editing.i) === i && (editing === null || editing === void 0 ? void 0 : editing.j) === j,
 
         /** 是否有效拉伸 */
-        isVaildCommit: isEmpty$1(commiting) ? false : isSelected && !checkIsSelectd(i, j, commiting === null || commiting === void 0 ? void 0 : commiting.start, commiting === null || commiting === void 0 ? void 0 : commiting.end)
+        isVaildCommit: isEmpty$1(commiting) ? false : isSelected && !checkIsSelectd(i, j, commiting === null || commiting === void 0 ? void 0 : commiting.start, commiting === null || commiting === void 0 ? void 0 : commiting.end),
+
+        /** 是否选中只读框  */
+        // TODO
+        selectedReadonly: true
       };
     };
     /** 获取框选的数据 */
@@ -293797,40 +293836,36 @@
 
 
     var handleCopy = function handleCopy(e) {
-      var _shellStatusRef$curre2;
-
-      if (isEmpty$1((_shellStatusRef$curre2 = shellStatusRef.current) === null || _shellStatusRef$curre2 === void 0 ? void 0 : _shellStatusRef$curre2.editing)) {
-        var _e$clipboardData;
+      var _e$clipboardData;
 
-        e === null || e === void 0 ? void 0 : e.preventDefault();
-        var _shellStatusRef$curre3 = shellStatusRef.current,
-            start = _shellStatusRef$curre3.start,
-            end = _shellStatusRef$curre3.end;
-        var text = getSelectDatas(start, end);
-
-        if (window.clipboardData && window.clipboardData.setData) {
-          window.clipboardData.setData('Text', text);
-        } else if ((_e$clipboardData = e.clipboardData) === null || _e$clipboardData === void 0 ? void 0 : _e$clipboardData.setData) {
-          e.clipboardData.setData('text/plain', text);
-        } else {
-          var _document;
+      e === null || e === void 0 ? void 0 : e.preventDefault();
+      var _shellStatusRef$curre2 = shellStatusRef.current,
+          start = _shellStatusRef$curre2.start,
+          end = _shellStatusRef$curre2.end;
+      var text = getSelectDatas(start, end);
+
+      if (window.clipboardData && window.clipboardData.setData) {
+        window.clipboardData.setData('Text', text);
+      } else if ((_e$clipboardData = e.clipboardData) === null || _e$clipboardData === void 0 ? void 0 : _e$clipboardData.setData) {
+        e.clipboardData.setData('text/plain', text);
+      } else {
+        var _document;
 
-          (_document = document) === null || _document === void 0 ? void 0 : _document.execCommand('copy');
+        (_document = document) === null || _document === void 0 ? void 0 : _document.execCommand('copy');
 
-          if (contextMenuStatus) {
-            setContextMenuStatus(false);
-          }
+        if (contextMenuStatus) {
+          setContextMenuStatus(false);
         }
       }
     };
 
     var onMouseOver = function onMouseOver(i, j) {
-      var _shellStatusRef$curre4, _shellStatusRef$curre7, _checkStatus, _shellStatusRef$curre8;
+      var _shellStatusRef$curre3, _shellStatusRef$curre6, _checkStatus, _shellStatusRef$curre7;
 
-      if (isEmpty$1(shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre4 = shellStatusRef.current) === null || _shellStatusRef$curre4 === void 0 ? void 0 : _shellStatusRef$curre4.commiting)) {
-        var _shellStatusRef$curre5, _shellStatusRef$curre6;
+      if (isEmpty$1(shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre3 = shellStatusRef.current) === null || _shellStatusRef$curre3 === void 0 ? void 0 : _shellStatusRef$curre3.commiting)) {
+        var _shellStatusRef$curre4, _shellStatusRef$curre5;
 
-        if ((shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre5 = shellStatusRef.current) === null || _shellStatusRef$curre5 === void 0 ? void 0 : _shellStatusRef$curre5.selecting) && isEmpty$1(shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre6 = shellStatusRef.current) === null || _shellStatusRef$curre6 === void 0 ? void 0 : _shellStatusRef$curre6.editing)) {
+        if ((shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre4 = shellStatusRef.current) === null || _shellStatusRef$curre4 === void 0 ? void 0 : _shellStatusRef$curre4.selecting) && isEmpty$1(shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre5 = shellStatusRef.current) === null || _shellStatusRef$curre5 === void 0 ? void 0 : _shellStatusRef$curre5.editing)) {
           shellStatusRef.current = _objectSpread(_objectSpread({}, shellStatusRef.current), {}, {
             end: {
               i: i,
@@ -293844,7 +293879,15 @@
             }
           }));
         }
-      } else if (!isEmpty$1((shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre7 = shellStatusRef.current) === null || _shellStatusRef$curre7 === void 0 ? void 0 : _shellStatusRef$curre7.commiting) || {}) && ((_checkStatus = checkStatus(i, j, shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre8 = shellStatusRef.current) === null || _shellStatusRef$curre8 === void 0 ? void 0 : _shellStatusRef$curre8.commiting)) === null || _checkStatus === void 0 ? void 0 : _checkStatus.isVaildCommit)) {
+      } else if (!isEmpty$1((shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre6 = shellStatusRef.current) === null || _shellStatusRef$curre6 === void 0 ? void 0 : _shellStatusRef$curre6.commiting) || {}) && ((_checkStatus = checkStatus(i, j, shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre7 = shellStatusRef.current) === null || _shellStatusRef$curre7 === void 0 ? void 0 : _shellStatusRef$curre7.commiting)) === null || _checkStatus === void 0 ? void 0 : _checkStatus.isVaildCommit)) {
+        if (isSelectCrossRowGroup(i, shellStatusRef, deepDataSourceRef)) {
+          return;
+        }
+
+        if (isSelectCrossInvalidCol(i, j, shellStatusRef, deepDataSourceRef, deepColumnsRef)) {
+          return;
+        }
+
         shellStatusRef.current = _objectSpread(_objectSpread({}, shellStatusRef.current), {}, {
           end: {
             i: i,
@@ -293858,6 +293901,49 @@
           }
         }));
       }
+    }; // 通过表格的行列索引，获取对应的原始数据的item信息
+
+
+    var getSourceItemInfo = function getSourceItemInfo(trIndex, tdIndex) {
+      var innerColumns = (groupColKeys === null || groupColKeys === void 0 ? void 0 : groupColKeys.length) ? deepColumnsRef.current : columns;
+      var columnsKeysList = innerColumns.map(function (item) {
+        return item.dataIndex;
+      });
+      var key = columnsKeysList[tdIndex];
+      var index;
+      var nil = {
+        index: -1,
+        key: undefined
+      };
+
+      if (key === undefined) {
+        return nil;
+      } // 列分组的情况下
+
+
+      if (groupColKeys === null || groupColKeys === void 0 ? void 0 : groupColKeys.length) {
+        var _deepDataSourceRef$cu;
+
+        if ((groupRowKeys === null || groupRowKeys === void 0 ? void 0 : groupRowKeys.length) && (deepDataSourceRef === null || deepDataSourceRef === void 0 ? void 0 : (_deepDataSourceRef$cu = deepDataSourceRef.current) === null || _deepDataSourceRef$cu === void 0 ? void 0 : _deepDataSourceRef$cu[trIndex]._group)) {
+          return nil;
+        }
+
+        index = getDataSourceIndex({
+          key: key,
+          dataSource: dataSource
+        });
+        var arr = key.split('_');
+        key = arr[arr.length - 2];
+      } else if (groupRowKeys.length) {
+        index = deepDataSourceRef.current[trIndex].__index;
+      } else {
+        index = trIndex;
+      }
+
+      return {
+        index: index,
+        key: key
+      };
     };
     /** sheel 表格 鼠标松开 */
 
@@ -293865,30 +293951,31 @@
 
 
     var sheelOnMouseUp = function sheelOnMouseUp() {
-      var _shellStatusRef$curre9;
+      var _shellStatusRef$curre8;
 
       console.log('mouseup_start', shellStatusRef.current);
 
-      if (!isEmpty$1((_shellStatusRef$curre9 = shellStatusRef.current) === null || _shellStatusRef$curre9 === void 0 ? void 0 : _shellStatusRef$curre9.commiting)) {
+      if (!isEmpty$1((_shellStatusRef$curre8 = shellStatusRef.current) === null || _shellStatusRef$curre8 === void 0 ? void 0 : _shellStatusRef$curre8.commiting)) {
         var _commiting$start, _commiting$end, _commiting$start2, _commiting$end2, _difference, _difference2, _obj$i;
 
-        var _shellStatusRef$curre10 = shellStatusRef.current,
-            start = _shellStatusRef$curre10.start,
-            end = _shellStatusRef$curre10.end,
-            commiting = _shellStatusRef$curre10.commiting; //
+        var _shellStatusRef$curre9 = shellStatusRef.current,
+            start = _shellStatusRef$curre9.start,
+            end = _shellStatusRef$curre9.end,
+            commiting = _shellStatusRef$curre9.commiting; //
 
         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 rowtext = getSelectionRowText({
           selection: commiting,
           columnsKeysList: columnsKeysList,
           dataSource: innerDataSource
-        });
+        }); // 列文本
+
         var coltext = getSelectionColText({
           selection: commiting,
           columns: innerColumns,
@@ -293935,20 +294022,17 @@
             var _isSelected;
 
             if ((_isSelected = isSelected(tri, tdj)) === null || _isSelected === void 0 ? void 0 : _isSelected.isSelected) {
-              var key = columnsKeysList[tdj];
-              var sourceIndex; // 列分组的情况下
+              var _deepColumnsRef$curre, _deepColumnsRef$curre2;
 
-              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 (deepColumnsRef === null || deepColumnsRef === void 0 ? void 0 : (_deepColumnsRef$curre = deepColumnsRef.current) === null || _deepColumnsRef$curre === void 0 ? void 0 : (_deepColumnsRef$curre2 = _deepColumnsRef$curre[tdj]) === null || _deepColumnsRef$curre2 === void 0 ? void 0 : _deepColumnsRef$curre2.readOnly) {
+                return;
               }
 
+              var _getSourceItemInfo = getSourceItemInfo(tri, tdj),
+                  sourceIndex = _getSourceItemInfo.index,
+                  key = _getSourceItemInfo.key;
+
               if (sourceIndex < 0 || sourceIndex >= data.length) {
                 return;
               } // 行替换
@@ -293997,9 +294081,9 @@
 
 
     var handleCut = function handleCut(e) {
-      var _shellStatusRef$curre11;
+      var _shellStatusRef$curre10;
 
-      if (isEmpty$1((_shellStatusRef$curre11 = shellStatusRef.current) === null || _shellStatusRef$curre11 === void 0 ? void 0 : _shellStatusRef$curre11.editing)) {
+      if (isEmpty$1((_shellStatusRef$curre10 = shellStatusRef.current) === null || _shellStatusRef$curre10 === void 0 ? void 0 : _shellStatusRef$curre10.editing)) {
         e.preventDefault();
         handleCopy(e);
         /** 暂时先不隐藏 */
@@ -294012,42 +294096,70 @@
     /** TODO: 在分组的情况，需要排除_group行的数据转换 */
 
 
-    var handlePaste = function handlePaste(e) {// if (isEmpty(shellStatusRef.current?.editing)) {
-      //   let { start, end } = shellStatusRef.current
-      //   start = { i: Math.min(start.i, end.i), j: Math.min(start.j, end.j) }
-      //   end = { i: Math.max(start.i, end.i), j: Math.max(start.j, end.j) }
-      //   const parse = defaultParsePaste
-      //   let pasteData = []
-      //   if (window.clipboardData && window.clipboardData.getData) {
-      //     // IE
-      //     pasteData = parse(window.clipboardData.getData('Text'))
-      //   } else if (e.clipboardData && e.clipboardData.getData) {
-      //     pasteData = parse(e.clipboardData.getData('text/plain'))
-      //   }
-      //   // in order of preference
-      //   const resultEnd = []
-      //   pasteData.forEach((row, i) => {
-      //     row.forEach((value, j) => {
-      //       resultEnd.push({
-      //         i: start.i + i,
-      //         j: start.j + j,
-      //         value,
-      //       })
-      //     })
-      //   })
-      //   const columnsKeysList = columns.map((item) => item.dataIndex)
-      //   const res = produce(dataSourceRef.current, (draft) => {
-      //     resultEnd.forEach((item) => {
-      //       if (isSelected(item.i, item.j)?.isSelected) {
-      //         draft[item.i][columnsKeysList[item.j]] = item.value
-      //       }
-      //     })
-      //   })
-      //   /** 只有开通了编辑权限之后才可以 */
-      //   if (editSheet) {
-      //     dataChange?.(res)
-      //   }
-      // }
+    var handlePaste = function handlePaste(e) {
+      var _shellStatusRef$curre11;
+
+      if (isEmpty$1((_shellStatusRef$curre11 = shellStatusRef.current) === null || _shellStatusRef$curre11 === void 0 ? void 0 : _shellStatusRef$curre11.editing)) {
+        var _shellStatusRef$curre12 = shellStatusRef.current,
+            start = _shellStatusRef$curre12.start,
+            end = _shellStatusRef$curre12.end;
+        start = {
+          i: Math.min(start.i, end.i),
+          j: Math.min(start.j, end.j)
+        };
+        end = {
+          i: Math.max(start.i, end.i),
+          j: Math.max(start.j, end.j)
+        };
+        var parse = defaultParsePaste;
+        var pasteData = [];
+
+        if (window.clipboardData && window.clipboardData.getData) {
+          // IE
+          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 resultEnd = [];
+        pasteData.forEach(function (row, i) {
+          row.forEach(function (value, j) {
+            resultEnd.push({
+              i: start.i + i,
+              j: start.j + j,
+              value: value
+            });
+          });
+        });
+        var res = fn(dataSourceRef.current, function (draft) {
+          resultEnd.forEach(function (item) {
+            var _isSelected2;
+
+            if ((_isSelected2 = isSelected(item.i, item.j)) === null || _isSelected2 === void 0 ? void 0 : _isSelected2.isSelected) {
+              var _getSourceItemInfo2 = getSourceItemInfo(item.i, item.j),
+                  index = _getSourceItemInfo2.index,
+                  key = _getSourceItemInfo2.key;
+
+              if (index < 0 || index >= draft.length) {
+                return;
+              }
+
+              draft[index][key] = item.value;
+            }
+          });
+        });
+        /** 只有开通了编辑权限之后才可以 */
+
+        if (editSheet) {
+          dataChange === null || dataChange === void 0 ? void 0 : dataChange(res);
+        }
+      } // 修复重复问题
+
+
+      document.removeEventListener('paste', handlePaste);
+      document.removeEventListener('copy', handleCopy);
+      document.removeEventListener('cut', handleCut);
     };
 
     var pageClick = function pageClick(e) {
@@ -294091,13 +294203,13 @@
 
 
     var sheelMouseDown = function sheelMouseDown(i, j, e, commitStatus) {
-      var _shellStatusRef$curre12, _shellStatusRef$curre13, _shellStatusRef$curre14, _shellStatusRef$curre15, _shellStatusRef$curre16, _shellStatusRef$curre17, _shellStatusRef$curre18, _shellStatusRef$curre19, _shellStatusRef$curre20, _shellStatusRef$curre21;
+      var _shellStatusRef$curre13, _shellStatusRef$curre14, _shellStatusRef$curre15, _shellStatusRef$curre16, _shellStatusRef$curre17, _shellStatusRef$curre18, _shellStatusRef$curre19, _shellStatusRef$curre20, _shellStatusRef$curre21, _shellStatusRef$curre22;
 
-      var isNowEditingSameCell = !isEmpty$1((_shellStatusRef$curre12 = shellStatusRef.current) === null || _shellStatusRef$curre12 === void 0 ? void 0 : _shellStatusRef$curre12.editing) && ((_shellStatusRef$curre13 = shellStatusRef.current) === null || _shellStatusRef$curre13 === void 0 ? void 0 : _shellStatusRef$curre13.editing.i) === i && ((_shellStatusRef$curre14 = shellStatusRef.current) === null || _shellStatusRef$curre14 === void 0 ? void 0 : _shellStatusRef$curre14.editing.j) === j;
-      var editing = isEmpty$1((_shellStatusRef$curre15 = shellStatusRef.current) === null || _shellStatusRef$curre15 === void 0 ? void 0 : _shellStatusRef$curre15.editing) || ((_shellStatusRef$curre16 = shellStatusRef.current) === null || _shellStatusRef$curre16 === void 0 ? void 0 : _shellStatusRef$curre16.editing.i) !== i || ((_shellStatusRef$curre17 = shellStatusRef.current) === null || _shellStatusRef$curre17 === void 0 ? void 0 : _shellStatusRef$curre17.editing.j) !== j ? {} : (_shellStatusRef$curre18 = shellStatusRef.current) === null || _shellStatusRef$curre18 === void 0 ? void 0 : _shellStatusRef$curre18.editing;
+      var isNowEditingSameCell = !isEmpty$1((_shellStatusRef$curre13 = shellStatusRef.current) === null || _shellStatusRef$curre13 === void 0 ? void 0 : _shellStatusRef$curre13.editing) && ((_shellStatusRef$curre14 = shellStatusRef.current) === null || _shellStatusRef$curre14 === void 0 ? void 0 : _shellStatusRef$curre14.editing.i) === i && ((_shellStatusRef$curre15 = shellStatusRef.current) === null || _shellStatusRef$curre15 === void 0 ? void 0 : _shellStatusRef$curre15.editing.j) === j;
+      var editing = isEmpty$1((_shellStatusRef$curre16 = shellStatusRef.current) === null || _shellStatusRef$curre16 === void 0 ? void 0 : _shellStatusRef$curre16.editing) || ((_shellStatusRef$curre17 = shellStatusRef.current) === null || _shellStatusRef$curre17 === void 0 ? void 0 : _shellStatusRef$curre17.editing.i) !== i || ((_shellStatusRef$curre18 = shellStatusRef.current) === null || _shellStatusRef$curre18 === void 0 ? void 0 : _shellStatusRef$curre18.editing.j) !== j ? {} : (_shellStatusRef$curre19 = shellStatusRef.current) === null || _shellStatusRef$curre19 === void 0 ? void 0 : _shellStatusRef$curre19.editing;
       shellStatusRef.current = {
         selecting: !isNowEditingSameCell,
-        start: (e === null || e === void 0 ? void 0 : e.shiftKey) || commitStatus ? (_shellStatusRef$curre19 = shellStatusRef.current) === null || _shellStatusRef$curre19 === void 0 ? void 0 : _shellStatusRef$curre19.start : {
+        start: (e === null || e === void 0 ? void 0 : e.shiftKey) || commitStatus ? (_shellStatusRef$curre20 = shellStatusRef.current) === null || _shellStatusRef$curre20 === void 0 ? void 0 : _shellStatusRef$curre20.start : {
           i: i,
           j: j
         },
@@ -294108,7 +294220,7 @@
         editing: editing,
         forceEdit: !!isNowEditingSameCell,
         commiting: commitStatus ? {
-          start: (_shellStatusRef$curre20 = shellStatusRef.current) === null || _shellStatusRef$curre20 === void 0 ? void 0 : _shellStatusRef$curre20.start,
+          start: (_shellStatusRef$curre21 = shellStatusRef.current) === null || _shellStatusRef$curre21 === void 0 ? void 0 : _shellStatusRef$curre21.start,
           end: {
             i: i,
             j: j
@@ -294121,7 +294233,7 @@
         setCommitIng(true);
       }
 
-      if (isEmpty$1((_shellStatusRef$curre21 = shellStatusRef.current) === null || _shellStatusRef$curre21 === void 0 ? void 0 : _shellStatusRef$curre21.editing)) {
+      if (isEmpty$1((_shellStatusRef$curre22 = shellStatusRef.current) === null || _shellStatusRef$curre22 === void 0 ? void 0 : _shellStatusRef$curre22.editing)) {
         setEditIng(false);
       }
 
@@ -294137,9 +294249,9 @@
     var onContextMenu = function onContextMenu(evt, i, j) {
       console.log(evt, i, j, '222');
       evt.preventDefault();
-      var _shellStatusRef$curre22 = shellStatusRef.current,
-          start = _shellStatusRef$curre22.start,
-          end = _shellStatusRef$curre22.end;
+      var _shellStatusRef$curre23 = shellStatusRef.current,
+          start = _shellStatusRef$curre23.start,
+          end = _shellStatusRef$curre23.end;
       /** 如果表格当前没有选择，则把当前的右击的td块默认选中 */
 
       if (isEmpty$1(start) && isEmpty$1(end)) {
@@ -294194,11 +294306,18 @@
       }
     };
 
-    var dataSourceChange = function dataSourceChange(i, j, newRecord) {
-      // 表格中的行数 转化为 对应的数据源索引
-      var rowIndex = i - skipListRef.current[i] + hideListRef.current[i];
+    var dataSourceChange = function dataSourceChange(i, j, value) {
+      var _getSourceItemInfo3 = getSourceItemInfo(i, j),
+          index = _getSourceItemInfo3.index,
+          key = _getSourceItemInfo3.key;
+
+      if (index < 0 || index >= dataSourceRef.current.length) {
+        return;
+      } // 表格中的行数 转化为 对应的数据源索引
+
+
       var res = fn(dataSourceRef.current, function (draft) {
-        draft[rowIndex] = newRecord;
+        draft[index][key] = value;
       });
       dataChange === null || dataChange === void 0 ? void 0 : dataChange(res);
       shellStatusRef.current = _objectSpread(_objectSpread({}, shellStatusRef.current), {}, {
@@ -294228,6 +294347,7 @@
 
           if (col.children && col.children.length) {
             traverseColumns(col.children);
+            return;
           } else {
             // $_ 开头表示私有属性
             col.$_colIndex = colIndex;
@@ -294564,7 +294684,6 @@
         })
       };
     }, [sortOpen, resizeable, components, colSortOpen]);
-    console.log(dataSource, '-------datasource-----');
     return /*#__PURE__*/React__default['default'].createElement("div", {
       style: {
         height: '100%',
@@ -294668,6 +294787,8 @@
         return setChartsModalStatus(false);
       },
       data: dataSource,
+      deepDataSource: deepDataSourceRef.current,
+      rowKey: rowKey,
       columns: columns,
       selectInfo: lodash.pick(shellStatusRef.current, ['start', 'end'])
     }));