@ecoding/components.antd 0.5.10 → 0.5.11

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/package.json

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