@das-fed/ui 6.4.0-dev.68 → 6.4.0-dev.69

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@das-fed/ui",
-  "version": "6.4.0-dev.68",
+  "version": "6.4.0-dev.69",
   "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": "6.4.0-dev.68",
+    "@das-fed/cli": "6.4.0-dev.69",
     "@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": "6.4.0-dev.68",
-    "@das-fed/utils": "6.4.0-dev.68",
-    "@das-fed/web": "6.4.0-dev.68",
+    "@das-fed/ui": "6.4.0-dev.69",
+    "@das-fed/utils": "6.4.0-dev.69",
+    "@das-fed/web": "6.4.0-dev.69",
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "^5.1.12",
     "@wangeditor/plugin-upload-attachment": "^1.1.0",

package/packages/business-components/export-button/hooks/useExport.d.ts

@@ -1,9 +1,8 @@
-import { Ref } from 'vue';
 export declare const useExport: (props: any, emits: any) => {
-    showProgressDialog: Ref<boolean, boolean>;
-    progressTitle: Ref<string, string>;
-    percent: Ref<number, number>;
-    progressStatus: Ref<string, string>;
-    progressLoading: Ref<boolean, boolean>;
+    showProgressDialog: import("vue").Ref<boolean, boolean>;
+    progressTitle: import("vue").Ref<string, string>;
+    percent: import("vue").Ref<number, number>;
+    progressStatus: import("vue").Ref<string, string>;
+    progressLoading: import("vue").Ref<boolean, boolean>;
     exportList: (params: any, bodyParams: any) => void;
 };

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

@@ -1,15 +1,15 @@
 import '@das-fed/ui/packages/business-components/export-button/style.css';
 import { withInstall as X } from "@das-fed/utils/with-install/index";
-import { ref as p, defineComponent as G, computed as J, watch as I, openBlock as K, createElementBlock as Q, createVNode as T, unref as h, withCtx as B, renderSlot as W, createTextVNode as Z, toDisplayString as ee, createCommentVNode as te, isRef as S } from "vue";
-import { t as g, i18n as $, setI18nRule as se } from "@das-fed/web/packages/i18n/index";
-import { DasDialog as ae } from "@das-fed/ui/packages/components/dialog/index";
-import { DasProgress as oe } from "@das-fed/ui/packages/components/progress/index";
-import { DasButton as re } from "@das-fed/ui/packages/components/button/index";
-import { iotProgress as le } from "@das-fed/utils/api-services/modules/iot";
-import z from "dayjs";
+import { ref as p, defineComponent as G, computed as J, watch as S, openBlock as K, createElementBlock as Q, createVNode as z, unref as k, withCtx as B, renderSlot as W, createTextVNode as Z, toDisplayString as ee, createCommentVNode as te, isRef as L } from "vue";
+import { t as g, currentLang as se, i18n as $, setI18nRule as ae } from "@das-fed/web/packages/i18n/index";
+import { DasDialog as oe } from "@das-fed/ui/packages/components/dialog/index";
+import { DasProgress as re } from "@das-fed/ui/packages/components/progress/index";
+import { DasButton as le } from "@das-fed/ui/packages/components/button/index";
+import { iotProgress as ne } from "@das-fed/utils/api-services/modules/iot";
+import D from "dayjs";
 import { DasMessage as P } from "@das-fed/ui/packages/components/message/index";
-import { getConfig as L } from "@das-fed/utils/config";
-let H = (a = 21) => {
+import { getConfig as M } from "@das-fed/utils/config";
+let Y = (a = 21) => {
   let l = "", e = crypto.getRandomValues(new Uint8Array(a));
   for (; a--; ) {
     let s = e[a] & 63;
@@ -17,34 +17,34 @@ let H = (a = 21) => {
   }
   return l;
 };
-const ne = le.get("progress"), ue = (a) => {
-  let l = p(!1), e = p(!1), s = p(""), i = p(0), o = p("normal"), m = p(!1), c, x = p(""), n = p(""), d = p(""), f = p(""), v = p(!1), k = p(""), w;
-  const Y = () => {
-    n.value = "", d.value = "", f.value = "", v.value = !1, k.value = "";
-  }, O = async (t, u = "", y = "") => {
-    o.value = "normal", i.value = 0, s.value = y || g("导出进度"), e.value = !0;
+const ue = ne.get("progress"), ie = (a) => {
+  let l = p(!1), e = p(!1), s = p(""), i = p(0), o = p("normal"), m = p(!1), c, x = p(""), n = p(""), d = p(""), f = p(""), v = p(!1), w = p(""), y;
+  const _ = () => {
+    n.value = "", d.value = "", f.value = "", v.value = !1, w.value = "";
+  }, F = async (t, u = "", h = "") => {
+    o.value = "normal", i.value = 0, s.value = h || g("导出进度"), e.value = !0;
     const b = await (t == null ? void 0 : t());
     if (!b.status) {
       e.value = !1, o.value = "error";
       return;
     }
-    _(b.taskId, "action", "");
-  }, F = async (t, u = "", y = "") => {
+    T(b.taskId, "action", "");
+  }, O = async (t, u = "", h = "") => {
     o.value = "normal", i.value = 0, s.value = g("导出进度"), e.value = !0;
     const b = await (t == null ? void 0 : t());
     if (!b.status) {
       e.value = !1, o.value = "error";
       return;
     }
-    z().format("YYYYMMDDHHmmss") + "", _(b.taskId, "export", u || "", y);
-  }, _ = async (t, u, y, b = "") => {
-    m.value = !0, V(t, u, y, b), c = setTimeout(() => {
+    D().format("YYYYMMDDHHmmss") + "", T(b.taskId, "export", u || "", h);
+  }, T = async (t, u, h, b = "") => {
+    m.value = !0, V(t, u, h, b), c = setTimeout(() => {
     }, 50);
-  }, D = () => {
+  }, N = () => {
     clearTimeout(c), c = null, e.value = !1;
-  }, V = async (t, u = "export", y, b = "") => {
-    var R, U, E;
-    const [j, r] = await ne("", {
+  }, V = async (t, u = "export", h, b = "") => {
+    var R, U, I;
+    const [j, r] = await ue("", {
       url: `progress/${t}`
     }).run();
     if (j) {
@@ -54,8 +54,8 @@ const ne = le.get("progress"), ue = (a) => {
     i.value = r.percentage;
     const C = u == "export" ? g("导出") : g("导入");
     if (i.value == 100)
-      if (x.value = r, m.value = !1, D(), u == "export")
-        r.status == 1 ? (o.value = "success", M(`${L().baseURL}/oss${r.filePath}`, y, b), m.value = !1, a("success")) : r.status == 2 && (f.value = r.message || `${C}${g("失败")}`, P.error({
+      if (x.value = r, m.value = !1, N(), u == "export")
+        r.status == 1 ? (o.value = "success", H(`${M().baseURL}/oss${r.filePath}`, h, b), m.value = !1, a("success")) : r.status == 2 && (f.value = r.message || `${C}${g("失败")}`, P.error({
           message: r.message || `${C}${g("失败")}`,
           grouping: !0,
           repeatNum: 1
@@ -63,18 +63,18 @@ const ne = le.get("progress"), ue = (a) => {
       else if (u == "import") {
         if (r.filePath) {
           o.value = "error";
-          const q = (R = w.name) == null ? void 0 : R.substr(w.name.indexOf("."));
-          (U = w.name) == null || U.replace(/(.*\/)*([^.]+).*/gi, "$2"), v.value = !0;
-          const A = (E = r.filePath) == null ? void 0 : E.replace(/(.*\/)*([^.]+).*/gi, "$2");
-          n.value = `${A}${q}`, d.value = w.sizeText, f.value = g("部分数据校验不通过，请下载附件并修改，重新导入！"), k.value = `${L().baseURL}/oss${r.filePath}`;
+          const q = (R = y.name) == null ? void 0 : R.substr(y.name.indexOf("."));
+          (U = y.name) == null || U.replace(/(.*\/)*([^.]+).*/gi, "$2"), v.value = !0;
+          const A = (I = r.filePath) == null ? void 0 : I.replace(/(.*\/)*([^.]+).*/gi, "$2");
+          n.value = `${A}${q}`, d.value = y.sizeText, f.value = g("部分数据校验不通过，请下载附件并修改，重新导入！"), w.value = `${M().baseURL}/oss${r.filePath}`;
         }
-        N(r.status, C), r.status == 1 && (l.value = !1), a("success");
+        E(r.status, C), r.status == 1 && (l.value = !1), a("success");
       } else u == "action" && (o.value = "success");
     else
       c && r.status != 2 ? c = setTimeout(() => {
-        V(t, u, y, b);
-      }, 50) : (x.value = r, m.value = !1, N(r.status, C), D(), v.value = !0, f.value = (r == null ? void 0 : r.message) || "");
-  }, N = (t, u) => {
+        V(t, u, h, b);
+      }, 50) : (x.value = r, m.value = !1, E(r.status, C), N(), v.value = !0, f.value = (r == null ? void 0 : r.message) || "");
+  }, E = (t, u) => {
     t == 1 ? (o.value = "success", P.success({
       message: g("business-components_export-success-tip", u),
       grouping: !0,
@@ -101,18 +101,18 @@ const ne = le.get("progress"), ue = (a) => {
     errorFileSize: d,
     errorMessage: f,
     errorImport: v,
-    errorFilePath: k,
-    fileExport: F,
-    fileAction: O,
+    errorFilePath: w,
+    fileExport: O,
+    fileAction: F,
     generateUniqueName: (t) => {
       const u = t == null ? void 0 : t.substr(t.indexOf("."));
-      return `${t == null ? void 0 : t.replace(/(.*\/)*([^.]+).*/gi, "$2")}${H()}${u}`;
+      return `${t == null ? void 0 : t.replace(/(.*\/)*([^.]+).*/gi, "$2")}${Y()}${u}`;
     },
-    downloadFile: M,
-    resetStataus: Y,
-    checkProgress: _
+    downloadFile: H,
+    resetStataus: _,
+    checkProgress: T
   };
-}, M = (a, l, e = "xlsx") => {
+}, H = (a, l, e = "xlsx") => {
   const s = new XMLHttpRequest();
   s.open("get", a), s.setRequestHeader("Content-Type", "application/json; charset=UTF-8"), s.responseType = "blob", s.onload = function(i) {
     const o = new Blob([this.response], {
@@ -125,20 +125,22 @@ const ne = le.get("progress"), ue = (a) => {
       c.href = m, c.download = l, c.click(), window.URL.revokeObjectURL(m);
     }
   }, s.send();
-}, ie = (a, l) => {
-  const { showProgressDialog: e, progressTitle: s, percent: i, progressStatus: o, progressLoading: m, fileExport: c } = ue(l), x = p({}), n = p({}), d = (v, k) => {
+}, pe = (a, l) => {
+  const { showProgressDialog: e, progressTitle: s, percent: i, progressStatus: o, progressLoading: m, fileExport: c } = ie(l), x = p({}), n = p({}), d = (v, w) => {
     x.value = {
       ...v
     }, n.value = {
-      ...k
+      ...w
     };
-    const w = `${a.exportFileName}${z().format("YYYYMMDD")}-${z().format("HHmmss")}.${a.fileType}`;
-    c(f, w, a.fileType);
+    let y = `${D().format("YYYYMMDD")}-${D().format("HHmmss")}.${a.fileType}`;
+    se.value === "en" && !/s$/.test(a.exportFileName) && (y = " " + y);
+    const _ = `${a.exportFileName}${y}`;
+    c(f, _, a.fileType);
   }, f = async () => {
-    let v = H();
+    let v = Y();
     a.taskIdPosition === "params" && (x.value.taskId = v), a.taskIdPosition === "body" && (n.value.taskId = v);
-    const [k, w] = await a.exportFun(n.value, { params: x.value }).run();
-    return k ? { status: !1 } : { status: !0, taskId: v };
+    const [w, y] = await a.exportFun(n.value, { params: x.value }).run();
+    return w ? { status: !1 } : { status: !0, taskId: v };
   };
   return {
     showProgressDialog: e,
@@ -148,7 +150,7 @@ const ne = le.get("progress"), ue = (a) => {
     progressLoading: m,
     exportList: d
   };
-}, pe = { class: "das-export-button" }, me = /* @__PURE__ */ G({
+}, me = { class: "das-export-button" }, ce = /* @__PURE__ */ G({
   __name: "App",
   props: {
     modelValue: {},
@@ -165,25 +167,25 @@ const ne = le.get("progress"), ue = (a) => {
   emits: ["update:modelValue", "update:bodyParams", "success"],
   setup(a, { emit: l }) {
     const e = a, s = l;
-    J(() => e.exportFileName || g("导出表")), I(e.modelValue, (n) => {
+    J(() => e.exportFileName || g("导出表")), S(e.modelValue, (n) => {
       s("update:modelValue", n);
-    }), I(e.bodyParams, (n) => {
+    }), S(e.bodyParams, (n) => {
       s("update:bodyParams", n);
     });
-    const { showProgressDialog: i, percent: o, progressStatus: m, exportList: c } = ie(e, s), x = [$("正在导出中...").value, $("导出失败").value, $("导出成功").value];
-    return (n, d) => (K(), Q("div", pe, [
-      T(h(re), {
+    const { showProgressDialog: i, percent: o, progressStatus: m, exportList: c } = pe(e, s), x = [$("正在导出中...").value, $("导出失败").value, $("导出成功").value];
+    return (n, d) => (K(), Q("div", me, [
+      z(k(le), {
         block: n.block,
         size: "middle",
         disabled: n.disabled,
         "btn-type": e.btnType,
         ghost: n.ghost,
-        onClick: d[0] || (d[0] = (f) => h(c)(e.modelValue, e.bodyParams))
+        onClick: d[0] || (d[0] = (f) => k(c)(e.modelValue, e.bodyParams))
       }, {
         default: B(() => [
           W(n.$slots, "default", {}, () => [
             Z(
-              ee(h($)("导出").value),
+              ee(k($)("导出").value),
               1
               /* TEXT */
             )
@@ -193,22 +195,22 @@ const ne = le.get("progress"), ue = (a) => {
         /* FORWARDED */
       }, 8, ["block", "disabled", "btn-type", "ghost"]),
       te(" 进度弹窗 "),
-      T(h(ae), {
+      z(k(oe), {
         size: "mini",
-        title: h($)("导出进度").value,
+        title: k($)("导出进度").value,
         "is-feedback-img": !1,
-        modelValue: h(i),
-        "onUpdate:modelValue": d[2] || (d[2] = (f) => S(i) ? i.value = f : null),
+        modelValue: k(i),
+        "onUpdate:modelValue": d[2] || (d[2] = (f) => L(i) ? i.value = f : null),
         "append-to-body": !0,
         type: "feedback"
       }, {
         default: B(() => [
-          T(h(oe), {
-            modelValue: h(o),
-            "onUpdate:modelValue": d[1] || (d[1] = (f) => S(o) ? o.value = f : null),
+          z(k(re), {
+            modelValue: k(o),
+            "onUpdate:modelValue": d[1] || (d[1] = (f) => L(o) ? o.value = f : null),
             style: { "margin-top": "35px" },
             type: "circle",
-            status: h(m),
+            status: k(m),
             textMap: x
           }, null, 8, ["modelValue", "status"])
         ]),
@@ -217,12 +219,12 @@ const ne = le.get("progress"), ue = (a) => {
       }, 8, ["title", "modelValue"])
     ]));
   }
-}), ce = (a, l) => {
+}), de = (a, l) => {
   const e = a.__vccOpts || a;
   for (const [s, i] of l)
     e[s] = i;
   return e;
-}, de = /* @__PURE__ */ ce(me, [["__scopeId", "data-v-49f0bb05"]]), fe = {
+}, fe = /* @__PURE__ */ de(ce, [["__scopeId", "data-v-49f0bb05"]]), ge = {
   导出表: { "zh-CN": "导出表", en: "Export Table", _appCode: "framework" },
   导出失败: { "zh-CN": "导出失败", en: "Export Failed", _appCode: "framework" },
   导出成功: { "zh-CN": "导出成功", en: "Export Successful", _appCode: "framework" },
@@ -243,9 +245,9 @@ const ne = le.get("progress"), ue = (a) => {
     _appCode: "framework"
   }
 };
-se(fe);
-const _e = X(de);
+ae(ge);
+const Te = X(fe);
 export {
-  _e as DasExportButton,
-  _e as default
+  Te as DasExportButton,
+  Te as default
 };