linkmore-design 1.0.68 → 1.0.71

package/lib/LmUpload/fns/index.js

@@ -53,13 +53,30 @@ var useCoreOptions = function useCoreOptions(_ref) {
   var state = _ref.state,
       dispatch = _ref.dispatch,
       props = _ref.props;
-  var onChange = props.onChange,
+  var uid = props.uid,
+      onChange = props.onChange,
       type = props.type,
       fileSize = props.fileSize,
-      ossConfig = props.ossConfig; // 上传完成
+      enabledOss = props.enabledOss,
+      ossConfig = props.ossConfig; // 获取当前的文件列表
 
-  var uploadOnChange = (0, _react.useCallback)(function (file) {
-    var fileList = [file].concat((0, _toConsumableArray2.default)(state.fileList));
+  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
@@ -73,17 +90,38 @@ var useCoreOptions = function useCoreOptions(_ref) {
       file: file,
       fileList: fileList
     });
-  }, [state.fileList]); // 上传至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, dir, shortlink, region, accessKeyId, accessKeySecret, stsToken, bucket, client, fileName, pathName, url, result, 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:
-              dir = ossConfig.dir, shortlink = ossConfig.shortlink, region = ossConfig.region, accessKeyId = ossConfig.accessKeyId, accessKeySecret = ossConfig.accessKeySecret, stsToken = ossConfig.stsToken, bucket = ossConfig.bucket;
+              _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,
                 accessKeyId: accessKeyId,
@@ -91,24 +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({
-                    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,
@@ -116,10 +148,10 @@ var useCoreOptions = function useCoreOptions(_ref) {
 
               });
 
-            case 8:
-              result = _context.sent;
+            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,
                 fileName: fileName,
@@ -131,24 +163,39 @@ var useCoreOptions = function useCoreOptions(_ref) {
                 seq: seq,
                 url: url
               };
-              uploadOnChange(params);
-              console.log('result', result);
+              uploadDone(params);
               _context.next = 18;
               break;
 
-            case 15:
-              _context.prev = 15;
-              _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 18:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, null, [[2, 15]]);
+      }, _callee, null, [[0, 14]]);
     }));
-  }, [ossConfig, uploadOnChange]); // 上传前的检测
+  }, [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; // 循环文件检查是否存在不符合要求的文件
@@ -165,27 +212,76 @@ var useCoreOptions = function useCoreOptions(_ref) {
         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);
       }
 
-      uploadOss(item); // 单个文件上传
-      // fileUpload?.({ file: item, size, value, onChange: uploadOnChange, isImg: true });
+      enabledOss && uploadOss(item); // 单个文件上传
+
+      customUpload(item);
     }
 
     return false;
-  }, [type, fileSize, uploadOss]); // 获取上传状态
+  }, [type, fileSize, uploadOss, customUpload]); // 删除事件
 
-  var getUploadStatus = (0, _react.useCallback)(function () {
-    var uploading = typeof state.percent === 'number';
-    return {
-      uploading: uploading
-    };
-  }, [state.percent]);
+  var remove = (0, _react.useCallback)(function (file) {
+    return __awaiter(void 0, void 0, void 0, /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+      var _b, _c, res, fileList;
+
+      return _regenerator.default.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);
+
+            case 2:
+              res = _context2.sent;
+
+              if (res) {
+                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:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2);
+    }));
+  }, [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 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
+    getUploadStatus: getUploadStatus,
+    remove: remove,
+    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/utils.d.ts

@@ -1,3 +1,4 @@
+export declare function getIsHas(val: any): boolean;
 export declare function isClassComponent(component: any): any;
 export declare function isExoticComponent(component: any): boolean;
 export declare function isReactComponent(component: any): any;

package/lib/LmUpload/utils.js

@@ -5,6 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.getIsHas = getIsHas;
 exports.isClassComponent = isClassComponent;
 exports.isExoticComponent = isExoticComponent;
 exports.isReactComponent = isReactComponent;
@@ -14,7 +15,21 @@ var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 
 var _react = _interopRequireDefault(require("react"));
 
-// 检查是否类组件
+// 检查是否存在内容
+function getIsHas(val) {
+  var _a; // 检查是否数字类型, 是否布尔类型
+
+
+  var flag = !!val || typeof val === 'number' || typeof val === 'boolean'; // 检查空对象和空数组
+
+  if (!!val && (0, _typeof2.default)(val) === 'object') {
+    flag = Array.isArray(val) ? !!val.length : !!((_a = Object.keys(val)) === null || _a === void 0 ? void 0 : _a.length);
+  }
+
+  return flag;
+} // 检查是否类组件
+
+
 function isClassComponent(component) {
   return typeof component === 'function' && function () {
     var proto = Object.getPrototypeOf(component);

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.d.ts

@@ -1,4 +1,5 @@
-declare const LmUploadContainer: ({ instance }: {
+import * as React from 'react';
+declare const _default: React.MemoExoticComponent<({ instance }: {
     instance: any;
-}) => JSX.Element;
-export default LmUploadContainer;
+}) => any>;
+export default _default;

package/lib/LmUpload/wrapper/UploadContainer.js

@@ -13,13 +13,31 @@ var React = _interopRequireWildcard(require("react"));
 
 var _Upload = _interopRequireDefault(require("./Upload"));
 
+var _UploadList = _interopRequireDefault(require("../UploadList"));
+
 // 上传组件主体区域
 var LmUploadContainer = function LmUploadContainer(_ref) {
   var instance = _ref.instance;
-  return /*#__PURE__*/React.createElement(_Upload.default, {
-    instance: instance
+  var wrapper = instance.components.wrapper;
+
+  if (!wrapper) {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Upload.default, {
+      instance: instance
+    }), /*#__PURE__*/React.createElement(_UploadList.default, {
+      instance: instance
+    }));
+  }
+
+  return wrapper === null || wrapper === void 0 ? void 0 : wrapper({
+    uploadDom: /*#__PURE__*/React.createElement(_Upload.default, {
+      instance: instance
+    }),
+    fileListDom: /*#__PURE__*/React.createElement(_UploadList.default, {
+      instance: instance
+    })
   });
 };
 
-var _default = LmUploadContainer;
+var _default = /*#__PURE__*/React.memo(LmUploadContainer);
+
 exports.default = _default;

package/lib/LmUpload/wrapper/UploadRoot.js

@@ -28,7 +28,15 @@ var LmUploadRoot = function LmUploadRoot(props, ref) {
   var _useReducer = (0, _react.useReducer)(_reducer.default, initialState),
       _useReducer2 = (0, _slicedToArray2.default)(_useReducer, 2),
       state = _useReducer2[0],
-      dispatch = _useReducer2[1]; // 获取核心Methods
+      dispatch = _useReducer2[1]; // 格式化接收参数值
+  // const configProps = useMemo(() => {
+  //   const { ...resetProps } = props
+  //   // 受控/非受控时的数据收集
+  //   return {
+  //     ...resetProps,
+  //   }
+  // }, [props])
+  // 获取核心Methods
 
 
   var _useCoreOptions = (0, _fns.default)({

package/lib/LmUpload/wrapper/UploadWrapper.js

@@ -2,32 +2,25 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 
-var React = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 
 var _UploadContainer = _interopRequireDefault(require("./UploadContainer"));
 
-var _UploadList = _interopRequireDefault(require("../UploadList"));
-
 var _view = _interopRequireDefault(require("../view"));
 
 // 包裹上传组件区域： 拓展其他结构
 var LmUploadWrapper = function LmUploadWrapper(_ref) {
   var instance = _ref.instance;
-  var wrapper = instance.components.wrapper;
-  return /*#__PURE__*/React.createElement("div", {
-    className: 'lm_upload_wrapper'
-  }, wrapper === null || wrapper === void 0 ? void 0 : wrapper( /*#__PURE__*/React.createElement(_UploadContainer.default, {
-    instance: instance
-  }), /*#__PURE__*/React.createElement(_UploadList.default, {
+  return /*#__PURE__*/_react.default.createElement("div", {
+    className: "lm_upload_wrapper"
+  }, /*#__PURE__*/_react.default.createElement(_UploadContainer.default, {
     instance: instance
-  })), /*#__PURE__*/React.createElement(_view.default, {
+  }), /*#__PURE__*/_react.default.createElement(_view.default, {
     instance: instance
   }));
 };

package/lib/LmUpload/wrapper/reducer.js

@@ -36,7 +36,8 @@ var initialState = function initialState(props) {
     upload: upload,
     process: 0,
     status: 'done',
-    fileList: defaultFileList
+    fileList: defaultFileList // 用于非受控模式时的数据收集
+
   };
 };
 

package/lib/Mentions/style/index.css

@@ -81,6 +81,9 @@
 .ant-notification-notice .ant-notification-notice-description {
   font-size: 12px;
 }
+.ant-collapse {
+  font-size: 12px;
+}
 @font-face {
   font-family: 'iconfont';
   /* Project id 2966019 */
@@ -503,3 +506,6 @@ html {
 .card_cell_content:hover .card_cell_body .card_cell_checkbox {
   opacity: 1;
 }
+p {
+  margin-bottom: 0;
+}

package/lib/Menu/style/index.css

@@ -81,6 +81,9 @@
 .ant-notification-notice .ant-notification-notice-description {
   font-size: 12px;
 }
+.ant-collapse {
+  font-size: 12px;
+}
 @font-face {
   font-family: 'iconfont';
   /* Project id 2966019 */
@@ -503,3 +506,6 @@ html {
 .card_cell_content:hover .card_cell_body .card_cell_checkbox {
   opacity: 1;
 }
+p {
+  margin-bottom: 0;
+}

package/lib/Modal/style/index.css

@@ -81,6 +81,9 @@
 .ant-notification-notice .ant-notification-notice-description {
   font-size: 12px;
 }
+.ant-collapse {
+  font-size: 12px;
+}
 @font-face {
   font-family: 'iconfont';
   /* Project id 2966019 */
@@ -503,6 +506,9 @@ html {
 .card_cell_content:hover .card_cell_body .card_cell_checkbox {
   opacity: 1;
 }
+p {
+  margin-bottom: 0;
+}
 .lm_modal.ant-modal-wrap .ant-modal-header > .ant-modal-title {
   font-weight: normal;
   font-size: 14px;

package/lib/PageHeader/style/index.css

@@ -81,6 +81,9 @@
 .ant-notification-notice .ant-notification-notice-description {
   font-size: 12px;
 }
+.ant-collapse {
+  font-size: 12px;
+}
 @font-face {
   font-family: 'iconfont';
   /* Project id 2966019 */
@@ -503,3 +506,6 @@ html {
 .card_cell_content:hover .card_cell_body .card_cell_checkbox {
   opacity: 1;
 }
+p {
+  margin-bottom: 0;
+}

package/lib/Pagination/style/index.css

@@ -81,6 +81,9 @@
 .ant-notification-notice .ant-notification-notice-description {
   font-size: 12px;
 }
+.ant-collapse {
+  font-size: 12px;
+}
 @font-face {
   font-family: 'iconfont';
   /* Project id 2966019 */
@@ -503,6 +506,9 @@ html {
 .card_cell_content:hover .card_cell_body .card_cell_checkbox {
   opacity: 1;
 }
+p {
+  margin-bottom: 0;
+}
 .lm_pagination.ant-pagination li {
   font-size: 12px;
   line-height: 24px !important;

package/lib/PopTable/style/index.css

@@ -81,6 +81,9 @@
 .ant-notification-notice .ant-notification-notice-description {
   font-size: 12px;
 }
+.ant-collapse {
+  font-size: 12px;
+}
 @font-face {
   font-family: 'iconfont';
   /* Project id 2966019 */
@@ -503,6 +506,9 @@ html {
 .card_cell_content:hover .card_cell_body .card_cell_checkbox {
   opacity: 1;
 }
+p {
+  margin-bottom: 0;
+}
 .lm_popover_table .btn-dashed {
   font-size: 12px;
   color: #ccc;

package/lib/Popconfirm/style/index.css

@@ -81,6 +81,9 @@
 .ant-notification-notice .ant-notification-notice-description {
   font-size: 12px;
 }
+.ant-collapse {
+  font-size: 12px;
+}
 @font-face {
   font-family: 'iconfont';
   /* Project id 2966019 */
@@ -503,3 +506,6 @@ html {
 .card_cell_content:hover .card_cell_body .card_cell_checkbox {
   opacity: 1;
 }
+p {
+  margin-bottom: 0;
+}

package/lib/Popover/style/index.css

@@ -81,6 +81,9 @@
 .ant-notification-notice .ant-notification-notice-description {
   font-size: 12px;
 }
+.ant-collapse {
+  font-size: 12px;
+}
 @font-face {
   font-family: 'iconfont';
   /* Project id 2966019 */
@@ -503,3 +506,6 @@ html {
 .card_cell_content:hover .card_cell_body .card_cell_checkbox {
   opacity: 1;
 }
+p {
+  margin-bottom: 0;
+}

package/lib/ProTable/Table.js

@@ -297,7 +297,6 @@ var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var throttleSize = (0, _lodash.throttle)(function (_ref) {
     var height = _ref.height,
         width = _ref.width;
-    console.log(height, width, 444);
 
     var resetHeight = function resetHeight() {
       var h = height - 48;

package/lib/ProTable/autosize.js

@@ -48,7 +48,6 @@ var AutoSizer = /*#__PURE__*/function (_React$Component) {
     _this._detectElementResize = void 0;
 
     _this._onResize = function () {
-      console.log(11);
       var _this$props = _this.props,
           disableHeight = _this$props.disableHeight,
           disableWidth = _this$props.disableWidth,
@@ -109,8 +108,6 @@ var AutoSizer = /*#__PURE__*/function (_React$Component) {
 
         this._detectElementResize.addResizeListener(this._parentNode, this.handleResize);
 
-        console.log(3);
-
         this._onResize();
       }
     }

package/lib/ProTable/style/index.css

@@ -81,6 +81,9 @@
 .ant-notification-notice .ant-notification-notice-description {
   font-size: 12px;
 }
+.ant-collapse {
+  font-size: 12px;
+}
 @font-face {
   font-family: 'iconfont';
   /* Project id 2966019 */
@@ -503,6 +506,9 @@ html {
 .card_cell_content:hover .card_cell_body .card_cell_checkbox {
   opacity: 1;
 }
+p {
+  margin-bottom: 0;
+}
 .z_container {
   position: relative;
   display: flex;

package/lib/Progress/style/index.css

@@ -81,6 +81,9 @@
 .ant-notification-notice .ant-notification-notice-description {
   font-size: 12px;
 }
+.ant-collapse {
+  font-size: 12px;
+}
 @font-face {
   font-family: 'iconfont';
   /* Project id 2966019 */
@@ -503,3 +506,6 @@ html {
 .card_cell_content:hover .card_cell_body .card_cell_checkbox {
   opacity: 1;
 }
+p {
+  margin-bottom: 0;
+}

package/lib/QuickMenu/style/index.css

@@ -81,6 +81,9 @@
 .ant-notification-notice .ant-notification-notice-description {
   font-size: 12px;
 }
+.ant-collapse {
+  font-size: 12px;
+}
 @font-face {
   font-family: 'iconfont';
   /* Project id 2966019 */
@@ -503,6 +506,9 @@ html {
 .card_cell_content:hover .card_cell_body .card_cell_checkbox {
   opacity: 1;
 }
+p {
+  margin-bottom: 0;
+}
 .lm_quick_menu {
   position: fixed;
   right: 16px;