linkmore-design 1.1.27-beta.1 → 1.1.27-beta.2

package/dist/LmTable/components/CalcExpression.d.ts

@@ -3,8 +3,6 @@ export interface IProps {
     record: Record<string, any>;
     rowKey: string;
     col: any;
-    rowIndex: number;
-    colIndex: number;
     [key: string]: any;
 }
 declare const CalcExpression: React.FC<IProps>;

package/dist/index.umd.js

@@ -223260,12 +223260,13 @@
       };
     }, [items]);
     var isOk = function isOk(active, over) {
+      var _items$row, _items$col;
       var item = filterColumns.find(function (item) {
         return item.title === active.id;
       });
-      if (over.id === 'row' || items.row.includes(over.id)) {
+      if (over.id === 'row' || (items === null || items === void 0 ? void 0 : (_items$row = items.row) === null || _items$row === void 0 ? void 0 : _items$row.includes(over.id))) {
         return item && item.rowGroup;
-      } else if (over.id === 'col' || items.col.includes(over.id)) {
+      } else if (over.id === 'col' || (items === null || items === void 0 ? void 0 : (_items$col = items.col) === null || _items$col === void 0 ? void 0 : _items$col.includes(over.id))) {
         return item && item.colGroup;
       }
       return true;
@@ -224078,6 +224079,7 @@
      * @param {Array<string>} oGroup 数组，列分组的keys值
      * @param {string} markStr
      * @returns
+     * 2万条数据 393ms
      */
     var groupBy = function groupBy(source, columns, oGroup, markStr) {
       if (!(oGroup === null || oGroup === void 0 ? void 0 : oGroup.length)) {
@@ -224701,7 +224703,13 @@
   function getSortDndColumns(value, _ref2) {
     var columns = _ref2.columns;
     var tableHeader = value.tableHeader;
-    var hiddenArr = [].concat(_toConsumableArray$1(value.row), _toConsumableArray$1(value.col)) || [];
+    var hiddenArr = [];
+    if (value.row) {
+      hiddenArr = [].concat(_toConsumableArray$1(hiddenArr), _toConsumableArray$1(value.row));
+    }
+    if (value.col) {
+      hiddenArr = [].concat(_toConsumableArray$1(hiddenArr), _toConsumableArray$1(value.col));
+    }
     if (!tableHeader || !tableHeader.length) {
       return [];
     }
@@ -224775,16 +224783,20 @@
     }, [customizeGroupRowKeys, customizeGroupColKeys]);
     // 初始化
     var defaultItems = {
-      row: [],
-      col: [],
       tableHeader: []
     };
+    if (openRowGroup) {
+      defaultItems.row = [];
+    }
+    if (openColGroup) {
+      defaultItems.col = [];
+    }
     if (openColGroup || openRowGroup || colSortOpen) {
       treeFind(columns, function (node) {
-        if (groupRowKeys.includes(node.dataIndex)) {
-          defaultItems.row.push(node.title);
+        if (openRowGroup && groupRowKeys.includes(node.dataIndex)) {
+          defaultItems.row && defaultItems.row.push(node.title);
         } else if (groupColKeys.includes(node.dataIndex)) {
-          defaultItems.col.push(node.title);
+          defaultItems.col && defaultItems.col.push(node.title);
         } else {
           defaultItems.tableHeader.push(node.title);
         }
@@ -224808,8 +224820,13 @@
     }, [columns]);
     // 更新
     var updateItems = function updateItems(value, resume) {
-      value.row = value.row.filter(Boolean);
-      value.col = value.col.filter(Boolean);
+      var _value$col;
+      if (value.row) {
+        value.row = value === null || value === void 0 ? void 0 : value.row.filter(Boolean);
+      }
+      if (value.col) {
+        value.col = value.col.filter(Boolean);
+      }
       if (resume) {
         // 删除
         del$1(value.row, resume);
@@ -224819,7 +224836,7 @@
         });
       }
       // 列分组进行覆盖，只允许存在一个
-      if (value.col.length >= 2) {
+      if ((value === null || value === void 0 ? void 0 : (_value$col = value.col) === null || _value$col === void 0 ? void 0 : _value$col.length) >= 2) {
         value.tableHeader = getSortInsert(value.tableHeader, items.col[0], {
           columns: columns
         });
@@ -225763,11 +225780,10 @@
                 };
               };
             } else if (openRowGroup) {
-              col.onCell = function (record, rowIndex) {
+              col.onCell = function (record) {
                 i = _i;
                 return {
                   record: record,
-                  rowIndex: rowIndex,
                   col: col,
                   onChangeRecord: function onChangeRecord() {
                     update();