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

package/dist/LmTable/hooks/useDndItems.d.ts

@@ -6,8 +6,8 @@ interface IdndItems {
 declare function useDndItems(props: any): {
     dndColumns: any;
     items: IdndItems;
-    groupRowKeys: any[];
-    groupColKeys: any[];
+    groupRowKeys: any;
+    groupColKeys: any;
     updateItems: (value: IdndItems, resume: string) => void;
 };
 export default useDndItems;

package/dist/LmTable/util.d.ts

@@ -5,7 +5,7 @@
  * @param groupColKeys 列分组的keys
  * @returns
  */
-export function transformWithColGroup(columns: any, dataSource: any, groupColKeys: any): {
+export function transformWithColGroup(columns: any, dataSource: any, groupColKeys: any, groupRowKeys: any): {
     columns: any;
     dataSource: any;
 };

package/dist/index.umd.js

@@ -223791,13 +223791,18 @@
    * @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.cloneDeep(columns);
     var dataSourceCopy = lodash.cloneDeep(dataSource);
 
@@ -224461,39 +224466,55 @@
       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(_toConsumableArray$1(value.row), _toConsumableArray$1(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) {
@@ -224513,40 +224534,53 @@
       colSortOpen = props.colSortOpen,
       filterChange = props.filterChange,
       openRowGroup = props.openRowGroup,
-      openColGroup = props.openColGroup;
+      openColGroup = props.openColGroup,
+      customizeGroupRowKeys = props.customizeGroupRowKeys,
+      customizeGroupColKeys = props.customizeGroupColKeys;
     var _useState = React.useState(columns),
       _useState2 = _slicedToArray$1(_useState, 2),
       dndColumns = _useState2[0],
       setDndColumns = _useState2[1];
-    var _useState3 = React.useState([]),
+    var _useState3 = React.useState(customizeGroupRowKeys || []),
       _useState4 = _slicedToArray$1(_useState3, 2),
       groupRowKeys = _useState4[0],
       setGroupRowKeys = _useState4[1];
-    var _useState5 = React.useState([]),
+    var _useState5 = React.useState(customizeGroupColKeys || []),
       _useState6 = _slicedToArray$1(_useState5, 2),
       groupColKeys = _useState6[0],
       setGroupColKeys = _useState6[1];
+    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 = [];
       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 = React.useState(defaultItems),
       _useState8 = _slicedToArray$1(_useState7, 2),
       items = _useState8[0],
       setItems = _useState8[1];
     React.useEffect(function () {
+      columns.forEach(function (c) {
+        if (customizeGroupRowKeys.includes(c.dataIndex) || customizeGroupColKeys.includes(c.dataIndex)) {
+          c.show = false;
+        }
+      });
       setDndColumns(columns);
       setItems(defaultItems);
     }, [columns]);
@@ -224562,6 +224596,7 @@
           columns: columns
         });
       }
+      // 列分组进行覆盖，只允许存在一个
       if (value.col.length >= 2) {
         value.tableHeader = getSortInsert(value.tableHeader, items.col[0], {
           columns: columns
@@ -224573,7 +224608,7 @@
       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);
@@ -224590,7 +224625,9 @@
 
   function HeaderCellContent(props) {
     var column = props.column,
-      children = props.children;
+      children = props.children,
+      openRowGroup = props.openRowGroup,
+      openColGroup = props.openColGroup;
     var rowGroup = column.rowGroup,
       colGroup = column.colGroup,
       _column$title = column.title,
@@ -224611,6 +224648,7 @@
       touchAction: 'none',
       display: 'flex'
     };
+    var isShow = openRowGroup && rowGroup || openColGroup && colGroup;
     return /*#__PURE__*/React__default['default'].createElement("div", {
       style: {
         display: 'flex',
@@ -224620,13 +224658,13 @@
       style: {
         flex: 1
       }
-    }, children), (rowGroup || colGroup) && /*#__PURE__*/React__default['default'].createElement(Handle$1, _extends$2({
+    }, children), isShow && /*#__PURE__*/React__default['default'].createElement(Handle$1, _extends$2({
       style: style,
       ref: setNodeRef
     }, attributes, listeners)));
   }
 
-  var _excluded$1$ = ["columns", "dataSource", "autoSize", "rowClick", "onDoubleClick", "checkConfig", "summary", "pagination", "hiddenPage", "loading", "virtual", "sortOpen", "colSortOpen", "resizeable", "customCheck", "components", "rowSelection", "columnsState", "onChange", "filterChange", "tableRowType", "size", "openSheet", "editSheet", "dataChange", "openColGroup", "colGroupTitle", "openRowGroup", "rowGroupTitle", "groupWidth", "onGroupChange", "emptyProps"],
+  var _excluded$1$ = ["columns", "dataSource", "autoSize", "rowClick", "onDoubleClick", "checkConfig", "summary", "pagination", "hiddenPage", "loading", "virtual", "sortOpen", "colSortOpen", "resizeable", "customCheck", "components", "rowSelection", "columnsState", "onChange", "filterChange", "tableRowType", "size", "openSheet", "editSheet", "dataChange", "openColGroup", "colGroupTitle", "openRowGroup", "rowGroupTitle", "groupWidth", "groupRowKeys", "groupColKeys", "onGroupChange", "emptyProps"],
     _excluded2$r = ["className", "style"],
     _excluded3$6 = ["onResize", "width", "dataIndex", "onResizeStop"];
   var Summary$1 = ProviderWarp.Summary;
@@ -224700,10 +224738,15 @@
       openRowGroup = props.openRowGroup,
       rowGroupTitle = props.rowGroupTitle,
       groupWidth = props.groupWidth,
+      customizeGroupRowKeys = props.groupRowKeys,
+      customizeGroupColKeys = props.groupColKeys,
       _props$onGroupChange = props.onGroupChange,
       onGroupChange = _props$onGroupChange === void 0 ? function () {} : _props$onGroupChange,
       emptyProps = props.emptyProps,
       resetProps = _objectWithoutProperties$1(props, _excluded$1$);
+    if (!Array.isArray(customizeColumns) || !customizeColumns.length) {
+      return null;
+    }
     var _resetProps$rowKey = resetProps.rowKey,
       rowKey = _resetProps$rowKey === void 0 ? 'id' : _resetProps$rowKey;
     var _React$useContext = React__default['default'].useContext(ConfigContext$5),
@@ -224726,8 +224769,12 @@
       useActiveKey = _useState2[0],
       setActiveKey = _useState2[1]; // 行选中
     var tableWarpRef = React.useRef(null);
+    /** 记录最原始数据 */
     var dataSourceRef = React.useRef(null);
+    dataSourceRef.current = customizeDataSource;
     var columnsRef = React.useRef(null);
+    columnsRef.current = customizeColumns;
+
     /** 右键的ref */
     var contentMenuRef = React.useRef(null);
     /** 当前展开的列 */
@@ -224745,7 +224792,9 @@
         openColGroup: openColGroup,
         openRowGroup: openRowGroup,
         colSortOpen: colSortOpen,
-        filterChange: filterChange
+        filterChange: filterChange,
+        customizeGroupRowKeys: customizeGroupRowKeys,
+        customizeGroupColKeys: customizeGroupColKeys
       }),
       dndColumns = _useDndItems.dndColumns,
       items = _useDndItems.items,
@@ -224754,14 +224803,6 @@
       updateItems = _useDndItems.updateItems;
     onGroupChange && onGroupChange(groupRowKeys, groupColKeys);
 
-    /** 记录最原始数据 */
-    React.useEffect(function () {
-      dataSourceRef.current = customizeDataSource;
-    }, [customizeDataSource]);
-    React.useEffect(function () {
-      columnsRef.current = customizeColumns;
-    }, [customizeColumns]);
-
     /** 行分组 */
     var _useGroupDataSource = useGroupDataSource({
         groupRowKeys: groupRowKeys,
@@ -224778,8 +224819,8 @@
             columns: dndColumns
           };
         }
-        return transformWithColGroup(dndColumns, groupDataSource, groupColKeys);
-      }, [dndColumns, groupDataSource, groupColKeys]),
+        return transformWithColGroup(dndColumns, groupDataSource, groupColKeys, groupRowKeys);
+      }, [dndColumns, groupDataSource, groupColKeys, groupRowKeys]),
       columns = _useMemo.columns,
       dataSource = _useMemo.dataSource;
     React.useEffect(function () {
@@ -225455,21 +225496,23 @@
     var resetColumns = React.useCallback(function () {
       var colIndex = 0;
       var traverseColumns = function traverseColumns(columns) {
-        columns === null || columns === void 0 ? void 0 : columns.forEach(function (col, index) {
+        var _loop = function _loop(_i) {
+          var col = columns[_i];
           if (col.show === false) {
-            return;
-          }
-          if (col.children && col.children.length) {
+            columns.splice(_i, 1);
+            _i -= 1;
+          } else if (col.children && col.children.length) {
             traverseColumns(col.children);
-            return;
           } else {
             // $_ 开头表示私有属性
             col.$_colIndex = colIndex;
+            // eslint-disable-next-line no-loop-func
             col.onHeaderCell = function (column) {
+              i = _i;
               return resizeable ? {
                 width: column.width,
                 dataIndex: column.dataIndex,
-                onResize: handleResize(index),
+                onResize: handleResize(_i),
                 onResizeStop: endResize
               } : {
                 width: column.width,
@@ -225478,6 +225521,7 @@
             };
             if (openSheet) {
               col.onCell = function (record, rowIndex) {
+                i = _i;
                 return {
                   record: record,
                   rowKey: rowKey,
@@ -225496,9 +225540,13 @@
                 };
               };
             }
+            colIndex += 1;
           }
-          colIndex += 1;
-        });
+          i = _i;
+        };
+        for (var i = 0; i < columns.length; i += 1) {
+          _loop(i);
+        }
       };
       var innerColumns = lodash.cloneDeep(useColumns.filter(function (item) {
         return item.show !== false;
@@ -225773,7 +225821,10 @@
         }
       }, /*#__PURE__*/React__default['default'].createElement("th", restProps, /*#__PURE__*/React__default['default'].createElement(HeaderCellContent, _extends$2({
         column: column
-      }, props))));
+      }, props, {
+        openRowGroup: openRowGroup,
+        openColGroup: openColGroup
+      }))));
     };
     var colDraggableContainer = React.useCallback(function (_ref4) {
       var props = _extends$2({}, (_objectDestructuringEmpty(_ref4), _ref4));