@das-fed/ui 6.4.0-dev.21 → 6.4.0-dev.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@das-fed/ui",
-  "version": "6.4.0-dev.21",
+  "version": "6.4.0-dev.23",
   "description": "",
   "type": "module",
   "main": "./index.js",
@@ -25,7 +25,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.21",
+    "@das-fed/cli": "6.4.0-dev.23",
     "@element-plus/icons-vue": "^2.3.1",
     "@types/lodash": "^4.14.194",
     "@types/lodash-es": "^4.17.9",
@@ -55,9 +55,9 @@
     "vue-tsc": "^2.0.29"
   },
   "dependencies": {
-    "@das-fed/ui": "6.4.0-dev.21",
-    "@das-fed/utils": "6.4.0-dev.21",
-    "@das-fed/web": "6.4.0-dev.21",
+    "@das-fed/ui": "6.4.0-dev.23",
+    "@das-fed/utils": "6.4.0-dev.23",
+    "@das-fed/web": "6.4.0-dev.23",
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "^5.1.12",
     "@wangeditor/plugin-upload-attachment": "^1.1.0",

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

@@ -1,17 +1,17 @@
 import '@das-fed/ui/packages/business-components/import-button/style.css';
-import { withInstall as pe } from "@das-fed/utils/with-install/index";
-import { ref as h, defineComponent as ce, watch as de, openBlock as fe, createElementBlock as ge, createElementVNode as A, unref as s, renderSlot as ae, createVNode as P, withCtx as j, createTextVNode as H, toDisplayString as R, createCommentVNode as se, isRef as X } from "vue";
+import { withInstall as ce } from "@das-fed/utils/with-install/index";
+import { ref as h, defineComponent as de, watch as fe, openBlock as ge, createElementBlock as ve, createElementVNode as A, unref as s, renderSlot as ae, createVNode as P, withCtx as j, createTextVNode as H, toDisplayString as R, createCommentVNode as se, isRef as X } from "vue";
 import { i18n as V } from "@das-fed/web/packages/i18n/index";
 import { DasDialog as le } from "@das-fed/ui/packages/components/dialog/index";
-import { DasUpload as ve } from "@das-fed/ui/packages/components/upload/index";
-import { DasProgress as xe } from "@das-fed/ui/packages/components/progress/index";
+import { DasUpload as xe } from "@das-fed/ui/packages/components/upload/index";
+import { DasProgress as be } from "@das-fed/ui/packages/components/progress/index";
 import { DasButton as G } from "@das-fed/ui/packages/components/button/index";
-import { iotMinio as ee, iotProgress as be } from "@das-fed/utils/api-services/modules/iot";
+import { iotMinio as ee, iotProgress as he } from "@das-fed/utils/api-services/modules/iot";
 import { DasMessage as S } from "@das-fed/ui/packages/components/message/index";
-import he from "dayjs";
+import we from "dayjs";
 import { getConfig as oe } from "@das-fed/utils/config";
-import { getUserInfo as we } from "@das-fed/utils/common-info/index";
-import { pureImageSrc as ye } from "@das-fed/utils/pure-image-src";
+import { getUserInfo as ye } from "@das-fed/utils/common-info/index";
+import { pureImageSrc as re } from "@das-fed/utils/pure-image-src";
 let Z = (e = 21) => {
   let p = "", m = crypto.getRandomValues(new Uint8Array(e));
   for (; e--; ) {
@@ -20,10 +20,10 @@ let Z = (e = 21) => {
   }
   return p;
 };
-const Te = ee.get("token"), ke = ee.post("put-object", (e) => (e.headers || (e.headers = {}), e.headers["Content-Type"] = "multipart/form-data", e.responseType = "blob", e)), Ne = ee.post("upload-objects", (e) => (e.headers || (e.headers = {}), e.headers["Content-Type"] = "multipart/form-data", e.responseType = "blob", e)), $e = be.get("progress"), Fe = (e) => {
-  let p = h(!1), m = h(!1), i = h(""), v = h(0), n = h("normal"), x = h(!1), f, $ = h(""), C = h(""), I = h(""), T = h(""), U = h(!1), M = h(""), F = "", k;
+const Te = ee.get("token"), ke = ee.post("put-object", (e) => (e.headers || (e.headers = {}), e.headers["Content-Type"] = "multipart/form-data", e.responseType = "blob", e)), Ne = ee.post("upload-objects", (e) => (e.headers || (e.headers = {}), e.headers["Content-Type"] = "multipart/form-data", e.responseType = "blob", e)), $e = he.get("progress"), Fe = (e) => {
+  let p = h(!1), m = h(!1), i = h(""), v = h(0), n = h("normal"), x = h(!1), f, $ = h(""), C = h(""), I = h(""), k = h(""), U = h(!1), M = h(""), F = "", w;
   const b = () => {
-    C.value = "", I.value = "", T.value = "", U.value = !1, M.value = "";
+    C.value = "", I.value = "", k.value = "", U.value = !1, M.value = "";
   }, L = async () => {
     const [l, o] = await Te().run();
     return l ? { stauts: !1 } : { status: !0, data: o };
@@ -34,27 +34,27 @@ const Te = ee.get("token"), ke = ee.post("put-object", (e) => (e.headers || (e.h
       const N = l.slice(t, t + 1048576);
       u.push(N), t += 1048576;
     }
-    const w = new Blob(u, { type: l.type });
-    o(w);
+    const y = new Blob(u, { type: l.type });
+    o(y);
   }), D = async (l, o, a, r = !1, u = !0, t = "") => {
-    F = t, u && (n.value = "normal", v.value = 0, i.value = "导入进度", m.value = !0, $.value = ""), k = o;
-    const w = await L();
-    if (!w.status) return;
-    let N = w.data, y = null, { autoContentType: K, bucketName: _, importFileName: q } = a;
-    const ie = r ? Ne : ke;
+    F = t, u && (n.value = "normal", v.value = 0, i.value = "导入进度", m.value = !0, $.value = ""), w = o;
+    const y = await L();
+    if (!y.status) return;
+    let N = y.data, T = null, { autoContentType: K, bucketName: _, importFileName: q } = a;
+    const ne = r ? Ne : ke;
     if (r) {
       let Y = [];
       await o.forEach(async (J) => {
         let W = await B(J);
         Y.push(W);
-      }), y = new FormData(), y.append("accessKeyId", N.accessKeyId), y.append("secretAccessKey", N.secretAccessKey), y.append("sessionToken", N.sessionToken), y.append("bucketName", _), o.forEach((J, W) => {
-        y.append("file", Y[W]);
+      }), T = new FormData(), T.append("accessKeyId", N.accessKeyId), T.append("secretAccessKey", N.secretAccessKey), T.append("sessionToken", N.sessionToken), T.append("bucketName", _), o.forEach((J, W) => {
+        T.append("file", Y[W]);
       }), q.forEach((J) => {
-        y.append("filePaths", J);
+        T.append("filePaths", J);
       });
     } else {
       const Y = await B(o);
-      y = {
+      T = {
         accessKeyId: N.accessKeyId,
         secretAccessKey: N.secretAccessKey,
         sessionToken: N.sessionToken,
@@ -64,9 +64,9 @@ const Te = ee.get("token"), ke = ee.post("put-object", (e) => (e.headers || (e.h
         autoContentType: K
       };
     }
-    const [ne, ue] = await ie(y).run();
-    if (ne) return;
-    const me = await Ue(ue.data), Q = await (l == null ? void 0 : l(me));
+    const [ue, me] = await ne(T).run();
+    if (ue) return;
+    const pe = await Ue(me.data), Q = await (l == null ? void 0 : l(pe));
     if (u) {
       if (!Q.status) {
         m.value = !1, n.value = "error";
@@ -96,14 +96,14 @@ const Te = ee.get("token"), ke = ee.post("put-object", (e) => (e.headers || (e.h
       m.value = !1, n.value = "error";
       return;
     }
-    he().format("YYYYMMDDHHmmss") + "", c(r.taskId, "export", o || "", a);
+    we().format("YYYYMMDDHHmmss") + "", c(r.taskId, "export", o || "", a);
   }, c = async (l, o, a, r = "") => {
     x.value = !0, g(l, o, a, r), f = setTimeout(() => {
     }, 50);
   }, d = () => {
     clearTimeout(f), f = null, m.value = !1;
   }, g = async (l, o = "export", a, r = "") => {
-    var N, y;
+    var N, T;
     const [u, t] = await $e("", {
       url: `progress/${l}`
     }).run();
@@ -112,34 +112,34 @@ const Te = ee.get("token"), ke = ee.post("put-object", (e) => (e.headers || (e.h
       return;
     }
     v.value = t.percentage;
-    const w = o == "export" ? "导出" : "导入";
+    const y = o == "export" ? "导出" : "导入";
     if (v.value == 100)
       if ($.value = t, x.value = !1, d(), o == "export")
-        t.status == 1 ? (n.value = "success", re(`${oe().baseURL}/oss${t.filePath}`, a, r), x.value = !1) : t.status == 2 && (T.value = t.message || `${w}失败`, S.error({
-          message: t.message || `${w}失败`,
+        t.status == 1 ? (n.value = "success", ie(`${oe().baseURL}/oss${t.filePath}`, a, r), x.value = !1) : t.status == 2 && (k.value = t.message || `${y}失败`, S.error({
+          message: t.message || `${y}失败`,
           grouping: !0,
           repeatNum: 1
         }));
       else if (o == "import") {
         if (t.filePath) {
           n.value = "error";
-          const K = (N = k.name) == null ? void 0 : N.match(/(.*?)(\.[^.]*$|$)/), _ = K.length ? K[2] : "";
+          const K = (N = w.name) == null ? void 0 : N.match(/(.*?)(\.[^.]*$|$)/), _ = K.length ? K[2] : "";
           U.value = !0;
-          const q = (y = t.filePath) == null ? void 0 : y.replace(/(.*\/)*([^.]+).*/gi, "$2");
-          C.value = F || `${q}${_}`, I.value = k.sizeText, T.value = "部分数据校验不通过，请下载附件并修改，重新导入！", M.value = `${oe().baseURL}/oss${t.filePath}`;
+          const q = (T = t.filePath) == null ? void 0 : T.replace(/(.*\/)*([^.]+).*/gi, "$2");
+          C.value = F || `${q}${_}`, I.value = w.sizeText, k.value = "部分数据校验不通过，请下载附件并修改，重新导入！", M.value = `${oe().baseURL}/oss${t.filePath}`;
         }
-        O(t.status, w, t.message), t.status == 1 && (p.value = !1), e("success");
+        O(t.status, y, t.message), t.status == 1 && (p.value = !1), e("success");
       } else o == "action" && (n.value = "success");
     else
       f && t.status != 2 ? f = setTimeout(() => {
         g(l, o, a, r);
-      }, 50) : ($.value = t, x.value = !1, O(t.status, w, t.message), d(), U.value = !0, T.value = (t == null ? void 0 : t.message) || "", e("error", t));
+      }, 50) : ($.value = t, x.value = !1, O(t.status, y, t.message), d(), U.value = !0, k.value = (t == null ? void 0 : t.message) || "", e("error", t));
   }, O = (l, o, a) => {
     l == 1 ? (n.value = "success", S.success({
       message: `${o}成功`,
       grouping: !0,
       repeatNum: 1
-    }), C.value = "", I.value = "", T.value = "") : l == 2 ? (n.value = "error", S.error({
+    }), C.value = "", I.value = "", k.value = "") : l == 2 ? (n.value = "error", S.error({
       message: a || `${o}失败`,
       grouping: !0,
       repeatNum: 1
@@ -159,7 +159,7 @@ const Te = ee.get("token"), ke = ee.post("put-object", (e) => (e.headers || (e.h
     progressResult: $,
     errorFileName: C,
     errorFileSize: I,
-    errorMessage: T,
+    errorMessage: k,
     errorImport: U,
     errorFilePath: M,
     fileImport: D,
@@ -169,7 +169,7 @@ const Te = ee.get("token"), ke = ee.post("put-object", (e) => (e.headers || (e.h
       const o = l == null ? void 0 : l.match(/(.*?)(\.[^.]*$|$)/), a = o.length ? o[2] : "";
       return `${o.length ? o[1] : l}${Z()}${a}`;
     },
-    downloadFile: re,
+    downloadFile: ie,
     resetStataus: b,
     checkProgress: c
   };
@@ -202,7 +202,7 @@ const Te = ee.get("token"), ke = ee.post("put-object", (e) => (e.headers || (e.h
     der: "application/x-x509-ca-cert",
     cer: "application/pkix-cert"
   }[p];
-}, re = (e, p, m = "excel") => {
+}, ie = (e, p, m = "excel") => {
   const i = new XMLHttpRequest();
   i.open("get", e), i.setRequestHeader("Content-Type", "application/json; charset=UTF-8"), i.responseType = "blob", i.onload = function(v) {
     const n = new Blob([this.response], {
@@ -233,26 +233,26 @@ const Te = ee.get("token"), ke = ee.post("put-object", (e) => (e.headers || (e.h
     errorFileName: $,
     errorFileSize: C,
     errorMessage: I,
-    errorImport: T,
+    errorImport: k,
     errorFilePath: U,
     fileImport: M,
     fileExport: F,
-    downloadFile: k
+    downloadFile: w
   } = Fe(p);
-  let b = h([]), L = (o = we()) == null ? void 0 : o.tenantId;
+  let b = h([]), L = (o = ye()) == null ? void 0 : o.tenantId;
   const B = () => {
-    b.value = [], T.value = !1, $.value = "", C.value = "", I.value = "", m.value = !0, U.value = "", p("open");
+    b.value = [], k.value = !1, $.value = "", C.value = "", I.value = "", m.value = !0, U.value = "", p("open");
   };
   let D;
   const E = (a) => {
-    const r = e.fileType.split(","), u = a.name.substring(a.name.lastIndexOf(".")), t = z(a.sizeText), w = z(e.fileMaxSize);
+    const r = e.fileType.split(","), u = a.name.substring(a.name.lastIndexOf(".")), t = z(a.sizeText), y = z(e.fileMaxSize);
     if (!r.includes(u)) {
       S.warning("文件格式错误，请重新上传！"), setTimeout(() => {
         b.value = [];
       });
       return;
     }
-    if (t > w) {
+    if (t > y) {
       S.warning(`文件大小不超过${e.fileMaxSize}`), setTimeout(() => {
         b.value = [];
       });
@@ -269,7 +269,7 @@ const Te = ee.get("token"), ke = ee.post("put-object", (e) => (e.headers || (e.h
       filePath: `${e.bucketName}/${L}/${e.ossName}/${D}`,
       taskId: a,
       ...e.importParams
-    }, u = e.importParamsPosition === "params" ? e.importFun("", { params: r }) : e.importFun(r), [t, w] = await u.run();
+    }, u = e.importParamsPosition === "params" ? e.importFun("", { params: r }) : e.importFun(r), [t, y] = await u.run();
     return t ? { status: !1 } : { status: !0, taskId: a };
   }, d = async () => {
     if (!b.value.length) return S.warning("请上传文件");
@@ -279,7 +279,7 @@ const Te = ee.get("token"), ke = ee.post("put-object", (e) => (e.headers || (e.h
     }, r = e.maxCount > 1, u = e.maxCount > 1 ? b.value : b.value[0];
     await M(c, u, a, r);
   }, g = () => {
-    k(U.value, $.value);
+    w(U.value, $.value);
   }, O = () => {
     F(te, e.templateName);
   }, te = async () => {
@@ -296,7 +296,7 @@ const Te = ee.get("token"), ke = ee.post("put-object", (e) => (e.headers || (e.h
     errorFileName: $,
     errorFileSize: C,
     errorMessage: I,
-    errorImport: T,
+    errorImport: k,
     importDialog: m,
     fileList: b,
     showImportHandle: B,
@@ -306,7 +306,7 @@ const Te = ee.get("token"), ke = ee.post("put-object", (e) => (e.headers || (e.h
     downTemplate: async () => {
       let a = "";
       if (e.templateUrl)
-        a = e.templateUrl;
+        a = e.templateUrl, w(re(a), e.templateName);
       else if (e.templateFun) {
         if (e.templateType === "static") {
           if (e.templateUrl)
@@ -315,13 +315,13 @@ const Te = ee.get("token"), ke = ee.post("put-object", (e) => (e.headers || (e.h
             const [r, u] = await e.templateFun().run();
             a = u;
           }
-          k(ye(a), e.templateName);
+          w(re(a), e.templateName);
         }
         e.templateType === "dynamic" && e.templateFun && O();
       }
     }
   };
-}, De = { class: "das-import-button" }, ze = { class: "tip-box" }, Pe = { class: "first-line" }, Se = { class: "second-line" }, Me = /* @__PURE__ */ ce({
+}, De = { class: "das-import-button" }, ze = { class: "tip-box" }, Pe = { class: "first-line" }, Se = { class: "second-line" }, Me = /* @__PURE__ */ de({
   __name: "App",
   props: {
     importFun: {},
@@ -350,11 +350,11 @@ const Te = ee.get("token"), ke = ee.post("put-object", (e) => (e.headers || (e.h
       progressStatus: $,
       progressLoading: C,
       errorFileName: I,
-      errorFileSize: T,
+      errorFileSize: k,
       errorMessage: U,
       errorImport: M,
       importDialog: F,
-      fileList: k,
+      fileList: w,
       showImportHandle: b,
       confirmImport: L,
       fileUpload: B,
@@ -362,12 +362,12 @@ const Te = ee.get("token"), ke = ee.post("put-object", (e) => (e.headers || (e.h
       downTemplate: E
     } = Ce(i, v);
     let z;
-    return de(x, (c) => {
+    return fe(x, (c) => {
       c.includes("导入") ? z = ["正在导入中...", "导入失败", "导入成功"] : z = ["正在导出中...", "导出失败", "导出成功"];
     }), p({
       confirmImport: L,
       showImportHandle: b
-    }), (c, d) => (fe(), ge("div", De, [
+    }), (c, d) => (ge(), ve("div", De, [
       A("div", {
         onClick: d[0] || (d[0] = //@ts-ignore
         (...g) => s(b) && s(b)(...g))
@@ -417,7 +417,7 @@ const Te = ee.get("token"), ke = ee.post("put-object", (e) => (e.headers || (e.h
             P(s(G), {
               size: "middle",
               "btn-type": "primary",
-              disabled: c.openDisabled && s(k).length === 0,
+              disabled: c.openDisabled && s(w).length === 0,
               style: { "margin-left": "12px" },
               onClick: s(L)
             }, {
@@ -468,12 +468,12 @@ const Te = ee.get("token"), ke = ee.post("put-object", (e) => (e.headers || (e.h
               )
             ])
           ], !0),
-          P(s(ve), {
-            modelValue: s(k),
-            "onUpdate:modelValue": d[1] || (d[1] = (g) => X(k) ? k.value = g : null),
+          P(s(xe), {
+            modelValue: s(w),
+            "onUpdate:modelValue": d[1] || (d[1] = (g) => X(w) ? w.value = g : null),
             error: s(M),
             "error-file-name": s(I),
-            "error-file-size": s(T),
+            "error-file-size": s(k),
             "error-message": s(U),
             accept: c.fileType,
             maxCount: c.maxCount,
@@ -495,7 +495,7 @@ const Te = ee.get("token"), ke = ee.post("put-object", (e) => (e.headers || (e.h
         type: "feedback"
       }, {
         default: j(() => [
-          P(s(xe), {
+          P(s(be), {
             modelValue: s(f),
             "onUpdate:modelValue": d[4] || (d[4] = (g) => X(f) ? f.value = g : null),
             style: { "margin-top": "35px" },
@@ -514,7 +514,7 @@ const Te = ee.get("token"), ke = ee.post("put-object", (e) => (e.headers || (e.h
   for (const [i, v] of p)
     m[i] = v;
   return m;
-}, je = /* @__PURE__ */ Le(Me, [["__scopeId", "data-v-1194e8dd"]]), Ge = pe(je);
+}, je = /* @__PURE__ */ Le(Me, [["__scopeId", "data-v-1194e8dd"]]), Ge = ce(je);
 export {
   Ge as DasImportButton,
   Ge as default