linkmore-design 1.1.26 → 1.1.27-beta.1

package/lib/LmTable/testDemos/group.js

@@ -0,0 +1,115 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = _interopRequireWildcard(require("react"));
+var _linkmoreDesign = require("linkmore-design");
+var createDataSource = function createDataSource(start) {
+  var arr = [];
+  for (var i = start; i < start + 30000; i += 1) {
+    var obj = {
+      key: "key_".concat(i),
+      name: "\u5C0F\u9EC4_".concat(i),
+      id: "id_".concat(i),
+      age: "87",
+      address: "\u676D\u5DDE_".concat(i),
+      height: i,
+      favorite2: "\u7BEE\u7403_".concat(i),
+      favorite: "\u8DB3\u7403_".concat(i),
+      sex: i % 3 === 0 ? '男' : '女'
+    };
+    arr.push(obj);
+  }
+  return arr;
+};
+var columns = [{
+  title: '姓名',
+  dataIndex: 'name',
+  key: 'name',
+  width: 100
+}, {
+  title: '爱好',
+  dataIndex: 'favorite',
+  key: 'favorite',
+  width: 100
+}, {
+  title: '爱好2',
+  dataIndex: 'favorite2',
+  key: 'favorite2',
+  width: 100
+}, {
+  title: '年龄',
+  dataIndex: 'age',
+  key: 'age',
+  etype: 'number',
+  width: 100
+}, {
+  title: '薪水',
+  dataIndex: 'height',
+  key: 'height',
+  etype: 'number',
+  width: 100,
+  expression: 'sum'
+}, {
+  title: '住址',
+  dataIndex: 'address',
+  key: 'address',
+  width: 100
+}];
+var App = function App() {
+  var _useState = (0, _react.useState)([]),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    dataSource = _useState2[0],
+    setDataSource = _useState2[1];
+  (0, _react.useEffect)(function () {
+    setTimeout(function () {
+      if (dataSource.length >= 500) {
+        return;
+      }
+      var data = createDataSource(dataSource.length);
+      setDataSource([].concat((0, _toConsumableArray2.default)(dataSource), (0, _toConsumableArray2.default)(data)));
+    }, 500);
+  }, [dataSource]);
+  var dataChange = function dataChange(newDataSource) {
+    setDataSource((0, _toConsumableArray2.default)(newDataSource));
+  };
+  var config = {
+    pagination: false,
+    scroll: {
+      y: 300
+    },
+    virtual: true,
+    hiddenPage: true
+  };
+  return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Space, {
+    direction: "vertical",
+    style: {
+      width: '100%'
+    }
+  }, /*#__PURE__*/_react.default.createElement("div", null, "\u6570\u636E\u603B\u6570\uFF1A ", dataSource.length), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.LmTable, (0, _extends2.default)({}, config, {
+    dataSource: dataSource,
+    columns: columns
+    // 表格行 key 的取值，可以是字符串或一个函数
+    ,
+    rowKey: "key",
+    size: "small",
+    dataChange: dataChange,
+    resizeable: true // 表头列宽度是否可拖动
+    ,
+    openRowGroup: true // 开启行分组
+    ,
+    rowGroupTitle: "\u884C\u5206\u7EC4\u6807\u9898",
+    openColGroup: true // 开启列分组
+    ,
+    colGroupTitle: "\u5217\u5206\u7EC4\u6807\u9898"
+  })));
+};
+var _default = App;
+exports.default = _default;

package/lib/LmTable/util.js

@@ -1,7 +1,6 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -15,13 +14,9 @@ exports.isSelectCrossRowGroup = isSelectCrossRowGroup;
 exports.range = void 0;
 exports.transformWithColGroup = transformWithColGroup;
 exports.transformWithRowGroup = transformWithRowGroup;
-
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
 var _lodash = _interopRequireDefault(require("lodash"));
-
 /**
  * 生成 start 到 end 数字组成的数组
  * @param {number} start
@@ -31,29 +26,25 @@ var _lodash = _interopRequireDefault(require("lodash"));
 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}
+ * 时间复杂度O(n), 空间复杂度O(n)
  */
-
-
 exports.range = range;
-
 function dataGroup(data, key) {
   var result = {};
   data === null || data === void 0 ? void 0 : data.forEach(function (item) {
     if (item.children) {
       var _Object$keys;
-
       var temp = dataGroup(item.children, key);
       (_Object$keys = Object.keys(temp)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.forEach(function (k) {
         if (!result[k]) result[k] = [];
@@ -73,22 +64,29 @@ function dataGroup(data, key) {
  * @param groupColKeys 列分组的keys
  * @returns
  */
-
-
-function transformWithColGroup(columns, dataSource, groupColKeys) {
+function transformWithColGroup(columns, dataSource, groupColKeys, groupRowKeys) {
   if (!Array.isArray(groupColKeys) || !groupColKeys.length) {
     return {
       columns: columns,
       dataSource: dataSource
     };
   }
-
-  var columnsCopy = _lodash.default.cloneDeep(columns);
-
-  var dataSourceCopy = _lodash.default.cloneDeep(dataSource); // 去重
-
-
+  columns.forEach(function (c) {
+    if (groupRowKeys.includes(c.dataIndex)) {
+      c.show = false;
+    }
+  });
+  var columnsCopy = _lodash.default.cloneDeep(columns.filter(function (item) {
+    return item.joinCol;
+  }));
+  var unColumns = _lodash.default.cloneDeep(columns.filter(function (item) {
+    return !item.joinCol;
+  }));
+  var dataSourceCopy = _lodash.default.cloneDeep(dataSource);
+
+  // 去重
   var groupColKeysCopy = (0, _toConsumableArray2.default)(new Set(groupColKeys));
+
   /**
    * @param {Array} source source数据源，树状结构，行分组会有children子级结构
    * @param {Array} columns 列数据，用于表头，当列分组时会有children子级结构
@@ -96,7 +94,6 @@ function transformWithColGroup(columns, dataSource, groupColKeys) {
    * @param {string} markStr
    * @returns
    */
-
   var groupBy = function groupBy(source, columns, oGroup, markStr) {
     if (!(oGroup === null || oGroup === void 0 ? void 0 : oGroup.length)) {
       // 表头数据的生成，生成新的 dataIndex 值
@@ -113,11 +110,10 @@ function transformWithColGroup(columns, dataSource, groupColKeys) {
         }));
       });
       return handledColumns;
-    } // 拷贝
-
-
-    var group = oGroup.slice(); // 获取列表的第一个值
-
+    }
+    // 拷贝
+    var group = oGroup.slice();
+    // 获取列表的第一个值
     var filterKey = group.shift();
     var map = dataGroup(source, filterKey);
     return Object.keys(map).map(function (item) {
@@ -129,41 +125,34 @@ function transformWithColGroup(columns, dataSource, groupColKeys) {
       };
     });
   };
-
   var tempColumns = groupBy(dataSourceCopy, columnsCopy, groupColKeysCopy, null);
+  tempColumns = unColumns.concat(tempColumns);
   var keyMap = new Map();
   var __index = 0;
-
   var dataSourceBy = function dataSourceBy(source) {
     return [source.reduce(function (prev, sItem) {
       if (sItem.children && sItem.children.length) {
         sItem.children = dataSourceBy(sItem.children).flat();
-
         if (!prev) {
           prev = [];
         }
-
         return [].concat((0, _toConsumableArray2.default)(prev), [sItem]);
       } else {
         var _Object$keys2;
-
-        var str = ''; // 根据筛选条件生成对应的前缀key值，比如[name, age] => 'name_xiaoming_age_18'
-
+        var str = '';
+        // 根据筛选条件生成对应的前缀key值，比如[name, age] => 'name_xiaoming_age_18'
         groupColKeysCopy === null || groupColKeysCopy === void 0 ? void 0 : groupColKeysCopy.forEach(function (dataIndex, i) {
           if (i !== 0) {
             str += '_';
           }
-
           str += "".concat(dataIndex, "_").concat(sItem[dataIndex]);
-        }); // 对dataSource的key值进行更改：例如：'name' => 'name_xiaoming_age_18_address'
-
+        });
+        // 对dataSource的key值进行更改：例如：'name' => 'name_xiaoming_age_18_address'
         (_Object$keys2 = Object.keys(sItem)) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2.forEach(function (key) {
           if (key === '__index') {
             return;
           }
-
           var newKey = "".concat(str, "_").concat(key);
-
           if (keyMap.has(newKey)) {
             var value = keyMap.get(newKey) + 1;
             keyMap.set(newKey, value);
@@ -172,44 +161,42 @@ function transformWithColGroup(columns, dataSource, groupColKeys) {
             keyMap.set(newKey, 0);
             newKey = "".concat(newKey, "_", 0);
           }
-
           sItem[newKey] = sItem[key];
           sItem["".concat(newKey, "_originIndex")] = sItem.__index === undefined ? __index : sItem.__index;
         });
         __index += 1;
       }
-
       if (!prev) {
         prev = {};
       }
-
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, prev), sItem);
     }, null)];
   };
-
   var tempDataSource = dataSourceBy(dataSourceCopy).flat();
   return {
     columns: tempColumns,
     dataSource: tempDataSource
   };
 }
+
 /**
  * 行分组
  * @param {Array} dataSource 数据源
  * @param {Array} groupRowKeys 行分组的keys
  * @returns
  */
-
-
 function transformWithRowGroup(dataSource, groupRowKeys) {
   var groupBy = function groupBy(lastFilter, oGroup, preKey) {
     if (!(oGroup === null || oGroup === void 0 ? void 0 : oGroup.length)) return lastFilter;
     var group = oGroup.slice();
-    var filterKey = group.shift(); // 记录数据原来的位置索引信息
-
+    var filterKey = group.shift();
+    // 记录数据原来的位置索引信息
     var i = 0;
     var map = lastFilter.reduce(function (acc, el) {
       var value = el[filterKey];
+      if (value === undefined) {
+        value = '-';
+      }
       acc[value] = [].concat((0, _toConsumableArray2.default)(acc[value] || []), [(0, _objectSpread2.default)((0, _objectSpread2.default)({}, el), {}, {
         __index: i
       })]);
@@ -218,13 +205,11 @@ function transformWithRowGroup(dataSource, groupRowKeys) {
     }, {});
     return Object.keys(map).map(function (item) {
       var key;
-
       if (preKey) {
         key = "".concat(preKey, "_").concat(filterKey, "_").concat(item);
       } else {
         key = "".concat(filterKey, "_").concat(item);
       }
-
       return {
         type: filterKey,
         _group: item,
@@ -233,10 +218,8 @@ function transformWithRowGroup(dataSource, groupRowKeys) {
       };
     });
   };
-
   return groupBy(dataSource, groupRowKeys);
 }
-
 function checkIsSelectd(i, j) {
   var start = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   var end = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
@@ -246,10 +229,9 @@ function checkIsSelectd(i, j) {
   var negY = i <= start.i && i >= end.i;
   return posX && posY || negX && posY || negX && negY || posX && negY;
 }
-
 function checkStatus(i, j, commiting) {
   var start = commiting.start,
-      end = commiting.end;
+    end = commiting.end;
   var maxi = Math.max(start === null || start === void 0 ? void 0 : start.i, end.i);
   var mini = Math.min(start === null || start === void 0 ? void 0 : start.i, end.i);
   var maxj = Math.max(start === null || start === void 0 ? void 0 : start.j, end.j);
@@ -259,6 +241,7 @@ function checkStatus(i, j, commiting) {
     isVaildCommit: mini <= i && maxi >= i || minj <= j && maxj >= j
   };
 }
+
 /**
  * 获取选中行文本
  * @param {Object}
@@ -269,12 +252,10 @@ function checkStatus(i, j, commiting) {
  * }
  * @returns {Array}
  */
-
-
 function getSelectionRowText(_ref) {
   var selection = _ref.selection,
-      columnsKeysList = _ref.columnsKeysList,
-      dataSource = _ref.dataSource;
+    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;
@@ -285,75 +266,64 @@ function getSelectionRowText(_ref) {
   });
   return rowtext;
 }
+
 /**
  * 获取选中列文本
  * @param {Object}
  * @returns {Array}
  */
-
-
 function getSelectionColText(_ref2) {
   var selection = _ref2.selection,
-      columns = _ref2.columns,
-      dataSource = _ref2.dataSource;
+    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;
 }
+
 /**
  * 获取key所对应的原始数据的索引
  * @param {Object} {key, dataSource}
  * @returns {number}
  */
-
-
 function getDataSourceIndex(_ref3) {
   var key = _ref3.key,
-      _ref3$dataSource = _ref3.dataSource,
-      dataSource = _ref3$dataSource === void 0 ? [] : _ref3$dataSource;
+    _ref3$dataSource = _ref3.dataSource,
+    dataSource = _ref3$dataSource === void 0 ? [] : _ref3$dataSource;
   var index = -1;
-
   var dfs = function dfs(arr) {
     if (!Array.isArray(arr)) {
       return;
     }
-
     if (index !== -1) {
       return;
     }
-
     for (var i = 0; i < arr.length; i += 1) {
       var item = arr[i];
-
       if (item["".concat(key, "_originIndex")] !== undefined) {
         index = item["".concat(key, "_originIndex")];
         return;
       }
-
       if (item.children) {
         dfs(item.children);
       }
     }
   };
-
   dfs(dataSource);
   return index;
 }
+
 /**
  * 框选是否跨行分组
  * @param {number} i
@@ -361,36 +331,28 @@ function getDataSourceIndex(_ref3) {
  * @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
@@ -400,37 +362,27 @@ function isSelectCrossRowGroup(i, shellStatusRef, 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;
 }

package/lib/LmTable/virTual/VirtualRow.js

@@ -1,46 +1,36 @@
 "use strict";
 
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _react = _interopRequireWildcard(require("react"));
-
 var _context = require("./context");
-
 var __rest = void 0 && (void 0).__rest || function (s, e) {
   var t = {};
-
   for (var p in s) {
     if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
   }
-
   if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
     if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
   }
   return t;
 };
-
 var VirtualRow = /*#__PURE__*/_react.default.memo(function (_a, ref) {
   var children = _a.children,
-      resetProps = __rest(_a, ["children"]);
-
+    resetProps = __rest(_a, ["children"]);
   var _useStore = (0, _context.useStore)(),
-      state = _useStore.state,
-      dispatch = _useStore.dispatch,
-      instance = _useStore.instance;
-
+    state = _useStore.state,
+    dispatch = _useStore.dispatch,
+    instance = _useStore.instance;
   var rowHeight = state.rowHeight,
-      totalLen = state.totalLen;
+    totalLen = state.totalLen;
   var virtualItems = instance.columnVirtual.virtualItems;
-  var trRef = (0, _react.useRef)(null); // 列长度
-
+  var trRef = (0, _react.useRef)(null);
+  // 列长度
   var columnsLen = (0, _react.useMemo)(function () {
     var _a;
-
     return (_a = children === null || children === void 0 ? void 0 : children.length) !== null && _a !== void 0 ? _a : 0;
   }, [children]);
   (0, _react.useEffect)(function () {
@@ -54,7 +44,6 @@ var VirtualRow = /*#__PURE__*/_react.default.memo(function (_a, ref) {
   (0, _react.useEffect)(function () {
     var initHeight = function initHeight(tempRef) {
       var _a, _b, _c;
-
       if (((_a = tempRef === null || tempRef === void 0 ? void 0 : tempRef.current) === null || _a === void 0 ? void 0 : _a.offsetHeight) && !rowHeight && totalLen) {
         var tempRowHeight = (_c = (_b = tempRef === null || tempRef === void 0 ? void 0 : tempRef.current) === null || _b === void 0 ? void 0 : _b.offsetHeight) !== null && _c !== void 0 ? _c : 0;
         dispatch({
@@ -63,24 +52,20 @@ var VirtualRow = /*#__PURE__*/_react.default.memo(function (_a, ref) {
         });
       }
     };
-
     initHeight(Object.prototype.hasOwnProperty.call(ref, 'current') ? ref : trRef);
-  }, [trRef, dispatch, rowHeight, totalLen, ref]); // return {fixedLeft: [], fixedRight: [], columns: []}
-
+  }, [trRef, dispatch, rowHeight, totalLen, ref]);
+  // return {fixedLeft: [], fixedRight: [], columns: []}
   var fixedColumns = (0, _react.useMemo)(function () {
     return children === null || children === void 0 ? void 0 : children.reduce(function (pre, cur) {
       var _a, _b;
-
       if (typeof ((_a = cur.props) === null || _a === void 0 ? void 0 : _a.fixLeft) === 'number') {
         pre.fixedLeft.push(cur);
         return pre;
       }
-
       if (typeof ((_b = cur.props) === null || _b === void 0 ? void 0 : _b.fixRight) === 'number') {
         pre.fixedRight.push(cur);
         return pre;
       }
-
       pre.columns.push(cur);
       return pre;
     }, {
@@ -88,17 +73,16 @@ var VirtualRow = /*#__PURE__*/_react.default.memo(function (_a, ref) {
       fixedRight: [],
       columns: []
     });
-  }, [children]); // 截取非固定列
-
+  }, [children]);
+  // 截取非固定列
   var resetVirtualItems = (0, _react.useMemo)(function () {
     var fixedLeft = fixedColumns.fixedLeft,
-        columns = fixedColumns.columns;
+      columns = fixedColumns.columns;
     return virtualItems.slice(fixedLeft.length, fixedLeft.length + columns.length);
-  }, [fixedColumns, virtualItems]); // 横线单元格合并
-
+  }, [fixedColumns, virtualItems]);
+  // 横线单元格合并
   var colSpan = (0, _react.useMemo)(function () {
     var _a;
-
     var startIndex = ((_a = resetVirtualItems === null || resetVirtualItems === void 0 ? void 0 : resetVirtualItems[0]) === null || _a === void 0 ? void 0 : _a.index) || 0;
     return startIndex ? startIndex - fixedColumns.fixedLeft.length : startIndex;
   }, [fixedColumns, resetVirtualItems]);
@@ -110,6 +94,5 @@ var VirtualRow = /*#__PURE__*/_react.default.memo(function (_a, ref) {
     return children[virtualCol.index];
   }), fixedColumns.fixedRight);
 });
-
 var _default = VirtualRow;
 exports.default = _default;