linkmore-design 1.1.22-beta.4 → 1.1.22-beta.6

package/dist/variables.css

@@ -9001,6 +9001,10 @@ p {
 .form_responsive_group_title img.open {
   transform: rotate(180deg);
 }
+.lm_form.ant-form .ant-form-item .ant-form-item-explain {
+  line-height: 16px;
+  height: 16px;
+}
 .lm_form-item-tip-error .ant-form-item-explain {
   width: 100%;
   position: absolute;
@@ -10965,6 +10969,12 @@ p {
 #lm_protable_warp .ant-table-container {
   height: 100%;
 }
+#lm_protable_warp.lm_protable_footer .ant-table-container {
+  height: auto;
+}
+#lm_protable_warp.lm_protable_footer .ant-table-footer {
+  background-color: #fff;
+}
 #lm_protable_warp .ant-card-body,
 #lm_protable_warp .ant-pro-card-body {
   padding: 0;

package/es/Form/style/index.css

@@ -6656,6 +6656,10 @@ p {
 .form_responsive_group_title img.open {
   transform: rotate(180deg);
 }
+.lm_form.ant-form .ant-form-item .ant-form-item-explain {
+  line-height: 16px;
+  height: 16px;
+}
 .lm_form-item-tip-error .ant-form-item-explain {
   width: 100%;
   position: absolute;

package/es/Form/style/variables.css

@@ -6144,6 +6144,10 @@
 .form_responsive_group_title img.open {
   transform: rotate(180deg);
 }
+.lm_form.ant-form .ant-form-item .ant-form-item-explain {
+  line-height: 16px;
+  height: 16px;
+}
 .lm_form-item-tip-error .ant-form-item-explain {
   width: 100%;
   position: absolute;

package/es/LmTable/Table.js

@@ -933,14 +933,19 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     if (trigger === 'row') {
       var selectedRows = useSelectedRows.selectedRows;
       if (tableRowType === 'select' || tableRowType === 'default' && selectedRows.length) {
-        var selectIndex = selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.findIndex(function (v) {
-          return (0, _lodash.isObject)(v) ? v[rowKey] === record[rowKey] : v === record[rowKey];
-        });
-        selectIndex >= 0 ? selectedRows.splice(selectIndex, 1) : selectedRows.push((0, _lodash.isObject)(selectedRows[0]) || !selectedRows.length ? record : record[rowKey]);
-        setSelectedRows({
-          selectedRows: (0, _lodash.cloneDeep)(selectedRows)
-        });
-        // rowClick?.(selectedRows)
+        if ((rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.type) === 'radio') {
+          setSelectedRows({
+            selectedRows: [(0, _lodash.isObject)(selectedRows[0]) || !selectedRows.length ? record : record[rowKey]]
+          });
+        } else {
+          var selectIndex = selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.findIndex(function (v) {
+            return (0, _lodash.isObject)(v) ? v[rowKey] === record[rowKey] : v === record[rowKey];
+          });
+          selectIndex >= 0 ? selectedRows.splice(selectIndex, 1) : selectedRows.push((0, _lodash.isObject)(selectedRows[0]) || !selectedRows.length ? record : record[rowKey]);
+          setSelectedRows({
+            selectedRows: (0, _lodash.cloneDeep)(selectedRows)
+          });
+        }
       }
     } else {
       rowClick === null || rowClick === void 0 ? void 0 : rowClick(record);
@@ -1030,7 +1035,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
           // rowClick?.(reulstSelect)
         } : undefined,
         onSelect: (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRows) ? function (record, selected) {
-          var reulstSelect = selected ? (0, _lodash.uniqBy)([].concat((0, _toConsumableArray2.default)(rowSelection.selectedRows), [record]), rowKey) : rowSelection.selectedRows.filter(function (item) {
+          var reulstSelect = rowSelection.type === 'radio' ? [record] : selected ? (0, _lodash.uniqBy)([].concat((0, _toConsumableArray2.default)(rowSelection.selectedRows), [record]), rowKey) : rowSelection.selectedRows.filter(function (item) {
             return item[rowKey] !== record[rowKey];
           });
           setSelectedRows({
@@ -1150,7 +1155,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     if (!width) {
       return /*#__PURE__*/_react.default.createElement("th", restProps);
     }
-    var column = (0, _index.treeFind)(columnsRef.current, function (node) {
+    var column = (0, _index.treeFind)(columns, function (node) {
       return node.dataIndex === dataIndex;
     });
     if (!column) {
@@ -1215,7 +1220,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         cell: openSheet ? _sheelTableCell.default : null
       }, body)
     };
-  }, [sortOpen, resizeable, components, colSortOpen, customizeDataSource]);
+  }, [sortOpen, resizeable, components, colSortOpen, customizeDataSource, columns]);
   return /*#__PURE__*/_react.default.createElement("div", {
     style: {
       height: '100%',
@@ -1307,7 +1312,10 @@ var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var _props$autoSizer = props.autoSizer,
     autoSizer = _props$autoSizer === void 0 ? false : _props$autoSizer,
     openRowGroup = props.openRowGroup,
-    openColGroup = props.openColGroup;
+    openColGroup = props.openColGroup,
+    groupHeight = props.groupHeight,
+    footer = props.footer,
+    footerHeight = props.footerHeight;
   var _useState21 = (0, _react.useState)({
       width: '100%',
       height: '100%'
@@ -1318,9 +1326,11 @@ var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var defaultRef = ref || (0, _react.useRef)(null);
   var tableWarpRef = (0, _react.useRef)(null);
   var resizeRef = (0, _react.useRef)(null);
+  var clsName = (0, _classnames.default)(footer && 'lm_protable_footer');
   if (!autoSizer) {
     return /*#__PURE__*/_react.default.createElement("div", {
       ref: tableWarpRef,
+      className: clsName,
       id: "lm_protable_warp",
       style: {
         width: '100%',
@@ -1350,8 +1360,16 @@ var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     })) {
       h -= 32;
     }
+    // 行列分组的高度
     if (openRowGroup || openColGroup) {
-      h -= 100;
+      h -= groupHeight || 102;
+    }
+    if (footer) {
+      h -= footerHeight || 54;
+    }
+    // safe area
+    if (h < 0) {
+      h = 0;
     }
     return h;
   }, [props.hiddenPage, props.customCheck, props.columns, tableSize]);
@@ -1405,6 +1423,7 @@ var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     };
   }, []);
   return /*#__PURE__*/_react.default.createElement("div", {
+    className: clsName,
     ref: tableWarpRef,
     id: "lm_protable_warp",
     style: {

package/es/LmTable/components/Container/Container.css

@@ -18,13 +18,20 @@
 .dnd_container:last-child {
   margin-right: 0;
 }
+.dnd_container.isNoneBorder {
+  border: 0 !important;
+  margin: 0;
+}
 .dnd_container ul {
   display: flex;
   flex-wrap: wrap;
   list-style: none;
   padding: 10px;
   margin: 0;
-  min-height: 40px;
+  min-height: 57px;
+}
+.dnd_container ul.ulClassName {
+  padding: 0px;
 }
 .dnd_container.scrollable ul {
   overflow-y: auto;

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

@@ -14,5 +14,7 @@ export interface Props {
     unstyled?: boolean;
     onClick?: (e: any) => void;
     onRemove?: (e: any) => void;
+    ulClassName?: string;
+    isNoneBorder?: boolean;
 }
 export declare const Container: React.ForwardRefExoticComponent<Props & React.RefAttributes<HTMLDivElement>>;

package/es/LmTable/components/Container/Container.js

@@ -27,18 +27,22 @@ export var Container = /*#__PURE__*/forwardRef(function (_a, ref) {
     scrollable = _a.scrollable,
     shadow = _a.shadow,
     unstyled = _a.unstyled,
-    props = __rest(_a, ["children", "columns", "handleProps", "horizontal", "hover", "onClick", "onRemove", "label", "placeholder", "style", "scrollable", "shadow", "unstyled"]);
+    ulClassName = _a.ulClassName,
+    isNoneBorder = _a.isNoneBorder,
+    props = __rest(_a, ["children", "columns", "handleProps", "horizontal", "hover", "onClick", "onRemove", "label", "placeholder", "style", "scrollable", "shadow", "unstyled", "ulClassName", "isNoneBorder"]);
   return /*#__PURE__*/React.createElement("div", Object.assign({}, props, {
     ref: ref,
     style: Object.assign(Object.assign({}, style), {
       '--columns': columns
     }),
-    className: classNames('dnd_container', unstyled && 'unstyled', horizontal && 'horizontal', hover && 'hover', placeholder && 'placeholder', scrollable && 'scrollable', shadow && 'shadow'),
+    className: classNames('dnd_container', unstyled && 'unstyled', horizontal && 'horizontal', hover && 'hover', placeholder && 'placeholder', scrollable && 'scrollable', shadow && 'shadow', isNoneBorder && 'isNoneBorder'),
     onClick: onClick,
     tabIndex: onClick ? 0 : undefined
   }), label ? /*#__PURE__*/React.createElement("div", {
     className: 'dnd_header'
   }, label, /*#__PURE__*/React.createElement("div", {
     className: 'dnd_actions'
-  })) : null, placeholder ? children : /*#__PURE__*/React.createElement("ul", null, children));
+  })) : null, placeholder ? children : /*#__PURE__*/React.createElement("ul", {
+    className: ulClassName
+  }, children));
 });

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

@@ -1,6 +1,5 @@
 import React from 'react';
 import { CancelDrop, Modifiers, UniqueIdentifier, KeyboardCoordinateGetter } from '@dnd-kit/core';
-import './DndContainer.module.less';
 declare type Items = Record<UniqueIdentifier, UniqueIdentifier[]>;
 interface Props {
     adjustScale?: boolean;

package/es/LmTable/components/DndContainer.js

@@ -12,7 +12,7 @@ var __rest = this && this.__rest || function (s, e) {
   return t;
 };
 import React, { useCallback, useEffect, useRef, useState } from 'react';
-import { createPortal, unstable_batchedUpdates } from 'react-dom';
+import { createPortal } from 'react-dom';
 import { closestCenter, pointerWithin,
 // 返回指针悬停在其上的矩形
 rectIntersection, DndContext, DragOverlay,
@@ -24,7 +24,6 @@ import multipleContainersCoordinateGetter from '../multipleContainersKeyboardCoo
 import { Item } from './Item';
 import { Container } from './Container';
 import classNames from 'classnames';
-import "./DndContainer.module.css";
 var defaultDropAnimationSideEffects = function defaultDropAnimationSideEffects(options) {
   return function (_ref) {
     var active = _ref.active,
@@ -128,7 +127,7 @@ var dropAnimation = {
   })
 };
 export var TRASH_ID = 'void';
-var PLACEHOLDER_ID = 'placeholder';
+// const PLACEHOLDER_ID = 'placeholder';
 // const empty: UniqueIdentifier[] = [];
 export default function DndContainer(_ref2) {
   var _ref2$adjustScale = _ref2.adjustScale,
@@ -371,30 +370,13 @@ export default function DndContainer(_ref2) {
         setActiveId(null);
         return;
       }
-      if (overId === PLACEHOLDER_ID) {
-        var newContainerId = getNextContainerId();
-        unstable_batchedUpdates(function () {
-          setContainers(function (containers) {
-            return [].concat(_toConsumableArray(containers), [newContainerId]);
-          });
-          console.log('PLACEHOLDER_ID', overId);
-          setItems(function (items) {
-            var _Object$assign3;
-            return Object.assign(Object.assign({}, items), (_Object$assign3 = {}, _defineProperty(_Object$assign3, activeContainer, items[activeContainer].filter(function (id) {
-              return id !== activeId;
-            })), _defineProperty(_Object$assign3, newContainerId, [active.id]), _Object$assign3));
-          });
-          setActiveId(null);
-        });
-        return;
-      }
       var overContainer = findContainer(overId);
       if (overContainer) {
         var activeIndex = items[activeContainer].indexOf(active.id);
         var overIndex = items[overContainer].indexOf(overId);
         if (activeIndex !== overIndex) {
           var newItems = Object.assign(Object.assign({}, items), _defineProperty({}, overContainer, arrayMove(items[overContainer], activeIndex, overIndex)));
-          setItems(newItems);
+          // setItems(newItems);
           updateItems(newItems);
         } else {
           updateItems(items);
@@ -454,7 +436,9 @@ export default function DndContainer(_ref2) {
     items: items[tableContainer],
     scrollable: scrollable,
     style: containerStyle,
-    unstyled: false
+    unstyled: false,
+    ulClassName: 'ulClassName',
+    isNoneBorder: true
   }, /*#__PURE__*/React.createElement(SortableContext, {
     items: items[tableContainer],
     strategy: horizontalListSortingStrategy
@@ -520,12 +504,13 @@ export default function DndContainer(_ref2) {
       });
     }));
   }
-  function getNextContainerId() {
-    var containerIds = Object.keys(items);
-    var lastContainerId = containerIds[containerIds.length - 1];
-    return String.fromCharCode(lastContainerId.charCodeAt(0) + 1);
-  }
+  // function getNextContainerId() {
+  //   const containerIds = Object.keys(items);
+  //   const lastContainerId = containerIds[containerIds.length - 1];
+  //   return String.fromCharCode(lastContainerId.charCodeAt(0) + 1);
+  // }
 }
+
 function getColor(id) {
   switch (String(id)[0]) {
     case 'A':

package/es/LmTable/components/sheelTableCell.js

@@ -120,15 +120,18 @@ var SheelTabelCell = function SheelTabelCell(props) {
   };
   var renderViewer = children;
   var content = renderComponent() || renderEditor() || renderViewer;
+  var className = cls(colIndex === undefined && 'row_selection_td', 'unselection', _selected && selectIng && 'selected', isEnd && 'end', isRightEnd && 'right_end', isEditing && 'editing', isVaildCommit && 'commiting', selectedReadonly && 'readonly_red');
+  // 在编辑模式下不允许进行快速复制操作
+  var showEndCell = isRightEnd && isEnd && !isEditing;
+  console.log(content);
   return /*#__PURE__*/React.createElement("td", Object.assign({}, omit(clearProps, ['commitIng', 'editIng']), {
-    // style={{ userSelect: 'none' }}
-    className: cls(colIndex === undefined && 'row_selection_td', 'unselection', _selected && selectIng && 'selected', isEnd && 'end', isRightEnd && 'right_end', isEditing && 'editing', isVaildCommit && 'commiting', selectedReadonly && 'readonly_red'),
+    className: className,
     onMouseDown: handleMouseDown,
     onMouseOver: handleMouseOver,
     onContextMenu: handleContextMenu,
     onDoubleClick: handleDoubleClick,
     key: "".concat(rowIndex, "_").concat(colIndex)
-  }), content, isRightEnd && isEnd && !isEditing && /*#__PURE__*/React.createElement("div", {
+  }), content, showEndCell && /*#__PURE__*/React.createElement("div", {
     ref: endCellRef,
     className: 'lmtable_cell_end_icon'
   }));

package/es/LmTable/expression.js

@@ -25,6 +25,7 @@ export default function calcExpression(item, needCalcKeys) {
       } else if (expression === 'average') {
         item[key] = sum / item.children.length;
       }
+      // console.log(item)
     });
   }
 }

package/es/LmTable/style/index.css

@@ -873,6 +873,12 @@ p {
 #lm_protable_warp .ant-table-container {
   height: 100%;
 }
+#lm_protable_warp.lm_protable_footer .ant-table-container {
+  height: auto;
+}
+#lm_protable_warp.lm_protable_footer .ant-table-footer {
+  background-color: #fff;
+}
 #lm_protable_warp .ant-card-body,
 #lm_protable_warp .ant-pro-card-body {
   padding: 0;

package/es/LmTable/style/variables.css

@@ -361,6 +361,12 @@
 #lm_protable_warp .ant-table-container {
   height: 100%;
 }
+#lm_protable_warp.lm_protable_footer .ant-table-container {
+  height: auto;
+}
+#lm_protable_warp.lm_protable_footer .ant-table-footer {
+  background-color: #fff;
+}
 #lm_protable_warp .ant-card-body,
 #lm_protable_warp .ant-pro-card-body {
   padding: 0;

package/es/QuickMenu/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-interface IMenuData {
+export interface IMenuData {
     menuId: string;
     title: string | React.ReactNode;
     hidden?: boolean;
@@ -10,6 +10,7 @@ export interface IQuickMenuProps {
     top?: number;
     menuData: IMenuData[];
     warpElement: any;
+    root?: IntersectionObserver['root'] | undefined;
 }
 declare const LMQuickMenu: React.FC<IQuickMenuProps>;
 export default LMQuickMenu;

package/es/QuickMenu/index.js

@@ -11,7 +11,8 @@ var LMQuickMenu = function LMQuickMenu(props) {
     top = _props$top === void 0 ? '104px' : _props$top,
     _props$menuData = props.menuData,
     menuData = _props$menuData === void 0 ? [] : _props$menuData,
-    warpElement = props.warpElement;
+    warpElement = props.warpElement,
+    root = props.root;
   var idTopInfo = useRef({});
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -56,11 +57,13 @@ var LMQuickMenu = function LMQuickMenu(props) {
     // eslint-disable-next-line global-require
     var scrollama = require('scrollama');
     menuTimeEventRef.current = scrollama();
+    console.log(getTargetElement(warpElement || document), '--getTargetElement(warpElement || document)');
     (_c = (_b = menuTimeEventRef.current) === null || _b === void 0 ? void 0 : _b.setup({
       step: filterMenuData.map(function (item) {
         return document.getElementById("".concat(item.menuId));
       }).filter(Boolean),
-      container: getTargetElement(warpElement || document)
+      container: getTargetElement(warpElement || document),
+      root: root ? getTargetElement(root) : undefined
     })) === null || _c === void 0 ? void 0 : _c.onStepEnter(function (_ref) {
       var element = _ref.element;
       updateActiveToc(element.id);
@@ -86,11 +89,6 @@ var LMQuickMenu = function LMQuickMenu(props) {
   }, [scroll], {
     wait: 50
   });
-  var bindDom = function bindDom() {
-    if (!Object.keys(idTopInfo.current).length) {
-      setKeysDom();
-    }
-  };
   var handleScroll = function handleScroll() {
     setScrollOpenStatus(true);
   };
@@ -101,10 +99,6 @@ var LMQuickMenu = function LMQuickMenu(props) {
   useEffect(function () {
     var _a;
     // bindScroller();
-    setTimeout(function () {
-      bindDom();
-      bindScroller();
-    }, 200);
     (_a = getTargetElement(warpElement || document)) === null || _a === void 0 ? void 0 : _a.addEventListener('scroll', handleScroll, {
       once: true
     });
@@ -113,6 +107,12 @@ var LMQuickMenu = function LMQuickMenu(props) {
       (_a = getTargetElement(warpElement || document)) === null || _a === void 0 ? void 0 : _a.removeEventListener('scroll', handleScroll);
     };
   }, []);
+  useEffect(function () {
+    setTimeout(function () {
+      setKeysDom();
+      bindScroller();
+    }, 200);
+  }, [filterMenuData]);
   return /*#__PURE__*/React.createElement("div", {
     className: classNames(prefixCls),
     onMouseEnter: function onMouseEnter() {

package/es/index.d.ts

@@ -54,6 +54,7 @@ export { default as LmEditTable } from './LmEditTable';
 export type { CountdownHandle, TLmEditTable } from './LmEditTable/EditTable';
 export { default as List } from './List';
 export { default as LMQuickMenu } from './QuickMenu';
+export type { IMenuData, IQuickMenuProps } from './QuickMenu';
 export { default as DatePicker } from './DatePicker';
 export type { DatePickerProps, MonthPickerProps, WeekPickerProps, RangePickerProps } from './DatePicker';
 export { default as Popover } from './Popover';

package/es/styles/variables.css

@@ -9001,6 +9001,10 @@ p {
 .form_responsive_group_title img.open {
   transform: rotate(180deg);
 }
+.lm_form.ant-form .ant-form-item .ant-form-item-explain {
+  line-height: 16px;
+  height: 16px;
+}
 .lm_form-item-tip-error .ant-form-item-explain {
   width: 100%;
   position: absolute;
@@ -10965,6 +10969,12 @@ p {
 #lm_protable_warp .ant-table-container {
   height: 100%;
 }
+#lm_protable_warp.lm_protable_footer .ant-table-container {
+  height: auto;
+}
+#lm_protable_warp.lm_protable_footer .ant-table-footer {
+  background-color: #fff;
+}
 #lm_protable_warp .ant-card-body,
 #lm_protable_warp .ant-pro-card-body {
   padding: 0;

package/lib/Form/style/index.css

@@ -6656,6 +6656,10 @@ p {
 .form_responsive_group_title img.open {
   transform: rotate(180deg);
 }
+.lm_form.ant-form .ant-form-item .ant-form-item-explain {
+  line-height: 16px;
+  height: 16px;
+}
 .lm_form-item-tip-error .ant-form-item-explain {
   width: 100%;
   position: absolute;

package/lib/Form/style/variables.css

@@ -6144,6 +6144,10 @@
 .form_responsive_group_title img.open {
   transform: rotate(180deg);
 }
+.lm_form.ant-form .ant-form-item .ant-form-item-explain {
+  line-height: 16px;
+  height: 16px;
+}
 .lm_form-item-tip-error .ant-form-item-explain {
   width: 100%;
   position: absolute;

package/lib/LmTable/Table.js

@@ -933,14 +933,19 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     if (trigger === 'row') {
       var selectedRows = useSelectedRows.selectedRows;
       if (tableRowType === 'select' || tableRowType === 'default' && selectedRows.length) {
-        var selectIndex = selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.findIndex(function (v) {
-          return (0, _lodash.isObject)(v) ? v[rowKey] === record[rowKey] : v === record[rowKey];
-        });
-        selectIndex >= 0 ? selectedRows.splice(selectIndex, 1) : selectedRows.push((0, _lodash.isObject)(selectedRows[0]) || !selectedRows.length ? record : record[rowKey]);
-        setSelectedRows({
-          selectedRows: (0, _lodash.cloneDeep)(selectedRows)
-        });
-        // rowClick?.(selectedRows)
+        if ((rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.type) === 'radio') {
+          setSelectedRows({
+            selectedRows: [(0, _lodash.isObject)(selectedRows[0]) || !selectedRows.length ? record : record[rowKey]]
+          });
+        } else {
+          var selectIndex = selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.findIndex(function (v) {
+            return (0, _lodash.isObject)(v) ? v[rowKey] === record[rowKey] : v === record[rowKey];
+          });
+          selectIndex >= 0 ? selectedRows.splice(selectIndex, 1) : selectedRows.push((0, _lodash.isObject)(selectedRows[0]) || !selectedRows.length ? record : record[rowKey]);
+          setSelectedRows({
+            selectedRows: (0, _lodash.cloneDeep)(selectedRows)
+          });
+        }
       }
     } else {
       rowClick === null || rowClick === void 0 ? void 0 : rowClick(record);
@@ -1030,7 +1035,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
           // rowClick?.(reulstSelect)
         } : undefined,
         onSelect: (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRows) ? function (record, selected) {
-          var reulstSelect = selected ? (0, _lodash.uniqBy)([].concat((0, _toConsumableArray2.default)(rowSelection.selectedRows), [record]), rowKey) : rowSelection.selectedRows.filter(function (item) {
+          var reulstSelect = rowSelection.type === 'radio' ? [record] : selected ? (0, _lodash.uniqBy)([].concat((0, _toConsumableArray2.default)(rowSelection.selectedRows), [record]), rowKey) : rowSelection.selectedRows.filter(function (item) {
             return item[rowKey] !== record[rowKey];
           });
           setSelectedRows({
@@ -1150,7 +1155,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     if (!width) {
       return /*#__PURE__*/_react.default.createElement("th", restProps);
     }
-    var column = (0, _index.treeFind)(columnsRef.current, function (node) {
+    var column = (0, _index.treeFind)(columns, function (node) {
       return node.dataIndex === dataIndex;
     });
     if (!column) {
@@ -1215,7 +1220,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         cell: openSheet ? _sheelTableCell.default : null
       }, body)
     };
-  }, [sortOpen, resizeable, components, colSortOpen, customizeDataSource]);
+  }, [sortOpen, resizeable, components, colSortOpen, customizeDataSource, columns]);
   return /*#__PURE__*/_react.default.createElement("div", {
     style: {
       height: '100%',
@@ -1307,7 +1312,10 @@ var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var _props$autoSizer = props.autoSizer,
     autoSizer = _props$autoSizer === void 0 ? false : _props$autoSizer,
     openRowGroup = props.openRowGroup,
-    openColGroup = props.openColGroup;
+    openColGroup = props.openColGroup,
+    groupHeight = props.groupHeight,
+    footer = props.footer,
+    footerHeight = props.footerHeight;
   var _useState21 = (0, _react.useState)({
       width: '100%',
       height: '100%'
@@ -1318,9 +1326,11 @@ var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var defaultRef = ref || (0, _react.useRef)(null);
   var tableWarpRef = (0, _react.useRef)(null);
   var resizeRef = (0, _react.useRef)(null);
+  var clsName = (0, _classnames.default)(footer && 'lm_protable_footer');
   if (!autoSizer) {
     return /*#__PURE__*/_react.default.createElement("div", {
       ref: tableWarpRef,
+      className: clsName,
       id: "lm_protable_warp",
       style: {
         width: '100%',
@@ -1350,8 +1360,16 @@ var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     })) {
       h -= 32;
     }
+    // 行列分组的高度
     if (openRowGroup || openColGroup) {
-      h -= 100;
+      h -= groupHeight || 102;
+    }
+    if (footer) {
+      h -= footerHeight || 54;
+    }
+    // safe area
+    if (h < 0) {
+      h = 0;
     }
     return h;
   }, [props.hiddenPage, props.customCheck, props.columns, tableSize]);
@@ -1405,6 +1423,7 @@ var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     };
   }, []);
   return /*#__PURE__*/_react.default.createElement("div", {
+    className: clsName,
     ref: tableWarpRef,
     id: "lm_protable_warp",
     style: {

package/lib/LmTable/components/Container/Container.css

@@ -18,13 +18,20 @@
 .dnd_container:last-child {
   margin-right: 0;
 }
+.dnd_container.isNoneBorder {
+  border: 0 !important;
+  margin: 0;
+}
 .dnd_container ul {
   display: flex;
   flex-wrap: wrap;
   list-style: none;
   padding: 10px;
   margin: 0;
-  min-height: 40px;
+  min-height: 57px;
+}
+.dnd_container ul.ulClassName {
+  padding: 0px;
 }
 .dnd_container.scrollable ul {
   overflow-y: auto;

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

@@ -14,5 +14,7 @@ export interface Props {
     unstyled?: boolean;
     onClick?: (e: any) => void;
     onRemove?: (e: any) => void;
+    ulClassName?: string;
+    isNoneBorder?: boolean;
 }
 export declare const Container: React.ForwardRefExoticComponent<Props & React.RefAttributes<HTMLDivElement>>;