ztxkui 4.2.18-98 → 4.2.18-99

package/dist/UploadDemo.js

@@ -301,7 +301,7 @@ function UploadDemo() {
                 rotationSlider: true,
                 aspect: 4 / 5,
                 quality: 1,
-            }, maxSize: 2 * 1024 * 1024, minSize: 200 * 1024, maxResolution: { width: 960, height: 1200 }, minResolution: { width: 480, height: 600 }, ztAccept: ['.jpg', '.jpeg'], listType: "picture-card", method: "post", headers: {
+            }, maxSize: 2 * 1024 * 1024, minSize: 20 * 1024, maxResolution: { width: 960, height: 1200 }, minResolution: { width: 480, height: 600 }, ztAccept: ['.jpg', '.jpeg'], listType: "picture-card", method: "post", headers: {
                 'Zmdms-Auth': token,
             }, showUploadList: {
                 showPreviewIcon: true,

package/dist/components/Upload/upload.js

@@ -283,9 +283,18 @@ var Upload = function (props) {
                         (dimensions.width > maxResolution.width ||
                             dimensions.height > maxResolution.height)) {
                         if (needMessage) {
-                            message.warning(i18next.t('图片分辨率超出最大值宽*高 {{maxResolution}}！', {
-                                maxResolution: maxResolution.width + 'x' + maxResolution.height,
-                            }));
+                            if (isCrop) {
+                                message.warning(i18next.t('裁剪后的图片分辨率宽*高：{{currentResolution}}，超出最大值{{maxResolution}}！', {
+                                    maxResolution: maxResolution.width + 'x' + maxResolution.height,
+                                    currentResolution: dimensions.width + 'x' + dimensions.height,
+                                }));
+                            }
+                            else {
+                                message.warning(i18next.t('图片分辨率超出最大值宽*高 {{maxResolution}}！当前图片分辨率：{{currentResolution}}', {
+                                    maxResolution: maxResolution.width + 'x' + maxResolution.height,
+                                    currentResolution: dimensions.width + 'x' + dimensions.height,
+                                }));
+                            }
                         }
                         return AntUpload.LIST_IGNORE;
                     }
@@ -293,9 +302,18 @@ var Upload = function (props) {
                         (dimensions.width < minResolution.width ||
                             dimensions.height < minResolution.height)) {
                         if (needMessage) {
-                            message.warning(i18next.t('图片分辨率低于最小值宽*高 {{minResolution}}！', {
-                                minResolution: minResolution.width + 'x' + minResolution.height,
-                            }));
+                            if (isCrop) {
+                                message.warning(i18next.t('裁剪后的图片分辨率宽*高：{{currentResolution}}，低于最小值{{minResolution}}！', {
+                                    minResolution: minResolution.width + 'x' + minResolution.height,
+                                    currentResolution: dimensions.width + 'x' + dimensions.height,
+                                }));
+                            }
+                            else {
+                                message.warning(i18next.t('图片分辨率低于最小值宽*高 {{minResolution}}！当前图片分辨率：{{currentResolution}}', {
+                                    minResolution: minResolution.width + 'x' + minResolution.height,
+                                    currentResolution: dimensions.width + 'x' + dimensions.height,
+                                }));
+                            }
                         }
                         return AntUpload.LIST_IGNORE;
                     }
@@ -332,11 +350,33 @@ var Upload = function (props) {
             return AntUpload.LIST_IGNORE;
         }
         if (fileSize > MAXSIZE) {
-            message.warning(i18next.t('文件超出 {{MAXSIZESTR}}！', { MAXSIZESTR: MAXSIZESTR }));
+            if (isCrop) {
+                message.warning(i18next.t('裁剪后的图片大小：{{fileSizeStr}}，超出最大值{{MAXSIZESTR}}！', {
+                    MAXSIZESTR: MAXSIZESTR,
+                    fileSizeStr: transformFileSize(fileSize),
+                }));
+            }
+            else {
+                message.warning(i18next.t('文件超出 {{MAXSIZESTR}}！当前文件大小：{{fileSizeStr}}', {
+                    MAXSIZESTR: MAXSIZESTR,
+                    fileSizeStr: transformFileSize(fileSize),
+                }));
+            }
             return AntUpload.LIST_IGNORE;
         }
         if (MINSIZE && fileSize < MINSIZE) {
-            message.warning(i18next.t('文件小于 {{MINSIZSTR}}！', { MINSIZSTR: MINSIZSTR }));
+            if (isCrop) {
+                message.warning(i18next.t('裁剪后的图片大小：{{fileSizeStr}}，低于最小值{{MINSIZSTR}}！', {
+                    MINSIZSTR: MINSIZSTR,
+                    fileSizeStr: transformFileSize(fileSize),
+                }));
+            }
+            else {
+                message.warning(i18next.t('文件小于 {{MINSIZSTR}}！当前文件大小：{{fileSizeStr}}', {
+                    MINSIZSTR: MINSIZSTR,
+                    fileSizeStr: transformFileSize(fileSize),
+                }));
+            }
             return AntUpload.LIST_IGNORE;
         }
         // 如果是图片，获取文件分辨率
@@ -351,10 +391,6 @@ var Upload = function (props) {
     var onFileChange = function (info) {
         var file = info.file, fileList = info.fileList;
         setFileList(fileList);
-        var originalFile = file.originFileObj;
-        if (originalFile && listType === 'picture-card') {
-            fileResolution(originalFile, false);
-        }
         callback &&
             callback(fileList, {
                 currentResolution: currentResolutionRef.current,
@@ -532,24 +568,21 @@ var Upload = function (props) {
             }))) : maxCount && fileList.length >= maxCount && !isDirect ? null : (React.createElement("div", null,
         React.createElement(UploadOutlined, { style: { fontSize: 18 } }),
         React.createElement("div", { style: { marginTop: 8 } }, fileBtnText || i18next.t('添加图片'))))));
-    var beforeCropUpload = function (file, fileList) {
-        var result = beforeFileUpload(file, fileList);
-        if (typeof result === 'string') {
-            return result;
+    /**裁剪模式下，选择图片时只校验文件类型，裁剪完成后再校验大小和分辨率 */
+    var beforeCropUpload = function (file, _fileList) {
+        var fileName = file.name, fileSize = file.size;
+        var fileNameSuffix = getFileSuffix(fileName);
+        if (!ACCEPT.includes(fileNameSuffix)) {
+            message.warning(i18next.t('不支持 {{fileNameSuffix}} 文件格式！', {
+                fileNameSuffix: fileNameSuffix,
+            }));
+            return AntUpload.LIST_IGNORE;
         }
-        return result
-            .then(function (res) {
-            console.log(res);
-            if (typeof res === 'string') {
-                return res;
-            }
-            else {
-                return true;
-            }
-        })
-            .catch(function () {
-            return true;
-        });
+        if (fileSize === 0) {
+            message.warning(i18next.t('不能上传空文件！', {}));
+            return AntUpload.LIST_IGNORE;
+        }
+        return true;
     };
     return (React.createElement(React.Fragment, null,
         showAllDeleteloadBtnInner && !showUploadBtn && (React.createElement(Button, { type: "primary", style: { marginRight: '10px' }, onClick: onAllDeleteHandle }, i18next.t('批量删除'))),

package/dist/locales/en-US.json

@@ -429,6 +429,10 @@
     "不支持 {{fileNameSuffix}} 文件格式！": "{{fileName Suffix}} file format is not supported!",
     "不能上传空文件！": "Cannot upload an empty file!",
     "文件超出 {{MAXSIZESTR}}！": "File exceeds {{MAX SIZESTR}}!",
+    "文件超出 {{MAXSIZESTR}}！当前文件大小：{{fileSizeStr}}": "File exceeds {{MAX SIZESTR}}! Current file size: {{fileSizeStr}}",
+    "裁剪后的图片大小：{{fileSizeStr}}，超出最大值{{MAXSIZESTR}}！": "Cropped image size: {{fileSizeStr}} exceeds the maximum value {{MAXSIZESTR}}!",
+    "文件小于 {{MINSIZSTR}}！当前文件大小：{{fileSizeStr}}": "File is {{MINSIZSTR}}! Current file size: {{fileSizeStr}}",
+    "裁剪后的图片大小：{{fileSizeStr}}，低于最小值{{MINSIZSTR}}！": "Cropped image size: {{fileSizeStr}} is below the minimum value {{MINSIZSTR}}!",
     "请选择需要删除得附件!": "Please select the attachment to be deleted!",
     "批量下载": "Batch download",
     "批量删除": "Mass delete",
@@ -816,5 +820,9 @@
     "反选": "Invert selection",
     "请至少保留一个展示项!": "Please keep at least one display item!",
     "图片分辨率低于最小值宽*高 {{minResolution}}！": "Image resolution is below the minimum value width*height {{minResolution}}!",
-    "图片分辨率超出最大值宽*高 {{maxResolution}}！": "Image resolution is above the maximum value width*height {{maxResolution}}!"
+    "图片分辨率超出最大值宽*高 {{maxResolution}}！": "Image resolution is above the maximum value width*height {{maxResolution}}!",
+    "图片分辨率超出最大值宽*高 {{maxResolution}}！当前图片分辨率：{{currentResolution}}": "Image resolution is above the maximum value width*height {{maxResolution}}! Current image resolution: {{currentResolution}}",
+    "图片分辨率低于最小值宽*高 {{minResolution}}！当前图片分辨率：{{currentResolution}}": "Image resolution is below the minimum value width*height {{minResolution}}! Current image resolution: {{currentResolution}}",
+    "裁剪后的图片分辨率宽*高：{{currentResolution}}，超出最大值{{maxResolution}}！": "Cropped image resolution: {{currentResolution}} exceeds the maximum value {{maxResolution}}!",
+    "裁剪后的图片分辨率宽*高：{{currentResolution}}，低于最小值{{minResolution}}！": "Cropped image resolution: {{currentResolution}} is below the minimum value {{minResolution}}!"
 }

package/dist/locales/zh-CN.json

@@ -429,6 +429,10 @@
     "不支持 {{fileNameSuffix}} 文件格式！": "不支持 {{fileNameSuffix}} 文件格式！",
     "不能上传空文件！": "不能上传空文件！",
     "文件超出 {{MAXSIZESTR}}！": "文件超出 {{MAXSIZESTR}}！",
+    "文件超出 {{MAXSIZESTR}}！当前文件大小：{{fileSizeStr}}": "文件超出 {{MAXSIZESTR}}！当前文件大小：{{fileSizeStr}}",
+    "裁剪后的图片大小：{{fileSizeStr}}，超出最大值{{MAXSIZESTR}}！": "裁剪后的图片大小：{{fileSizeStr}}，超出最大值{{MAXSIZESTR}}！",
+    "文件小于 {{MINSIZSTR}}！当前文件大小：{{fileSizeStr}}": "文件小于 {{MINSIZSTR}}！当前文件大小：{{fileSizeStr}}",
+    "裁剪后的图片大小：{{fileSizeStr}}，低于最小值{{MINSIZSTR}}！": "裁剪后的图片大小：{{fileSizeStr}}，低于最小值{{MINSIZSTR}}！",
     "请选择需要删除得附件!": "请选择需要删除得附件!",
     "批量下载": "批量下载",
     "批量删除": "批量删除",
@@ -816,5 +820,9 @@
     "反选": "反选",
     "请至少保留一个展示项!": "请至少保留一个展示项!",
     "图片分辨率低于最小值宽*高 {{minResolution}}！": "图片分辨率低于最小值宽*高 {{minResolution}}！",
-    "图片分辨率超出最大值宽*高 {{maxResolution}}！": "图片分辨率超出最大值宽*高 {{maxResolution}}！"
+    "图片分辨率超出最大值宽*高 {{maxResolution}}！": "图片分辨率超出最大值宽*高 {{maxResolution}}！",
+    "图片分辨率超出最大值宽*高 {{maxResolution}}！当前图片分辨率：{{currentResolution}}": "图片分辨率超出最大值宽*高 {{maxResolution}}！当前图片分辨率：{{currentResolution}}",
+    "图片分辨率低于最小值宽*高 {{minResolution}}！当前图片分辨率：{{currentResolution}}": "图片分辨率低于最小值宽*高 {{minResolution}}！当前图片分辨率：{{currentResolution}}",
+    "裁剪后的图片分辨率宽*高：{{currentResolution}}，超出最大值{{maxResolution}}！": "裁剪后的图片分辨率宽*高：{{currentResolution}}，超出最大值{{maxResolution}}！",
+    "裁剪后的图片分辨率宽*高：{{currentResolution}}，低于最小值{{minResolution}}！": "裁剪后的图片分辨率宽*高：{{currentResolution}}，低于最小值{{minResolution}}！"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkui",
-  "version": "4.2.18-98",
+  "version": "4.2.18-99",
   "private": false,
   "description": "React components library",
   "author": "zt-front-end",