@ecoding/components.antd 0.5.9 → 0.5.11

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

@@ -8,6 +8,7 @@ interface IFace {
     cache?: boolean;
     method?: string;
     fromKey?: string[] | string;
+    filters?: (res: any) => any;
     format?: {
         [props: string]: any;
     };

package/lib/core/async-select/index.js

@@ -74,7 +74,7 @@ const AsyncSelect = memo((props) => {
                 }
             }
             const res = iface.format2 ? jsonFormatNewKey2(resOrigin, iface.format2) : iface.format ? jsonFormatNewKey(resOrigin, iface.format) : resOrigin;
-            return Promise.resolve(res);
+            return Promise.resolve(iface.filters ? iface.filters(res) : res);
         }
         return Promise.reject("没有iface或data");
     });
@@ -131,7 +131,7 @@ const AsyncSelect = memo((props) => {
                     }
                 }
                 const res = searchIface.format2 ? jsonFormatNewKey2(resOrigin, searchIface.format2) : searchIface.format ? jsonFormatNewKey(resOrigin, searchIface.format) : resOrigin;
-                setOptions(res);
+                setOptions(searchIface.filters ? searchIface.filters(res) : res);
             }
         });
         timeout = setTimeout(innerEx, 300);

package/lib/core/form.label.attachment/index.d.ts

@@ -7,6 +7,7 @@ interface IRes {
 interface IProps {
     value?: IRes | IRes[];
     empty?: React.ReactNode;
+    domain?: string;
     i18n?: any;
     batchDownload?: string | ((infos: any) => void);
     format?: {

package/lib/core/form.label.attachment/index.js

@@ -1,10 +1,19 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 import React, { useState } from 'react';
 import { isSomething } from '@ecoding/helper.is';
 import { LinkOutlined, CloudDownloadOutlined, EyeOutlined } from '@ant-design/icons';
 import { Typography, Popover, Tag, Checkbox, Space } from 'antd';
 import { jsonFormatNewKey2 } from "@ecoding/helper.json";
 import http from "../../helpers/http";
-const InfosRender = ({ infos, i18n, format, batchDownload }) => {
+const InfosRender = ({ infos, i18n, format, batchDownload, domain }) => {
     const [checkedList, setCheckedList] = useState([]);
     const r = http.getRequest();
     const style = {
@@ -48,6 +57,24 @@ const InfosRender = ({ infos, i18n, format, batchDownload }) => {
             window.URL.revokeObjectURL(url);
         });
     };
+    const openUrl = (url, name) => {
+        const aLink = document.createElement('a');
+        aLink.href = url;
+        // 2.直接使用自定义文件名,设置下载文件名称
+        aLink.setAttribute('download', name || "");
+        document.body.appendChild(aLink);
+        // 模拟点击下载
+        aLink.click();
+        // 移除改下载标签
+        document.body.removeChild(aLink);
+    };
+    const waitMS = (ms) => {
+        return new Promise((resolve) => {
+            setTimeout(() => {
+                resolve(true);
+            }, ms);
+        });
+    };
     const checkChange = (keys) => {
         setCheckedList(keys);
     };
@@ -59,23 +86,24 @@ const InfosRender = ({ infos, i18n, format, batchDownload }) => {
             setCheckedList([]);
         }
     };
-    const downLoadAll = () => {
+    const downLoadAll = () => __awaiter(void 0, void 0, void 0, function* () {
         const temp = [];
         checkedList.forEach(key => {
             temp.push(infos.find(info => info.url === key));
         });
         if (typeof batchDownload === "string") {
-            downloadFile(batchDownload);
+            openUrl(batchDownload);
             return;
         }
         if (typeof batchDownload === "function") {
             batchDownload(temp);
             return;
         }
-        temp.forEach(info => {
-            downloadFile(info.url, info.name);
-        });
-    };
+        for (const info of temp) {
+            openUrl(info.url, info.name);
+            yield waitMS(500);
+        }
+    });
     return (React.createElement("ul", { style: { width: 300, overflow: "hidden" } },
         React.createElement(Checkbox.Group, { style: { display: "block" }, onChange: checkChange, value: checkedList }, infos.map((info, i) => {
             info = format ? jsonFormatNewKey2(info, format) : info;
@@ -89,7 +117,7 @@ const InfosRender = ({ infos, i18n, format, batchDownload }) => {
                         React.createElement(LinkOutlined, null),
                         " ",
                         info.name)),
-                    React.createElement(Typography.Link, { download: info.name, title: info.name, onClick: () => downloadFile(info.url, info.name) },
+                    React.createElement(Typography.Link, { download: info.name, title: info.name, href: domain ? `${domain}${info === null || info === void 0 ? void 0 : info.url}` : info === null || info === void 0 ? void 0 : info.url, target: "_blank" },
                         React.createElement(CloudDownloadOutlined, null))),
                 info.time || info.user ? (React.createElement("div", { style: style },
                     React.createElement(Typography.Text, { type: "secondary", style: { fontSize: 12 } }, info.time),
@@ -100,21 +128,21 @@ const InfosRender = ({ infos, i18n, format, batchDownload }) => {
                 React.createElement(Checkbox, { indeterminate: indeterminate, onChange: onCheckAllChange, checked: checkAll }, i18n ? i18n.$t('global.checkbox.all', '全选') : '全选'),
                 React.createElement(Typography.Link, { disabled: checkedList.length === 0, onClick: () => downLoadAll() }, i18n ? i18n.$t('global.batch.download', '批量下载') : '批量下载')))) : null));
 };
-const C = ({ value, empty, render, i18n, batchDownload, format }) => {
+const C = ({ value, empty, render, i18n, batchDownload, domain, format }) => {
     if (!isSomething(value) || (Array.isArray(value) && value.length === 0)) {
         return React.createElement(React.Fragment, null, empty || '-');
     }
     if (Array.isArray(value)) {
-        return (React.createElement(Popover, { destroyOnHidden: true, placement: "right", trigger: "hover", title: "Uploaded", content: render ? render(value) : React.createElement(InfosRender, { batchDownload: batchDownload, format: format, i18n: i18n, infos: value }) },
+        return (React.createElement(Popover, { destroyOnHidden: true, placement: "right", trigger: "hover", title: "Uploaded", content: render ? render(value) : React.createElement(InfosRender, { domain: domain, batchDownload: batchDownload, format: format, i18n: i18n, infos: value }) },
             React.createElement(Tag, { icon: React.createElement(EyeOutlined, null), color: "processing" }, i18n ? i18n.$t('global.attachment', '附件') : '附件')));
     }
     if (typeof value === 'string') {
-        return (React.createElement(Typography.Link, { download: "", title: value, href: value, target: "_blank" },
+        return (React.createElement(Typography.Link, { download: "", title: value, href: domain ? `${domain}${value}` : value, target: "_blank" },
             React.createElement(LinkOutlined, null),
             " ",
             i18n ? i18n.$t('global.attachment', '附件') : '附件'));
     }
-    return (React.createElement(Typography.Link, { download: value === null || value === void 0 ? void 0 : value.name, title: value === null || value === void 0 ? void 0 : value.name, href: value === null || value === void 0 ? void 0 : value.url, target: "_blank" },
+    return (React.createElement(Typography.Link, { download: value === null || value === void 0 ? void 0 : value.name, title: value === null || value === void 0 ? void 0 : value.name, href: domain ? `${domain}${value === null || value === void 0 ? void 0 : value.url}` : value === null || value === void 0 ? void 0 : value.url, target: "_blank" },
         React.createElement(LinkOutlined, null),
         " ",
         i18n ? i18n.$t('global.attachment', '附件') : '附件'));

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

@@ -11,6 +11,7 @@ interface IProps {
     data?: any;
     value?: UploadFile[] | string[];
     valueKey?: string;
+    nameKey?: string;
     headers?: any;
     uploadRef?: any;
     domain?: string;

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

@@ -12,7 +12,7 @@ import { Upload, message, Button, Popover, Typography, Space, Empty } from 'antd
 import { UploadOutlined, LinkOutlined, DeleteOutlined, EllipsisOutlined } from '@ant-design/icons';
 import { buildURL } from '@ecoding/helper.url';
 import Toast from "../../core/toast";
-const InfosRender = ({ infos, updateItems, domain }) => {
+const InfosRender = ({ infos, updateItems, domain, nameKey }) => {
     const remove = (i) => {
         const temp = infos.concat([]);
         temp.splice(i, 1);
@@ -27,7 +27,7 @@ const InfosRender = ({ infos, updateItems, domain }) => {
             }
             else {
                 url = info.url;
-                name = info.name || info.filename || info.file_name || info.fileName || info.original_file_name || info.originalFilename || info.originalFileName;
+                name = info[nameKey || ''] || info.name || info.filename || info.file_name || info.fileName || info.original_file_name || info.originalFilename || info.originalFileName;
             }
             return (React.createElement("li", { key: url, style: {
                     display: "flex",
@@ -45,7 +45,7 @@ const InfosRender = ({ infos, updateItems, domain }) => {
     return React.createElement(Empty, { style: { height: 30 }, image: Empty.PRESENTED_IMAGE_SIMPLE });
 };
 const MultipleUpload = (props) => {
-    const { value, domain, onChange, valueKey, objectInValue } = props;
+    const { value, domain, onChange, valueKey, objectInValue, nameKey } = props;
     const isInnerChange = useRef(false);
     const [infos, setInfos] = useState(() => {
         return [];
@@ -162,6 +162,7 @@ const MultipleUpload = (props) => {
                         // 防止重复拼接domain
                         item.url = domain ? item.url.replace(domain, "") : item.url;
                         item.url = domain ? `${domain}${item.url}` : item.url;
+                        item.name = item[nameKey || ''] || item.name || item.filename || item.file_name || item.fileName || item.original_file_name || item.originalFilename || item.originalFileName;
                         temp.push(item);
                     }
                 }
@@ -170,11 +171,11 @@ const MultipleUpload = (props) => {
         }
     }, [value]);
     return (React.createElement(Space.Compact, { block: true },
-        React.createElement(Upload, { ref: props.uploadRef, withCredentials: true, multiple: true, data: props.data, openFileDialogOnClick: props.openFileDialogOnClick, beforeUpload: beforeUpload, name: props.name, disabled: props.disabled, headers: props.headers, action: action, onChange: handleChange, showUploadList: false, onRemove: (file) => {
+        React.createElement(Upload, { ref: props.uploadRef, withCredentials: true, multiple: true, fileList: infos, data: props.data, openFileDialogOnClick: props.openFileDialogOnClick, beforeUpload: beforeUpload, name: props.name, disabled: props.disabled, headers: props.headers, action: action, onChange: handleChange, showUploadList: false, onRemove: (file) => {
                 props.onRemove && props.onRemove(file);
             }, 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, { infos: infos, updateItems: updateItems, domain: props.domain }) },
+        React.createElement(Popover, { destroyOnHidden: true, open: open, placement: "right", trigger: "hover", title: "Uploaded", content: React.createElement(InfosRender, { infos: infos, nameKey: nameKey || '', updateItems: updateItems, domain: props.domain }) },
             React.createElement(Button, { icon: React.createElement(EllipsisOutlined, null) }))));
 };
 MultipleUpload.defaultProps = {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ecoding/components.antd",
-    "version": "0.5.9",
+    "version": "0.5.11",
     "author": "cxc",
     "homepage": "",
     "license": "MIT",
@@ -47,5 +47,5 @@
         "antd": "^6.0.0",
         "axios": "^1.1.2"
     },
-    "gitHead": "b9691a891b05214151e9ec74cb5a6392c038f3ef"
+    "gitHead": "c5cad337bcd9a52bf1acf009be2792fbb2b57487"
 }