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

package/es/LmTable/Table.js

@@ -26,7 +26,6 @@ var _IconFont = _interopRequireDefault(require("../IconFont"));
 var _Empty = _interopRequireDefault(require("../Empty"));
 var _DndContainer = _interopRequireDefault(require("./components/DndContainer"));
 var _sheelTableCell = _interopRequireDefault(require("./components/sheelTableCell"));
-var _tableChartsModal = _interopRequireDefault(require("./components/tableChartsModal"));
 var _customRenderEmpty = _interopRequireDefault(require("./components/customRenderEmpty"));
 var _util = require("./util");
 var _resetConfig = _interopRequireDefault(require("./resetConfig"));
@@ -35,7 +34,7 @@ var _useGroupDataSource3 = _interopRequireDefault(require("./hooks/useGroupDataS
 var _useDndItems2 = _interopRequireDefault(require("./hooks/useDndItems"));
 var _HeaderCol = _interopRequireDefault(require("./components/HeaderCol"));
 var _index = require("./common/index");
-var _excluded = ["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", "openGroup", "emptyProps"],
+var _excluded = ["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", "emptyProps"],
   _excluded2 = ["className", "style"],
   _excluded3 = ["onResize", "width", "dataIndex", "onResizeStop"];
 var Summary = _proTable.default.Summary;
@@ -105,7 +104,10 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     _props$editSheet = props.editSheet,
     editSheet = _props$editSheet === void 0 ? false : _props$editSheet,
     dataChange = props.dataChange,
-    openGroup = props.openGroup,
+    openColGroup = props.openColGroup,
+    colGroupTitle = props.colGroupTitle,
+    openRowGroup = props.openRowGroup,
+    rowGroupTitle = props.rowGroupTitle,
     emptyProps = props.emptyProps,
     resetProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _resetProps$rowKey = resetProps.rowKey,
@@ -129,20 +131,16 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     useActiveKey = _useState2[0],
     setActiveKey = _useState2[1]; // 行选中
-  var _useState3 = (0, _react.useState)([]),
-    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-    useColumns = _useState4[0],
-    setColumns = _useState4[1];
   var tableWarpRef = (0, _react.useRef)(null);
   var dataSourceRef = (0, _react.useRef)(null);
   var columnsRef = (0, _react.useRef)(null);
   /** 右键的ref */
   var contentMenuRef = (0, _react.useRef)(null);
   /** 当前展开的列 */
-  var _useState5 = (0, _react.useState)([]),
-    _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
-    expandedRowKeys = _useState6[0],
-    setExpandedRowKeys = _useState6[1];
+  var _useState3 = (0, _react.useState)([]),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    expandedRowKeys = _useState4[0],
+    setExpandedRowKeys = _useState4[1];
   var deepDataSourceRef = (0, _react.useRef)([]);
   var deepColumnsRef = (0, _react.useRef)([]);
   //
@@ -150,7 +148,8 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   //
   var _useDndItems = (0, _useDndItems2.default)({
       columns: customizeColumns,
-      openGroup: openGroup,
+      openColGroup: openColGroup,
+      openRowGroup: openRowGroup,
       colSortOpen: colSortOpen,
       filterChange: filterChange
     }),
@@ -196,7 +195,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   }, [groupRowKeys, groupColKeys]);
 
   /** sheel数据的表格 */
-  var _useState7 = (0, _react.useState)({
+  var _useState5 = (0, _react.useState)({
       // 记录框选的行列坐标信息
       start: {},
       end: {},
@@ -209,9 +208,9 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       // 记录右下角小方块的拖动信息
       commiting: {}
     }),
-    _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
-    sheelStataus = _useState8[0],
-    setSheelStatus = _useState8[1];
+    _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
+    sheelStataus = _useState6[0],
+    setSheelStatus = _useState6[1];
   var shellStatusRef = (0, _react.useRef)({
     start: {},
     end: {},
@@ -221,42 +220,40 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     clear: {},
     commiting: {}
   });
+  var _useState7 = (0, _react.useState)(false),
+    _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
+    selectIng = _useState8[0],
+    setSelectIng = _useState8[1];
   var _useState9 = (0, _react.useState)(false),
     _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
-    selectIng = _useState10[0],
-    setSelectIng = _useState10[1];
+    editIng = _useState10[0],
+    setEditIng = _useState10[1];
   var _useState11 = (0, _react.useState)(false),
     _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
-    editIng = _useState12[0],
-    setEditIng = _useState12[1];
+    commitIng = _useState12[0],
+    setCommitIng = _useState12[1];
+  /** 右键菜单是否显示 */
   var _useState13 = (0, _react.useState)(false),
     _useState14 = (0, _slicedToArray2.default)(_useState13, 2),
-    commitIng = _useState14[0],
-    setCommitIng = _useState14[1];
-  /** 右键菜单是否显示 */
-  var _useState15 = (0, _react.useState)(false),
-    _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
-    contextMenuStatus = _useState16[0],
-    setContextMenuStatus = _useState16[1];
+    contextMenuStatus = _useState14[0],
+    setContextMenuStatus = _useState14[1];
   /** 右键按钮的位置 */
-  var _useState17 = (0, _react.useState)({
+  var _useState15 = (0, _react.useState)({
       position: 'fixed',
       left: 300,
       top: 200
     }),
-    _useState18 = (0, _slicedToArray2.default)(_useState17, 2),
-    style = _useState18[0],
-    setStyle = _useState18[1];
-  var _useState19 = (0, _react.useState)(null),
-    _useState20 = (0, _slicedToArray2.default)(_useState19, 2),
-    chartsModalStatus = _useState20[0],
-    setChartsModalStatus = _useState20[1];
+    _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
+    style = _useState16[0],
+    setStyle = _useState16[1];
+
+  // const [chartsModalStatus, setChartsModalStatus] = useState(null)
 
   // 列设置
-  var _useState21 = (0, _react.useState)(false),
-    _useState22 = (0, _slicedToArray2.default)(_useState21, 2),
-    columnsStateMap = _useState22[0],
-    setColumnsStateMap = _useState22[1];
+  var _useState17 = (0, _react.useState)(false),
+    _useState18 = (0, _slicedToArray2.default)(_useState17, 2),
+    columnsStateMap = _useState18[0],
+    setColumnsStateMap = _useState18[1];
   var SortableItem = (0, _reactSortableHoc.SortableElement)(function (props) {
     return /*#__PURE__*/_react.default.createElement("tr", props);
   });
@@ -295,6 +292,13 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     deepChildren(columns);
     deepColumnsRef.current = source;
   }, [columns, groupColKeys]);
+  var _useState19 = (0, _react.useState)(columns),
+    _useState20 = (0, _slicedToArray2.default)(_useState19, 2),
+    useColumns = _useState20[0],
+    setColumns = _useState20[1];
+  (0, _react.useEffect)(function () {
+    setColumns(columns);
+  }, [columns]);
   var onSortEnd = function onSortEnd(_ref) {
     var oldIndex = _ref.oldIndex,
       newIndex = _ref.newIndex;
@@ -908,14 +912,12 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         title: '分组',
         dataIndex: '_group',
         key: '_group',
-        width: 100
+        width: 100,
+        fixed: true
       }].concat((0, _toConsumableArray2.default)(innerColumns));
     }
     return sortOpen ? [sortDefaultColumnItem].concat((0, _toConsumableArray2.default)(innerColumns)) : innerColumns;
   }, [useColumns, sortOpen, selectIng, dataSource, groupRowKeys, commitIng]);
-  (0, _react.useEffect)(function () {
-    setColumns(columns);
-  }, [columns]);
 
   // 行点击事件
   var onRecord = function onRecord(record) {
@@ -1178,11 +1180,19 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       body = _ref5$body === void 0 ? {} : _ref5$body,
       _ref5$header = _ref5.header,
       header = _ref5$header === void 0 ? {} : _ref5$header;
+    var headerRow = null;
+    if (openRowGroup || openColGroup) {
+      headerRow = colDraggableContainer;
+    }
+    var headerCell = null;
+    if (openRowGroup || openColGroup || resizeable) {
+      headerCell = ResizableTitle;
+    }
     return {
       table: virtual ? _virTual.VirtualTable : null,
       header: (0, _objectSpread2.default)({
-        row: openGroup ? colDraggableContainer : null,
-        cell: resizeable ? ResizableTitle : null
+        row: headerRow,
+        cell: headerCell
       }, header),
       body: (0, _objectSpread2.default)((0, _objectSpread2.default)({
         wrapper: sortOpen ? DraggableContainer : virtual ? _virTual.VirtualWrapper : null,
@@ -1205,9 +1215,11 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     } : emptyProps ? function () {
       return /*#__PURE__*/_react.default.createElement(_Empty.default, emptyProps, (emptyProps === null || emptyProps === void 0 ? void 0 : emptyProps.footer) || null);
     } : _customRenderEmpty.default
-  }, openGroup || colSortOpen ? /*#__PURE__*/_react.default.createElement(_DndContainer.default, {
+  }, openRowGroup || openColGroup || colSortOpen ? /*#__PURE__*/_react.default.createElement(_DndContainer.default, {
     items: items,
-    updateItems: updateItems
+    updateItems: updateItems,
+    rowGroupTitle: rowGroupTitle,
+    colGroupTitle: colGroupTitle
   }, /*#__PURE__*/_react.default.createElement(_proTable.default, (0, _extends2.default)({}, config, {
     loading: loading,
     dataSource: dataSource,
@@ -1272,20 +1284,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   }, "\u590D\u5236"), /*#__PURE__*/_react.default.createElement("div", {
     className: "rightClickItems",
     onClick: handleCopyAll
-  }, "\u590D\u5236\u5168\u90E8")), chartsModalStatus && /*#__PURE__*/_react.default.createElement(_tableChartsModal.default, {
-    type: chartsModalStatus,
-    onCancel: function onCancel() {
-      return setChartsModalStatus(false);
-    },
-    onOk: function onOk() {
-      return setChartsModalStatus(false);
-    },
-    data: dataSource,
-    deepDataSource: deepDataSourceRef.current,
-    rowKey: rowKey,
-    columns: columns,
-    selectInfo: (0, _lodash.pick)(shellStatusRef.current, ['start', 'end'])
-  }));
+  }, "\u590D\u5236\u5168\u90E8")));
 });
 
 // 监听大小: 这里的高度是整个表格的高度，表体需要减去列头和分页的高度
@@ -1293,13 +1292,13 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var _props$autoSizer = props.autoSizer,
     autoSizer = _props$autoSizer === void 0 ? false : _props$autoSizer;
-  var _useState23 = (0, _react.useState)({
+  var _useState21 = (0, _react.useState)({
       width: '100%',
       height: '100%'
     }),
-    _useState24 = (0, _slicedToArray2.default)(_useState23, 2),
-    tableSize = _useState24[0],
-    setTableSize = _useState24[1];
+    _useState22 = (0, _slicedToArray2.default)(_useState21, 2),
+    tableSize = _useState22[0],
+    setTableSize = _useState22[1];
   var defaultRef = ref || (0, _react.useRef)(null);
   var tableWarpRef = (0, _react.useRef)(null);
   var resizeRef = (0, _react.useRef)(null);

package/es/LmTable/components/DndContainer.d.ts

@@ -29,7 +29,9 @@ interface Props {
     scrollable?: boolean;
     children?: React.ReactNode;
     updateItems?(items: Items, resume?: string): void;
+    rowGroupTitle?: string;
+    colGroupTitle?: string;
 }
 export declare const TRASH_ID = "void";
-export default function DndContainer({ adjustScale, itemCount, cancelDrop, columns, handle, items: initialItems, containerStyle, coordinateGetter, getItemStyles, wrapperStyle, modifiers, renderItem, trashable, scrollable, children, updateItems, }: Props): JSX.Element;
+export default function DndContainer({ adjustScale, itemCount, cancelDrop, columns, handle, items: initialItems, containerStyle, coordinateGetter, getItemStyles, wrapperStyle, modifiers, renderItem, trashable, scrollable, children, updateItems, rowGroupTitle, colGroupTitle, }: Props): JSX.Element;
 export {};

package/es/LmTable/components/DndContainer.js

@@ -160,7 +160,11 @@ export default function DndContainer(_ref2) {
     _ref2$updateItems = _ref2.updateItems,
     updateItems = _ref2$updateItems === void 0 ? function () {
       return {};
-    } : _ref2$updateItems;
+    } : _ref2$updateItems,
+    _ref2$rowGroupTitle = _ref2.rowGroupTitle,
+    rowGroupTitle = _ref2$rowGroupTitle === void 0 ? '行分组' : _ref2$rowGroupTitle,
+    _ref2$colGroupTitle = _ref2.colGroupTitle,
+    colGroupTitle = _ref2$colGroupTitle === void 0 ? '列分组' : _ref2$colGroupTitle;
   var _useState = useState(function () {
       return initialItems;
     }),
@@ -407,7 +411,7 @@ export default function DndContainer(_ref2) {
     return /*#__PURE__*/React.createElement(DroppableContainer, {
       key: containerId,
       id: containerId,
-      label: containerId === 'row' ? '行分组' : '列分组',
+      label: containerId === 'row' ? rowGroupTitle : colGroupTitle,
       columns: columns,
       items: items[containerId],
       scrollable: true,

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

@@ -4,7 +4,7 @@ interface IdndItems {
     tableHeader?: string[];
 }
 declare function useDndItems(props: any): {
-    dndColumns: any[];
+    dndColumns: any;
     items: IdndItems;
     groupRowKeys: any[];
     groupColKeys: any[];

package/es/LmTable/hooks/useDndItems.js

@@ -2,6 +2,9 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { useState, useEffect } from 'react';
 import { treeFind } from '../common/index';
 function del(arr, target) {
+  if (!arr || !arr.length) {
+    return null;
+  }
   var index = arr.findIndex(function (item) {
     return item === target;
   });
@@ -24,12 +27,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) {
@@ -66,8 +63,9 @@ function useDndItems(props) {
   var columns = props.columns,
     colSortOpen = props.colSortOpen,
     filterChange = props.filterChange,
-    openGroup = props.openGroup;
-  var _useState = useState([]),
+    openRowGroup = props.openRowGroup,
+    openColGroup = props.openColGroup;
+  var _useState = useState(columns),
     _useState2 = _slicedToArray(_useState, 2),
     dndColumns = _useState2[0],
     setDndColumns = _useState2[1];
@@ -82,27 +80,27 @@ function useDndItems(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     groupColKeys = _useState6[0],
     setGroupColKeys = _useState6[1];
-  var tableHeader = [];
-  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 = [];
+    treeFind(columns, function (node) {
+      tableHeader.push(node.title);
+      return false;
+    });
+    defaultItems.tableHeader = tableHeader;
   }
   var _useState7 = useState(defaultItems),
     _useState8 = _slicedToArray(_useState7, 2),
     items = _useState8[0],
     setItems = _useState8[1];
+  // 更新
   var updateItems = function updateItems(value, resume) {
     if (resume) {
       del(value.row, resume);

package/lib/LmTable/Table.js

@@ -26,7 +26,6 @@ var _IconFont = _interopRequireDefault(require("../IconFont"));
 var _Empty = _interopRequireDefault(require("../Empty"));
 var _DndContainer = _interopRequireDefault(require("./components/DndContainer"));
 var _sheelTableCell = _interopRequireDefault(require("./components/sheelTableCell"));
-var _tableChartsModal = _interopRequireDefault(require("./components/tableChartsModal"));
 var _customRenderEmpty = _interopRequireDefault(require("./components/customRenderEmpty"));
 var _util = require("./util");
 var _resetConfig = _interopRequireDefault(require("./resetConfig"));
@@ -35,7 +34,7 @@ var _useGroupDataSource3 = _interopRequireDefault(require("./hooks/useGroupDataS
 var _useDndItems2 = _interopRequireDefault(require("./hooks/useDndItems"));
 var _HeaderCol = _interopRequireDefault(require("./components/HeaderCol"));
 var _index = require("./common/index");
-var _excluded = ["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", "openGroup", "emptyProps"],
+var _excluded = ["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", "emptyProps"],
   _excluded2 = ["className", "style"],
   _excluded3 = ["onResize", "width", "dataIndex", "onResizeStop"];
 var Summary = _proTable.default.Summary;
@@ -105,7 +104,10 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     _props$editSheet = props.editSheet,
     editSheet = _props$editSheet === void 0 ? false : _props$editSheet,
     dataChange = props.dataChange,
-    openGroup = props.openGroup,
+    openColGroup = props.openColGroup,
+    colGroupTitle = props.colGroupTitle,
+    openRowGroup = props.openRowGroup,
+    rowGroupTitle = props.rowGroupTitle,
     emptyProps = props.emptyProps,
     resetProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _resetProps$rowKey = resetProps.rowKey,
@@ -129,20 +131,16 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     useActiveKey = _useState2[0],
     setActiveKey = _useState2[1]; // 行选中
-  var _useState3 = (0, _react.useState)([]),
-    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-    useColumns = _useState4[0],
-    setColumns = _useState4[1];
   var tableWarpRef = (0, _react.useRef)(null);
   var dataSourceRef = (0, _react.useRef)(null);
   var columnsRef = (0, _react.useRef)(null);
   /** 右键的ref */
   var contentMenuRef = (0, _react.useRef)(null);
   /** 当前展开的列 */
-  var _useState5 = (0, _react.useState)([]),
-    _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
-    expandedRowKeys = _useState6[0],
-    setExpandedRowKeys = _useState6[1];
+  var _useState3 = (0, _react.useState)([]),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    expandedRowKeys = _useState4[0],
+    setExpandedRowKeys = _useState4[1];
   var deepDataSourceRef = (0, _react.useRef)([]);
   var deepColumnsRef = (0, _react.useRef)([]);
   //
@@ -150,7 +148,8 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   //
   var _useDndItems = (0, _useDndItems2.default)({
       columns: customizeColumns,
-      openGroup: openGroup,
+      openColGroup: openColGroup,
+      openRowGroup: openRowGroup,
       colSortOpen: colSortOpen,
       filterChange: filterChange
     }),
@@ -196,7 +195,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   }, [groupRowKeys, groupColKeys]);
 
   /** sheel数据的表格 */
-  var _useState7 = (0, _react.useState)({
+  var _useState5 = (0, _react.useState)({
       // 记录框选的行列坐标信息
       start: {},
       end: {},
@@ -209,9 +208,9 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       // 记录右下角小方块的拖动信息
       commiting: {}
     }),
-    _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
-    sheelStataus = _useState8[0],
-    setSheelStatus = _useState8[1];
+    _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
+    sheelStataus = _useState6[0],
+    setSheelStatus = _useState6[1];
   var shellStatusRef = (0, _react.useRef)({
     start: {},
     end: {},
@@ -221,42 +220,40 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     clear: {},
     commiting: {}
   });
+  var _useState7 = (0, _react.useState)(false),
+    _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
+    selectIng = _useState8[0],
+    setSelectIng = _useState8[1];
   var _useState9 = (0, _react.useState)(false),
     _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
-    selectIng = _useState10[0],
-    setSelectIng = _useState10[1];
+    editIng = _useState10[0],
+    setEditIng = _useState10[1];
   var _useState11 = (0, _react.useState)(false),
     _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
-    editIng = _useState12[0],
-    setEditIng = _useState12[1];
+    commitIng = _useState12[0],
+    setCommitIng = _useState12[1];
+  /** 右键菜单是否显示 */
   var _useState13 = (0, _react.useState)(false),
     _useState14 = (0, _slicedToArray2.default)(_useState13, 2),
-    commitIng = _useState14[0],
-    setCommitIng = _useState14[1];
-  /** 右键菜单是否显示 */
-  var _useState15 = (0, _react.useState)(false),
-    _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
-    contextMenuStatus = _useState16[0],
-    setContextMenuStatus = _useState16[1];
+    contextMenuStatus = _useState14[0],
+    setContextMenuStatus = _useState14[1];
   /** 右键按钮的位置 */
-  var _useState17 = (0, _react.useState)({
+  var _useState15 = (0, _react.useState)({
       position: 'fixed',
       left: 300,
       top: 200
     }),
-    _useState18 = (0, _slicedToArray2.default)(_useState17, 2),
-    style = _useState18[0],
-    setStyle = _useState18[1];
-  var _useState19 = (0, _react.useState)(null),
-    _useState20 = (0, _slicedToArray2.default)(_useState19, 2),
-    chartsModalStatus = _useState20[0],
-    setChartsModalStatus = _useState20[1];
+    _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
+    style = _useState16[0],
+    setStyle = _useState16[1];
+
+  // const [chartsModalStatus, setChartsModalStatus] = useState(null)
 
   // 列设置
-  var _useState21 = (0, _react.useState)(false),
-    _useState22 = (0, _slicedToArray2.default)(_useState21, 2),
-    columnsStateMap = _useState22[0],
-    setColumnsStateMap = _useState22[1];
+  var _useState17 = (0, _react.useState)(false),
+    _useState18 = (0, _slicedToArray2.default)(_useState17, 2),
+    columnsStateMap = _useState18[0],
+    setColumnsStateMap = _useState18[1];
   var SortableItem = (0, _reactSortableHoc.SortableElement)(function (props) {
     return /*#__PURE__*/_react.default.createElement("tr", props);
   });
@@ -295,6 +292,13 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     deepChildren(columns);
     deepColumnsRef.current = source;
   }, [columns, groupColKeys]);
+  var _useState19 = (0, _react.useState)(columns),
+    _useState20 = (0, _slicedToArray2.default)(_useState19, 2),
+    useColumns = _useState20[0],
+    setColumns = _useState20[1];
+  (0, _react.useEffect)(function () {
+    setColumns(columns);
+  }, [columns]);
   var onSortEnd = function onSortEnd(_ref) {
     var oldIndex = _ref.oldIndex,
       newIndex = _ref.newIndex;
@@ -908,14 +912,12 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         title: '分组',
         dataIndex: '_group',
         key: '_group',
-        width: 100
+        width: 100,
+        fixed: true
       }].concat((0, _toConsumableArray2.default)(innerColumns));
     }
     return sortOpen ? [sortDefaultColumnItem].concat((0, _toConsumableArray2.default)(innerColumns)) : innerColumns;
   }, [useColumns, sortOpen, selectIng, dataSource, groupRowKeys, commitIng]);
-  (0, _react.useEffect)(function () {
-    setColumns(columns);
-  }, [columns]);
 
   // 行点击事件
   var onRecord = function onRecord(record) {
@@ -1178,11 +1180,19 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       body = _ref5$body === void 0 ? {} : _ref5$body,
       _ref5$header = _ref5.header,
       header = _ref5$header === void 0 ? {} : _ref5$header;
+    var headerRow = null;
+    if (openRowGroup || openColGroup) {
+      headerRow = colDraggableContainer;
+    }
+    var headerCell = null;
+    if (openRowGroup || openColGroup || resizeable) {
+      headerCell = ResizableTitle;
+    }
     return {
       table: virtual ? _virTual.VirtualTable : null,
       header: (0, _objectSpread2.default)({
-        row: openGroup ? colDraggableContainer : null,
-        cell: resizeable ? ResizableTitle : null
+        row: headerRow,
+        cell: headerCell
       }, header),
       body: (0, _objectSpread2.default)((0, _objectSpread2.default)({
         wrapper: sortOpen ? DraggableContainer : virtual ? _virTual.VirtualWrapper : null,
@@ -1205,9 +1215,11 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     } : emptyProps ? function () {
       return /*#__PURE__*/_react.default.createElement(_Empty.default, emptyProps, (emptyProps === null || emptyProps === void 0 ? void 0 : emptyProps.footer) || null);
     } : _customRenderEmpty.default
-  }, openGroup || colSortOpen ? /*#__PURE__*/_react.default.createElement(_DndContainer.default, {
+  }, openRowGroup || openColGroup || colSortOpen ? /*#__PURE__*/_react.default.createElement(_DndContainer.default, {
     items: items,
-    updateItems: updateItems
+    updateItems: updateItems,
+    rowGroupTitle: rowGroupTitle,
+    colGroupTitle: colGroupTitle
   }, /*#__PURE__*/_react.default.createElement(_proTable.default, (0, _extends2.default)({}, config, {
     loading: loading,
     dataSource: dataSource,
@@ -1272,20 +1284,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   }, "\u590D\u5236"), /*#__PURE__*/_react.default.createElement("div", {
     className: "rightClickItems",
     onClick: handleCopyAll
-  }, "\u590D\u5236\u5168\u90E8")), chartsModalStatus && /*#__PURE__*/_react.default.createElement(_tableChartsModal.default, {
-    type: chartsModalStatus,
-    onCancel: function onCancel() {
-      return setChartsModalStatus(false);
-    },
-    onOk: function onOk() {
-      return setChartsModalStatus(false);
-    },
-    data: dataSource,
-    deepDataSource: deepDataSourceRef.current,
-    rowKey: rowKey,
-    columns: columns,
-    selectInfo: (0, _lodash.pick)(shellStatusRef.current, ['start', 'end'])
-  }));
+  }, "\u590D\u5236\u5168\u90E8")));
 });
 
 // 监听大小: 这里的高度是整个表格的高度，表体需要减去列头和分页的高度
@@ -1293,13 +1292,13 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var _props$autoSizer = props.autoSizer,
     autoSizer = _props$autoSizer === void 0 ? false : _props$autoSizer;
-  var _useState23 = (0, _react.useState)({
+  var _useState21 = (0, _react.useState)({
       width: '100%',
       height: '100%'
     }),
-    _useState24 = (0, _slicedToArray2.default)(_useState23, 2),
-    tableSize = _useState24[0],
-    setTableSize = _useState24[1];
+    _useState22 = (0, _slicedToArray2.default)(_useState21, 2),
+    tableSize = _useState22[0],
+    setTableSize = _useState22[1];
   var defaultRef = ref || (0, _react.useRef)(null);
   var tableWarpRef = (0, _react.useRef)(null);
   var resizeRef = (0, _react.useRef)(null);

package/lib/LmTable/components/DndContainer.d.ts

@@ -29,7 +29,9 @@ interface Props {
     scrollable?: boolean;
     children?: React.ReactNode;
     updateItems?(items: Items, resume?: string): void;
+    rowGroupTitle?: string;
+    colGroupTitle?: string;
 }
 export declare const TRASH_ID = "void";
-export default function DndContainer({ adjustScale, itemCount, cancelDrop, columns, handle, items: initialItems, containerStyle, coordinateGetter, getItemStyles, wrapperStyle, modifiers, renderItem, trashable, scrollable, children, updateItems, }: Props): JSX.Element;
+export default function DndContainer({ adjustScale, itemCount, cancelDrop, columns, handle, items: initialItems, containerStyle, coordinateGetter, getItemStyles, wrapperStyle, modifiers, renderItem, trashable, scrollable, children, updateItems, rowGroupTitle, colGroupTitle, }: Props): JSX.Element;
 export {};

package/lib/LmTable/components/DndContainer.js

@@ -166,7 +166,11 @@ function DndContainer(_ref2) {
     _ref2$updateItems = _ref2.updateItems,
     updateItems = _ref2$updateItems === void 0 ? function () {
       return {};
-    } : _ref2$updateItems;
+    } : _ref2$updateItems,
+    _ref2$rowGroupTitle = _ref2.rowGroupTitle,
+    rowGroupTitle = _ref2$rowGroupTitle === void 0 ? '行分组' : _ref2$rowGroupTitle,
+    _ref2$colGroupTitle = _ref2.colGroupTitle,
+    colGroupTitle = _ref2$colGroupTitle === void 0 ? '列分组' : _ref2$colGroupTitle;
   var _useState = (0, _react.useState)(function () {
       return initialItems;
     }),
@@ -413,7 +417,7 @@ function DndContainer(_ref2) {
     return /*#__PURE__*/_react.default.createElement(DroppableContainer, {
       key: containerId,
       id: containerId,
-      label: containerId === 'row' ? '行分组' : '列分组',
+      label: containerId === 'row' ? rowGroupTitle : colGroupTitle,
       columns: columns,
       items: items[containerId],
       scrollable: true,