linkmore-design 1.1.35 → 1.1.37

package/dist/variables.css

@@ -9822,9 +9822,6 @@ p {
 .lm_editTable_warpper .lm_table_quickcopy .anticon {
   color: var(--text-color);
 }
-.lm_editTable_warpper .ant-table-body {
-  scroll-behavior: smooth;
-}
 .lm_editTable_warpper .icon_drag {
   color: var(--tip-text-color);
 }

package/es/LmEditTable/EditTable.js

@@ -766,6 +766,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
   deepDataSourceRef.current = deepDataSourcePreKeys(dataSource, _rowKey);
   var disabledDataSourceRowKeys = useRef(checkTableRowIsDisable(deepDataSourceRef.current, localDisabledRows.disabledRows, _rowKey));
   disabledDataSourceRowKeys.current = checkTableRowIsDisable(deepDataSourceRef.current, localDisabledRows.disabledRows, _rowKey);
+  var columnsRef = useRef(columns);
   var tableWarpRef = useRef(null);
   var autoSizerRef = useRef(null);
   var allFormListRef = useRef({});
@@ -1271,6 +1272,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
     var res = localColumns === null || localColumns === void 0 ? void 0 : localColumns.map(function (col, index) {
       return mapColumns(col, index);
     });
+    columnsRef.current = res;
     return res;
   }, [columns, isAdd, sortOpen, useQuickOpetate, dataSource, _toConsumableArray(memoOptions)]);
 
@@ -1629,7 +1631,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
             onSortEnd: onSortEnd,
             tableWidth: (_c = (_b = tableWarpRef === null || tableWarpRef === void 0 ? void 0 : tableWarpRef.current) === null || _b === void 0 ? void 0 : _b.getBoundingClientRect()) === null || _c === void 0 ? void 0 : _c.width,
             tableHeight: (_e = (_d = tableWarpRef === null || tableWarpRef === void 0 ? void 0 : tableWarpRef.current) === null || _d === void 0 ? void 0 : _d.getBoundingClientRect()) === null || _e === void 0 ? void 0 : _e.height,
-            columns: resultColumns
+            columns: columnsRef.current || resultColumns
           }));
         }
       } : virtual ? {

package/es/LmEditTable/rowSort/DndContainerRow.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import './index.less';
 declare const _default: React.MemoExoticComponent<({ children, options, move, rowKey, items, tableWidth, tableHeight, columns }: {
     children: any;
     options: any;

package/es/LmEditTable/rowSort/DndContainerRow.js

@@ -6,6 +6,7 @@ import { DndContext, closestCenter, KeyboardSensor, PointerSensor, useSensor, us
 import { restrictToParentElement, restrictToVerticalAxis } from '@dnd-kit/modifiers';
 import { sortableKeyboardCoordinates } from '@dnd-kit/sortable';
 import Table from '../EditTable';
+import "./index.css";
 var DragOver = /*#__PURE__*/React.memo(function (_ref) {
   var instance = _ref.instance;
   var isDragging = instance.isDragging,
@@ -19,6 +20,7 @@ var DragOver = /*#__PURE__*/React.memo(function (_ref) {
   return /*#__PURE__*/React.createElement(DragOverlay, {
     adjustScale: false
   }, isDragging ? /*#__PURE__*/React.createElement("div", {
+    className: "lm_editable_darg_item",
     style: {
       width: instance.tableWidth,
       backgroundColor: '#fff',
@@ -27,8 +29,8 @@ var DragOver = /*#__PURE__*/React.memo(function (_ref) {
   }, /*#__PURE__*/React.createElement(Table, {
     columns: columns || [],
     showHeader: false,
-    scroll: {
-      x: '100%'
+    style: {
+      overflow: 'hidden'
     },
     pagination: false,
     value: [item]

package/es/LmEditTable/rowSort/index.css

@@ -0,0 +1,6 @@
+.lm_editable_darg_item .ant-table-tbody::-webkit-scrollbar {
+  display: none;
+}
+.lm_editable_darg_item .ant-table-body::-webkit-scrollbar {
+  display: none;
+}

package/es/LmEditTable/style/index.css

@@ -614,9 +614,6 @@ p {
 .lm_editTable_warpper .lm_table_quickcopy .anticon {
   color: var(--text-color);
 }
-.lm_editTable_warpper .ant-table-body {
-  scroll-behavior: smooth;
-}
 .lm_editTable_warpper .icon_drag {
   color: var(--tip-text-color);
 }

package/es/LmEditTable/style/variables.css

@@ -102,9 +102,6 @@
 .lm_editTable_warpper .lm_table_quickcopy .anticon {
   color: var(--text-color);
 }
-.lm_editTable_warpper .ant-table-body {
-  scroll-behavior: smooth;
-}
 .lm_editTable_warpper .icon_drag {
   color: var(--tip-text-color);
 }

package/es/LmUpload/fns/index.js

@@ -119,29 +119,47 @@ var useCoreOptions = function useCoreOptions(_ref) {
   }, [getFileList, props]); // 上传成功事件: File, fileParams
 
   var uploadSuccess = useCallback(function (file, params, ossCallBack) {
-    var _a;
+    return __awaiter(void 0, void 0, void 0, /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var _a, _b, fileList, res;
 
-    var fileList = [].concat(_toConsumableArray(Array.isArray(params) ? params : [params]), _toConsumableArray(getFileList()));
-    dispatch({
-      type: 'changeFileList',
-      fileList: fileList
-    });
-    dispatch({
-      type: 'changePercent',
-      percent: null
-    }); // 上传事件：抛出 file: 文件  filelist: 文件列表 event: 上传进度信息
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              fileList = [].concat(_toConsumableArray(Array.isArray(params) ? params : [params]), _toConsumableArray(getFileList()));
+              dispatch({
+                type: 'changeFileList',
+                fileList: fileList
+              });
+              dispatch({
+                type: 'changePercent',
+                percent: null
+              }); // 上传事件：抛出 file: 文件  filelist: 文件列表 event: 上传进度信息
 
-    (_a = props.onSuccess) === null || _a === void 0 ? void 0 : _a.call(props, {
-      file: file,
-      fileList: fileList
-    });
-    onChange === null || onChange === void 0 ? void 0 : onChange({
-      file: file,
-      fileList: fileList
-    });
-    ossCallBack === null || ossCallBack === void 0 ? void 0 : ossCallBack(params);
-    doneFileUploadLen.current = [];
-  }, [getFileList, props.onSuccess, onChange, dispatch, doneFileUploadLen.current]); // 上传进度事件
+              (_a = props.onSuccess) === null || _a === void 0 ? void 0 : _a.call(props, {
+                file: file,
+                fileList: fileList
+              });
+              onChange === null || onChange === void 0 ? void 0 : onChange({
+                file: file,
+                fileList: fileList
+              });
+              doneFileUploadLen.current = [];
+              _context.next = 8;
+              return ossCallBack === null || ossCallBack === void 0 ? void 0 : ossCallBack(params);
+
+            case 8:
+              res = _context.sent;
+              (_b = props.onCallBack) === null || _b === void 0 ? void 0 : _b.call(props, res);
+
+            case 10:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+  }, [getFileList, props.onSuccess, props.onCallBack, onChange, dispatch, doneFileUploadLen.current]); // 上传进度事件
 
   var uploadProgress = useCallback(function (file, _ref2) {
     var progress = _ref2.progress,
@@ -188,14 +206,14 @@ var useCoreOptions = function useCoreOptions(_ref) {
   }, [props.onError, getFileList, onChange, doneFileUploadLen.current]); // 上传至ali-oss
 
   var uploadOss = useCallback(function (file) {
-    return __awaiter(void 0, void 0, void 0, /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    return __awaiter(void 0, void 0, void 0, /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var _ossConfig, _ossConfig$dir, filePath, shortlink, _ossConfig$region, region, accessKeyId, accessKeySecret, stsToken, _ossConfig$bucket, bucket, ossCallBack, client, timestamp, fileName, pathName, url, params;
 
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) {
-          switch (_context.prev = _context.next) {
+          switch (_context2.prev = _context2.next) {
             case 0:
-              _context.prev = 0;
+              _context2.prev = 0;
               _ossConfig = ossConfig(), _ossConfig$dir = _ossConfig.dir, filePath = _ossConfig$dir === void 0 ? '/BizFile/4595/Supplier/' : _ossConfig$dir, shortlink = _ossConfig.shortlink, _ossConfig$region = _ossConfig.region, region = _ossConfig$region === void 0 ? 'oss-cn-hangzhou' : _ossConfig$region, accessKeyId = _ossConfig.accessKeyId, accessKeySecret = _ossConfig.accessKeySecret, stsToken = _ossConfig.stsToken, _ossConfig$bucket = _ossConfig.bucket, bucket = _ossConfig$bucket === void 0 ? 'linkmore-scm-test' : _ossConfig$bucket, ossCallBack = _ossConfig.ossCallBack;
               client = new OSS({
                 region: region,
@@ -208,7 +226,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
               fileName = "".concat(timestamp, "-").concat(file.name);
               pathName = filePath.slice(-1) === '/' ? "".concat(filePath).concat(fileName) : "".concat(filePath, "/").concat(fileName);
               url = "".concat(shortlink).concat(pathName) || '';
-              _context.next = 9;
+              _context2.next = 9;
               return client.multipartUpload(pathName, file, {
                 // 获取分片上传进度、断点和返回值。
                 progress: function progress(_progress, checkPoint, result) {
@@ -245,23 +263,23 @@ var useCoreOptions = function useCoreOptions(_ref) {
                 }
               }
 
-              _context.next = 17;
+              _context2.next = 17;
               break;
 
             case 14:
-              _context.prev = 14;
-              _context.t0 = _context["catch"](0);
+              _context2.prev = 14;
+              _context2.t0 = _context2["catch"](0);
               uploadError({
-                error: _context.t0,
+                error: _context2.t0,
                 file: file
               });
 
             case 17:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
         }
-      }, _callee, null, [[0, 14]]);
+      }, _callee2, null, [[0, 14]]);
     }));
   }, [multiple, ossConfig, uploadProgress, props.fileConfig, uploadSuccess, uploadError, fileUploadLen.current, doneFileUploadLen.current]); // 自定义使用外部上传
 
@@ -281,53 +299,53 @@ var useCoreOptions = function useCoreOptions(_ref) {
   }, [enabledOss, uploadOss, customUpload]); // 检测完成, 执行外部 `beforeUpload` 事件
 
   var checkOver = useCallback(function (file) {
-    return __awaiter(void 0, void 0, void 0, /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    return __awaiter(void 0, void 0, void 0, /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
       var res, newFile;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) {
-          switch (_context2.prev = _context2.next) {
+          switch (_context3.prev = _context3.next) {
             case 0:
               if (props === null || props === void 0 ? void 0 : props.beforeUpload) {
-                _context2.next = 3;
+                _context3.next = 3;
                 break;
               }
 
               uploadFile(file);
-              return _context2.abrupt("return");
+              return _context3.abrupt("return");
 
             case 3:
               res = props.beforeUpload(file, getFileList()); // Promise
 
               if (!(res === null || res === void 0 ? void 0 : res.then)) {
-                _context2.next = 16;
+                _context3.next = 16;
                 break;
               }
 
-              _context2.prev = 5;
-              _context2.next = 8;
+              _context3.prev = 5;
+              _context3.next = 8;
               return res;
 
             case 8:
-              newFile = _context2.sent;
+              newFile = _context3.sent;
               uploadFile(newFile);
-              _context2.next = 15;
+              _context3.next = 15;
               break;
 
             case 12:
-              _context2.prev = 12;
-              _context2.t0 = _context2["catch"](5);
+              _context3.prev = 12;
+              _context3.t0 = _context3["catch"](5);
               console.log('上传失败!');
 
             case 15:
-              return _context2.abrupt("return");
+              return _context3.abrupt("return");
 
             case 16:
               if (res) {
-                _context2.next = 18;
+                _context3.next = 18;
                 break;
               }
 
-              return _context2.abrupt("return");
+              return _context3.abrupt("return");
 
             case 18:
               // () => true
@@ -335,10 +353,10 @@ var useCoreOptions = function useCoreOptions(_ref) {
 
             case 19:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
         }
-      }, _callee2, null, [[5, 12]]);
+      }, _callee3, null, [[5, 12]]);
     }));
   }, [props.beforeUpload, getFileList, uploadFile]); // 单个文件异步校验
 
@@ -400,19 +418,19 @@ var useCoreOptions = function useCoreOptions(_ref) {
    */
 
   var beforeUpload = useCallback(function (e) {
-    return __awaiter(void 0, void 0, void 0, /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+    return __awaiter(void 0, void 0, void 0, /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
       var files, res;
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) {
-          switch (_context3.prev = _context3.next) {
+          switch (_context4.prev = _context4.next) {
             case 0:
               files = Array.from(e.target.files);
-              _context3.prev = 1;
-              _context3.next = 4;
+              _context4.prev = 1;
+              _context4.next = 4;
               return filesLoopCheck(files);
 
             case 4:
-              res = _context3.sent;
+              res = _context4.sent;
               fileUploadLen.current = res.length; // 仅单文件上传时可剪裁
 
               if (enableCrop) {
@@ -425,40 +443,40 @@ var useCoreOptions = function useCoreOptions(_ref) {
                 res.forEach(checkOver);
               }
 
-              _context3.next = 13;
+              _context4.next = 13;
               break;
 
             case 9:
-              _context3.prev = 9;
-              _context3.t0 = _context3["catch"](1);
-              console.log('文件校验未通过！', _context3.t0.message);
-              message.warning(_context3.t0.message, 1.5);
+              _context4.prev = 9;
+              _context4.t0 = _context4["catch"](1);
+              console.log('文件校验未通过！', _context4.t0.message);
+              message.warning(_context4.t0.message, 1.5);
 
             case 13:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
         }
-      }, _callee3, null, [[1, 9]]);
+      }, _callee4, null, [[1, 9]]);
     }));
   }, [filesLoopCheck, enableCrop, checkOver, fileUploadLen.current]); // 删除事件
 
   var remove = useCallback(function (file) {
-    return __awaiter(void 0, void 0, void 0, /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-      var _a, _b, res, fileList;
+    return __awaiter(void 0, void 0, void 0, /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+      var _c, _d, res, fileList;
 
-      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         while (1) {
-          switch (_context4.prev = _context4.next) {
+          switch (_context5.prev = _context5.next) {
             case 0:
-              _context4.next = 2;
-              return (_a = props.onRemove) === null || _a === void 0 ? void 0 : _a.call(props, file);
+              _context5.next = 2;
+              return (_c = props.onRemove) === null || _c === void 0 ? void 0 : _c.call(props, file);
 
             case 2:
-              res = _context4.sent;
+              res = _context5.sent;
 
               if (res) {
-                fileList = (_b = getFileList()) === null || _b === void 0 ? void 0 : _b.filter(function (v) {
+                fileList = (_d = getFileList()) === null || _d === void 0 ? void 0 : _d.filter(function (v) {
                   return !getHasEqual(v, file);
                 });
                 dispatch({
@@ -473,10 +491,10 @@ var useCoreOptions = function useCoreOptions(_ref) {
 
             case 4:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
         }
-      }, _callee4);
+      }, _callee5);
     }));
   }, [props.onRemove, getFileList, onChange, dispatch, getHasEqual]); // 点击文件链接或预览图标时的回调
 

package/es/styles/variables.css

@@ -9822,9 +9822,6 @@ p {
 .lm_editTable_warpper .lm_table_quickcopy .anticon {
   color: var(--text-color);
 }
-.lm_editTable_warpper .ant-table-body {
-  scroll-behavior: smooth;
-}
 .lm_editTable_warpper .icon_drag {
   color: var(--tip-text-color);
 }

package/lib/LmEditTable/EditTable.js

@@ -800,6 +800,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   deepDataSourceRef.current = (0, _util.deepDataSourcePreKeys)(dataSource, _rowKey);
   var disabledDataSourceRowKeys = (0, _react.useRef)((0, _util.checkTableRowIsDisable)(deepDataSourceRef.current, localDisabledRows.disabledRows, _rowKey));
   disabledDataSourceRowKeys.current = (0, _util.checkTableRowIsDisable)(deepDataSourceRef.current, localDisabledRows.disabledRows, _rowKey);
+  var columnsRef = (0, _react.useRef)(columns);
   var tableWarpRef = (0, _react.useRef)(null);
   var autoSizerRef = (0, _react.useRef)(null);
   var allFormListRef = (0, _react.useRef)({});
@@ -1305,6 +1306,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     var res = localColumns === null || localColumns === void 0 ? void 0 : localColumns.map(function (col, index) {
       return mapColumns(col, index);
     });
+    columnsRef.current = res;
     return res;
   }, [columns, isAdd, sortOpen, useQuickOpetate, dataSource, (0, _toConsumableArray2.default)(memoOptions)]);
 
@@ -1662,7 +1664,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
             onSortEnd: onSortEnd,
             tableWidth: (_c = (_b = tableWarpRef === null || tableWarpRef === void 0 ? void 0 : tableWarpRef.current) === null || _b === void 0 ? void 0 : _b.getBoundingClientRect()) === null || _c === void 0 ? void 0 : _c.width,
             tableHeight: (_e = (_d = tableWarpRef === null || tableWarpRef === void 0 ? void 0 : tableWarpRef.current) === null || _d === void 0 ? void 0 : _d.getBoundingClientRect()) === null || _e === void 0 ? void 0 : _e.height,
-            columns: resultColumns
+            columns: columnsRef.current || resultColumns
           }));
         }
       } : virtual ? {

package/lib/LmEditTable/rowSort/DndContainerRow.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import './index.less';
 declare const _default: React.MemoExoticComponent<({ children, options, move, rowKey, items, tableWidth, tableHeight, columns }: {
     children: any;
     options: any;

package/lib/LmEditTable/rowSort/DndContainerRow.js

@@ -21,6 +21,8 @@ var _sortable = require("@dnd-kit/sortable");
 
 var _EditTable = _interopRequireDefault(require("../EditTable"));
 
+require("./index.css");
+
 /* eslint-disable no-unused-vars */
 var DragOver = /*#__PURE__*/_react.default.memo(function (_ref) {
   var instance = _ref.instance;
@@ -35,6 +37,7 @@ var DragOver = /*#__PURE__*/_react.default.memo(function (_ref) {
   return /*#__PURE__*/_react.default.createElement(_core.DragOverlay, {
     adjustScale: false
   }, isDragging ? /*#__PURE__*/_react.default.createElement("div", {
+    className: "lm_editable_darg_item",
     style: {
       width: instance.tableWidth,
       backgroundColor: '#fff',
@@ -43,8 +46,8 @@ var DragOver = /*#__PURE__*/_react.default.memo(function (_ref) {
   }, /*#__PURE__*/_react.default.createElement(_EditTable.default, {
     columns: columns || [],
     showHeader: false,
-    scroll: {
-      x: '100%'
+    style: {
+      overflow: 'hidden'
     },
     pagination: false,
     value: [item]

package/lib/LmEditTable/rowSort/index.css

@@ -0,0 +1,6 @@
+.lm_editable_darg_item .ant-table-tbody::-webkit-scrollbar {
+  display: none;
+}
+.lm_editable_darg_item .ant-table-body::-webkit-scrollbar {
+  display: none;
+}

package/lib/LmEditTable/style/index.css

@@ -614,9 +614,6 @@ p {
 .lm_editTable_warpper .lm_table_quickcopy .anticon {
   color: var(--text-color);
 }
-.lm_editTable_warpper .ant-table-body {
-  scroll-behavior: smooth;
-}
 .lm_editTable_warpper .icon_drag {
   color: var(--tip-text-color);
 }

package/lib/LmEditTable/style/variables.css

@@ -102,9 +102,6 @@
 .lm_editTable_warpper .lm_table_quickcopy .anticon {
   color: var(--text-color);
 }
-.lm_editTable_warpper .ant-table-body {
-  scroll-behavior: smooth;
-}
 .lm_editTable_warpper .icon_drag {
   color: var(--tip-text-color);
 }