linkmore-design 1.0.84 → 1.0.87

package/es/LmUpload/LmUpload.js

@@ -15,24 +15,41 @@ import React, { useRef, useMemo, forwardRef } from 'react';
 import LmFilterRoot from './wrapper/UploadRoot';
 
 var LmUpload = function LmUpload(_a, ref) {
-  var fileConfig = _a.fileConfig,
+  var _fileConfig = _a.fileConfig,
+      fileNames = _a.fileNames,
       components = _a.components,
       _ossConfig = _a.ossConfig,
-      resetProps = __rest(_a, ["fileConfig", "components", "ossConfig"]);
+      resetProps = __rest(_a, ["fileConfig", "fileNames", "components", "ossConfig"]);
 
   var defaultRef = useRef(null); // 仅在初始化触发一次
 
   var initConfig = useMemo(function () {
     return {
-      // 文件配置单独存储
-      // fileConfig: {
-      //   size: 10,
-      //   type: ['jpg', 'jpeg', 'png'],
-      //   maxCount: 99,
-      //   ...(fileConfig || {}),
-      // },
-      // 读取字段配置
-      fileNames: {
+      // 文件参数配置: 存储时的数据
+      fileConfig: function fileConfig(fileConfigProps) {
+        var file = fileConfigProps.file,
+            timestamp = fileConfigProps.timestamp,
+            fileName = fileConfigProps.fileName,
+            filePath = fileConfigProps.filePath,
+            shortlink = fileConfigProps.shortlink,
+            url = fileConfigProps.url;
+        return Object.assign({
+          uid: timestamp,
+          fileTypeCode: file.type,
+          fileTypeName: file.type,
+          fileName: fileName,
+          realFileName: file.name,
+          fileSize: file.size,
+          internalUrl: shortlink,
+          externalUrl: shortlink,
+          filePath: filePath,
+          seq: 0,
+          url: url,
+          status: 'done'
+        }, _fileConfig === null || _fileConfig === void 0 ? void 0 : _fileConfig(fileConfigProps));
+      },
+      // 读取字段配置: 读取存储的参数字段
+      fileNames: Object.assign({
         uid: 'uid',
         fileTypeCode: 'fileTypeCode',
         fileTypeName: 'fileTypeName',
@@ -43,32 +60,31 @@ var LmUpload = function LmUpload(_a, ref) {
         externalUrl: 'externalUrl',
         filePath: 'filePath',
         seq: 'seq',
-        url: 'url'
-      },
+        url: 'url',
+        status: 'status'
+      }, fileNames),
       // 初始化
       components: Object.assign({
         wrapper: null
       }, components || {})
     };
   }, []);
-  var defaultProps = {
+  var defaultProps = Object.assign({
+    size: 100,
+    fileSize: 10,
     uid: 'uid',
-    fileList: null,
-    type: ['jpg', 'jpeg', 'png'],
     accept: '',
-    fileSize: 10,
+    type: ['jpg', 'jpeg', 'png'],
     listType: 'card',
-    size: 100,
+    readOnly: false,
     disabled: false,
-    maxCount: null,
     showUploadList: true,
-    children: null,
+    fileList: null,
     defaultFileList: [],
+    limit: null,
+    maxCount: null,
+    children: null,
     itemRender: null,
-    readOnly: false,
-    onRemove: function onRemove() {
-      return true;
-    },
     enabledOss: false,
     // oss配置
     ossConfig: function ossConfig() {
@@ -81,11 +97,15 @@ var LmUpload = function LmUpload(_a, ref) {
         bucket: 'linkmore-scm-test',
         shortlink: 'https://linkmore-scm-test.oss-cn-hangzhou.aliyuncs.com'
       }, typeof _ossConfig === 'function' ? _ossConfig() : _ossConfig);
+    },
+    // 根据返回值决定是否可删除
+    onRemove: function onRemove() {
+      return true;
     }
-  };
+  }, resetProps);
   return /*#__PURE__*/React.createElement(LmFilterRoot, Object.assign({
     ref: ref || defaultRef
-  }, initConfig, defaultProps, resetProps));
+  }, initConfig, defaultProps));
 };
 
 export default /*#__PURE__*/forwardRef(LmUpload);

package/es/LmUpload/UploadList/ItemPicture.js

@@ -8,9 +8,10 @@ var PictureItem = function PictureItem(_ref) {
   var readOnly = instance.readOnly,
       remove = instance.remove,
       preview = instance.preview,
-      download = instance.download;
+      download = instance.download,
+      fileNames = instance.fileNames;
   return /*#__PURE__*/React.createElement("div", {
-    className: cn('lm_upload_item lm_upload_item_picture', file.status === 'error' && 'error')
+    className: cn('lm_upload_item lm_upload_item_picture', file[fileNames.status] === 'error' && 'lm_upload_item_error')
   }, /*#__PURE__*/React.createElement("div", {
     className: "picture_left"
   }, /*#__PURE__*/React.createElement("div", {
@@ -19,14 +20,14 @@ var PictureItem = function PictureItem(_ref) {
       return preview(file);
     }
   }, /*#__PURE__*/React.createElement("img", {
-    src: file.url,
+    src: file[fileNames.url],
     alt: ""
   })), /*#__PURE__*/React.createElement("div", {
     className: "lm_upload_item_name",
     onClick: function onClick() {
       return download(file);
     }
-  }, file.fileName)), !readOnly && /*#__PURE__*/React.createElement("div", {
+  }, file[fileNames.fileName])), !readOnly && /*#__PURE__*/React.createElement("div", {
     className: "picture_right lm_upload_item_action"
   }, /*#__PURE__*/React.createElement("div", {
     className: "action_delete",

package/es/LmUpload/UploadList/ItemPictureCard.js

@@ -14,13 +14,22 @@ var renderThumb = function renderThumb(file) {
     case 'png':
     case 'jpg':
       return /*#__PURE__*/React.createElement("div", {
-        className: "lm_upload_item_error"
+        className: "lm_upload_item_thumb_error"
       }, /*#__PURE__*/React.createElement(IconFont, {
         type: "lmweb-image"
       }), /*#__PURE__*/React.createElement("div", {
         className: "lm_upload_item_name"
       }, file.realFileName));
 
+    case 'mp4':
+    case 'm2v':
+    case 'mkv':
+    case 'ogm':
+    case 'webm':
+      return /*#__PURE__*/React.createElement(IconFont, {
+        type: "lmweb-video"
+      });
+
     case 'doc':
     case 'docx':
       return /*#__PURE__*/React.createElement(IconFont, {
@@ -58,24 +67,29 @@ var PictureItem = function PictureItem(_ref) {
   var readOnly = instance.readOnly,
       size = instance.size,
       remove = instance.remove,
-      preview = instance.preview;
+      preview = instance.preview,
+      getFileFields = instance.getFileFields;
 
   var _useState = useState(false),
       _useState2 = _slicedToArray(_useState, 2),
       isError = _useState2[0],
-      setIsError = _useState2[1]; // 文件信息重组
+      setIsError = _useState2[1]; // 文件信息重组 获取文件名称 => 截取后缀文件名
 
 
   var resetFile = useMemo(function () {
-    var fileExtension = file.realFileName.replace(/.*\./, '').toLowerCase();
-    return Object.assign(Object.assign({}, file), {
+    var fileParams = getFileFields(file);
+    var realFileName = fileParams.realFileName,
+        fileName = fileParams.fileName,
+        filename = fileParams.filename;
+    var fileExtension = (realFileName || fileName || filename).replace(/.*\./, '').toLowerCase();
+    return Object.assign(Object.assign({}, fileParams), {
       fileExtension: fileExtension
     });
-  }, [file]); // 预览小图
+  }, [getFileFields, file]); // 预览小图
 
   var thumbUrl = useMemo(function () {
-    return "".concat(file.url, "?x-oss-process=image/resize,w_").concat(size);
-  }, [file.url, size]); // 根据文件名后缀判断
+    return "".concat(resetFile.url, "?x-oss-process=image/resize,w_").concat(size);
+  }, [resetFile.url, size]); // 根据文件名后缀判断
 
   var isImg = useMemo(function () {
     return ['jpg', 'jpeg', 'png', 'gif', 'bmp'].includes(resetFile.fileExtension);
@@ -84,7 +98,7 @@ var PictureItem = function PictureItem(_ref) {
   var resetSize = useMemo(function () {
     var width = size - 16;
     var padding = size > 60 ? 8 : 4;
-    var fontSize = size > 60 ? 16 : 14;
+    var fontSize = size > 60 ? 16 : 12;
     return {
       width: width,
       padding: padding,
@@ -92,7 +106,7 @@ var PictureItem = function PictureItem(_ref) {
     };
   }, [size]);
   return /*#__PURE__*/React.createElement("div", {
-    className: cn('lm_upload_item', 'lm_upload_item_card', isError && 'error'),
+    className: cn('lm_upload_item', 'lm_upload_item_card', isError && 'lm_upload_item_error'),
     style: {
       height: size,
       width: size
@@ -118,7 +132,7 @@ var PictureItem = function PictureItem(_ref) {
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "lmweb-eye",
     style: {
-      fontSize: size > 48 ? 16 : 12
+      fontSize: resetSize.fontSize
     }
   })), !readOnly && /*#__PURE__*/React.createElement("div", {
     className: "action_delete",
@@ -128,7 +142,7 @@ var PictureItem = function PictureItem(_ref) {
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "lmweb-delete",
     style: {
-      fontSize: size > 48 ? 16 : 12
+      fontSize: resetSize.fontSize
     }
   })))));
 };

package/es/LmUpload/UploadList/ItemText.js

@@ -6,9 +6,10 @@ var TextItem = function TextItem(_ref) {
   var file = _ref.file,
       instance = _ref.instance;
   var readOnly = instance.readOnly,
-      remove = instance.remove;
+      remove = instance.remove,
+      fileNames = instance.fileNames;
   return /*#__PURE__*/React.createElement("div", {
-    className: cn('lm_upload_item lm_upload_item_text', file.status === 'error' && 'error')
+    className: cn('lm_upload_item lm_upload_item_text', file[fileNames.status] === 'error' && 'lm_upload_item_error')
   }, /*#__PURE__*/React.createElement("div", {
     className: "text_left"
   }, /*#__PURE__*/React.createElement("div", {
@@ -17,7 +18,7 @@ var TextItem = function TextItem(_ref) {
     type: "lmweb-attachment"
   })), /*#__PURE__*/React.createElement("div", {
     className: "lm_upload_item_name"
-  }, file.fileName)), !readOnly && /*#__PURE__*/React.createElement("div", {
+  }, file[fileNames.fileName])), !readOnly && /*#__PURE__*/React.createElement("div", {
     className: "text_right lm_upload_item_text_action"
   }, /*#__PURE__*/React.createElement("div", {
     className: "action_delete",

package/es/LmUpload/body/UploadCore.js

@@ -31,7 +31,7 @@ var UploadCore = function UploadCore(_ref) {
     if ((_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.value) {
       inputRef.current.value = '';
     }
-  }, [(_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.value]);
+  }, [beforeUpload, (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.value]);
   var inputConfig = {
     type: 'file',
     accept: accept,

package/es/LmUpload/fns/index.d.ts

@@ -5,6 +5,7 @@ declare const useCoreOptions: ({ state, dispatch, props }: {
 }) => {
     CoreMethods: {
         getIsMaxCount: () => boolean;
+        getFileFields: (fileParams: any) => {};
         beforeUpload: (e: any) => false | import("../../message").MessageType;
         getUploadStatus: () => {
             uploading: boolean;

package/es/LmUpload/fns/index.js

@@ -34,7 +34,8 @@ var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, gene
 };
 
 import { useCallback } from 'react';
-import { message } from 'linkmore-design';
+import { message } from 'linkmore-design'; // import { message } from 'antd'
+
 import OSS from 'ali-oss';
 
 var useCoreOptions = function useCoreOptions(_ref) {
@@ -57,13 +58,38 @@ var useCoreOptions = function useCoreOptions(_ref) {
     return {
       uploading: uploading
     };
-  }, [state.percent]); // 获取是否达到最大上传数量
+  }, [state.percent]); // 获取文件字段值
+
+  var getFileFields = useCallback(function (fileParams) {
+    var fileNames = props.fileNames;
+    var obj = {};
+    Object.entries(fileNames).forEach(function (v) {
+      var itemKey = v[0];
+      var itemValue = v[1];
+
+      if (fileParams[itemKey]) {
+        obj[itemKey] = fileParams[itemValue];
+      }
+    });
+    return obj;
+  }, [props]); // 获取是否达到最大上传数量
 
   var getIsMaxCount = useCallback(function () {
-    return typeof props.maxCount === 'number' && !(getFileList().length < props.maxCount);
-  }, [getFileList, props.maxCount]); // 上传完成: File, fileParams
+    var maxCount = props.maxCount,
+        limit = props.limit;
+    var flag = false;
+    var num = maxCount || limit;
+
+    if (num && typeof num === 'number') {
+      flag = !(getFileList().length < num);
+    }
+
+    return flag;
+  }, [getFileList, props]); // 上传成功事件: File, fileParams
+
+  var uploadSuccess = useCallback(function (file, params, ossCallBack) {
+    var _a;
 
-  var uploadDone = useCallback(function (file, params, ossCallBack) {
     var fileList = [params].concat(_toConsumableArray(getFileList()));
     dispatch({
       type: 'changeFileList',
@@ -74,18 +100,25 @@ var useCoreOptions = function useCoreOptions(_ref) {
       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);
-  }, [getFileList]); // 上传进度事件
+  }, [getFileList, props.onSuccess, onChange, dispatch]); // 上传进度事件
 
   var uploadProgress = useCallback(function (file, _ref2) {
     var progress = _ref2.progress,
         checkPoint = _ref2.checkPoint,
         result = _ref2.result;
-    onChange({
+
+    var _a;
+
+    var params = {
       file: file,
       fileList: getFileList(),
       event: {
@@ -94,23 +127,43 @@ var useCoreOptions = function useCoreOptions(_ref) {
         result: result,
         status: typeof progress !== 'number' ? 'done' : 'uploading'
       }
-    });
+    };
+    (_a = props.onProgress) === null || _a === void 0 ? void 0 : _a.call(props, params);
+    onChange === null || onChange === void 0 ? void 0 : onChange(params);
     dispatch({
       type: 'changePercent',
       percent: Number((progress * 100).toFixed(2))
     });
-  }, [getFileList]); // 上传至ali-oss
+  }, [getFileList, props.onProgress, onChange, dispatch]); // 上传失败事件
+
+  var uploadError = useCallback(function (_ref3) {
+    var error = _ref3.error,
+        file = _ref3.file;
+    console.log('上传报错:', error);
+    props.onError ? props.onError({
+      error: error,
+      file: file,
+      fileList: getFileList()
+    }) : message.warning('文件上传失败!', 1.5);
+    onChange === null || onChange === void 0 ? void 0 : onChange({
+      file: file,
+      fileList: getFileList(),
+      event: {
+        status: 'error'
+      }
+    });
+  }, [props.onError, getFileList, onChange]); // 上传至ali-oss
 
   var uploadOss = useCallback(function (file) {
     return __awaiter(void 0, void 0, void 0, /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var _a, _ossConfig, _ossConfig$dir, dir, shortlink, _ossConfig$region, region, accessKeyId, accessKeySecret, stsToken, _ossConfig$bucket, bucket, ossCallBack, client, timestamp, fileName, pathName, url, seq, params;
+      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) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
               _context.prev = 0;
-              _ossConfig = ossConfig(), _ossConfig$dir = _ossConfig.dir, dir = _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;
+              _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,
                 accessKeyId: accessKeyId,
@@ -120,7 +173,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
               });
               timestamp = Date.now();
               fileName = "".concat(timestamp, "-").concat(file.name);
-              pathName = dir.slice(-1) === '/' ? "".concat(dir).concat(fileName) : "".concat(dir, "/").concat(fileName);
+              pathName = filePath.slice(-1) === '/' ? "".concat(filePath).concat(fileName) : "".concat(filePath, "/").concat(fileName);
               url = "".concat(shortlink).concat(pathName) || '';
               _context.next = 9;
               return client.multipartUpload(pathName, file, {
@@ -138,53 +191,44 @@ var useCoreOptions = function useCoreOptions(_ref) {
               });
 
             case 9:
-              seq = (((_a = state.fileList) === null || _a === void 0 ? void 0 : _a.length) || 0) + 1;
-              params = {
-                uid: timestamp,
-                fileTypeCode: file.type,
-                fileTypeName: file.type,
+              params = props.fileConfig({
+                file: file,
+                timestamp: timestamp,
                 fileName: fileName,
-                realFileName: file.name,
-                fileSize: file.size,
-                internalUrl: 'internalUrl',
-                externalUrl: 'externalUrl',
-                filePath: dir,
-                seq: seq,
+                filePath: filePath,
+                shortlink: shortlink,
                 url: url
-              };
-              uploadDone(file, params, ossCallBack);
-              _context.next = 18;
+              });
+              uploadSuccess(file, params, ossCallBack);
+              _context.next = 16;
               break;
 
-            case 14:
-              _context.prev = 14;
+            case 13:
+              _context.prev = 13;
               _context.t0 = _context["catch"](0);
-              console.log('上传报错:', _context.t0);
-              onChange === null || onChange === void 0 ? void 0 : onChange({
-                file: file,
-                fileList: getFileList(),
-                event: {
-                  status: 'error'
-                }
+              uploadError({
+                error: _context.t0,
+                file: file
               });
 
-            case 18:
+            case 16:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, null, [[0, 14]]);
+      }, _callee, null, [[0, 13]]);
     }));
-  }, [ossConfig, uploadDone, uploadProgress, getFileList]);
+  }, [ossConfig, uploadProgress, props.fileConfig, uploadSuccess, uploadError]); // 自定义使用外部上传
+
   var customUpload = useCallback(function (file) {
     var _a;
 
     (_a = props.fileUpload) === null || _a === void 0 ? void 0 : _a.call(props, {
       file: file,
       value: getFileList(),
-      onChange: uploadDone
+      onChange: uploadSuccess
     });
-  }, [props.fileUpload, getFileList, uploadDone]); // 上传前的检测
+  }, [props.fileUpload, getFileList, uploadSuccess]); // 上传前的检测
 
   var beforeUpload = useCallback(function (e) {
     var files = e.target.files; // 循环文件检查是否存在不符合要求的文件
@@ -211,20 +255,20 @@ var useCoreOptions = function useCoreOptions(_ref) {
 
   var remove = useCallback(function (file) {
     return __awaiter(void 0, void 0, void 0, /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-      var _b, _c, res, fileList;
+      var _a, _b, res, fileList;
 
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
               _context2.next = 2;
-              return (_b = props.onRemove) === null || _b === void 0 ? void 0 : _b.call(props, file);
+              return (_a = props.onRemove) === null || _a === void 0 ? void 0 : _a.call(props, file);
 
             case 2:
               res = _context2.sent;
 
               if (res) {
-                fileList = (_c = getFileList()) === null || _c === void 0 ? void 0 : _c.filter(function (v) {
+                fileList = (_b = getFileList()) === null || _b === void 0 ? void 0 : _b.filter(function (v) {
                   return v[uid] !== file[uid];
                 });
                 dispatch({
@@ -244,21 +288,22 @@ var useCoreOptions = function useCoreOptions(_ref) {
         }
       }, _callee2);
     }));
-  }, [props.onRemove, getFileList, uid]); // 点击文件链接或预览图标时的回调
+  }, [props.onRemove, getFileList, onChange, dispatch, uid]); // 点击文件链接或预览图标时的回调
 
   var preview = useCallback(function (file) {
     var _a;
 
     (_a = props.onPreview) === null || _a === void 0 ? void 0 : _a.call(props, file);
-  }, []); // 点击下载文件时的回调
+  }, [props.onPreview]); // 点击下载文件时的回调
 
   var download = useCallback(function (file) {
     var _a;
 
     (_a = props.onDownload) === null || _a === void 0 ? void 0 : _a.call(props, file);
-  }, []);
+  }, [props.onDownload]);
   var CoreMethods = {
     getIsMaxCount: getIsMaxCount,
+    getFileFields: getFileFields,
     beforeUpload: beforeUpload,
     getUploadStatus: getUploadStatus,
     remove: remove,