linkmore-design 1.0.98 → 1.0.99

package/es/LmSelect/useCheckboxOptions.d.ts

@@ -1,4 +1,4 @@
-export declare const useCheckboxOptions: (options: any, { value, onChange: onCheckChange }: {
+export declare const useCheckboxOptions: (options: any, { value, onChange }: {
     value?: any[];
     onChange: any;
 }, filter?: string) => JSX.Element;

package/es/LmTable/Table.js

@@ -19,7 +19,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm
 
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
 
-var _proComponents = require("@ant-design/pro-components");
+var _proTable = _interopRequireDefault(require("@ant-design/pro-table"));
 
 var _sortable = require("@dnd-kit/sortable");
 
@@ -62,7 +62,7 @@ var _virTual = require("./virTual");
 var _excluded = ["columns", "dataSource", "autoSize", "rowClick", "onDoubleClick", "checkConfig", "summary", "pagination", "hiddenPage", "loading", "virtual", "sortOpen", "colSortOpen", "resizeable", "customCheck", "components", "rowSelection", "columnsState", "onChange", "filterChange", "tableRowType", "size", "openSheet", "editSheet", "dataChange", "groupInfo", "emptyProps", "columnKeys"],
     _excluded2 = ["className", "style"],
     _excluded3 = ["onResize", "width", "onResizeStop"];
-var Summary = _proComponents.ProTable.Summary;
+var Summary = _proTable.default.Summary;
 exports.Summary = Summary;
 
 var isEmpty = function isEmpty(obj) {
@@ -75,24 +75,6 @@ var defaultParsePaste = function defaultParsePaste(str) {
   return str.split(/\r\n|\n|\r/).map(function (row) {
     return row.split('\t');
   });
-};
-/**
- * 生成 start 到 end 数字组成的数组
- * @param {number} start
- * @param {number} end
- * @returns {Array<number>}
- */
-
-
-var range = function range(start, end) {
-  var array = [];
-  var inc = end - start > 0;
-
-  for (var i = start; inc ? i <= end : i >= end; inc ? i += 1 : i -= 1) {
-    inc ? array.push(i) : array.unshift(i);
-  }
-
-  return array;
 }; // const DragHandle = SortableHandle(() => <MenuOutlined style={{ cursor: 'grab', color: '#999' }} />);
 
 
@@ -189,6 +171,11 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
   var deepDataSourceRef = (0, _react.useRef)([]);
   var deepColumnsRef = (0, _react.useRef)([]);
+  /** 记录最原始数据 */
+
+  (0, _react.useEffect)(function () {
+    dataSourceRef.current = customizeDataSource;
+  }, [customizeDataSource]);
   /** 行分组 */
 
   var groupDataSource = (0, _react.useMemo)(function () {
@@ -219,23 +206,21 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   /** sheel数据的表格 */
 
   var _useState9 = (0, _react.useState)({
+    // 记录框选的行列坐标信息
     start: {},
     end: {},
+    // 是否在框选
     selecting: false,
     forceEdit: false,
+    // 是否在编辑中
     editing: {},
     clear: {},
+    // 记录右下角小方块的拖动信息
     commiting: {}
   }),
       _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
       sheelStataus = _useState10[0],
       setSheelStatus = _useState10[1];
-  /**
-   * start: {i, j} 框选的坐标开始位置
-   * end: {i, j} 框选的坐标结束位置
-   * commiting: { start: {i, j}, end: {i, j}} 提交
-   */
-
 
   var shellStatusRef = (0, _react.useRef)({
     start: {},
@@ -296,10 +281,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   });
   var SortContainer = (0, _reactSortableHoc.SortableContainer)(function (props) {
     return /*#__PURE__*/_react.default.createElement("tbody", props);
-  });
-  (0, _react.useEffect)(function () {
-    dataSourceRef.current = dataSource;
-  }, [dataSource]); // 行分组数据铺平, 在框选时获取数据使用
+  }); // 行分组数据铺平, 在框选时获取数据使用
 
   (0, _react.useEffect)(function () {
     var source = [];
@@ -432,8 +414,8 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
 
   var getSelectDatas = function getSelectDatas(start, end) {
-    return range(start.i, end.i).map(function (i) {
-      return range(start.j, end.j).map(function (j) {
+    return (0, _util.range)(start.i, end.i).map(function (i) {
+      return (0, _util.range)(start.j, end.j).map(function (j) {
         var _columns$j, _columns$j2;
 
         var columnKey = (columnKeys === null || columnKeys === void 0 ? void 0 : columnKeys.length) ? deepColumnsRef.current[j].dataIndex : (_columns$j = columns[j]) === null || _columns$j === void 0 ? void 0 : _columns$j.dataIndex;
@@ -523,52 +505,42 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     var _shellStatusRef$curre9;
 
     if (!isEmpty((_shellStatusRef$curre9 = shellStatusRef.current) === null || _shellStatusRef$curre9 === void 0 ? void 0 : _shellStatusRef$curre9.commiting)) {
-      var _commiting$start, _commiting$end, _commiting$start2, _commiting$end2, _difference, _difference2;
+      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;
+          commiting = _shellStatusRef$curre10.commiting; //
+
       var innerColumns = (columnKeys === null || columnKeys === void 0 ? void 0 : columnKeys.length) ? deepColumnsRef.current : columns;
+      var innerDataSource = (groupInfo === null || groupInfo === void 0 ? void 0 : groupInfo.length) ? deepDataSourceRef.current : dataSource; //
+
       var columnsKeysList = innerColumns.map(function (item) {
         return item.dataIndex;
-      });
-      var rowtext = range(commiting === null || commiting === void 0 ? void 0 : commiting.start.i, commiting === null || commiting === void 0 ? void 0 : commiting.end.i).map(function (i) {
-        return columnsKeysList.map(function (j) {
-          var columnKey = j;
-          var dataItem = (groupInfo === null || groupInfo === void 0 ? void 0 : groupInfo.length) ? deepDataSourceRef.current[i] : dataSource[i];
-          var cell = dataItem === null || dataItem === void 0 ? void 0 : dataItem[columnKey];
-          return cell;
-        });
-      });
-      var coltext = range(commiting === null || commiting === void 0 ? void 0 : commiting.start.i, commiting === null || commiting === void 0 ? void 0 : commiting.end.i).map(function (i) {
-        return range(commiting === null || commiting === void 0 ? void 0 : commiting.start.j, commiting === null || commiting === void 0 ? void 0 : commiting.end.j).map(function (j) {
-          var _innerColumns$j, _innerColumns$j2;
-
-          var columnKey = (_innerColumns$j = innerColumns[j]) === null || _innerColumns$j === void 0 ? void 0 : _innerColumns$j.dataIndex;
-          var dataItem = (groupInfo === null || groupInfo === void 0 ? void 0 : groupInfo.length) ? deepDataSourceRef.current[i] : dataSource[i];
-          var cell = dataItem === null || dataItem === void 0 ? void 0 : dataItem[columnKey];
-
-          if ((_innerColumns$j2 = innerColumns[j]) === null || _innerColumns$j2 === void 0 ? void 0 : _innerColumns$j2.render) {
-            var _innerColumns$j3, _innerColumns$j3$rend;
-
-            return (_innerColumns$j3 = innerColumns[j]) === null || _innerColumns$j3 === void 0 ? void 0 : (_innerColumns$j3$rend = _innerColumns$j3.render) === null || _innerColumns$j3$rend === void 0 ? void 0 : _innerColumns$j3$rend.call(_innerColumns$j3, cell, dataItem, i);
-          }
+      }); //
 
-          return cell;
-        });
+      var skipList = (0, _util.getSkipList)(innerDataSource);
+      var rowtext = (0, _util.getSelectionRowText)({
+        selection: commiting,
+        columnsKeysList: columnsKeysList,
+        dataSource: innerDataSource
+      });
+      var coltext = (0, _util.getSelectionColText)({
+        selection: commiting,
+        columns: innerColumns,
+        dataSource: innerDataSource
       });
       /** 选择范围 例如：i:[0,1], j:[1,2] */
 
       var selectedRange = {
-        i: range(start.i, end.i),
-        j: range(start.j, end.j)
+        i: (0, _util.range)(start.i, end.i),
+        j: (0, _util.range)(start.j, end.j)
       };
       /** 提交范围 */
 
       var commitRange = {
-        i: range(commiting === null || commiting === void 0 ? void 0 : (_commiting$start = commiting.start) === null || _commiting$start === void 0 ? void 0 : _commiting$start.i, commiting === null || commiting === void 0 ? void 0 : (_commiting$end = commiting.end) === null || _commiting$end === void 0 ? void 0 : _commiting$end.i),
-        j: range(commiting === null || commiting === void 0 ? void 0 : (_commiting$start2 = commiting.start) === null || _commiting$start2 === void 0 ? void 0 : _commiting$start2.j, commiting === null || commiting === void 0 ? void 0 : (_commiting$end2 = commiting.end) === null || _commiting$end2 === void 0 ? void 0 : _commiting$end2.j)
+        i: (0, _util.range)(commiting === null || commiting === void 0 ? void 0 : (_commiting$start = commiting.start) === null || _commiting$start === void 0 ? void 0 : _commiting$start.i, commiting === null || commiting === void 0 ? void 0 : (_commiting$end = commiting.end) === null || _commiting$end === void 0 ? void 0 : _commiting$end.i),
+        j: (0, _util.range)(commiting === null || commiting === void 0 ? void 0 : (_commiting$start2 = commiting.start) === null || _commiting$start2 === void 0 ? void 0 : _commiting$start2.j, commiting === null || commiting === void 0 ? void 0 : (_commiting$end2 = commiting.end) === null || _commiting$end2 === void 0 ? void 0 : _commiting$end2.j)
       }; // obj 为新增的范围
 
       var obj = {
@@ -591,36 +563,38 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         type = 'col';
       }
 
-      var data = (0, _lodash.cloneDeep)(dataSourceRef.current); // 行列分组
+      var data = (0, _lodash.cloneDeep)(dataSourceRef.current);
+      (_obj$i = obj.i) === null || _obj$i === void 0 ? void 0 : _obj$i.forEach(function (tri, index) {
+        var _obj$j;
 
-      if ((groupInfo === null || groupInfo === void 0 ? void 0 : groupInfo.length) || (columnKeys === null || columnKeys === void 0 ? void 0 : columnKeys.length)) {} else {
-        var _obj$i;
+        (_obj$j = obj.j) === null || _obj$j === void 0 ? void 0 : _obj$j.forEach(function (tdj) {
+          var _isSelected;
 
-        (_obj$i = obj.i) === null || _obj$i === void 0 ? void 0 : _obj$i.map(function (tri, index) {
-          var _obj$j;
+          if ((_isSelected = isSelected(tri, tdj)) === null || _isSelected === void 0 ? void 0 : _isSelected.isSelected) {
+            var key = columnsKeysList[tdj];
+            var sourceIndex = tri - skipList[tri];
 
-          (_obj$j = obj.j) === null || _obj$j === void 0 ? void 0 : _obj$j.map(function (tdj) {
-            var _isSelected;
+            if (sourceIndex < 0) {
+              return;
+            } // 行替换
 
-            if ((_isSelected = isSelected(tri, tdj)) === null || _isSelected === void 0 ? void 0 : _isSelected.isSelected) {
-              var key = columnsKeysList[tdj];
 
-              if (type === 'row') {
-                var _rowtext;
+            if (type === 'row') {
+              var _rowtext;
 
-                data[tri][key] = (_rowtext = rowtext[index % rowtext.length]) === null || _rowtext === void 0 ? void 0 : _rowtext[tdj];
-              } else {
-                var _coltext;
+              data[sourceIndex][key] = (_rowtext = rowtext[index % rowtext.length]) === null || _rowtext === void 0 ? void 0 : _rowtext[tdj];
+            } else {
+              var _coltext;
 
-                data[tri][key] = (_coltext = coltext[index % coltext.length]) === null || _coltext === void 0 ? void 0 : _coltext[tdj % coltext[index % coltext.length].length];
-              }
+              // 列替换
+              data[sourceIndex][key] = (_coltext = coltext[index % coltext.length]) === null || _coltext === void 0 ? void 0 : _coltext[tdj % coltext[index % coltext.length].length];
             }
-          });
+          }
         });
+      });
 
-        if (editSheet) {
-          dataChange === null || dataChange === void 0 ? void 0 : dataChange(data);
-        }
+      if (editSheet) {
+        dataChange === null || dataChange === void 0 ? void 0 : dataChange(data);
       }
 
       setSheelStatus((0, _objectSpread2.default)((0, _objectSpread2.default)({}, sheelStataus), {}, {
@@ -1234,7 +1208,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     items: columns.reduce(function (acc, item) {
       return [].concat((0, _toConsumableArray2.default)(acc), [item.dataIndex]);
     }, [])
-  }, /*#__PURE__*/_react.default.createElement(_proComponents.ProTable, (0, _extends2.default)({}, config, {
+  }, /*#__PURE__*/_react.default.createElement(_proTable.default, (0, _extends2.default)({}, config, {
     loading: loading,
     dataSource: dataSource,
     components: tableComponents,
@@ -1260,7 +1234,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     summary: function summary(pageData) {
       return _summary && _summary(pageData, resultColumns);
     }
-  })))) : /*#__PURE__*/_react.default.createElement(_proComponents.ProTable, (0, _extends2.default)({}, config, {
+  })))) : /*#__PURE__*/_react.default.createElement(_proTable.default, (0, _extends2.default)({}, config, {
     loading: loading,
     dataSource: dataSource,
     components: tableComponents,

package/es/LmTable/components/sheelTableCell.js

@@ -74,7 +74,7 @@ var SheelTabelCell = function SheelTabelCell(props) {
     if (e.button === 2) {
       console.log('点击了右键');
     } else if (!(col === null || col === void 0 ? void 0 : col.disableEvents)) {
-      console.log((_a = endCellRef === null || endCellRef === void 0 ? void 0 : endCellRef.current) === null || _a === void 0 ? void 0 : _a.contains(e.target), '点击了快速选择键');
+      console.log((_a = endCellRef === null || endCellRef === void 0 ? void 0 : endCellRef.current) === null || _a === void 0 ? void 0 : _a.contains(e.target), '点击了快速选择键', record, col, rowKey);
       onMouseDown === null || onMouseDown === void 0 ? void 0 : onMouseDown(rowIndex, colIndex, e, !!((_b = endCellRef === null || endCellRef === void 0 ? void 0 : endCellRef.current) === null || _b === void 0 ? void 0 : _b.contains(e.target)));
     }
   };

package/es/LmTable/util.js

@@ -7,6 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.checkIsSelectd = checkIsSelectd;
 exports.checkStatus = checkStatus;
+exports.getSelectionColText = getSelectionColText;
+exports.getSelectionRowText = getSelectionRowText;
+exports.getSkipList = getSkipList;
+exports.range = void 0;
 exports.transformWithColGroup = transformWithColGroup;
 exports.transformWithRowGroup = transformWithRowGroup;
 
@@ -16,12 +20,32 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
+/**
+ * 生成 start 到 end 数字组成的数组
+ * @param {number} start
+ * @param {number} end
+ * @returns {Array<number>}
+ */
+var range = function range(start, end) {
+  var array = [];
+  var inc = end - start > 0;
+
+  for (var i = start; inc ? i <= end : i >= end; inc ? i += 1 : i -= 1) {
+    inc ? array.push(i) : array.unshift(i);
+  }
+
+  return array;
+};
 /**
  * 对数据进行分组
  * @param {Array} data
  * @param {string} key
  * @return {Object}
  */
+
+
+exports.range = range;
+
 function dataGroup(data, key) {
   var result = {};
   data.forEach(function (item) {
@@ -208,4 +232,81 @@ function checkStatus(i, j, commiting) {
     /** 是否有效拉伸 */
     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((0, _toConsumableArray2.default)(prev), [prev[prev.length - 1] + 1]);
+    }
+
+    return [].concat((0, _toConsumableArray2.default)(prev), [prev[prev.length - 1]]);
+  }, []);
+  return skipList;
+}
+/**
+ * 获取选中行文本
+ * @param {Object}
+ * {
+ *    selection: {start: {i, j}, end: {i, j}},
+ *    columnsKeysList: Array,
+ *    dataSource: Array
+ * }
+ * @returns {Array}
+ */
+
+
+function getSelectionRowText(_ref) {
+  var selection = _ref.selection,
+      columnsKeysList = _ref.columnsKeysList,
+      dataSource = _ref.dataSource;
+  var rowtext = range(selection === null || selection === void 0 ? void 0 : selection.start.i, selection === null || selection === void 0 ? void 0 : selection.end.i).map(function (i) {
+    return columnsKeysList.map(function (j) {
+      var columnKey = j;
+      var dataItem = dataSource[i];
+      var cell = dataItem === null || dataItem === void 0 ? void 0 : dataItem[columnKey];
+      return cell;
+    });
+  });
+  return rowtext;
+}
+/**
+ * 获取选中列文本
+ * @param {Object}
+ * @returns {Array}
+ */
+
+
+function getSelectionColText(_ref2) {
+  var selection = _ref2.selection,
+      columns = _ref2.columns,
+      dataSource = _ref2.dataSource;
+  var coltext = range(selection === null || selection === void 0 ? void 0 : selection.start.i, selection === null || selection === void 0 ? void 0 : selection.end.i).map(function (i) {
+    return range(selection === null || selection === void 0 ? void 0 : selection.start.j, selection === null || selection === void 0 ? void 0 : selection.end.j).map(function (j) {
+      var _columns$j, _columns$j2;
+
+      var columnKey = (_columns$j = columns[j]) === null || _columns$j === void 0 ? void 0 : _columns$j.dataIndex;
+      var dataItem = dataSource[i];
+      var cell = dataItem === null || dataItem === void 0 ? void 0 : dataItem[columnKey];
+
+      if ((_columns$j2 = columns[j]) === null || _columns$j2 === void 0 ? void 0 : _columns$j2.render) {
+        var _columns$j3, _columns$j3$render;
+
+        return (_columns$j3 = columns[j]) === null || _columns$j3 === void 0 ? void 0 : (_columns$j3$render = _columns$j3.render) === null || _columns$j3$render === void 0 ? void 0 : _columns$j3$render.call(_columns$j3, cell, dataItem, i);
+      }
+
+      return cell;
+    });
+  });
+  return coltext;
 }

package/es/_util/placements.d.ts

@@ -1,4 +1,3 @@
-import type { BuildInPlacements } from 'rc-trigger';
 export interface AdjustOverflow {
     adjustX?: 0 | 1;
     adjustY?: 0 | 1;

package/lib/LmSelect/useCheckboxOptions.d.ts

@@ -1,4 +1,4 @@
-export declare const useCheckboxOptions: (options: any, { value, onChange: onCheckChange }: {
+export declare const useCheckboxOptions: (options: any, { value, onChange }: {
     value?: any[];
     onChange: any;
 }, filter?: string) => JSX.Element;

package/lib/LmTable/Table.js

@@ -19,7 +19,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 
-var _proComponents = require("@ant-design/pro-components");
+var _proTable = _interopRequireDefault(require("@ant-design/pro-table"));
 
 var _sortable = require("@dnd-kit/sortable");
 
@@ -62,7 +62,7 @@ var _virTual = require("./virTual");
 var _excluded = ["columns", "dataSource", "autoSize", "rowClick", "onDoubleClick", "checkConfig", "summary", "pagination", "hiddenPage", "loading", "virtual", "sortOpen", "colSortOpen", "resizeable", "customCheck", "components", "rowSelection", "columnsState", "onChange", "filterChange", "tableRowType", "size", "openSheet", "editSheet", "dataChange", "groupInfo", "emptyProps", "columnKeys"],
     _excluded2 = ["className", "style"],
     _excluded3 = ["onResize", "width", "onResizeStop"];
-var Summary = _proComponents.ProTable.Summary;
+var Summary = _proTable.default.Summary;
 exports.Summary = Summary;
 
 var isEmpty = function isEmpty(obj) {
@@ -75,24 +75,6 @@ var defaultParsePaste = function defaultParsePaste(str) {
   return str.split(/\r\n|\n|\r/).map(function (row) {
     return row.split('\t');
   });
-};
-/**
- * 生成 start 到 end 数字组成的数组
- * @param {number} start
- * @param {number} end
- * @returns {Array<number>}
- */
-
-
-var range = function range(start, end) {
-  var array = [];
-  var inc = end - start > 0;
-
-  for (var i = start; inc ? i <= end : i >= end; inc ? i += 1 : i -= 1) {
-    inc ? array.push(i) : array.unshift(i);
-  }
-
-  return array;
 }; // const DragHandle = SortableHandle(() => <MenuOutlined style={{ cursor: 'grab', color: '#999' }} />);
 
 
@@ -189,6 +171,11 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
   var deepDataSourceRef = (0, _react.useRef)([]);
   var deepColumnsRef = (0, _react.useRef)([]);
+  /** 记录最原始数据 */
+
+  (0, _react.useEffect)(function () {
+    dataSourceRef.current = customizeDataSource;
+  }, [customizeDataSource]);
   /** 行分组 */
 
   var groupDataSource = (0, _react.useMemo)(function () {
@@ -219,23 +206,21 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   /** sheel数据的表格 */
 
   var _useState9 = (0, _react.useState)({
+    // 记录框选的行列坐标信息
     start: {},
     end: {},
+    // 是否在框选
     selecting: false,
     forceEdit: false,
+    // 是否在编辑中
     editing: {},
     clear: {},
+    // 记录右下角小方块的拖动信息
     commiting: {}
   }),
       _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
       sheelStataus = _useState10[0],
       setSheelStatus = _useState10[1];
-  /**
-   * start: {i, j} 框选的坐标开始位置
-   * end: {i, j} 框选的坐标结束位置
-   * commiting: { start: {i, j}, end: {i, j}} 提交
-   */
-
 
   var shellStatusRef = (0, _react.useRef)({
     start: {},
@@ -296,10 +281,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   });
   var SortContainer = (0, _reactSortableHoc.SortableContainer)(function (props) {
     return /*#__PURE__*/_react.default.createElement("tbody", props);
-  });
-  (0, _react.useEffect)(function () {
-    dataSourceRef.current = dataSource;
-  }, [dataSource]); // 行分组数据铺平, 在框选时获取数据使用
+  }); // 行分组数据铺平, 在框选时获取数据使用
 
   (0, _react.useEffect)(function () {
     var source = [];
@@ -432,8 +414,8 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
 
   var getSelectDatas = function getSelectDatas(start, end) {
-    return range(start.i, end.i).map(function (i) {
-      return range(start.j, end.j).map(function (j) {
+    return (0, _util.range)(start.i, end.i).map(function (i) {
+      return (0, _util.range)(start.j, end.j).map(function (j) {
         var _columns$j, _columns$j2;
 
         var columnKey = (columnKeys === null || columnKeys === void 0 ? void 0 : columnKeys.length) ? deepColumnsRef.current[j].dataIndex : (_columns$j = columns[j]) === null || _columns$j === void 0 ? void 0 : _columns$j.dataIndex;
@@ -523,52 +505,42 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     var _shellStatusRef$curre9;
 
     if (!isEmpty((_shellStatusRef$curre9 = shellStatusRef.current) === null || _shellStatusRef$curre9 === void 0 ? void 0 : _shellStatusRef$curre9.commiting)) {
-      var _commiting$start, _commiting$end, _commiting$start2, _commiting$end2, _difference, _difference2;
+      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;
+          commiting = _shellStatusRef$curre10.commiting; //
+
       var innerColumns = (columnKeys === null || columnKeys === void 0 ? void 0 : columnKeys.length) ? deepColumnsRef.current : columns;
+      var innerDataSource = (groupInfo === null || groupInfo === void 0 ? void 0 : groupInfo.length) ? deepDataSourceRef.current : dataSource; //
+
       var columnsKeysList = innerColumns.map(function (item) {
         return item.dataIndex;
-      });
-      var rowtext = range(commiting === null || commiting === void 0 ? void 0 : commiting.start.i, commiting === null || commiting === void 0 ? void 0 : commiting.end.i).map(function (i) {
-        return columnsKeysList.map(function (j) {
-          var columnKey = j;
-          var dataItem = (groupInfo === null || groupInfo === void 0 ? void 0 : groupInfo.length) ? deepDataSourceRef.current[i] : dataSource[i];
-          var cell = dataItem === null || dataItem === void 0 ? void 0 : dataItem[columnKey];
-          return cell;
-        });
-      });
-      var coltext = range(commiting === null || commiting === void 0 ? void 0 : commiting.start.i, commiting === null || commiting === void 0 ? void 0 : commiting.end.i).map(function (i) {
-        return range(commiting === null || commiting === void 0 ? void 0 : commiting.start.j, commiting === null || commiting === void 0 ? void 0 : commiting.end.j).map(function (j) {
-          var _innerColumns$j, _innerColumns$j2;
-
-          var columnKey = (_innerColumns$j = innerColumns[j]) === null || _innerColumns$j === void 0 ? void 0 : _innerColumns$j.dataIndex;
-          var dataItem = (groupInfo === null || groupInfo === void 0 ? void 0 : groupInfo.length) ? deepDataSourceRef.current[i] : dataSource[i];
-          var cell = dataItem === null || dataItem === void 0 ? void 0 : dataItem[columnKey];
-
-          if ((_innerColumns$j2 = innerColumns[j]) === null || _innerColumns$j2 === void 0 ? void 0 : _innerColumns$j2.render) {
-            var _innerColumns$j3, _innerColumns$j3$rend;
-
-            return (_innerColumns$j3 = innerColumns[j]) === null || _innerColumns$j3 === void 0 ? void 0 : (_innerColumns$j3$rend = _innerColumns$j3.render) === null || _innerColumns$j3$rend === void 0 ? void 0 : _innerColumns$j3$rend.call(_innerColumns$j3, cell, dataItem, i);
-          }
+      }); //
 
-          return cell;
-        });
+      var skipList = (0, _util.getSkipList)(innerDataSource);
+      var rowtext = (0, _util.getSelectionRowText)({
+        selection: commiting,
+        columnsKeysList: columnsKeysList,
+        dataSource: innerDataSource
+      });
+      var coltext = (0, _util.getSelectionColText)({
+        selection: commiting,
+        columns: innerColumns,
+        dataSource: innerDataSource
       });
       /** 选择范围 例如：i:[0,1], j:[1,2] */
 
       var selectedRange = {
-        i: range(start.i, end.i),
-        j: range(start.j, end.j)
+        i: (0, _util.range)(start.i, end.i),
+        j: (0, _util.range)(start.j, end.j)
       };
       /** 提交范围 */
 
       var commitRange = {
-        i: range(commiting === null || commiting === void 0 ? void 0 : (_commiting$start = commiting.start) === null || _commiting$start === void 0 ? void 0 : _commiting$start.i, commiting === null || commiting === void 0 ? void 0 : (_commiting$end = commiting.end) === null || _commiting$end === void 0 ? void 0 : _commiting$end.i),
-        j: range(commiting === null || commiting === void 0 ? void 0 : (_commiting$start2 = commiting.start) === null || _commiting$start2 === void 0 ? void 0 : _commiting$start2.j, commiting === null || commiting === void 0 ? void 0 : (_commiting$end2 = commiting.end) === null || _commiting$end2 === void 0 ? void 0 : _commiting$end2.j)
+        i: (0, _util.range)(commiting === null || commiting === void 0 ? void 0 : (_commiting$start = commiting.start) === null || _commiting$start === void 0 ? void 0 : _commiting$start.i, commiting === null || commiting === void 0 ? void 0 : (_commiting$end = commiting.end) === null || _commiting$end === void 0 ? void 0 : _commiting$end.i),
+        j: (0, _util.range)(commiting === null || commiting === void 0 ? void 0 : (_commiting$start2 = commiting.start) === null || _commiting$start2 === void 0 ? void 0 : _commiting$start2.j, commiting === null || commiting === void 0 ? void 0 : (_commiting$end2 = commiting.end) === null || _commiting$end2 === void 0 ? void 0 : _commiting$end2.j)
       }; // obj 为新增的范围
 
       var obj = {
@@ -591,36 +563,38 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         type = 'col';
       }
 
-      var data = (0, _lodash.cloneDeep)(dataSourceRef.current); // 行列分组
+      var data = (0, _lodash.cloneDeep)(dataSourceRef.current);
+      (_obj$i = obj.i) === null || _obj$i === void 0 ? void 0 : _obj$i.forEach(function (tri, index) {
+        var _obj$j;
 
-      if ((groupInfo === null || groupInfo === void 0 ? void 0 : groupInfo.length) || (columnKeys === null || columnKeys === void 0 ? void 0 : columnKeys.length)) {} else {
-        var _obj$i;
+        (_obj$j = obj.j) === null || _obj$j === void 0 ? void 0 : _obj$j.forEach(function (tdj) {
+          var _isSelected;
 
-        (_obj$i = obj.i) === null || _obj$i === void 0 ? void 0 : _obj$i.map(function (tri, index) {
-          var _obj$j;
+          if ((_isSelected = isSelected(tri, tdj)) === null || _isSelected === void 0 ? void 0 : _isSelected.isSelected) {
+            var key = columnsKeysList[tdj];
+            var sourceIndex = tri - skipList[tri];
 
-          (_obj$j = obj.j) === null || _obj$j === void 0 ? void 0 : _obj$j.map(function (tdj) {
-            var _isSelected;
+            if (sourceIndex < 0) {
+              return;
+            } // 行替换
 
-            if ((_isSelected = isSelected(tri, tdj)) === null || _isSelected === void 0 ? void 0 : _isSelected.isSelected) {
-              var key = columnsKeysList[tdj];
 
-              if (type === 'row') {
-                var _rowtext;
+            if (type === 'row') {
+              var _rowtext;
 
-                data[tri][key] = (_rowtext = rowtext[index % rowtext.length]) === null || _rowtext === void 0 ? void 0 : _rowtext[tdj];
-              } else {
-                var _coltext;
+              data[sourceIndex][key] = (_rowtext = rowtext[index % rowtext.length]) === null || _rowtext === void 0 ? void 0 : _rowtext[tdj];
+            } else {
+              var _coltext;
 
-                data[tri][key] = (_coltext = coltext[index % coltext.length]) === null || _coltext === void 0 ? void 0 : _coltext[tdj % coltext[index % coltext.length].length];
-              }
+              // 列替换
+              data[sourceIndex][key] = (_coltext = coltext[index % coltext.length]) === null || _coltext === void 0 ? void 0 : _coltext[tdj % coltext[index % coltext.length].length];
             }
-          });
+          }
         });
+      });
 
-        if (editSheet) {
-          dataChange === null || dataChange === void 0 ? void 0 : dataChange(data);
-        }
+      if (editSheet) {
+        dataChange === null || dataChange === void 0 ? void 0 : dataChange(data);
       }
 
       setSheelStatus((0, _objectSpread2.default)((0, _objectSpread2.default)({}, sheelStataus), {}, {
@@ -1234,7 +1208,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     items: columns.reduce(function (acc, item) {
       return [].concat((0, _toConsumableArray2.default)(acc), [item.dataIndex]);
     }, [])
-  }, /*#__PURE__*/_react.default.createElement(_proComponents.ProTable, (0, _extends2.default)({}, config, {
+  }, /*#__PURE__*/_react.default.createElement(_proTable.default, (0, _extends2.default)({}, config, {
     loading: loading,
     dataSource: dataSource,
     components: tableComponents,
@@ -1260,7 +1234,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     summary: function summary(pageData) {
       return _summary && _summary(pageData, resultColumns);
     }
-  })))) : /*#__PURE__*/_react.default.createElement(_proComponents.ProTable, (0, _extends2.default)({}, config, {
+  })))) : /*#__PURE__*/_react.default.createElement(_proTable.default, (0, _extends2.default)({}, config, {
     loading: loading,
     dataSource: dataSource,
     components: tableComponents,