linkmore-design 1.1.37 → 1.1.38

package/es/CustomTableOption/cardSort.js

@@ -47,7 +47,8 @@ var FilterSort = /*#__PURE__*/forwardRef(function (_ref, ref) {
       card = _ref$card === void 0 ? [] : _ref$card,
       _ref$cardStateValue = _ref.cardStateValue,
       cardStateValue = _ref$cardStateValue === void 0 ? {} : _ref$cardStateValue,
-      showPromptNum = _ref.showPromptNum;
+      showPromptNum = _ref.showPromptNum,
+      changeStatusFn = _ref.changeStatusFn;
 
   var _useState = useState([]),
       _useState2 = _slicedToArray(_useState, 2),
@@ -128,6 +129,7 @@ var FilterSort = /*#__PURE__*/forwardRef(function (_ref, ref) {
           });
         });
       });
+      changeStatusFn === null || changeStatusFn === void 0 ? void 0 : changeStatusFn();
     }
   };
   /** 添加是否显示 */
@@ -144,6 +146,7 @@ var FilterSort = /*#__PURE__*/forwardRef(function (_ref, ref) {
       return Object.assign({}, item);
     });
     setLocalCard(resultColumns);
+    changeStatusFn === null || changeStatusFn === void 0 ? void 0 : changeStatusFn();
   };
   /** 切换是否全选 */
 
@@ -155,6 +158,7 @@ var FilterSort = /*#__PURE__*/forwardRef(function (_ref, ref) {
       });
     });
     setLocalCard(resultColumns);
+    changeStatusFn === null || changeStatusFn === void 0 ? void 0 : changeStatusFn();
   };
 
   useImperativeHandle(ref, function () {
@@ -201,7 +205,8 @@ var FilterSort = /*#__PURE__*/forwardRef(function (_ref, ref) {
     checked: isCheckAll.checkAll
   }, "\u5168\u9009"), /*#__PURE__*/React.createElement("span", {
     onClick: function onClick() {
-      return setLocalCard(card);
+      setLocalCard(card);
+      changeStatusFn === null || changeStatusFn === void 0 ? void 0 : changeStatusFn();
     }
   }, "\u91CD\u7F6E")), !!(sortMenu === null || sortMenu === void 0 ? void 0 : sortMenu.length) && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(DndContext, {
     sensors: sensors,

package/es/CustomTableOption/index.js

@@ -29,6 +29,9 @@ var LMCustomTableOption = /*#__PURE__*/forwardRef(function (props, ref) {
   var className = props.className,
       _props$tooltip = props.tooltip,
       tooltip = _props$tooltip === void 0 ? {} : _props$tooltip;
+  /** check is change */
+
+  var isChangeRef = useRef(false);
   var filterRef = useRef(null);
   var columnsRef = useRef(null);
   var cardRef = useRef(null); // const sizeRef = useRef(null)
@@ -59,6 +62,12 @@ var LMCustomTableOption = /*#__PURE__*/forwardRef(function (props, ref) {
     setVisible(true);
   };
 
+  var changeStatusFn = function changeStatusFn() {
+    if (!isChangeRef.current) {
+      isChangeRef.current = true;
+    }
+  };
+
   useEffect(function () {
     setLmOptions({
       filter: props.filter || [],
@@ -86,7 +95,7 @@ var LMCustomTableOption = /*#__PURE__*/forwardRef(function (props, ref) {
       return (item === null || item === void 0 ? void 0 : item.show) !== false;
     })) || [];
 
-    if (effectCardData.length > (((_g = props.recommendNumObj) === null || _g === void 0 ? void 0 : _g.card) || 10)) {
+    if (effectCardData.length > (((_g = props.recommendNumObj) === null || _g === void 0 ? void 0 : _g.card) || 10) && !!isChangeRef.current) {
       Modal.confirm({
         title: '当前选择的卡片字段数量会导致卡片高度过高,是否继续?',
         icon: /*#__PURE__*/React.createElement(ExclamationCircleOutlined, null),
@@ -129,7 +138,7 @@ var LMCustomTableOption = /*#__PURE__*/forwardRef(function (props, ref) {
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Tooltip, Object.assign({}, tooltip), /*#__PURE__*/React.createElement(Button, {
     onClick: openSetting,
     icon: /*#__PURE__*/React.createElement(IconFont, {
-      type: 'lmweb-setting'
+      type: "lmweb-setting"
     })
   })), /*#__PURE__*/React.createElement(Drawer, {
     className: classNames(className, prefixCls),
@@ -171,6 +180,7 @@ var LMCustomTableOption = /*#__PURE__*/forwardRef(function (props, ref) {
   }, /*#__PURE__*/React.createElement(CardSort, {
     ref: cardRef,
     card: lmOptions.card,
+    changeStatusFn: changeStatusFn,
     showPromptNum: ((_d = props.recommendNumObj) === null || _d === void 0 ? void 0 : _d.card) || 10
   })), /*#__PURE__*/React.createElement(TabPane, {
     tab: "\u5176\u4ED6",
@@ -182,11 +192,11 @@ var LMCustomTableOption = /*#__PURE__*/forwardRef(function (props, ref) {
         size: e.target.value
       }));
     },
-    className: 'lm_size_radio_group',
+    className: "lm_size_radio_group",
     value: lmOptions.size
   }, optionsWithDisabled.map(function (item) {
     return /*#__PURE__*/React.createElement("div", {
-      className: 'lm_custom_size_warp',
+      className: "lm_custom_size_warp",
       key: item.value
     }, /*#__PURE__*/React.createElement(IconFont, {
       onClick: function onClick() {
@@ -202,7 +212,7 @@ var LMCustomTableOption = /*#__PURE__*/forwardRef(function (props, ref) {
       value: item.value
     }, item.label));
   })), /*#__PURE__*/React.createElement("div", {
-    className: 'save_setting'
+    className: "save_setting"
   }, /*#__PURE__*/React.createElement("span", null, "\u662F\u5426\u8BB0\u4F4F\u9875\u9762\u4F7F\u7528\u72B6\u6001"), /*#__PURE__*/React.createElement(Switch, {
     checked: saveSetting,
     onChange: setSaveSetting

package/es/LmEditTable/rowSort/DndContainerRow.js

@@ -5,6 +5,7 @@ import React, { memo } from 'react';
 import { DndContext, closestCenter, KeyboardSensor, PointerSensor, useSensor, useSensors, DragOverlay } from '@dnd-kit/core';
 import { restrictToParentElement, restrictToVerticalAxis } from '@dnd-kit/modifiers';
 import { sortableKeyboardCoordinates } from '@dnd-kit/sortable';
+import { omit } from 'lodash';
 import Table from '../EditTable';
 import "./index.css";
 var DragOver = /*#__PURE__*/React.memo(function (_ref) {
@@ -17,6 +18,9 @@ var DragOver = /*#__PURE__*/React.memo(function (_ref) {
   var item = activeId && options.find(function (v) {
     return v[rowKey] === activeId;
   });
+  var filterCol = columns === null || columns === void 0 ? void 0 : columns.filter(function (item) {
+    return omit(item, 'onCell');
+  });
   return /*#__PURE__*/React.createElement(DragOverlay, {
     adjustScale: false
   }, isDragging ? /*#__PURE__*/React.createElement("div", {
@@ -27,7 +31,7 @@ var DragOver = /*#__PURE__*/React.memo(function (_ref) {
       overflowX: 'hidden'
     }
   }, /*#__PURE__*/React.createElement(Table, {
-    columns: columns || [],
+    columns: filterCol || [],
     showHeader: false,
     style: {
       overflow: 'hidden'

package/es/LmUpload/fns/index.js

@@ -146,7 +146,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
               });
               doneFileUploadLen.current = [];
               _context.next = 8;
-              return ossCallBack === null || ossCallBack === void 0 ? void 0 : ossCallBack(params);
+              return ossCallBack === null || ossCallBack === void 0 ? void 0 : ossCallBack(Array.isArray(params) ? params : [params]);
 
             case 8:
               res = _context.sent;

package/lib/CustomTableOption/cardSort.js

@@ -66,7 +66,8 @@ var FilterSort = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       card = _ref$card === void 0 ? [] : _ref$card,
       _ref$cardStateValue = _ref.cardStateValue,
       cardStateValue = _ref$cardStateValue === void 0 ? {} : _ref$cardStateValue,
-      showPromptNum = _ref.showPromptNum;
+      showPromptNum = _ref.showPromptNum,
+      changeStatusFn = _ref.changeStatusFn;
 
   var _useState = (0, _react.useState)([]),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -147,6 +148,7 @@ var FilterSort = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
           });
         });
       });
+      changeStatusFn === null || changeStatusFn === void 0 ? void 0 : changeStatusFn();
     }
   };
   /** 添加是否显示 */
@@ -163,6 +165,7 @@ var FilterSort = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       return Object.assign({}, item);
     });
     setLocalCard(resultColumns);
+    changeStatusFn === null || changeStatusFn === void 0 ? void 0 : changeStatusFn();
   };
   /** 切换是否全选 */
 
@@ -174,6 +177,7 @@ var FilterSort = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       });
     });
     setLocalCard(resultColumns);
+    changeStatusFn === null || changeStatusFn === void 0 ? void 0 : changeStatusFn();
   };
 
   (0, _react.useImperativeHandle)(ref, function () {
@@ -220,7 +224,8 @@ var FilterSort = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     checked: isCheckAll.checkAll
   }, "\u5168\u9009"), /*#__PURE__*/_react.default.createElement("span", {
     onClick: function onClick() {
-      return setLocalCard(card);
+      setLocalCard(card);
+      changeStatusFn === null || changeStatusFn === void 0 ? void 0 : changeStatusFn();
     }
   }, "\u91CD\u7F6E")), !!(sortMenu === null || sortMenu === void 0 ? void 0 : sortMenu.length) && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_core.DndContext, {
     sensors: sensors,

package/lib/CustomTableOption/index.js

@@ -50,6 +50,9 @@ var LMCustomTableOption = /*#__PURE__*/(0, _react.forwardRef)(function (props, r
   var className = props.className,
       _props$tooltip = props.tooltip,
       tooltip = _props$tooltip === void 0 ? {} : _props$tooltip;
+  /** check is change */
+
+  var isChangeRef = (0, _react.useRef)(false);
   var filterRef = (0, _react.useRef)(null);
   var columnsRef = (0, _react.useRef)(null);
   var cardRef = (0, _react.useRef)(null); // const sizeRef = useRef(null)
@@ -80,6 +83,12 @@ var LMCustomTableOption = /*#__PURE__*/(0, _react.forwardRef)(function (props, r
     setVisible(true);
   };
 
+  var changeStatusFn = function changeStatusFn() {
+    if (!isChangeRef.current) {
+      isChangeRef.current = true;
+    }
+  };
+
   (0, _react.useEffect)(function () {
     setLmOptions({
       filter: props.filter || [],
@@ -107,7 +116,7 @@ var LMCustomTableOption = /*#__PURE__*/(0, _react.forwardRef)(function (props, r
       return (item === null || item === void 0 ? void 0 : item.show) !== false;
     })) || [];
 
-    if (effectCardData.length > (((_g = props.recommendNumObj) === null || _g === void 0 ? void 0 : _g.card) || 10)) {
+    if (effectCardData.length > (((_g = props.recommendNumObj) === null || _g === void 0 ? void 0 : _g.card) || 10) && !!isChangeRef.current) {
       _linkmoreDesign.Modal.confirm({
         title: '当前选择的卡片字段数量会导致卡片高度过高,是否继续?',
         icon: /*#__PURE__*/_react.default.createElement(_icons.ExclamationCircleOutlined, null),
@@ -150,7 +159,7 @@ var LMCustomTableOption = /*#__PURE__*/(0, _react.forwardRef)(function (props, r
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_tooltip.default, Object.assign({}, tooltip), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
     onClick: openSetting,
     icon: /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
-      type: 'lmweb-setting'
+      type: "lmweb-setting"
     })
   })), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Drawer, {
     className: (0, _classnames.default)(className, prefixCls),
@@ -192,6 +201,7 @@ var LMCustomTableOption = /*#__PURE__*/(0, _react.forwardRef)(function (props, r
   }, /*#__PURE__*/_react.default.createElement(_cardSort.default, {
     ref: cardRef,
     card: lmOptions.card,
+    changeStatusFn: changeStatusFn,
     showPromptNum: ((_d = props.recommendNumObj) === null || _d === void 0 ? void 0 : _d.card) || 10
   })), /*#__PURE__*/_react.default.createElement(TabPane, {
     tab: "\u5176\u4ED6",
@@ -203,11 +213,11 @@ var LMCustomTableOption = /*#__PURE__*/(0, _react.forwardRef)(function (props, r
         size: e.target.value
       }));
     },
-    className: 'lm_size_radio_group',
+    className: "lm_size_radio_group",
     value: lmOptions.size
   }, optionsWithDisabled.map(function (item) {
     return /*#__PURE__*/_react.default.createElement("div", {
-      className: 'lm_custom_size_warp',
+      className: "lm_custom_size_warp",
       key: item.value
     }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
       onClick: function onClick() {
@@ -223,7 +233,7 @@ var LMCustomTableOption = /*#__PURE__*/(0, _react.forwardRef)(function (props, r
       value: item.value
     }, item.label));
   })), /*#__PURE__*/_react.default.createElement("div", {
-    className: 'save_setting'
+    className: "save_setting"
   }, /*#__PURE__*/_react.default.createElement("span", null, "\u662F\u5426\u8BB0\u4F4F\u9875\u9762\u4F7F\u7528\u72B6\u6001"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Switch, {
     checked: saveSetting,
     onChange: setSaveSetting

package/lib/LmEditTable/rowSort/DndContainerRow.js

@@ -19,6 +19,8 @@ var _modifiers = require("@dnd-kit/modifiers");
 
 var _sortable = require("@dnd-kit/sortable");
 
+var _lodash = require("lodash");
+
 var _EditTable = _interopRequireDefault(require("../EditTable"));
 
 require("./index.css");
@@ -34,6 +36,9 @@ var DragOver = /*#__PURE__*/_react.default.memo(function (_ref) {
   var item = activeId && options.find(function (v) {
     return v[rowKey] === activeId;
   });
+  var filterCol = columns === null || columns === void 0 ? void 0 : columns.filter(function (item) {
+    return (0, _lodash.omit)(item, 'onCell');
+  });
   return /*#__PURE__*/_react.default.createElement(_core.DragOverlay, {
     adjustScale: false
   }, isDragging ? /*#__PURE__*/_react.default.createElement("div", {
@@ -44,7 +49,7 @@ var DragOver = /*#__PURE__*/_react.default.memo(function (_ref) {
       overflowX: 'hidden'
     }
   }, /*#__PURE__*/_react.default.createElement(_EditTable.default, {
-    columns: columns || [],
+    columns: filterCol || [],
     showHeader: false,
     style: {
       overflow: 'hidden'

package/lib/LmUpload/fns/index.js

@@ -158,7 +158,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
               });
               doneFileUploadLen.current = [];
               _context.next = 8;
-              return ossCallBack === null || ossCallBack === void 0 ? void 0 : ossCallBack(params);
+              return ossCallBack === null || ossCallBack === void 0 ? void 0 : ossCallBack(Array.isArray(params) ? params : [params]);
 
             case 8:
               res = _context.sent;

package/package.json

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