@ecoding/components.antd 0.5.1 → 0.5.5

package/lib/core/async-cascader/index.d.ts

@@ -8,7 +8,7 @@ interface IFace {
     cache?: boolean;
     format?: {
         [props: string]: any;
-        isLeaf: boolean;
+        isLeaf: boolean | ((item: any) => boolean);
     };
     params?: any;
     fromKey?: string[] | string;

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

@@ -18,6 +18,7 @@ interface IProps {
     value?: IRes[];
     headers?: any;
     uploadRef?: any;
+    domain?: string;
     onChange?: (infos: IRes[]) => void;
     onDone?: (file: UploadFile, res: any) => void;
     onRemove?: (file: UploadFile) => void;

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

@@ -13,7 +13,7 @@ import { UploadOutlined, LinkOutlined, DeleteOutlined, EllipsisOutlined } from '
 import { buildURL } from '@ecoding/helper.url';
 import Toast from "../../core/toast";
 import Loading from "../../core/loading";
-const InfosRender = ({ infos, setInfos, onChange }) => {
+const InfosRender = ({ infos, setInfos, onChange, domain }) => {
     const remove = (i) => {
         const temp = infos.concat([]);
         temp.splice(i, 1);
@@ -27,7 +27,7 @@ const InfosRender = ({ infos, setInfos, onChange }) => {
                     justifyContent: "space-between",
                     maxWidth: 250
                 } },
-                React.createElement(Typography.Link, { download: info.name, ellipsis: true, title: info.name, href: info.url, target: "_blank" },
+                React.createElement(Typography.Link, { download: info.name, ellipsis: true, title: info.name, href: domain ? `${domain}${info.url}` : info.url, target: "_blank" },
                     React.createElement(LinkOutlined, null),
                     " ",
                     info.name),
@@ -125,7 +125,7 @@ const MultipleUpload = (props) => {
                 props.onRemove && props.onRemove(e);
             }, maxCount: props.maxCount },
             React.createElement(Button, { disabled: props.disabled, icon: props.icon ? React.createElement(UploadOutlined, null) : null }, props.buttonText)),
-        React.createElement(Popover, { destroyOnHidden: true, open: open, placement: "right", trigger: "hover", title: "Uploaded", content: React.createElement(InfosRender, { onChange: props.onChange, infos: infos, setInfos: setInfos }) },
+        React.createElement(Popover, { destroyOnHidden: true, open: open, placement: "right", trigger: "hover", title: "Uploaded", content: React.createElement(InfosRender, { onChange: props.onChange, infos: infos, setInfos: setInfos, domain: props.domain }) },
             React.createElement(Button, { icon: React.createElement(EllipsisOutlined, null) }))));
 };
 MultipleUpload.defaultProps = {

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,12 +16,13 @@ interface IProps {
     actionParams?: any;
     i18n?: any;
     opts?: IOpts;
-    value?: UploadFile[] | string[];
+    value?: any[];
     headers?: any;
     data?: any;
     gif?: boolean;
     disabled?: boolean;
     objectInValue?: boolean;
+    domain?: string;
     type?: string;
     name?: string;
     action: string | (() => string);

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

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import React, { useState, useCallback, useMemo } from 'react';
+import React, { useState, useCallback, useMemo, useEffect } from 'react';
 import { Upload, Image as Img, Alert, Flex, message, Space } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
 import { buildURL } from "@ecoding/helper.url";
@@ -35,29 +35,10 @@ const DraggableUploadListItem = ({ originNode, file, disabled }) => {
  */
 const MultipleImgUpload = (props) => {
     var _a, _b, _c, _d;
-    const { i18n, name, buttonText, maxCount, disabled, value, onChange, objectInValue } = props;
+    const { i18n, name, buttonText, maxCount, disabled, value, onChange, objectInValue, domain } = props;
     const [previewOpen, setPreviewOpen] = useState(false);
     const [previewImage, setPreviewImage] = useState('');
     const [imgList, setImgList] = useState(() => {
-        if (value && value.length > 0) {
-            const temp = [];
-            value.forEach((item, index) => {
-                if (typeof item === "string" && item) {
-                    temp.push({
-                        uid: String(index),
-                        status: 'done',
-                        url: item,
-                        name: item.substring(item.lastIndexOf('/') + 1, item.lastIndexOf('.'))
-                    });
-                }
-                else {
-                    if (item.url) {
-                        temp.push(item);
-                    }
-                }
-            });
-            return temp;
-        }
         return [];
     });
     const updateItems = (newItems) => {
@@ -76,10 +57,11 @@ const MultipleImgUpload = (props) => {
             }
         });
         if (objectInValue) {
-            onChange && onChange(!isEmpty ? temp : undefined);
+            const temp2 = temp && temp.map((item) => (Object.assign(Object.assign({}, item), { url: domain ? item.url.replace(domain, '') : item.url })));
+            onChange && onChange(!isEmpty ? temp2 : undefined);
         }
         else {
-            const urls = temp.map((item) => item.url);
+            const urls = temp.map((item) => domain ? item.url.replace(domain, '') : item.url);
             onChange && onChange(!isEmpty ? urls : undefined);
         }
     };
@@ -93,6 +75,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 +165,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,9 +200,35 @@ const MultipleImgUpload = (props) => {
                     return Upload.LIST_IGNORE;
                 }
             }
-            resolve();
+            resolve(file);
         }));
     }, []);
+    useEffect(() => {
+        if (value && value.length > 0) {
+            const temp = [];
+            value.forEach((item, index) => {
+                if (typeof item === "string" && item) {
+                    // 防止重复拼接domain
+                    item = domain ? item.replace(domain, "") : item;
+                    temp.push({
+                        uid: String(index),
+                        status: 'done',
+                        url: domain ? `${domain}${item}` : item,
+                        name: item.substring(item.lastIndexOf('/') + 1, item.lastIndexOf('.'))
+                    });
+                }
+                else {
+                    if (item.url) {
+                        // 防止重复拼接domain
+                        item.url = domain ? item.url.replace(domain, "") : item.url;
+                        item.url = domain ? `${domain}${item.url}` : item.url;
+                        temp.push(item);
+                    }
+                }
+            });
+            setImgList(temp);
+        }
+    }, [value]);
     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,
@@ -257,7 +271,7 @@ const MultipleImgUpload = (props) => {
                         visible: previewOpen,
                         onVisibleChange: (visible) => setPreviewOpen(visible),
                         afterOpenChange: (visible) => !visible && setPreviewImage('')
-                    }, src: previewImage }))))));
+                    }, src: domain ? `${domain}${previewImage}` : previewImage }))))));
 };
 MultipleImgUpload.defaultProps = {
     maxCount: 6,

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

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

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

@@ -20,6 +20,7 @@ interface IProps {
     icon?: boolean;
     openFileDialogOnClick?: boolean;
     style?: React.CSSProperties;
+    domain?: string;
 }
 declare const SingleFileUpload: React.FC<IProps>;
 export default SingleFileUpload;

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

@@ -80,11 +80,12 @@ const SingleFileUpload = (props) => {
     }, []);
     useEffect(() => {
         if (typeof props.value === "string") {
-            setFileUrl(props.value);
+            const temp = props.domain ? props.value.replace(props.domain, "") : props.value;
+            setFileUrl(temp);
         }
     }, [props.value]);
     return (React.createElement(Space.Compact, { block: true },
-        React.createElement(Input, { addonBefore: fileUrl ? (React.createElement("a", { style: { color: "#666" }, href: fileUrl, target: "_blank" }, "View")) : null, value: fileUrl, onChange: (e) => {
+        React.createElement(Input, { addonBefore: fileUrl ? (React.createElement("a", { style: { color: "#666" }, href: props.domain ? `${props.domain}${fileUrl}` : fileUrl, target: "_blank" }, "View")) : null, value: fileUrl ? props.domain ? `${props.domain}${fileUrl}` : fileUrl : "", onChange: (e) => {
                 const v = e.target.value.trim();
                 props.onChange && props.onChange(v);
             } }),

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

@@ -20,15 +20,17 @@ 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;
+    domain?: string;
 }
 declare const ImgUpload: React.FC<IProps>;
 export default ImgUpload;

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

@@ -15,7 +15,7 @@ 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(undefined);
     const action = useMemo(() => {
         if (typeof props.action === "string") {
             return buildURL(props.action, props.actionParams);
@@ -56,10 +56,24 @@ const ImgUpload = (props) => {
                     response.code === 0 ||
                     response.success ||
                     response.successed) {
-                    const url = data && data.url;
+                    let url = data && data.url;
+                    if (props.domain) {
+                        console.log(url, props.domain);
+                        url = url.replace(props.domain, "");
+                    }
                     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 +117,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 +159,23 @@ 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);
+        let item = props.value;
+        if (typeof item === "string" && item) {
+            // 防止重复拼接domain
+            item = props.domain ? item.replace(props.domain, "") : item;
+            setImageUrl(item);
+        }
+        if (item.url) {
+            // 防止重复拼接domain
+            item.url = props.domain ? item.url.replace(props.domain, "") : item.url;
+            setImageUrl(item.url);
         }
     }, [props.value]);
     return (React.createElement(Flex, { style: { fontSize: 0 } },
@@ -170,7 +194,7 @@ const ImgUpload = (props) => {
                     clear();
                 } },
                 React.createElement(DeleteOutlined, { style: { fontSize: 14 } }))),
-            React.createElement(Img, { style: { width: "102px", height: "102px", objectFit: "contain", cursor: "pointer" }, src: imageUrl }))) : (React.createElement(Upload, { withCredentials: true, beforeUpload: beforeUpload, name: props.name, data: props.data, headers: props.headers, disabled: props.disabled, listType: "picture-card", showUploadList: false, action: action, onChange: handleChange }, uploadButton)),
+            React.createElement(Img, { style: { width: "102px", height: "102px", objectFit: "contain", cursor: "pointer" }, src: props.domain ? `${props.domain}${imageUrl}` : imageUrl }))) : (React.createElement(Upload, { withCredentials: true, beforeUpload: beforeUpload, name: props.name, data: props.data, headers: props.headers, disabled: props.disabled, listType: "picture-card", showUploadList: false, action: action, onChange: handleChange }, uploadButton)),
         props.isTip ? (React.createElement("div", { style: { fontSize: '13px', marginLeft: '18px', lineHeight: '22px' } },
             React.createElement("p", null,
                 props.i18n ? props.i18n.$t("global.size", "大小") : "大小",

package/package.json

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