linkmore-design 1.1.5 → 1.1.7

package/lib/LmUpload/fns/index.js

@@ -57,6 +57,8 @@ var useCoreOptions = function useCoreOptions(_ref) {
       onChange = props.onChange,
       type = props.type,
       fileSize = props.fileSize,
+      fileSizeType = props.fileSizeType,
+      fileAreaSize = props.fileAreaSize,
       enabledOss = props.enabledOss,
       enableCrop = props.enableCrop,
       ossConfig = props.ossConfig; // 获取当前的文件列表
@@ -240,12 +242,12 @@ var useCoreOptions = function useCoreOptions(_ref) {
       value: getFileList(),
       onChange: uploadSuccess
     });
-  }, [props.fileUpload, getFileList, uploadSuccess]); // 上传文件
+  }, [props.fileUpload, getFileList, uploadSuccess]); // 调用上传方法: 执行 uploadOss && customUpload事件
 
   var uploadFile = (0, _react.useCallback)(function (file) {
     enabledOss && uploadOss(file);
     customUpload(file);
-  }, [enabledOss, uploadOss, customUpload]); // 检测完成 file
+  }, [enabledOss, uploadOss, customUpload]); // 检测完成, 执行外部 `beforeUpload` 事件
 
   var checkOver = (0, _react.useCallback)(function (file) {
     return __awaiter(void 0, void 0, void 0, /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
@@ -307,51 +309,123 @@ var useCoreOptions = function useCoreOptions(_ref) {
         }
       }, _callee2, null, [[5, 12]]);
     }));
-  }, [props.beforeUpload, getFileList, uploadFile]); // 上传前的检测
+  }, [props.beforeUpload, getFileList, uploadFile]); // 单个文件异步校验
 
-  var beforeUpload = (0, _react.useCallback)(function (e) {
-    var files = e.target.files; // 循环文件检查是否存在不符合要求的文件
+  var fileCheckAsync = (0, _react.useCallback)(function (file) {
+    return new Promise(function (resolve, reject) {
+      // 文件类型校验是否通过 | 存在通配符或符合规定类型
+      var isCheckType = type.includes('*') || type.includes(file.name.replace(/.*\./, '').toLowerCase()); // 大小校验是否通过
 
-    for (var i = 0, len = files.length; i < len; i += 1) {
-      var item = files[i];
+      var isCheckSize = file.size / 1024 / (fileSizeType.toLowerCase().includes('m') ? 1024 : 1) <= fileSize;
 
-      if (!type.includes(item.name.replace(/.*\./, '').toLowerCase())) {
+      if (!isCheckType) {
         var content = type.join('、');
-        return _linkmoreDesign.message.warning("\u6587\u4EF6\u4E0A\u4F20\u5931\u8D25\uFF01\u4EC5\u652F\u6301".concat(content, "\u7684\u6587\u4EF6\u7C7B\u578B\uFF01"), 1.5);
+        reject(new Error("\u6587\u4EF6\u4E0A\u4F20\u5931\u8D25\uFF01\u4EC5\u652F\u6301".concat(content, "\u7684\u6587\u4EF6\u7C7B\u578B\uFF01")));
       }
 
-      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);
-      } // 可剪裁时单独处理文件
-
-
-      if (enableCrop) {
-        dispatch({
-          type: 'changeCropFile',
-          cropFile: item
-        });
+      if (!isCheckSize) {
+        reject(new Error("\u6587\u4EF6\u4E0A\u4F20\u5931\u8D25\uFF01\u9644\u4EF6\u5927\u5C0F\u4E0D\u80FD\u8D85\u8FC7".concat(fileSize).concat(fileSizeType, "\uFF01")));
+      } // 是否需要校验图片宽高
+
+
+      if (fileAreaSize) {
+        var reader = new FileReader();
+        reader.readAsDataURL(file);
+
+        reader.onload = function (evt) {
+          var res = evt.target.result;
+          var imageObj = new Image();
+          imageObj.src = res;
+
+          imageObj.onload = function () {
+            var maxWidth = fileAreaSize.maxWidth,
+                maxHeight = fileAreaSize.maxHeight;
+            var isCheckAreaSizeMaxWidth = !maxWidth || imageObj.width <= maxWidth;
+            var isCheckAreaSizeMaxHeight = !maxHeight || imageObj.height <= maxHeight;
+
+            if (!isCheckAreaSizeMaxWidth || !isCheckAreaSizeMaxHeight) {
+              reject(new Error("\u6587\u4EF6\u4E0A\u4F20\u5931\u8D25\uFF01\u56FE\u7247\u5C3A\u5BF8\u4E0D\u7B26\u5408"));
+            } else {
+              resolve(file);
+            }
+          };
+        };
       } else {
-        // 单个文件上传
-        checkOver(item);
+        resolve(file);
       }
-    }
+    });
+  }, [type, fileSize, fileSizeType, fileAreaSize]); // 文件循环校验，返回校验后的文件数组
+
+  var filesLoopCheck = (0, _react.useCallback)(function (files) {
+    return Promise.all(files.map(fileCheckAsync));
+  }, []);
+  /*
+   * 上传前: 先校验 => 全部校验通过后开始上传
+   * 事件执行顺序:
+   * beforeUpload => filesLoopCheck => checkOver
+   * => uploadFile => uploadOss && customUpload
+   * => uploadProgress =>  uploadSuccess || uploadError
+   * => Props.onChange && (Props.onSuccess || Props.onError)
+   */
+
+  var beforeUpload = (0, _react.useCallback)(function (e) {
+    return __awaiter(void 0, void 0, void 0, /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3() {
+      var files, res;
+      return (0, _regeneratorRuntime2.default)().wrap(function _callee3$(_context3) {
+        while (1) {
+          switch (_context3.prev = _context3.next) {
+            case 0:
+              files = Array.from(e.target.files);
+              _context3.prev = 1;
+              _context3.next = 4;
+              return filesLoopCheck(files);
 
-    return false;
-  }, [type, fileSize, enableCrop, checkOver]); // 删除事件
+            case 4:
+              res = _context3.sent;
+
+              // 仅单文件上传时可剪裁
+              if (enableCrop) {
+                dispatch({
+                  type: 'changeCropFile',
+                  cropFile: res[0]
+                });
+              } else {
+                // 校验完成开始执行上传
+                res.forEach(checkOver);
+              }
+
+              _context3.next = 12;
+              break;
+
+            case 8:
+              _context3.prev = 8;
+              _context3.t0 = _context3["catch"](1);
+              console.log('文件校验未通过！', _context3.t0.message);
+
+              _linkmoreDesign.message.warning(_context3.t0.message, 1.5);
+
+            case 12:
+            case "end":
+              return _context3.stop();
+          }
+        }
+      }, _callee3, null, [[1, 8]]);
+    }));
+  }, [filesLoopCheck, enableCrop, checkOver]); // 删除事件
 
   var remove = (0, _react.useCallback)(function (file) {
-    return __awaiter(void 0, void 0, void 0, /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3() {
+    return __awaiter(void 0, void 0, void 0, /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee4() {
       var _a, _b, res, fileList;
 
-      return (0, _regeneratorRuntime2.default)().wrap(function _callee3$(_context3) {
+      return (0, _regeneratorRuntime2.default)().wrap(function _callee4$(_context4) {
         while (1) {
-          switch (_context3.prev = _context3.next) {
+          switch (_context4.prev = _context4.next) {
             case 0:
-              _context3.next = 2;
+              _context4.next = 2;
               return (_a = props.onRemove) === null || _a === void 0 ? void 0 : _a.call(props, file);
 
             case 2:
-              res = _context3.sent;
+              res = _context4.sent;
 
               if (res) {
                 fileList = (_b = getFileList()) === null || _b === void 0 ? void 0 : _b.filter(function (v) {
@@ -369,10 +443,10 @@ var useCoreOptions = function useCoreOptions(_ref) {
 
             case 4:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
         }
-      }, _callee3);
+      }, _callee4);
     }));
   }, [props.onRemove, getFileList, onChange, dispatch, uid]); // 点击文件链接或预览图标时的回调
 

package/lib/message/index.js

@@ -12,6 +12,10 @@ exports.getInstance = exports.default = void 0;
 exports.getKeyThenIncreaseKey = getKeyThenIncreaseKey;
 exports.typeList = void 0;
 
+require("antd/es/message/style");
+
+var _message2 = _interopRequireDefault(require("antd/es/message"));
+
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var _icons = require("@ant-design/icons");
@@ -229,7 +233,8 @@ var api = {
         messageInstance = null;
       }
     }
-  }
+  },
+  antdMessage: _message2.default
 };
 
 function attachTypeApi(originalApi, type) {

package/lib/styles/variables.css

@@ -761,7 +761,6 @@ p {
   margin-left: 4px;
   overflow: hidden;
   white-space: nowrap;
-  max-width: 96px;
 }
 .ant-btn.lm-button > span:not(.anticon) {
   display: inline-block;
@@ -779,12 +778,10 @@ p {
 .ant-btn.lm-button > span:not(.anticon) {
   font-size: 12px;
   line-height: 20px;
-  max-width: 96px;
 }
 .ant-btn.lm-button-small {
   height: 24px;
   padding: 2px 8px;
-  max-width: 112px;
   font-size: 12px;
 }
 .ant-btn.lm-button-small.lm-button-icon-only .anticon {
@@ -793,7 +790,6 @@ p {
 .ant-btn.lm-button-middle {
   height: 32px;
   padding: 6px 12px;
-  max-width: 142px;
 }
 .ant-btn.lm-button-middle .anticon {
   font-size: 16px;
@@ -1157,6 +1153,7 @@ p {
   overflow: hidden;
 }
 .card_PTR .card_PTR_container .card_PTR_body .card_PTR_left {
+  flex: 0 0 auto;
   width: 35%;
   min-width: 126px;
   border-radius: 2px;
@@ -1176,6 +1173,7 @@ p {
   flex: 1;
   display: flex;
   flex-flow: column;
+  overflow: hidden;
 }
 .card_PTR .card_PTR_container .card_PTR_body .card_PTR_right .card_title {
   overflow: hidden;
@@ -1204,8 +1202,8 @@ p {
 }
 .card_PTR .card_PTR_container .card_PTR_body .card_PTR_right .PTR_column .PTR_column_box {
   font-size: 12px;
-  display: grid;
-  grid-template-columns: repeat(2, 1fr);
+  display: flex;
+  flex-flow: wrap;
   column-gap: 8px;
   color: var(--color-65);
   margin-top: 8px;
@@ -1214,6 +1212,7 @@ p {
   display: inline-flex;
   align-items: center;
   min-height: 20px;
+  width: calc(50% - 4px);
 }
 .card_PTR .card_PTR_container .card_PTR_body .card_PTR_right .PTR_column .PTR_column_box .ellipsis {
   flex: 1 1 0;
@@ -1284,6 +1283,7 @@ p {
   overflow: hidden;
 }
 .card_PTRO .card_PTRO_container .card_PTRO_body .card_PTRO_left {
+  flex: 0 0 auto;
   width: 40%;
   min-width: 126px;
   border-radius: 2px;
@@ -1303,8 +1303,10 @@ p {
   flex: 1;
   display: flex;
   flex-flow: column;
+  overflow: hidden;
 }
 .card_PTRO .card_PTRO_container .card_PTRO_body .card_PTRO_right .card_title {
+  flex: 0 0 auto;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
@@ -1325,10 +1327,19 @@ p {
   color: var(--success-color);
 }
 .card_PTRO .card_PTRO_container .card_PTRO_body .card_PTRO_right .PTRO_column {
-  display: grid;
-  grid-template-columns: repeat(2, 1fr);
+  display: flex;
+  flex-flow: wrap;
+  column-gap: 8px;
   font-size: 12px;
   color: var(--color-65);
+  margin-top: 8px;
+}
+.card_PTRO .card_PTRO_container .card_PTRO_body .card_PTRO_right .PTRO_column > span {
+  min-height: 20px;
+  width: calc(50% - 4px);
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
 }
 .card_PTRO .card_PTRO_container .card_PTRO_body .card_PTRO_right .PTRO_extend {
   font-size: 12px;
@@ -9733,6 +9744,9 @@ p {
   flex: 1;
   max-width: 100%;
 }
+.lm_editTable_warpper .lm_custom_cell_td .ant-table-row-expand-icon {
+  margin-top: 6px;
+}
 .lm_editTable_warpper .lm_editTable_cell_edit {
   height: 40px;
   padding: 8px 8px !important;

package/package.json

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