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

package/es/LmTable/Table.js

@@ -909,11 +909,10 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
               };
             };
           } 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();

package/es/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/es/LmTable/components/DndContainer.js

@@ -288,12 +288,13 @@ export default function DndContainer(_ref2) {
     };
   }, [items]);
   var isOk = function isOk(active, over) {
+    var _a, _b;
     var item = filterColumns.find(function (item) {
       return item.title === active.id;
     });
-    if (over.id === 'row' || items.row.includes(over.id)) {
+    if (over.id === 'row' || ((_a = items === null || items === void 0 ? void 0 : items.row) === null || _a === void 0 ? void 0 : _a.includes(over.id))) {
       return item && item.rowGroup;
-    } else if (over.id === 'col' || items.col.includes(over.id)) {
+    } else if (over.id === 'col' || ((_b = items === null || items === void 0 ? void 0 : items.col) === null || _b === void 0 ? void 0 : _b.includes(over.id))) {
       return item && item.colGroup;
     }
     return true;

package/es/LmTable/hooks/useDndItems.js

@@ -32,7 +32,13 @@ function getSortInsert(tableHeader, value, _ref) {
 function getSortDndColumns(value, _ref2) {
   var columns = _ref2.columns;
   var tableHeader = value.tableHeader;
-  var hiddenArr = [].concat(_toConsumableArray(value.row), _toConsumableArray(value.col)) || [];
+  var hiddenArr = [];
+  if (value.row) {
+    hiddenArr = [].concat(_toConsumableArray(hiddenArr), _toConsumableArray(value.row));
+  }
+  if (value.col) {
+    hiddenArr = [].concat(_toConsumableArray(hiddenArr), _toConsumableArray(value.col));
+  }
   if (!tableHeader || !tableHeader.length) {
     return [];
   }
@@ -106,16 +112,20 @@ function useDndItems(props) {
   }, [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);
       }
@@ -139,8 +149,13 @@ function useDndItems(props) {
   }, [columns]);
   // 更新
   var updateItems = function updateItems(value, resume) {
-    value.row = value.row.filter(Boolean);
-    value.col = value.col.filter(Boolean);
+    var _a;
+    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(value.row, resume);
@@ -150,7 +165,7 @@ function useDndItems(props) {
       });
     }
     // 列分组进行覆盖，只允许存在一个
-    if (value.col.length >= 2) {
+    if (((_a = value === null || value === void 0 ? void 0 : value.col) === null || _a === void 0 ? void 0 : _a.length) >= 2) {
       value.tableHeader = getSortInsert(value.tableHeader, items.col[0], {
         columns: columns
       });

package/es/LmTable/util.js

@@ -93,6 +93,7 @@ function transformWithColGroup(columns, dataSource, groupColKeys, groupRowKeys)
    * @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)) {

package/lib/LmTable/Table.js

@@ -909,11 +909,10 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
               };
             };
           } 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();

package/lib/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/lib/LmTable/components/DndContainer.js

@@ -294,12 +294,13 @@ function DndContainer(_ref2) {
     };
   }, [items]);
   var isOk = function isOk(active, over) {
+    var _a, _b;
     var item = filterColumns.find(function (item) {
       return item.title === active.id;
     });
-    if (over.id === 'row' || items.row.includes(over.id)) {
+    if (over.id === 'row' || ((_a = items === null || items === void 0 ? void 0 : items.row) === null || _a === void 0 ? void 0 : _a.includes(over.id))) {
       return item && item.rowGroup;
-    } else if (over.id === 'col' || items.col.includes(over.id)) {
+    } else if (over.id === 'col' || ((_b = items === null || items === void 0 ? void 0 : items.col) === null || _b === void 0 ? void 0 : _b.includes(over.id))) {
       return item && item.colGroup;
     }
     return true;

package/lib/LmTable/hooks/useDndItems.js

@@ -39,7 +39,13 @@ function getSortInsert(tableHeader, value, _ref) {
 function getSortDndColumns(value, _ref2) {
   var columns = _ref2.columns;
   var tableHeader = value.tableHeader;
-  var hiddenArr = [].concat((0, _toConsumableArray2.default)(value.row), (0, _toConsumableArray2.default)(value.col)) || [];
+  var hiddenArr = [];
+  if (value.row) {
+    hiddenArr = [].concat((0, _toConsumableArray2.default)(hiddenArr), (0, _toConsumableArray2.default)(value.row));
+  }
+  if (value.col) {
+    hiddenArr = [].concat((0, _toConsumableArray2.default)(hiddenArr), (0, _toConsumableArray2.default)(value.col));
+  }
   if (!tableHeader || !tableHeader.length) {
     return [];
   }
@@ -113,16 +119,20 @@ function useDndItems(props) {
   }, [customizeGroupRowKeys, customizeGroupColKeys]);
   // 初始化
   var defaultItems = {
-    row: [],
-    col: [],
     tableHeader: []
   };
+  if (openRowGroup) {
+    defaultItems.row = [];
+  }
+  if (openColGroup) {
+    defaultItems.col = [];
+  }
   if (openColGroup || openRowGroup || colSortOpen) {
     (0, _index.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);
       }
@@ -146,8 +156,13 @@ function useDndItems(props) {
   }, [columns]);
   // 更新
   var updateItems = function updateItems(value, resume) {
-    value.row = value.row.filter(Boolean);
-    value.col = value.col.filter(Boolean);
+    var _a;
+    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(value.row, resume);
@@ -157,7 +172,7 @@ function useDndItems(props) {
       });
     }
     // 列分组进行覆盖，只允许存在一个
-    if (value.col.length >= 2) {
+    if (((_a = value === null || value === void 0 ? void 0 : value.col) === null || _a === void 0 ? void 0 : _a.length) >= 2) {
       value.tableHeader = getSortInsert(value.tableHeader, items.col[0], {
         columns: columns
       });

package/lib/LmTable/util.js

@@ -93,6 +93,7 @@ function transformWithColGroup(columns, dataSource, groupColKeys, groupRowKeys)
    * @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)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkmore-design",
-  "version": "1.1.27-beta.1",
+  "version": "1.1.27-beta.2",
   "author": {
     "name": "nowthen",
     "email": "rnlvwyx@gmail.com"