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

package/dist/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/dist/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/dist/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/dist/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/dist/index.umd.css

@@ -26811,6 +26811,10 @@ div.ant-typography-edit-content.ant-typography-rtl {
 .dnd_container:last-child {
   margin-right: 0;
 }
+.dnd_container.isNoneBorder {
+  border: 0 !important;
+  margin: 0;
+}
 .dnd_container ul {
   display: -webkit-box;
   display: -ms-flexbox;
@@ -26821,7 +26825,10 @@ div.ant-typography-edit-content.ant-typography-rtl {
   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;
@@ -26899,13 +26906,6 @@ div.ant-typography-edit-content.ant-typography-rtl {
   opacity: 1;
 }
 
-.DndContainer-module_dnd_table_container__28N0s > div {
-  border: none !important;
-}
-.DndContainer-module_dnd_table_container__28N0s ul {
-  padding: 0 !important;
-}
-
 /* stylelint-disable at-rule-empty-line-before,at-rule-name-space-after,at-rule-no-unknown */
 /* stylelint-disable no-duplicate-selectors */
 /* stylelint-disable */

package/dist/index.umd.js

@@ -222918,7 +222918,7 @@
     null, handle ? /*#__PURE__*/React__default['default'].createElement(Handle$1, _objectSpread(_objectSpread({}, handleProps), listeners)) : null)));
   }));
 
-  var _excluded$1V = ["children", "columns", "handleProps", "horizontal", "hover", "onClick", "onRemove", "label", "placeholder", "style", "scrollable", "shadow", "unstyled"];
+  var _excluded$1V = ["children", "columns", "handleProps", "horizontal", "hover", "onClick", "onRemove", "label", "placeholder", "style", "scrollable", "shadow", "unstyled", "ulClassName", "isNoneBorder"];
   var Container$1 = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     var children = _ref.children,
       _ref$columns = _ref.columns,
@@ -222934,20 +222934,24 @@
       scrollable = _ref.scrollable,
       shadow = _ref.shadow,
       unstyled = _ref.unstyled,
+      ulClassName = _ref.ulClassName,
+      isNoneBorder = _ref.isNoneBorder,
       props = _objectWithoutProperties$1(_ref, _excluded$1V);
     return /*#__PURE__*/React__default['default'].createElement("div", _objectSpread(_objectSpread({}, props), {}, {
       ref: ref,
       style: _objectSpread(_objectSpread({}, style), {}, {
         '--columns': columns
       }),
-      className: _classnames_2_3_2_classnames('dnd_container', unstyled && 'unstyled', horizontal && 'horizontal', hover && 'hover', placeholder && 'placeholder', scrollable && 'scrollable', shadow && 'shadow'),
+      className: _classnames_2_3_2_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__default['default'].createElement("div", {
       className: 'dnd_header'
     }, label, /*#__PURE__*/React__default['default'].createElement("div", {
       className: 'dnd_actions'
-    })) : null, placeholder ? children : /*#__PURE__*/React__default['default'].createElement("ul", null, children));
+    })) : null, placeholder ? children : /*#__PURE__*/React__default['default'].createElement("ul", {
+      className: ulClassName
+    }, children));
   });
 
   var _excluded$1W = ["children", "columns", "disabled", "id", "items", "style"];
@@ -223054,7 +223058,7 @@
     })
   };
   var TRASH_ID = 'void';
-  var PLACEHOLDER_ID = 'placeholder';
+  // const PLACEHOLDER_ID = 'placeholder';
   // const empty: UniqueIdentifier[] = [];
   function DndContainer(_ref3) {
     var _ref3$adjustScale = _ref3.adjustScale,
@@ -223296,30 +223300,13 @@
           setActiveId(null);
           return;
         }
-        if (overId === PLACEHOLDER_ID) {
-          var newContainerId = getNextContainerId();
-          ReactDOM.unstable_batchedUpdates(function () {
-            setContainers(function (containers) {
-              return [].concat(_toConsumableArray$1(containers), [newContainerId]);
-            });
-            console.log('PLACEHOLDER_ID', overId);
-            setItems(function (items) {
-              var _objectSpread4;
-              return _objectSpread(_objectSpread({}, items), {}, (_objectSpread4 = {}, _defineProperty$1(_objectSpread4, activeContainer, items[activeContainer].filter(function (id) {
-                return id !== activeId;
-              })), _defineProperty$1(_objectSpread4, newContainerId, [active.id]), _objectSpread4));
-            });
-            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 = _objectSpread(_objectSpread({}, items), {}, _defineProperty$1({}, overContainer, arrayMove(items[overContainer], activeIndex, overIndex)));
-            setItems(newItems);
+            // setItems(newItems);
             updateItems(newItems);
           } else {
             updateItems(items);
@@ -223379,7 +223366,9 @@
       items: items[tableContainer],
       scrollable: scrollable,
       style: containerStyle,
-      unstyled: false
+      unstyled: false,
+      ulClassName: 'ulClassName',
+      isNoneBorder: true
     }, /*#__PURE__*/React__default['default'].createElement(SortableContext$1, {
       items: items[tableContainer],
       strategy: horizontalListSortingStrategy
@@ -223445,12 +223434,13 @@
         });
       }));
     }
-    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':
@@ -224361,6 +224351,7 @@
         } else if (expression === 'average') {
           item[key] = sum / item.children.length;
         }
+        // console.log(item)
       });
     }
   }
@@ -225486,14 +225477,19 @@
       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 lodash.isObject(v) ? v[rowKey] === record[rowKey] : v === record[rowKey];
-          });
-          selectIndex >= 0 ? selectedRows.splice(selectIndex, 1) : selectedRows.push(lodash.isObject(selectedRows[0]) || !selectedRows.length ? record : record[rowKey]);
-          setSelectedRows({
-            selectedRows: lodash.cloneDeep(selectedRows)
-          });
-          // rowClick?.(selectedRows)
+          if ((rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.type) === 'radio') {
+            setSelectedRows({
+              selectedRows: [lodash.isObject(selectedRows[0]) || !selectedRows.length ? record : record[rowKey]]
+            });
+          } else {
+            var selectIndex = selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.findIndex(function (v) {
+              return lodash.isObject(v) ? v[rowKey] === record[rowKey] : v === record[rowKey];
+            });
+            selectIndex >= 0 ? selectedRows.splice(selectIndex, 1) : selectedRows.push(lodash.isObject(selectedRows[0]) || !selectedRows.length ? record : record[rowKey]);
+            setSelectedRows({
+              selectedRows: lodash.cloneDeep(selectedRows)
+            });
+          }
         }
       } else {
         rowClick === null || rowClick === void 0 ? void 0 : rowClick(record);
@@ -225583,7 +225579,7 @@
             // rowClick?.(reulstSelect)
           } : undefined,
           onSelect: (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRows) ? function (record, selected) {
-            var reulstSelect = selected ? lodash.uniqBy([].concat(_toConsumableArray$1(rowSelection.selectedRows), [record]), rowKey) : rowSelection.selectedRows.filter(function (item) {
+            var reulstSelect = rowSelection.type === 'radio' ? [record] : selected ? lodash.uniqBy([].concat(_toConsumableArray$1(rowSelection.selectedRows), [record]), rowKey) : rowSelection.selectedRows.filter(function (item) {
               return item[rowKey] !== record[rowKey];
             });
             setSelectedRows({
@@ -225703,7 +225699,7 @@
       if (!width) {
         return /*#__PURE__*/React__default['default'].createElement("th", restProps);
       }
-      var column = treeFind(columnsRef.current, function (node) {
+      var column = treeFind(columns, function (node) {
         return node.dataIndex === dataIndex;
       });
       if (!column) {
@@ -225768,7 +225764,7 @@
           cell: openSheet ? SheelTabelCell : null
         }, body)
       };
-    }, [sortOpen, resizeable, components, colSortOpen, customizeDataSource]);
+    }, [sortOpen, resizeable, components, colSortOpen, customizeDataSource, columns]);
     return /*#__PURE__*/React__default['default'].createElement("div", {
       style: {
         height: '100%',
@@ -225860,7 +225856,10 @@
     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 = React.useState({
         width: '100%',
         height: '100%'
@@ -225871,9 +225870,11 @@
     var defaultRef = ref || React.useRef(null);
     var tableWarpRef = React.useRef(null);
     var resizeRef = React.useRef(null);
+    var clsName = _classnames_2_3_2_classnames(footer && 'lm_protable_footer');
     if (!autoSizer) {
       return /*#__PURE__*/React__default['default'].createElement("div", {
         ref: tableWarpRef,
+        className: clsName,
         id: "lm_protable_warp",
         style: {
           width: '100%',
@@ -225903,8 +225904,16 @@
       })) {
         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]);
@@ -225958,6 +225967,7 @@
       };
     }, []);
     return /*#__PURE__*/React__default['default'].createElement("div", {
+      className: clsName,
       ref: tableWarpRef,
       id: "lm_protable_warp",
       style: {
@@ -241005,7 +241015,8 @@
       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 = React.useRef({});
     var _useState = React.useState(false),
       _useState2 = _slicedToArray$1(_useState, 2),
@@ -241051,11 +241062,13 @@
       // eslint-disable-next-line global-require
       var scrollama = require('scrollama');
       menuTimeEventRef.current = scrollama();
+      console.log(getTargetElement$1(warpElement || document), '--getTargetElement(warpElement || document)');
       (_menuTimeEventRef$cur2 = menuTimeEventRef.current) === null || _menuTimeEventRef$cur2 === void 0 ? void 0 : (_menuTimeEventRef$cur3 = _menuTimeEventRef$cur2.setup({
         step: filterMenuData.map(function (item) {
           return document.getElementById("".concat(item.menuId));
         }).filter(Boolean),
-        container: getTargetElement$1(warpElement || document)
+        container: getTargetElement$1(warpElement || document),
+        root: root ? getTargetElement$1(root) : undefined
       })) === null || _menuTimeEventRef$cur3 === void 0 ? void 0 : _menuTimeEventRef$cur3.onStepEnter(function (_ref) {
         var element = _ref.element;
         updateActiveToc(element.id);
@@ -241081,11 +241094,6 @@
     }, [scroll], {
       wait: 50
     });
-    var bindDom = function bindDom() {
-      if (!Object.keys(idTopInfo.current).length) {
-        setKeysDom();
-      }
-    };
     var handleScroll = function handleScroll() {
       setScrollOpenStatus(true);
     };
@@ -241096,10 +241104,6 @@
     React.useEffect(function () {
       var _getTargetElement2;
       // bindScroller();
-      setTimeout(function () {
-        bindDom();
-        bindScroller();
-      }, 200);
       (_getTargetElement2 = getTargetElement$1(warpElement || document)) === null || _getTargetElement2 === void 0 ? void 0 : _getTargetElement2.addEventListener('scroll', handleScroll, {
         once: true
       });
@@ -241108,6 +241112,12 @@
         (_getTargetElement3 = getTargetElement$1(warpElement || document)) === null || _getTargetElement3 === void 0 ? void 0 : _getTargetElement3.removeEventListener('scroll', handleScroll);
       };
     }, []);
+    React.useEffect(function () {
+      setTimeout(function () {
+        setKeysDom();
+        bindScroller();
+      }, 200);
+    }, [filterMenuData]);
     return /*#__PURE__*/React__default['default'].createElement("div", {
       className: _classnames_2_3_2_classnames(prefixCls$a),
       onMouseEnter: function onMouseEnter() {