@ecoding/components.antd 0.4.8 → 0.4.9

package/lib/core/multiple-img-upload/index.js

@@ -84,12 +84,14 @@ const MultipleImgUpload = (props) => {
         }
         return buildURL(props.action(), props.actionParams);
     }, [props.actionParams, props.action]);
-    const getBase64 = (file) => new Promise((resolve, reject) => {
-        const reader = new FileReader();
-        reader.readAsDataURL(file);
-        reader.onload = () => resolve(reader.result);
-        reader.onerror = (error) => reject(error);
-    });
+    const getBase64 = (file) => {
+        return new Promise((resolve, reject) => {
+            const reader = new FileReader();
+            reader.readAsDataURL(file);
+            reader.onload = () => resolve(reader.result);
+            reader.onerror = (error) => reject(error);
+        });
+    };
     const handlePreview = (file) => __awaiter(void 0, void 0, void 0, function* () {
         if (!file.url && !file.preview) {
             file.preview = yield getBase64(file.originFileObj);
@@ -138,46 +140,38 @@ const MultipleImgUpload = (props) => {
             }
             if (ary.indexOf(file.type.toLowerCase().replace(/image\//g, "")) === -1) {
                 message.error(`支持图片格式为：${ary.join(",")}`);
-                reject();
-                return;
+                return Upload.LIST_IGNORE;
             }
             const isLt2M = file.size / 1024 / 1024 < (props.opts.size || 1);
             if (!isLt2M) {
                 message.error(`图片大小必须小于${props.opts.size} MB`);
-                reject();
-                return;
+                return Upload.LIST_IGNORE;
             }
             const base64 = yield getBase64(file);
             const wh = yield getImgwh(base64);
             if (props.opts.w && props.opts.w !== wh.w) {
                 message.error(`图片宽度不符合 ${props.opts.w}px`);
-                reject();
-                return;
+                return Upload.LIST_IGNORE;
             }
             if (props.opts.h && props.opts.h !== wh.h) {
                 message.error(`图片高度不符合 ${props.opts.h}px`);
-                reject();
-                return;
+                return Upload.LIST_IGNORE;
             }
             if (props.opts.maxH && props.opts.maxH < wh.h) {
                 message.error(`图片高度不能大于 ${props.opts.maxH}px`);
-                reject();
-                return;
+                return Upload.LIST_IGNORE;
             }
             if (props.opts.minH && props.opts.minH > wh.h) {
                 message.error(`图片高度不能小于 ${props.opts.minH}px`);
-                reject();
-                return;
+                return Upload.LIST_IGNORE;
             }
             if (props.opts.maxW && props.opts.maxW < wh.w) {
                 message.error(`图片宽度不能大于 ${props.opts.maxW}px`);
-                reject();
-                return;
+                return Upload.LIST_IGNORE;
             }
             if (props.opts.minW && props.opts.minW > wh.w) {
                 message.error(`图片宽度不能小于 ${props.opts.minW}px`);
-                reject();
-                return;
+                return Upload.LIST_IGNORE;
             }
             if (props.opts.ratioW && props.opts.ratioH) {
                 // 保留2位小数进行比例计算
@@ -185,8 +179,7 @@ const MultipleImgUpload = (props) => {
                 const targetRatio = Number((props.opts.ratioW / props.opts.ratioH).toFixed(2));
                 if (ratio !== targetRatio) {
                     message.error(`图片宽度与高度比例必须是 ${props.opts.ratioW} x ${props.opts.ratioH}`);
-                    reject();
-                    return;
+                    return Upload.LIST_IGNORE;
                 }
             }
             resolve();
@@ -194,9 +187,6 @@ const MultipleImgUpload = (props) => {
     }, []);
     return (React.createElement(React.Fragment, null,
         props.showMessage && (React.createElement(Alert, { className: 'mb20', message: props.message ? props.message : (React.createElement(Flex, { gap: 10, wrap: true },
-                React.createElement("div", null,
-                    i18n ? i18n.$t("global.batch.upload", "批量上传") : "批量上传",
-                    ";"),
                 maxCount ? (React.createElement("div", null,
                     i18n ? i18n.$t("global.max.count", "最多张数") : "最多张数",
                     "\uFF1A",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ecoding/components.antd",
-    "version": "0.4.8",
+    "version": "0.4.9",
     "author": "cxc",
     "homepage": "",
     "license": "MIT",
@@ -47,5 +47,5 @@
         "antd": "5.27.0",
         "axios": "^1.1.2"
     },
-    "gitHead": "471c40c8bcb78fc7d088b1d7005cc6c2961a743f"
+    "gitHead": "835237e04f3c997c585c52bde578d4c2add265ee"
 }