@ecoding/components.antd 0.5.1 → 0.5.2

package/lib/core/multiple-img-upload/index.d.ts

@@ -1,5 +1,4 @@
 import React from 'react';
-import type { UploadFile } from 'antd';
 interface IOpts {
     size?: number;
     w?: number;
@@ -17,7 +16,7 @@ interface IProps {
     actionParams?: any;
     i18n?: any;
     opts?: IOpts;
-    value?: UploadFile[] | string[];
+    value?: any[];
     headers?: any;
     data?: any;
     gif?: boolean;

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

@@ -93,6 +93,10 @@ const MultipleImgUpload = (props) => {
                     response.successed) {
                     const data = response.data || response.model;
                     file.url = data.url;
+                    delete file.response;
+                    delete file.xhr;
+                    delete file.lastModifiedDate;
+                    delete file.originFileObj;
                 }
             }
             else if (file.status === "error") {
@@ -179,6 +183,8 @@ const MultipleImgUpload = (props) => {
             }
             const base64 = yield getBase64(file);
             const wh = yield getImgwh(base64);
+            file.width = wh.w;
+            file.height = wh.h;
             if (props.opts.w && props.opts.w !== wh.w) {
                 message.error(`${props.i18n ? props.i18n.$t('global.img.width') : '图片宽度不符合'} ${props.opts.w}px`);
                 return Upload.LIST_IGNORE;
@@ -212,7 +218,7 @@ const MultipleImgUpload = (props) => {
                     return Upload.LIST_IGNORE;
                 }
             }
-            resolve();
+            resolve(file);
         }));
     }, []);
     return (React.createElement(React.Fragment, null,

package/lib/core/multiple-single-img-upload/index.d.ts

@@ -26,6 +26,7 @@ interface IProps {
     onChange?: any;
     gif?: boolean;
     disabled?: boolean;
+    objectInValue?: boolean;
     isTip?: boolean;
 }
 declare const MultiPileImgUpload: React.FC<IProps>;

package/lib/core/single-img-upload/index.d.ts

@@ -20,13 +20,14 @@ interface IProps {
     name?: string;
     i18n?: any;
     opts?: IOpts;
-    value?: string;
+    value?: any;
     buttonText?: string;
     headers?: any;
     data?: any;
     onChange?: any;
     gif?: boolean;
     disabled?: boolean;
+    objectInValue?: boolean;
     isTip?: boolean;
     type?: string;
 }

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

@@ -15,7 +15,16 @@ import Toast from "../../core/toast";
 const ImgUpload = (props) => {
     var _a, _b, _c, _d;
     const [loading, setLoading] = useState(false);
-    const [imageUrl, setImageUrl] = useState(props.value || "");
+    const [imageUrl, setImageUrl] = useState(() => {
+        const item = props.value;
+        if (typeof item === "string" && item) {
+            return item;
+        }
+        if (item.url) {
+            return item.url;
+        }
+        return undefined;
+    });
     const action = useMemo(() => {
         if (typeof props.action === "string") {
             return buildURL(props.action, props.actionParams);
@@ -58,8 +67,18 @@ const ImgUpload = (props) => {
                     response.successed) {
                     const url = data && data.url;
                     setImageUrl(url);
-                    // Form.item 值注入关键
-                    props.onChange && props.onChange(url);
+                    if (props.objectInValue) {
+                        info.file.url = url;
+                        delete info.file.response;
+                        delete info.file.xhr;
+                        delete info.file.lastModifiedDate;
+                        delete info.file.originFileObj;
+                        props.onChange && props.onChange(info.file);
+                    }
+                    else {
+                        // Form.item 值注入关键
+                        props.onChange && props.onChange(url);
+                    }
                 }
                 else {
                     Toast.error({
@@ -103,6 +122,8 @@ const ImgUpload = (props) => {
             }
             const base64 = yield getBase64(file);
             const wh = yield getImgwh(base64);
+            file.width = wh.w;
+            file.height = wh.h;
             if (props.opts.w && props.opts.w !== wh.w) {
                 message.error(`${props.i18n ? props.i18n.$t('global.img.width') : '图片宽度不符合'} ${props.opts.w}px`);
                 reject();
@@ -143,15 +164,19 @@ const ImgUpload = (props) => {
                     return;
                 }
             }
-            resolve();
+            resolve(file);
         }));
     }, []);
     const uploadButton = useMemo(() => (React.createElement("div", null,
         loading ? React.createElement(LoadingOutlined, null) : React.createElement(PlusOutlined, null),
         React.createElement("div", { style: { marginTop: 8 } }, props.buttonText))), [loading]);
     useEffect(() => {
-        if (props.value || props.value == "") {
-            setImageUrl(props.value);
+        const item = props.value;
+        if (typeof item === "string" && item) {
+            setImageUrl(item);
+        }
+        if (item.url) {
+            setImageUrl(item.url);
         }
     }, [props.value]);
     return (React.createElement(Flex, { style: { fontSize: 0 } },

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ecoding/components.antd",
-    "version": "0.5.1",
+    "version": "0.5.2",
     "author": "cxc",
     "homepage": "",
     "license": "MIT",
@@ -47,5 +47,5 @@
         "antd": "^6.0.0",
         "axios": "^1.1.2"
     },
-    "gitHead": "84c695854492c49bcdf11c73cb5908a7b87f16b5"
+    "gitHead": "531ea382cedf74735ce957b15e8860533a3af29e"
 }