linkmore-design 1.0.67 → 1.0.68

package/lib/LmUpload/body/UploadPicture.js

@@ -1,5 +1,7 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 
 Object.defineProperty(exports, "__esModule", {
@@ -11,10 +13,17 @@ var React = _interopRequireWildcard(require("react"));
 
 var _linkmoreDesign = require("linkmore-design");
 
+var _Progress = _interopRequireDefault(require("./Progress"));
+
 // 预设卡片上传样式
 var uploadPicture = function uploadPicture(_ref) {
   var instance = _ref.instance;
-  var size = instance.size;
+  var size = instance.size,
+      getUploadStatus = instance.getUploadStatus; // 是否上传中状态
+
+  var isUploading = React.useMemo(function () {
+    return getUploadStatus().uploading;
+  }, [getUploadStatus]);
   return /*#__PURE__*/React.createElement("div", {
     className: 'lm_upload_core_picture',
     style: {
@@ -23,7 +32,7 @@ var uploadPicture = function uploadPicture(_ref) {
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: 'lm_upload_core_picture_action'
-  }, /*#__PURE__*/React.createElement("div", {
+  }, !isUploading && /*#__PURE__*/React.createElement("div", {
     className: 'action_plus'
   }, /*#__PURE__*/React.createElement(_linkmoreDesign.IconFont, {
     type: "lmweb-plus",
@@ -32,7 +41,9 @@ var uploadPicture = function uploadPicture(_ref) {
     }
   })), /*#__PURE__*/React.createElement("div", {
     className: 'tip'
-  }, "\u4E0A\u4F20")));
+  }, "\u4E0A\u4F20"), isUploading && /*#__PURE__*/React.createElement(_Progress.default, {
+    instance: instance
+  })));
 };
 
 var _default = uploadPicture;

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

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

package/lib/LmUpload/fns/index.js

@@ -7,42 +7,154 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
+var _react = require("react");
+
 var _linkmoreDesign = require("linkmore-design");
 
+var _aliOss = _interopRequireDefault(require("ali-oss"));
+
+var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
+  function adopt(value) {
+    return value instanceof P ? value : new P(function (resolve) {
+      resolve(value);
+    });
+  }
+
+  return new (P || (P = Promise))(function (resolve, reject) {
+    function fulfilled(value) {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+
+    function rejected(value) {
+      try {
+        step(generator["throw"](value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+
+    function step(result) {
+      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
+    }
+
+    step((generator = generator.apply(thisArg, _arguments || [])).next());
+  });
+};
+
 var useCoreOptions = function useCoreOptions(_ref) {
   var state = _ref.state,
       dispatch = _ref.dispatch,
       props = _ref.props;
-  var value = props.value,
-      onChange = props.onChange,
-      size = props.size,
+  var onChange = props.onChange,
       type = props.type,
       fileSize = props.fileSize,
-      fileUpload = props.fileUpload;
+      ossConfig = props.ossConfig; // 上传完成
 
-  var uploadOnChange = function uploadOnChange(file) {
+  var uploadOnChange = (0, _react.useCallback)(function (file) {
     var fileList = [file].concat((0, _toConsumableArray2.default)(state.fileList));
-    console.log('fileList', fileList);
     dispatch({
       type: 'changeFileList',
       fileList: fileList
+    });
+    dispatch({
+      type: 'changePercent',
+      percent: null
     }); // 上传事件：抛出 file: 文件  filelist: 文件列表 event: 上传进度信息
 
     onChange === null || onChange === void 0 ? void 0 : onChange({
       file: file,
-      fileList: fileList,
-      event: event
+      fileList: fileList
     });
-  }; // 上传前的检测
-
-
-  var beforeUpload = function beforeUpload(e) {
-    var file = e.target.files; // 循环文件检查是否存在不符合要求的文件
-
-    for (var i = 0, len = file.length; i < len; i += 1) {
-      var item = file[i];
+  }, [state.fileList]); // 上传至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, dir, shortlink, region, accessKeyId, accessKeySecret, stsToken, bucket, client, fileName, pathName, url, result, seq, params;
+
+      return _regenerator.default.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              dir = ossConfig.dir, shortlink = ossConfig.shortlink, region = ossConfig.region, accessKeyId = ossConfig.accessKeyId, accessKeySecret = ossConfig.accessKeySecret, stsToken = ossConfig.stsToken, bucket = ossConfig.bucket;
+              client = new _aliOss.default({
+                region: region,
+                accessKeyId: accessKeyId,
+                accessKeySecret: accessKeySecret,
+                stsToken: stsToken,
+                bucket: bucket
+              });
+              _context.prev = 2;
+              fileName = "".concat(Date.now(), "-").concat(file.name);
+              pathName = dir.slice(-1) === '/' ? "".concat(dir).concat(fileName) : "".concat(dir, "/").concat(fileName);
+              url = "".concat(shortlink).concat(pathName) || '';
+              _context.next = 8;
+              return client.multipartUpload(pathName, file, {
+                // 获取分片上传进度、断点和返回值。
+                progress: function progress(p, cpt, res) {
+                  onChange({
+                    event: {
+                      progress: p,
+                      checkPoint: cpt,
+                      result: res
+                    }
+                  });
+                  dispatch({
+                    type: 'changePercent',
+                    percent: Number((p * 100).toFixed(2))
+                  });
+                },
+                parallel: 4,
+                partSize: 1024 * 1024 // 分片大小
+
+              });
+
+            case 8:
+              result = _context.sent;
+              seq = (((_a = state.fileList) === null || _a === void 0 ? void 0 : _a.length) || 0) + 1;
+              params = {
+                fileTypeCode: file.type,
+                fileTypeName: file.type,
+                fileName: fileName,
+                realFileName: file.name,
+                fileSize: file.size,
+                internalUrl: '',
+                externalUrl: 'externalUrl',
+                filePath: dir,
+                seq: seq,
+                url: url
+              };
+              uploadOnChange(params);
+              console.log('result', result);
+              _context.next = 18;
+              break;
+
+            case 15:
+              _context.prev = 15;
+              _context.t0 = _context["catch"](2);
+              console.log('error:', _context.t0);
+
+            case 18:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee, null, [[2, 15]]);
+    }));
+  }, [ossConfig, uploadOnChange]); // 上传前的检测
+
+  var beforeUpload = (0, _react.useCallback)(function (e) {
+    var files = e.target.files; // 循环文件检查是否存在不符合要求的文件
+
+    for (var i = 0, len = files.length; i < len; i += 1) {
+      var item = files[i];
 
       if (!type.includes(item.name.replace(/.*\./, '').toLowerCase())) {
         var content = type.join('、');
@@ -51,24 +163,24 @@ var useCoreOptions = function useCoreOptions(_ref) {
 
       if (item.size / 1024 / 1024 > fileSize) {
         return _linkmoreDesign.message.warning("\u6587\u4EF6\u4E0A\u4F20\u5931\u8D25\uFF01\u9644\u4EF6\u5927\u5C0F\u4E0D\u80FD\u8D85\u8FC7".concat(fileSize, "M\uFF01"), 1.5);
-      } // 单个文件上传
-
+      }
 
-      fileUpload === null || fileUpload === void 0 ? void 0 : fileUpload({
-        file: item,
-        size: size,
-        value: value,
-        onChange: uploadOnChange,
-        isImg: true
-      });
+      uploadOss(item); // 单个文件上传
+      // fileUpload?.({ file: item, size, value, onChange: uploadOnChange, isImg: true });
     }
 
-    ;
     return false;
-  };
-
+  }, [type, fileSize, uploadOss]); // 获取上传状态
+
+  var getUploadStatus = (0, _react.useCallback)(function () {
+    var uploading = typeof state.percent === 'number';
+    return {
+      uploading: uploading
+    };
+  }, [state.percent]);
   var CoreMethods = {
-    beforeUpload: beforeUpload
+    beforeUpload: beforeUpload,
+    getUploadStatus: getUploadStatus
   };
   var RefMethods = {
     getState: function getState() {

package/lib/LmUpload/style/index.css

@@ -22,7 +22,9 @@
   border-color: var(--primary-color);
 }
 .lm_upload_wrapper .lm_upload_core .lm_upload_core_picture .lm_upload_core_picture_action {
+  width: 100%;
   text-align: center;
+  padding: var(--gap);
 }
 .lm_upload_wrapper .lm_upload_core .lm_upload_core_picture .lm_upload_core_picture_action .action_plus {
   color: var(--color-85);
@@ -31,6 +33,20 @@
   color: var(--color-45);
   margin-top: var(--gap);
 }
+.lm_upload_wrapper .lm_upload_progress {
+  width: 100%;
+  height: 2px;
+  background-color: var(--color-4);
+  border-radius: 20px;
+  margin: 10px 0;
+}
+.lm_upload_wrapper .lm_upload_progress .line {
+  width: 0%;
+  height: 2px;
+  transition: 0.3;
+  background-color: var(--primary-color);
+  border-radius: 20px;
+}
 .lm_upload_wrapper .lm_upload_item {
   vertical-align: middle;
 }
@@ -95,12 +111,13 @@
 .lm_upload_wrapper .lm_upload_item.lm_upload_item_card .lm_upload_item_thumb {
   width: 100%;
 }
+.lm_upload_wrapper .lm_upload_item.lm_upload_item_card .lm_upload_item_thumb .anticon {
+  font-size: 34px;
+  color: var(--color-45);
+}
 .lm_upload_wrapper .lm_upload_item.lm_upload_item_card .lm_upload_item_thumb img {
   object-fit: contain;
 }
-.lm_upload_wrapper .lm_upload_item.lm_upload_item_card .lm_upload_item_error .anticon {
-  font-size: 34px;
-}
 .lm_upload_wrapper .lm_upload_item.lm_upload_item_card .lm_upload_item_error .lm_upload_item_name {
   font-size: 12px;
   text-overflow: ellipsis;

package/lib/LmUpload/wrapper/reducer.js

@@ -7,7 +7,8 @@ exports.reducer = exports.initialState = exports.default = void 0;
 
 // 状态管理操作
 var reducer = function reducer(state, action) {
-  var fileList = action.fileList;
+  var fileList = action.fileList,
+      percent = action.percent;
 
   switch (action.type) {
     case 'changeFileList':
@@ -15,6 +16,11 @@ var reducer = function reducer(state, action) {
         fileList: fileList
       });
 
+    case 'changePercent':
+      return Object.assign(Object.assign({}, state), {
+        percent: percent
+      });
+
     default:
       throw new Error();
   }

package/lib/Modal/index.d.ts

@@ -4,7 +4,7 @@ export interface ILMModalProps extends ModalProps {
     wrapClassName?: string;
     size?: 'default' | 'small';
 }
-declare const LMModal: React.FC<ModalProps> & import("antd/lib/modal/confirm").ModalStaticFunctions & {
+declare const LMModal: React.FC<ILMModalProps> & React.FC<ModalProps> & import("antd/lib/modal/confirm").ModalStaticFunctions & {
     useModal: typeof import("antd/lib/modal/useModal").default;
     destroyAll: () => void;
     config: typeof import("antd/lib/modal/confirm").modalGlobalConfig;

package/lib/Popconfirm/index.d.ts

@@ -0,0 +1,3 @@
+import { Popconfirm } from "antd";
+export type { PopconfirmProps } from 'antd';
+export default Popconfirm;

package/lib/Popconfirm/index.js

@@ -0,0 +1,15 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+require("antd/es/popconfirm/style");
+
+var _popconfirm = _interopRequireDefault(require("antd/es/popconfirm"));
+
+var _default = _popconfirm.default;
+exports.default = _default;