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

package/lib/LmTable/components/Container/Container.js

@@ -34,19 +34,23 @@ var Container = /*#__PURE__*/(0, _react.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.default.createElement("div", Object.assign({}, props, {
     ref: ref,
     style: Object.assign(Object.assign({}, style), {
       '--columns': columns
     }),
-    className: (0, _classnames.default)('dnd_container', unstyled && 'unstyled', horizontal && 'horizontal', hover && 'hover', placeholder && 'placeholder', scrollable && 'scrollable', shadow && 'shadow'),
+    className: (0, _classnames.default)('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.createElement("div", {
     className: 'dnd_header'
   }, label, /*#__PURE__*/_react.default.createElement("div", {
     className: 'dnd_actions'
-  })) : null, placeholder ? children : /*#__PURE__*/_react.default.createElement("ul", null, children));
+  })) : null, placeholder ? children : /*#__PURE__*/_react.default.createElement("ul", {
+    className: ulClassName
+  }, children));
 });
 exports.Container = Container;

package/lib/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/lib/LmTable/components/DndContainer.js

@@ -19,7 +19,6 @@ var _multipleContainersKeyboardCoordinates = _interopRequireDefault(require("../
 var _Item = require("./Item");
 var _Container = require("./Container");
 var _classnames = _interopRequireDefault(require("classnames"));
-require("./DndContainer.module.css");
 var __rest = void 0 && (void 0).__rest || function (s, e) {
   var t = {};
   for (var p in s) {
@@ -133,9 +132,9 @@ var dropAnimation = {
   })
 };
 var TRASH_ID = 'void';
-exports.TRASH_ID = TRASH_ID;
-var PLACEHOLDER_ID = 'placeholder';
+// const PLACEHOLDER_ID = 'placeholder';
 // const empty: UniqueIdentifier[] = [];
+exports.TRASH_ID = TRASH_ID;
 function DndContainer(_ref2) {
   var _ref2$adjustScale = _ref2.adjustScale,
     adjustScale = _ref2$adjustScale === void 0 ? false : _ref2$adjustScale,
@@ -377,30 +376,13 @@ function DndContainer(_ref2) {
         setActiveId(null);
         return;
       }
-      if (overId === PLACEHOLDER_ID) {
-        var newContainerId = getNextContainerId();
-        (0, _reactDom.unstable_batchedUpdates)(function () {
-          setContainers(function (containers) {
-            return [].concat((0, _toConsumableArray2.default)(containers), [newContainerId]);
-          });
-          console.log('PLACEHOLDER_ID', overId);
-          setItems(function (items) {
-            var _Object$assign3;
-            return Object.assign(Object.assign({}, items), (_Object$assign3 = {}, (0, _defineProperty2.default)(_Object$assign3, activeContainer, items[activeContainer].filter(function (id) {
-              return id !== activeId;
-            })), (0, _defineProperty2.default)(_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), (0, _defineProperty2.default)({}, overContainer, (0, _sortable.arrayMove)(items[overContainer], activeIndex, overIndex)));
-          setItems(newItems);
+          // setItems(newItems);
           updateItems(newItems);
         } else {
           updateItems(items);
@@ -460,7 +442,9 @@ function DndContainer(_ref2) {
     items: items[tableContainer],
     scrollable: scrollable,
     style: containerStyle,
-    unstyled: false
+    unstyled: false,
+    ulClassName: 'ulClassName',
+    isNoneBorder: true
   }, /*#__PURE__*/_react.default.createElement(_sortable.SortableContext, {
     items: items[tableContainer],
     strategy: _sortable.horizontalListSortingStrategy
@@ -526,12 +510,13 @@ 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/lib/LmTable/components/sheelTableCell.js

@@ -128,15 +128,18 @@ var SheelTabelCell = function SheelTabelCell(props) {
   };
   var renderViewer = children;
   var content = renderComponent() || renderEditor() || renderViewer;
+  var className = (0, _classnames.default)(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.default.createElement("td", Object.assign({}, (0, _lodash.omit)(clearProps, ['commitIng', 'editIng']), {
-    // style={{ userSelect: 'none' }}
-    className: (0, _classnames.default)(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.default.createElement("div", {
+  }), content, showEndCell && /*#__PURE__*/_react.default.createElement("div", {
     ref: endCellRef,
     className: 'lmtable_cell_end_icon'
   }));

package/lib/LmTable/expression.js

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

package/lib/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/lib/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/lib/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/lib/QuickMenu/index.js

@@ -19,7 +19,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 = (0, _react.useRef)({});
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -64,11 +65,13 @@ var LMQuickMenu = function LMQuickMenu(props) {
     // eslint-disable-next-line global-require
     var scrollama = require('scrollama');
     menuTimeEventRef.current = scrollama();
+    console.log((0, _domTarget.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: (0, _domTarget.getTargetElement)(warpElement || document)
+      container: (0, _domTarget.getTargetElement)(warpElement || document),
+      root: root ? (0, _domTarget.getTargetElement)(root) : undefined
     })) === null || _c === void 0 ? void 0 : _c.onStepEnter(function (_ref) {
       var element = _ref.element;
       updateActiveToc(element.id);
@@ -94,11 +97,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);
   };
@@ -109,10 +107,6 @@ var LMQuickMenu = function LMQuickMenu(props) {
   (0, _react.useEffect)(function () {
     var _a;
     // bindScroller();
-    setTimeout(function () {
-      bindDom();
-      bindScroller();
-    }, 200);
     (_a = (0, _domTarget.getTargetElement)(warpElement || document)) === null || _a === void 0 ? void 0 : _a.addEventListener('scroll', handleScroll, {
       once: true
     });
@@ -121,6 +115,12 @@ var LMQuickMenu = function LMQuickMenu(props) {
       (_a = (0, _domTarget.getTargetElement)(warpElement || document)) === null || _a === void 0 ? void 0 : _a.removeEventListener('scroll', handleScroll);
     };
   }, []);
+  (0, _react.useEffect)(function () {
+    setTimeout(function () {
+      setKeysDom();
+      bindScroller();
+    }, 200);
+  }, [filterMenuData]);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)(prefixCls),
     onMouseEnter: function onMouseEnter() {

package/lib/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/lib/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/package.json

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

package/es/LmTable/components/DndContainer.module.css

@@ -1,6 +0,0 @@
-.dnd_table_container > div {
-  border: none !important;
-}
-.dnd_table_container ul {
-  padding: 0 !important;
-}

package/lib/LmTable/components/DndContainer.module.css

@@ -1,6 +0,0 @@
-.dnd_table_container > div {
-  border: none !important;
-}
-.dnd_table_container ul {
-  padding: 0 !important;
-}