@das-fed/ui 7.0.7-hot.6 → 7.0.7-hot.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@das-fed/ui",
-  "version": "7.0.7-hot.6",
+  "version": "7.0.7-hot.7",
   "description": "",
   "type": "module",
   "main": "./index.js",
@@ -26,7 +26,7 @@
     "@antv/x6-plugin-snapline": "^2.1.7",
     "@antv/x6-plugin-transform": "^2.1.8",
     "@antv/x6-vue-shape": "^2.1.2",
-    "@das-fed/cli": "7.0.7-hot.6",
+    "@das-fed/cli": "7.0.7-hot.7",
     "@element-plus/icons-vue": "^2.3.1",
     "@types/lodash": "^4.14.194",
     "@types/lodash-es": "^4.17.9",
@@ -56,9 +56,9 @@
     "vue-tsc": "^2.0.29"
   },
   "dependencies": {
-    "@das-fed/ui": "7.0.7-hot.6",
-    "@das-fed/utils": "7.0.7-hot.6",
-    "@das-fed/web": "7.0.7-hot.6",
+    "@das-fed/ui": "7.0.7-hot.7",
+    "@das-fed/utils": "7.0.7-hot.7",
+    "@das-fed/web": "7.0.7-hot.7",
     "@types/markdown-it": "^14.1.2",
     "@wangeditor-next/editor": "5.6.31",
     "@wangeditor-next/editor-for-vue": "5.1.14",

package/packages/business-components/import-button/index.js

@@ -11,7 +11,7 @@ import { DasMessage as U } from "@das-fed/ui/packages/components/message/index";
 import ze from "dayjs";
 import { getConfig as ne } from "@das-fed/utils/config";
 import { extractFilename as Te } from "@das-fed/utils/common-tools";
-import { getUserInfo as _e } from "@das-fed/utils/common-info/index";
+import { getUserInfo as Fe } from "@das-fed/utils/common-info/index";
 import { pureImageSrc as ie } from "@das-fed/utils/pure-image-src";
 let te = (e = 21) => {
   let m = "", p = crypto.getRandomValues(new Uint8Array(e));
@@ -21,14 +21,14 @@ let te = (e = 21) => {
   }
   return m;
 };
-const Fe = ae.get("token"), Ie = ae.post("put-object", (e) => (e.headers || (e.headers = {}), e.headers["Content-Type"] = "multipart/form-data", e.responseType = "blob", e)), $e = ae.post("upload-objects", (e) => (e.headers || (e.headers = {}), e.headers["Content-Type"] = "multipart/form-data", e.responseType = "blob", e)), Se = be.get("progress"), Pe = (e) => {
-  let m = k(!1), p = k(!1), l = k(""), w = k(0), n = k("normal"), v = k(!1), y, b = k(""), I = k(""), $ = k(""), z = k(""), S = k(!1), M = k(""), _ = "", F = k(""), P;
+const _e = ae.get("token"), Ie = ae.post("put-object", (e) => (e.headers || (e.headers = {}), e.headers["Content-Type"] = "multipart/form-data", e.responseType = "blob", e)), Se = ae.post("upload-objects", (e) => (e.headers || (e.headers = {}), e.headers["Content-Type"] = "multipart/form-data", e.responseType = "blob", e)), $e = be.get("progress"), Pe = (e) => {
+  let m = k(!1), p = k(!1), l = k(""), w = k(0), n = k("normal"), v = k(!1), y, b = k(""), I = k(""), S = k(""), z = k(""), $ = k(!1), M = k(""), F = "", _ = k(""), P;
   const E = () => {
-    I.value = "", $.value = "", z.value = "", S.value = !1, M.value = "";
+    I.value = "", S.value = "", z.value = "", $.value = !1, M.value = "";
   }, N = async () => {
-    const [r, s] = await Fe().run();
+    const [r, s] = await _e().run();
     return r ? { stauts: !1 } : { status: !0, data: s };
-  }, B = (r) => new Promise((s, d) => {
+  }, B = (r) => new Promise((s, f) => {
     const i = [];
     let t = 0;
     for (; t < r.size; ) {
@@ -37,12 +37,12 @@ const Fe = ae.get("token"), Ie = ae.post("put-object", (e) => (e.headers || (e.h
     }
     const c = new Blob(i, { type: r.type });
     s(c);
-  }), A = async (r, s, d, a = !1, i = !0, t = "") => {
-    _ = t, F.value = "import", i && (n.value = "normal", w.value = 0, l.value = u("导入进度"), p.value = !0, b.value = ""), P = s;
+  }), A = async (r, s, f, a = !1, i = !0, t = "") => {
+    F = t, _.value = "import", i && (n.value = "normal", w.value = 0, l.value = u("导入进度"), p.value = !0, b.value = ""), P = s;
     const c = await N();
     if (!c.status) return;
-    let C = c.data, x = null, { autoContentType: K, bucketName: V, importFileName: J } = d;
-    const ue = a ? $e : Ie;
+    let C = c.data, x = null, { autoContentType: K, bucketName: V, importFileName: J } = f;
+    const ue = a ? Se : Ie;
     if (a) {
       let X = [];
       await s.forEach(async (G) => {
@@ -82,30 +82,30 @@ const Fe = ae.get("token"), Ie = ae.post("put-object", (e) => (e.headers || (e.h
         repeatNum: 1
       });
     }
-  }, R = async (r, s = "", d = "") => {
-    n.value = "normal", w.value = 0, l.value = d || u("导出进度"), p.value = !0;
+  }, R = async (r, s = "", f = "") => {
+    n.value = "normal", w.value = 0, l.value = f || u("导出进度"), p.value = !0;
     const a = await (r == null ? void 0 : r());
     if (!a.status) {
       p.value = !1, n.value = "error";
       return;
     }
     T(a.taskId, "action", "");
-  }, O = async (r, s = "", d = "xlsx") => {
-    F.value = "export", n.value = "normal", w.value = 0, l.value = u("导出进度"), p.value = !0;
+  }, O = async (r, s = "", f = "xlsx") => {
+    _.value = "export", n.value = "normal", w.value = 0, l.value = u("导出进度"), p.value = !0;
     const a = await (r == null ? void 0 : r());
     if (!a.status) {
       p.value = !1, n.value = "error";
       return;
     }
-    ze().format("YYYYMMDDHHmmss") + "", T(a.taskId, "export", s || "", d);
-  }, T = async (r, s, d, a = "") => {
-    v.value = !0, g(r, s, d, a), y = setTimeout(() => {
+    ze().format("YYYYMMDDHHmmss") + "", T(a.taskId, "export", s || "", f);
+  }, T = async (r, s, f, a = "") => {
+    v.value = !0, g(r, s, f, a), y = setTimeout(() => {
     }, 50);
-  }, f = () => {
+  }, d = () => {
     clearTimeout(y), y = null, p.value = !1;
-  }, g = async (r, s = "export", d, a = "") => {
+  }, g = async (r, s = "export", f, a = "") => {
     var C, x;
-    const [i, t] = await Se("", {
+    const [i, t] = await $e("", {
       url: `progress/${r}`
     }).run();
     if (i) {
@@ -115,8 +115,8 @@ const Fe = ae.get("token"), Ie = ae.post("put-object", (e) => (e.headers || (e.h
     w.value = t.percentage;
     const c = s == "export" ? u("导出") : u("导入");
     if (w.value == 100)
-      if (b.value = t, v.value = !1, f(), s == "export")
-        t.status == 1 ? (n.value = "success", pe(`${ne().baseURL}/oss${t.filePath}`, d, a), v.value = !1) : t.status == 2 && (z.value = t.message || `${c}${u("失败")}`, U.error({
+      if (b.value = t, v.value = !1, d(), s == "export")
+        t.status == 1 ? (n.value = "success", pe(`${ne().baseURL}/oss${t.filePath}`, f, a), v.value = !1) : t.status == 2 && (z.value = t.message || `${c}${u("失败")}`, U.error({
           message: t.message || `${c}${u("失败")}`,
           grouping: !0,
           repeatNum: 1
@@ -125,24 +125,24 @@ const Fe = ae.get("token"), Ie = ae.post("put-object", (e) => (e.headers || (e.h
         if (t.filePath) {
           n.value = "error";
           const K = (C = P.name) == null ? void 0 : C.match(/(.*?)(\.[^.]*$|$)/);
-          K.length && K[2], S.value = !0;
+          K.length && K[2], $.value = !0;
           let V = await Te(`/oss/${t == null ? void 0 : t.filePath}`);
           const J = ((x = V == null ? void 0 : V.split("/")) == null ? void 0 : x.pop()) || "";
-          I.value = _ || J, $.value = P.sizeText, z.value = u("部分数据校验不通过，请下载附件并修改，重新导入！"), M.value = `${ne().baseURL}/oss/${t == null ? void 0 : t.filePath}`;
+          I.value = F || J, S.value = P.sizeText, z.value = u("部分数据校验不通过，请下载附件并修改，重新导入！"), M.value = `${ne().baseURL}/oss/${t == null ? void 0 : t.filePath}`;
         }
         h(t.status, c, t.message), t.status == 1 && (m.value = !1), e("success");
       } else s == "action" && (n.value = "success");
     else
       y && t.status != 2 ? y = setTimeout(() => {
-        g(r, s, d, a);
-      }, 50) : (b.value = t, v.value = !1, h(t.status, c, t.message), f(), S.value = !0, z.value = (t == null ? void 0 : t.message) || "", e("error", t));
-  }, h = (r, s, d) => {
+        g(r, s, f, a);
+      }, 50) : (b.value = t, v.value = !1, h(t.status, c, t.message), d(), $.value = !0, z.value = (t == null ? void 0 : t.message) || "", e("error", t));
+  }, h = (r, s, f) => {
     r == 1 ? (n.value = "success", U.success({
       message: u("business-components_export-success-tip", s),
       grouping: !0,
       repeatNum: 1
-    }), I.value = "", $.value = "", z.value = "") : r == 2 ? (n.value = "error", U.error({
-      message: d || u("business-components_export-failure-tip", s),
+    }), I.value = "", S.value = "", z.value = "") : r == 2 ? (n.value = "error", U.error({
+      message: f || u("business-components_export-failure-tip", s),
       grouping: !0,
       repeatNum: 1
     })) : r == 3 && (n.value = "error", U.error({
@@ -160,22 +160,22 @@ const Fe = ae.get("token"), Ie = ae.post("put-object", (e) => (e.headers || (e.h
     progressLoading: v,
     progressResult: b,
     errorFileName: I,
-    errorFileSize: $,
+    errorFileSize: S,
     errorMessage: z,
-    errorImport: S,
+    errorImport: $,
     errorFilePath: M,
-    fileHandleType: F,
+    fileHandleType: _,
     fileImport: A,
     fileExport: O,
     fileAction: R,
     generateUniqueName: (r) => {
-      const s = r == null ? void 0 : r.match(/(.*?)(\.[^.]*$|$)/), d = s.length ? s[2] : "";
-      return `${s.length ? s[1] : r}${te()}${d}`;
+      const s = r == null ? void 0 : r.match(/(.*?)(\.[^.]*$|$)/), f = s.length ? s[2] : "";
+      return `${s.length ? s[1] : r}${te()}${f}`;
     },
     downloadFile: pe,
     resetStataus: E,
     checkProgress: T,
-    clearTimer: f
+    clearTimer: d
   };
 }, De = (e) => {
   let m = e == null ? void 0 : e.toLocaleLowerCase();
@@ -226,7 +226,7 @@ const Fe = ae.get("token"), Ie = ae.post("put-object", (e) => (e.headers || (e.h
     typeof l.result == "string" && (n = JSON.parse(l.result)), m(n);
   }, l.readAsText(e);
 }), Me = (e, m) => {
-  var d;
+  var f;
   const {
     importDialog: p,
     showProgressDialog: l,
@@ -236,18 +236,18 @@ const Fe = ae.get("token"), Ie = ae.post("put-object", (e) => (e.headers || (e.h
     progressLoading: y,
     errorFileName: b,
     errorFileSize: I,
-    errorMessage: $,
+    errorMessage: S,
     errorImport: z,
-    errorFilePath: S,
+    errorFilePath: $,
     fileHandleType: M,
-    fileImport: _,
-    fileExport: F,
+    fileImport: F,
+    fileExport: _,
     downloadFile: P,
     clearTimer: E
   } = Pe(m);
-  let N = k([]), B = (d = _e()) == null ? void 0 : d.tenantId;
+  let N = k([]), B = (f = Fe()) == null ? void 0 : f.tenantId;
   const A = () => {
-    N.value = [], z.value = !1, b.value = "", I.value = "", $.value = "", p.value = !0, S.value = "", m("open");
+    N.value = [], z.value = !1, b.value = "", I.value = "", S.value = "", p.value = !0, $.value = "", m("open");
   };
   let R;
   const O = (a) => {
@@ -270,7 +270,7 @@ const Fe = ae.get("token"), Ie = ae.post("put-object", (e) => (e.headers || (e.h
   }, T = (a) => {
     let i = a.match(/\d+(\.\d+)?/)[0], t = a.match(/[a-zA-z]+/gi)[0], c = 0;
     return i = parseFloat(i), t = t.toLowerCase(), t === "gb" || t === "g" ? c = (i * 1024 * 1024 * 1024).toFixed(2) : t === "mb" || t === "m" ? c = (i * 1024 * 1024).toFixed(2) : t === "kb" || t === "k" ? c = (i * 1024).toFixed(2) : t === "b" && (c = i), parseFloat(c);
-  }, f = async (a) => {
+  }, d = async (a) => {
     const i = a.value.split("/");
     let t = te();
     const c = {
@@ -288,11 +288,11 @@ const Fe = ae.get("token"), Ie = ae.post("put-object", (e) => (e.headers || (e.h
     };
     e.maxCount > 1 && (a.importFileName = N.value.map((c) => c.name));
     const i = e.maxCount > 1, t = e.maxCount > 1 ? N.value : N.value[0];
-    await _(f, t, a, i);
+    await F(d, t, a, i);
   }, h = () => {
-    P(S.value, b.value);
+    P($.value, b.value);
   }, oe = () => {
-    F(r, e.templateName);
+    _(r, e.templateName);
   }, r = async () => {
     let a = te();
     const [i, t] = await e.templateFun({ taskId: a }).run();
@@ -306,7 +306,7 @@ const Fe = ae.get("token"), Ie = ae.post("put-object", (e) => (e.headers || (e.h
     progressLoading: y,
     errorFileName: b,
     errorFileSize: I,
-    errorMessage: $,
+    errorMessage: S,
     errorImport: z,
     importDialog: p,
     fileList: N,
@@ -353,7 +353,9 @@ const Fe = ae.get("token"), Ie = ae.post("put-object", (e) => (e.headers || (e.h
     openDisabled: { type: Boolean, default: !0 },
     bucketName: { default: "temp" },
     maxCount: { default: 1 },
-    multiple: { type: Boolean, default: !1 }
+    multiple: { type: Boolean, default: !1 },
+    dialogFistTip: {},
+    dialogSecondTip: {}
   },
   emits: ["open", "success", "error"],
   setup(e, { expose: m, emit: p }) {
@@ -362,12 +364,12 @@ const Fe = ae.get("token"), Ie = ae.post("put-object", (e) => (e.headers || (e.h
       progressTitle: y,
       percent: b,
       progressStatus: I,
-      errorFileName: $,
+      errorFileName: S,
       errorFileSize: z,
-      errorMessage: S,
+      errorMessage: $,
       errorImport: M,
-      importDialog: _,
-      fileList: F,
+      importDialog: F,
+      fileList: _,
       fileHandleType: P,
       showImportHandle: E,
       confirmImport: N,
@@ -377,17 +379,17 @@ const Fe = ae.get("token"), Ie = ae.post("put-object", (e) => (e.headers || (e.h
       clearTimer: O
     } = Me(l, w);
     let T;
-    return he(P, (f) => {
-      f.includes("import") ? T = [u("正在导入中..."), u("导入失败"), u("导入成功")] : T = [u("正在导出中..."), u("导出失败"), u("导出成功")];
+    return he(P, (d) => {
+      d.includes("import") ? T = [u("正在导入中..."), u("导入失败"), u("导入成功")] : T = [u("正在导出中..."), u("导出失败"), u("导出成功")];
     }), m({
       confirmImport: N,
       showImportHandle: E
-    }), (f, g) => (we(), Ce("div", Ee, [
+    }), (d, g) => (we(), Ce("div", Ee, [
       q("div", {
         onClick: g[0] || (g[0] = //@ts-ignore
         (...h) => o(E) && o(E)(...h))
       }, [
-        le(f.$slots, "default", {}, () => [
+        le(d.$slots, "default", {}, () => [
           D(o(W), {
             size: "middle",
             "btn-type": "primary"
@@ -406,9 +408,9 @@ const Fe = ae.get("token"), Ie = ae.post("put-object", (e) => (e.headers || (e.h
       ]),
       re(" 导入弹窗 "),
       D(o(se), {
-        title: o(j)(f.importDialogName).value,
-        modelValue: o(_),
-        "onUpdate:modelValue": g[3] || (g[3] = (h) => Q(_) ? _.value = h : null),
+        title: o(j)(d.importDialogName).value,
+        modelValue: o(F),
+        "onUpdate:modelValue": g[3] || (g[3] = (h) => Q(F) ? F.value = h : null),
         customClass: "upload-dialog",
         width: "610px",
         height: "500px"
@@ -417,7 +419,7 @@ const Fe = ae.get("token"), Ie = ae.post("put-object", (e) => (e.headers || (e.h
           q("div", null, [
             D(o(W), {
               size: "middle",
-              onClick: g[2] || (g[2] = (h) => _.value = !1)
+              onClick: g[2] || (g[2] = (h) => F.value = !1)
             }, {
               default: L(() => [
                 Y(
@@ -432,13 +434,13 @@ const Fe = ae.get("token"), Ie = ae.post("put-object", (e) => (e.headers || (e.h
             D(o(W), {
               size: "middle",
               "btn-type": "primary",
-              disabled: f.openDisabled && o(F).length === 0,
+              disabled: d.openDisabled && o(_).length === 0,
               style: { "margin-left": "12px", width: "100%" },
               onClick: o(N)
             }, {
               default: L(() => [
                 Y(
-                  H(o(j)(`${f.confirmButtonName}`).value),
+                  H(o(j)(`${d.confirmButtonName}`).value),
                   1
                   /* TEXT */
                 )
@@ -449,11 +451,11 @@ const Fe = ae.get("token"), Ie = ae.post("put-object", (e) => (e.headers || (e.h
           ])
         ]),
         default: L(() => [
-          le(f.$slots, "tip", {}, () => [
+          le(d.$slots, "tip", {}, () => [
             q("div", Le, [
               q("div", je, [
                 Y(
-                  H(o(j)("1、点击下载  ").value),
+                  H(d.dialogFistTip || o(j)("1、点击下载  ").value) + " ",
                   1
                   /* TEXT */
                 ),
@@ -465,7 +467,7 @@ const Fe = ae.get("token"), Ie = ae.post("put-object", (e) => (e.headers || (e.h
                 }, {
                   default: L(() => [
                     Y(
-                      H(o(j)(`${f.templateName}`).value),
+                      H(o(j)(`${d.templateName}`).value),
                       1
                       /* TEXT */
                     )
@@ -477,22 +479,22 @@ const Fe = ae.get("token"), Ie = ae.post("put-object", (e) => (e.headers || (e.h
               q(
                 "div",
                 Be,
-                H(o(j)("2、仅支持上传Excel文件，重复数据以最后一条为准").value),
+                H(d.dialogSecondTip || o(j)("2、仅支持上传Excel文件，重复数据以最后一条为准").value),
                 1
                 /* TEXT */
               )
             ])
           ], !0),
           D(o(ye), {
-            modelValue: o(F),
-            "onUpdate:modelValue": g[1] || (g[1] = (h) => Q(F) ? F.value = h : null),
+            modelValue: o(_),
+            "onUpdate:modelValue": g[1] || (g[1] = (h) => Q(_) ? _.value = h : null),
             error: o(M),
-            "error-file-name": o($),
+            "error-file-name": o(S),
             "error-file-size": o(z),
-            "error-message": o(S),
-            accept: f.fileType,
-            maxCount: f.maxCount,
-            multiple: f.multiple,
+            "error-message": o($),
+            accept: d.fileType,
+            maxCount: d.maxCount,
+            multiple: d.multiple,
             onErrorFileDownload: o(A),
             onFileUpload: o(B)
           }, null, 8, ["modelValue", "error", "error-file-name", "error-file-size", "error-message", "accept", "maxCount", "multiple", "onErrorFileDownload", "onFileUpload"])
@@ -530,7 +532,7 @@ const Fe = ae.get("token"), Ie = ae.post("put-object", (e) => (e.headers || (e.h
   for (const [l, w] of m)
     p[l] = w;
   return p;
-}, He = /* @__PURE__ */ Ve(Re, [["__scopeId", "data-v-658f8c34"]]), Ae = {
+}, He = /* @__PURE__ */ Ve(Re, [["__scopeId", "data-v-49caa32f"]]), Ae = {
   "1、点击下载  ": { "zh-CN": "1、点击下载  ", en: "1.Click to Download ", _appCode: "framework" },
   "2、仅支持上传Excel文件，重复数据以最后一条为准": {
     "zh-CN": "2、仅支持上传Excel文件，重复数据以最后一条为准",

package/packages/business-components/import-button/src/type.d.ts

@@ -33,6 +33,10 @@ export type Props = {
   maxCount?: number
   
   multiple?: boolean
+  
+  dialogFistTip?: string
+  
+  dialogSecondTip?: string
 }
 
 export type Emits = {

package/packages/business-components/import-button/style.css

@@ -1 +1 @@
-.das-import-button[data-v-658f8c34]{display:inline-block}.das-import-button .upload-dialog .second-line[data-v-658f8c34]{margin-bottom:20px}.das-import-button .upload-dialog .tips[data-v-658f8c34]{font-size:16px}
+.das-import-button[data-v-49caa32f]{display:inline-block}.das-import-button .upload-dialog .second-line[data-v-49caa32f]{margin-bottom:20px}.das-import-button .upload-dialog .tips[data-v-49caa32f]{font-size:16px}