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

package/lib/LmTable/hooks/useDndItems.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _react = require("react");
 var _index = require("../common/index");
 function del(arr, target) {
@@ -19,39 +20,55 @@ function del(arr, target) {
     arr.splice(index, 1);
   }
 }
-function getSortInsert(target, value, _ref) {
+function getSortInsert(tableHeader, value, _ref) {
   var columns = _ref.columns;
-  if (!target) {
+  if (!tableHeader) {
     return [];
   }
   var arr = new Array(columns.length);
-  target.push(value);
-  target.forEach(function (val) {
+  tableHeader.push(value);
+  tableHeader.forEach(function (val) {
     var index = columns.findIndex(function (item) {
       return item.title === val;
     });
+    columns[index].show = true;
     arr.splice(index, 0, val);
   });
   return arr.filter(Boolean);
 }
-function getSortDndColumns(arr, _ref2) {
+function getSortDndColumns(value, _ref2) {
   var columns = _ref2.columns;
-  if (!arr || !arr.length) {
+  var tableHeader = value.tableHeader;
+  var hiddenArr = [].concat((0, _toConsumableArray2.default)(value.row), (0, _toConsumableArray2.default)(value.col)) || [];
+  if (!tableHeader || !tableHeader.length) {
     return [];
   }
   var result = [];
-  arr.forEach(function (val) {
+  var _loop = function _loop(i) {
     var item = columns.find(function (item) {
-      return item.title === val;
+      return item.title === tableHeader[i];
     });
     if (item) {
+      item.order = i;
       result.push(item);
     }
-  });
-  return result.map(function (item, index) {
-    item.order = index;
-    return item;
-  });
+  };
+  for (var i = 0; i < tableHeader.length; i++) {
+    _loop(i);
+  }
+  var _loop2 = function _loop2(_i) {
+    var item = columns.find(function (item) {
+      return item.title === hiddenArr[_i];
+    });
+    if (item) {
+      item.show = false;
+      result.push(item);
+    }
+  };
+  for (var _i = 0; _i < hiddenArr.length; _i++) {
+    _loop2(_i);
+  }
+  return result;
 }
 function getDataIndexForTitle(row, columns) {
   if (!row) {
@@ -71,40 +88,53 @@ function useDndItems(props) {
     colSortOpen = props.colSortOpen,
     filterChange = props.filterChange,
     openRowGroup = props.openRowGroup,
-    openColGroup = props.openColGroup;
+    openColGroup = props.openColGroup,
+    customizeGroupRowKeys = props.customizeGroupRowKeys,
+    customizeGroupColKeys = props.customizeGroupColKeys;
   var _useState = (0, _react.useState)(columns),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     dndColumns = _useState2[0],
     setDndColumns = _useState2[1];
-  var _useState3 = (0, _react.useState)([]),
+  var _useState3 = (0, _react.useState)(customizeGroupRowKeys || []),
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     groupRowKeys = _useState4[0],
     setGroupRowKeys = _useState4[1];
-  var _useState5 = (0, _react.useState)([]),
+  var _useState5 = (0, _react.useState)(customizeGroupColKeys || []),
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
     groupColKeys = _useState6[0],
     setGroupColKeys = _useState6[1];
+  (0, _react.useEffect)(function () {
+    setGroupRowKeys(customizeGroupRowKeys);
+    setGroupColKeys(customizeGroupColKeys);
+  }, [customizeGroupRowKeys, customizeGroupColKeys]);
   // 初始化
-  var defaultItems = {};
-  if (openRowGroup) {
-    defaultItems.row = [];
-  }
-  if (openColGroup) {
-    defaultItems.col = [];
-  }
+  var defaultItems = {
+    row: [],
+    col: [],
+    tableHeader: []
+  };
   if (openColGroup || openRowGroup || colSortOpen) {
-    var tableHeader = [];
     (0, _index.treeFind)(columns, function (node) {
-      tableHeader.push(node.title);
+      if (groupRowKeys.includes(node.dataIndex)) {
+        defaultItems.row.push(node.title);
+      } else if (groupColKeys.includes(node.dataIndex)) {
+        defaultItems.col.push(node.title);
+      } else {
+        defaultItems.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];
   (0, _react.useEffect)(function () {
+    columns.forEach(function (c) {
+      if (customizeGroupRowKeys.includes(c.dataIndex) || customizeGroupColKeys.includes(c.dataIndex)) {
+        c.show = false;
+      }
+    });
     setDndColumns(columns);
     setItems(defaultItems);
   }, [columns]);
@@ -120,6 +150,7 @@ function useDndItems(props) {
         columns: columns
       });
     }
+    // 列分组进行覆盖，只允许存在一个
     if (value.col.length >= 2) {
       value.tableHeader = getSortInsert(value.tableHeader, items.col[0], {
         columns: columns
@@ -131,7 +162,7 @@ function useDndItems(props) {
     setItems(value);
     setGroupRowKeys(getDataIndexForTitle(value.row, columns));
     setGroupColKeys(getDataIndexForTitle(value.col, columns));
-    var newColumns = getSortDndColumns(value.tableHeader, {
+    var newColumns = getSortDndColumns(value, {
       columns: columns
     });
     setDndColumns(newColumns);

package/lib/LmTable/util.js

@@ -64,13 +64,18 @@ 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
     };
   }
+  columns.forEach(function (c) {
+    if (groupRowKeys.includes(c.dataIndex)) {
+      c.show = false;
+    }
+  });
   var columnsCopy = _lodash.default.cloneDeep(columns);
   var dataSourceCopy = _lodash.default.cloneDeep(dataSource);
 

package/package.json

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