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

package/lib/LmTable/hooks/useDndItems.js

@@ -9,6 +9,9 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = require("react");
 var _index = require("../common/index");
 function del(arr, target) {
+  if (!arr || !arr.length) {
+    return null;
+  }
   var index = arr.findIndex(function (item) {
     return item === target;
   });
@@ -31,12 +34,6 @@ function getSortInsert(target, value, _ref) {
   });
   return arr.filter(Boolean);
 }
-/**
- * 返回按照 arr 顺序的columns
- * @param arr
- * @param param1
- * @returns
- */
 function getSortDndColumns(arr, _ref2) {
   var columns = _ref2.columns;
   if (!arr || !arr.length) {
@@ -73,8 +70,9 @@ function useDndItems(props) {
   var columns = props.columns,
     colSortOpen = props.colSortOpen,
     filterChange = props.filterChange,
-    openGroup = props.openGroup;
-  var _useState = (0, _react.useState)([]),
+    openRowGroup = props.openRowGroup,
+    openColGroup = props.openColGroup;
+  var _useState = (0, _react.useState)(columns),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     dndColumns = _useState2[0],
     setDndColumns = _useState2[1];
@@ -89,27 +87,27 @@ function useDndItems(props) {
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
     groupColKeys = _useState6[0],
     setGroupColKeys = _useState6[1];
-  var tableHeader = [];
-  (0, _index.treeFind)(columns, function (node) {
-    tableHeader.push(node.title);
-    return false;
-  });
+  // 初始化
   var defaultItems = {};
-  if (openGroup) {
-    defaultItems = {
-      row: [],
-      col: [],
-      tableHeader: tableHeader
-    };
-  } else if (colSortOpen) {
-    defaultItems = {
-      tableHeader: tableHeader
-    };
+  if (openRowGroup) {
+    defaultItems.row = [];
+  }
+  if (openColGroup) {
+    defaultItems.col = [];
+  }
+  if (openColGroup || openRowGroup || colSortOpen) {
+    var tableHeader = [];
+    (0, _index.treeFind)(columns, function (node) {
+      tableHeader.push(node.title);
+      return false;
+    });
+    defaultItems.tableHeader = tableHeader;
   }
   var _useState7 = (0, _react.useState)(defaultItems),
     _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
     items = _useState8[0],
     setItems = _useState8[1];
+  // 更新
   var updateItems = function updateItems(value, resume) {
     if (resume) {
       del(value.row, resume);

package/package.json

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

package/dist/LmTable/demos/excelGroup.d.ts

@@ -1,2 +0,0 @@
-export default App;
-declare function App(): JSX.Element;