linkmore-design 1.0.69 → 1.0.72

package/lib/LmUpload/fns/index.js

@@ -54,15 +54,29 @@ var useCoreOptions = function useCoreOptions(_ref) {
       dispatch = _ref.dispatch,
       props = _ref.props;
   var uid = props.uid,
-      value = props.fileList,
       onChange = props.onChange,
       type = props.type,
       fileSize = props.fileSize,
       enabledOss = props.enabledOss,
-      ossConfig = props.ossConfig; // 上传完成
+      ossConfig = props.ossConfig; // 获取当前的文件列表
 
-  var uploadOnChange = (0, _react.useCallback)(function (file) {
-    var fileList = [file].concat((0, _toConsumableArray2.default)(value));
+  var getFileList = (0, _react.useCallback)(function () {
+    return props.fileList || state.fileList;
+  }, [props.fileList, state.fileList]); // 获取上传状态
+
+  var getUploadStatus = (0, _react.useCallback)(function () {
+    var uploading = typeof state.percent === 'number';
+    return {
+      uploading: uploading
+    };
+  }, [state.percent]); // 获取是否达到最大上传数量
+
+  var getIsMaxCount = (0, _react.useCallback)(function () {
+    return typeof props.maxCount === 'number' && !(getFileList().length < props.maxCount);
+  }, [getFileList, props.maxCount]); // 上传完成
+
+  var uploadDone = (0, _react.useCallback)(function (file) {
+    var fileList = [file].concat((0, _toConsumableArray2.default)(getFileList()));
     dispatch({
       type: 'changeFileList',
       fileList: fileList
@@ -76,16 +90,37 @@ var useCoreOptions = function useCoreOptions(_ref) {
       file: file,
       fileList: fileList
     });
-  }, [value]); // 上传至ali-oss
+  }, [getFileList]); // 上传进度事件
+
+  var uploadProgress = (0, _react.useCallback)(function (file, _ref2) {
+    var progress = _ref2.progress,
+        checkPoint = _ref2.checkPoint,
+        result = _ref2.result;
+    onChange({
+      file: file,
+      fileList: getFileList(),
+      event: {
+        progress: progress,
+        checkPoint: checkPoint,
+        result: result,
+        status: typeof progress !== 'number' ? 'done' : 'uploading'
+      }
+    });
+    dispatch({
+      type: 'changePercent',
+      percent: Number((progress * 100).toFixed(2))
+    });
+  }, [getFileList]); // 上传至ali-oss
 
   var uploadOss = (0, _react.useCallback)(function (file) {
     return __awaiter(void 0, void 0, void 0, /*#__PURE__*/_regenerator.default.mark(function _callee() {
-      var _a, _ossConfig, _ossConfig$dir, dir, shortlink, _ossConfig$region, region, accessKeyId, accessKeySecret, stsToken, _ossConfig$bucket, bucket, client, fileName, pathName, url, seq, params;
+      var _a, _ossConfig, _ossConfig$dir, dir, shortlink, _ossConfig$region, region, accessKeyId, accessKeySecret, stsToken, _ossConfig$bucket, bucket, client, timestamp, fileName, pathName, url, seq, params;
 
       return _regenerator.default.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;
               client = new _aliOss.default({
                 region: region,
@@ -94,26 +129,18 @@ var useCoreOptions = function useCoreOptions(_ref) {
                 stsToken: stsToken,
                 bucket: bucket
               });
-              _context.prev = 2;
-              fileName = "".concat(Date.now(), "-").concat(file.name);
+              timestamp = Date.now();
+              fileName = "".concat(timestamp, "-").concat(file.name);
               pathName = dir.slice(-1) === '/' ? "".concat(dir).concat(fileName) : "".concat(dir, "/").concat(fileName);
               url = "".concat(shortlink).concat(pathName) || '';
-              _context.next = 8;
+              _context.next = 9;
               return client.multipartUpload(pathName, file, {
                 // 获取分片上传进度、断点和返回值。
-                progress: function progress(p, cpt, res) {
-                  onChange({
-                    file: file,
-                    fileList: value,
-                    event: {
-                      progress: p,
-                      checkPoint: cpt,
-                      result: res
-                    }
-                  });
-                  dispatch({
-                    type: 'changePercent',
-                    percent: Number((p * 100).toFixed(2))
+                progress: function progress(_progress, checkPoint, result) {
+                  return uploadProgress(file, {
+                    progress: _progress,
+                    checkPoint: checkPoint,
+                    result: result
                   });
                 },
                 parallel: 4,
@@ -121,10 +148,10 @@ var useCoreOptions = function useCoreOptions(_ref) {
 
               });
 
-            case 8:
+            case 9:
               seq = (((_a = state.fileList) === null || _a === void 0 ? void 0 : _a.length) || 0) + 1;
               params = {
-                uid: seq,
+                uid: timestamp,
                 fileTypeCode: file.type,
                 fileTypeName: file.type,
                 fileName: fileName,
@@ -136,23 +163,39 @@ var useCoreOptions = function useCoreOptions(_ref) {
                 seq: seq,
                 url: url
               };
-              uploadOnChange(params);
-              _context.next = 16;
+              uploadDone(params);
+              _context.next = 18;
               break;
 
-            case 13:
-              _context.prev = 13;
-              _context.t0 = _context["catch"](2);
-              console.log('error:', _context.t0);
+            case 14:
+              _context.prev = 14;
+              _context.t0 = _context["catch"](0);
+              console.log('上传报错:', _context.t0);
+              onChange === null || onChange === void 0 ? void 0 : onChange({
+                file: file,
+                fileList: getFileList(),
+                event: {
+                  status: 'error'
+                }
+              });
 
-            case 16:
+            case 18:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, null, [[2, 13]]);
+      }, _callee, null, [[0, 14]]);
     }));
-  }, [ossConfig, uploadOnChange, value]); // 上传前的检测
+  }, [ossConfig, uploadDone, uploadProgress, getFileList]);
+  var customUpload = (0, _react.useCallback)(function (file) {
+    var _a;
+
+    (_a = props.fileUpload) === null || _a === void 0 ? void 0 : _a.call(props, {
+      file: file,
+      value: getFileList(),
+      onChange: uploadDone
+    });
+  }, [props.fileUpload, getFileList, uploadDone]); // 上传前的检测
 
   var beforeUpload = (0, _react.useCallback)(function (e) {
     var files = e.target.files; // 循环文件检查是否存在不符合要求的文件
@@ -170,15 +213,16 @@ var useCoreOptions = function useCoreOptions(_ref) {
       }
 
       enabledOss && uploadOss(item); // 单个文件上传
-      // fileUpload?.({ file: item, size, value, onChange: uploadOnChange, isImg: true });
+
+      customUpload(item);
     }
 
     return false;
-  }, [type, fileSize, uploadOss]); // 删除事件
+  }, [type, fileSize, uploadOss, customUpload]); // 删除事件
 
   var remove = (0, _react.useCallback)(function (file) {
     return __awaiter(void 0, void 0, void 0, /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-      var _b, res, fileList;
+      var _b, _c, res, fileList;
 
       return _regenerator.default.wrap(function _callee2$(_context2) {
         while (1) {
@@ -191,13 +235,17 @@ var useCoreOptions = function useCoreOptions(_ref) {
               res = _context2.sent;
 
               if (res) {
-                fileList = value.filter(function (v) {
+                fileList = (_c = getFileList()) === null || _c === void 0 ? void 0 : _c.filter(function (v) {
                   return v[uid] !== file[uid];
                 });
                 dispatch({
                   type: 'changeFileList',
                   fileList: fileList
                 });
+                onChange === null || onChange === void 0 ? void 0 : onChange({
+                  file: file,
+                  fileList: fileList
+                });
               }
 
             case 4:
@@ -207,30 +255,33 @@ var useCoreOptions = function useCoreOptions(_ref) {
         }
       }, _callee2);
     }));
-  }, [props.onRemove, state.fileList, uid]); // 点击文件链接或预览图标时的回调
+  }, [props.onRemove, getFileList, uid]); // 点击文件链接或预览图标时的回调
 
   var preview = (0, _react.useCallback)(function (file) {
     var _a;
 
     (_a = props.onPreview) === null || _a === void 0 ? void 0 : _a.call(props, file);
-  }, []); // 获取上传状态
+  }, []); // 点击下载文件时的回调
 
-  var getUploadStatus = (0, _react.useCallback)(function () {
-    var uploading = typeof state.percent === 'number';
-    return {
-      uploading: uploading
-    };
-  }, [state.percent]);
+  var download = (0, _react.useCallback)(function (file) {
+    var _a;
+
+    (_a = props.onDownload) === null || _a === void 0 ? void 0 : _a.call(props, file);
+  }, []);
   var CoreMethods = {
+    getIsMaxCount: getIsMaxCount,
     beforeUpload: beforeUpload,
     getUploadStatus: getUploadStatus,
     remove: remove,
-    preview: preview
+    preview: preview,
+    download: download
   };
   var RefMethods = {
     getState: function getState() {
       return state;
-    }
+    },
+    getFileList: getFileList // 获取文件列表
+
   };
   return {
     CoreMethods: CoreMethods,

package/lib/LmUpload/style/index.css

@@ -96,6 +96,9 @@
 .lm_upload_wrapper .lm_upload_item.lm_upload_item_text .text_right .action_delete:hover {
   color: var(--primary-color);
 }
+.lm_upload_wrapper .lm_upload_item.lm_upload_item_text.error {
+  color: var(--error-color);
+}
 .lm_upload_wrapper .lm_upload_item.lm_upload_item_card {
   position: relative;
   display: inline-flex;
@@ -203,3 +206,6 @@
 .lm_upload_wrapper .lm_upload_item.lm_upload_item_picture .picture_right .action_delete:hover {
   color: var(--primary-color);
 }
+.lm_upload_wrapper .lm_upload_item.lm_upload_item_picture.error {
+  color: var(--error-color);
+}

package/lib/LmUpload/view/index.js

@@ -12,8 +12,8 @@ var React = _interopRequireWildcard(require("react"));
 var LmUploadView = function LmUploadView(_ref) {
   var instance = _ref.instance;
   return /*#__PURE__*/React.createElement("div", {
-    className: 'lm_upload_view'
-  }, "view");
+    className: "lm_upload_view"
+  });
 };
 
 var _default = LmUploadView;

package/lib/LmUpload/wrapper/UploadContainer.js

@@ -29,10 +29,10 @@ var LmUploadContainer = function LmUploadContainer(_ref) {
   }
 
   return wrapper === null || wrapper === void 0 ? void 0 : wrapper({
-    upload: /*#__PURE__*/React.createElement(_Upload.default, {
+    uploadDom: /*#__PURE__*/React.createElement(_Upload.default, {
       instance: instance
     }),
-    fileList: /*#__PURE__*/React.createElement(_UploadList.default, {
+    fileListDom: /*#__PURE__*/React.createElement(_UploadList.default, {
       instance: instance
     })
   });

package/lib/LmUpload/wrapper/UploadRoot.js

@@ -19,22 +19,7 @@ var _fns = _interopRequireDefault(require("../fns"));
 
 var _UploadWrapper = _interopRequireDefault(require("./UploadWrapper"));
 
-var _utils = require("../utils");
-
-var __rest = void 0 && (void 0).__rest || function (s, e) {
-  var t = {};
-
-  for (var p in s) {
-    if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
-  }
-
-  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
-  }
-  return t;
-}; // 根文件 => 参数聚合
-
-
+// 根文件 => 参数聚合
 var LmUploadRoot = function LmUploadRoot(props, ref) {
   var initialState = (0, _react.useMemo)(function () {
     return (0, _reducer.initialState)(props);
@@ -44,20 +29,16 @@ var LmUploadRoot = function LmUploadRoot(props, ref) {
       _useReducer2 = (0, _slicedToArray2.default)(_useReducer, 2),
       state = _useReducer2[0],
       dispatch = _useReducer2[1]; // 格式化接收参数值
+  // const configProps = useMemo(() => {
+  //   const { ...resetProps } = props
+  //   // 受控/非受控时的数据收集
+  //   return {
+  //     ...resetProps,
+  //   }
+  // }, [props])
+  // 获取核心Methods
 
 
-  var configProps = (0, _react.useMemo)(function () {
-    var fileList = props.fileList,
-        resetProps = __rest(props // 受控/非受控时的数据收集
-    , ["fileList"]); // 受控/非受控时的数据收集
-
-
-    var aliveValue = (0, _utils.getIsHas)(fileList) ? fileList : state.fileList;
-    return Object.assign(Object.assign({}, resetProps), {
-      fileList: aliveValue
-    });
-  }, [props, state.fileList]); // 获取核心Methods
-
   var _useCoreOptions = (0, _fns.default)({
     state: state,
     dispatch: dispatch,
@@ -67,7 +48,7 @@ var LmUploadRoot = function LmUploadRoot(props, ref) {
       RefMethods = _useCoreOptions.RefMethods; // 组件实例
 
 
-  var instance = Object.assign(Object.assign(Object.assign(Object.assign({}, configProps), CoreMethods), RefMethods), {
+  var instance = Object.assign(Object.assign(Object.assign(Object.assign({}, props), CoreMethods), RefMethods), {
     state: state,
     dispatch: dispatch
   }); // 向外暴露出的方法

package/lib/index.d.ts

@@ -11,6 +11,8 @@ export { default as EditTable } from './EditTable';
 export { default as Empty } from './Empty';
 export { default as EnlargeImg } from './EnlargeImg';
 export { default as Filter } from './Filter';
+export { default as LmFilter } from './LmFilter';
+export { default as CardTable } from './CardTable';
 export { default as Icon } from './Icon';
 export { default as IconFont } from './IconFont';
 export { default as IconSelect } from './IconSelect';

package/lib/index.js

@@ -41,6 +41,12 @@ Object.defineProperty(exports, "Card", {
     return _Card.default;
   }
 });
+Object.defineProperty(exports, "CardTable", {
+  enumerable: true,
+  get: function get() {
+    return _CardTable.default;
+  }
+});
 Object.defineProperty(exports, "Carousel", {
   enumerable: true,
   get: function get() {
@@ -203,6 +209,12 @@ Object.defineProperty(exports, "LmEditTable", {
     return _LmEditTable.default;
   }
 });
+Object.defineProperty(exports, "LmFilter", {
+  enumerable: true,
+  get: function get() {
+    return _LmFilter.default;
+  }
+});
 Object.defineProperty(exports, "LmSelect", {
   enumerable: true,
   get: function get() {
@@ -434,6 +446,10 @@ var _EnlargeImg = _interopRequireDefault(require("./EnlargeImg"));
 
 var _Filter = _interopRequireDefault(require("./Filter"));
 
+var _LmFilter = _interopRequireDefault(require("./LmFilter"));
+
+var _CardTable = _interopRequireDefault(require("./CardTable"));
+
 var _Icon = _interopRequireDefault(require("./Icon"));
 
 var _IconFont = _interopRequireDefault(require("./IconFont"));

package/package.json

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