@das-fed/ui 6.4.0-test.3.1 → 6.4.0-test.30

package/packages/components/image-upload/index.js

@@ -1,85 +1,71 @@
 import '@das-fed/ui/packages/components/image-upload/style.css';
-import { withInstall as B } from "@das-fed/utils/with-install/index";
-import { i18n as b, t as N, setI18nRule as U } from "@das-fed/web/packages/i18n/index";
-import { getVar as S, setThemeRule as D } from "@das-fed/web/packages/theme/index";
-import { computed as w, defineComponent as k, openBlock as j, createElementBlock as E, createCommentVNode as $, withDirectives as z, createVNode as v, unref as a, normalizeClass as F, withCtx as y, createElementVNode as h, toDisplayString as T, vShow as V, createTextVNode as G } from "vue";
-import { UploadDragger as P, Upload as R } from "ant-design-vue";
+import { withInstall as R } from "@das-fed/utils/with-install/index";
+import { currentLang as U, i18n as $, t as w, setI18nRule as K } from "@das-fed/web/packages/i18n/index";
+import { getVar as k, setThemeRule as W } from "@das-fed/web/packages/theme/index";
+import { computed as z, defineComponent as P, createElementBlock as H, openBlock as L, createCommentVNode as B, withDirectives as N, createVNode as m, unref as o, normalizeClass as O, withCtx as g, createElementVNode as v, toDisplayString as S, vShow as I, createTextVNode as q } from "vue";
+import { UploadDragger as G, Upload as J } from "ant-design-vue";
 import "ant-design-vue/es/upload/style/css";
-import { DasSpin as J } from "@das-fed/ui/packages/components/spin/index";
-import { DasButton as H } from "@das-fed/ui/packages/components/button/index";
-import { DasIconAddto as K } from "@das-fed/ui/packages/icons/addto/index";
-import { DasIconWarning as O } from "@das-fed/ui/packages/icons/warning/index";
+import { DasSpin as Q } from "@das-fed/ui/packages/components/spin/index";
+import { DasButton as X } from "@das-fed/ui/packages/components/button/index";
+import { DasIconAddto as Y } from "@das-fed/ui/packages/icons/addto/index";
+import { DasIconWarning as Z } from "@das-fed/ui/packages/icons/warning/index";
 import { DasMessage as M } from "@das-fed/ui/packages/components/message/index";
-import { useModelValue as W } from "@das-fed/utils/vue";
+import { getFileExtension as ee } from "@das-fed/utils/common-tools";
+import { useModelValue as ae } from "@das-fed/utils/vue";
 import "@das-fed/ui/packages/global/theme";
-const q = () => ({ size2B: (t) => {
+const oe = () => ({ size2B: (t) => {
   isNaN(Number(t)) ? t = t.toString() : t = t + "M";
-  const o = Number(t.slice(0, -1)), p = t[t.length - 1].toUpperCase(), s = 1024, g = {
+  const i = Number(t.slice(0, -1)), n = t[t.length - 1].toUpperCase(), s = 1024, f = {
     M: s * s,
     K: s,
     B: 1
   };
-  return { finalSize: o * g[p], sizeText: t };
-} }), L = (e, t) => {
-  const o = W(e, "status"), { size2B: p } = q(), s = [".mp4", ".avi", ".mkv", ".mov", ".wmv", ".flv", ".mpeg", ".webm"], g = [".mp3", ".wav", ".aac", ".flac", ".ogg", ".alff", ".wma", ".m4a"], l = w(() => {
-    var r;
-    if (e.acceptVideo || e.acceptAudio) {
-      let n = e.accept ? (r = e.accept) == null ? void 0 : r.split(",") : [];
-      return e.acceptVideo && (n = [...n, ...s]), e.acceptAudio && (n = [...n, ...g]), n.join(",");
-    } else
-      return e.accept;
-  }), A = w(() => o.value === "uploading"), x = w(() => o.value === "error");
-  return { isAccept: l, uploadStatus: o, loading: A, errored: x, beforeupload: (r) => {
-    var _, I;
-    if (e.maxSize) {
-      const { finalSize: i, sizeText: c } = p(e.maxSize);
-      if (r.size > i) {
-        const u = !e.acceptAudio && !e.acceptVideo ? b(`上传的图片大小不能超过${c}的JPG、JPEG、PNG、GIF、SVG文件`).value : b(
-          `上传的图片大小不能超过${c}的${(_ = l.value) == null ? void 0 : _.toUpperCase().replaceAll(".", "").replaceAll(",", "、")}文件`
-        ).value, m = e.errorMessage || u;
-        return M.warning(m), t("update:status", "normal"), o.value = "normal", !1;
+  return { finalSize: i * f[n], sizeText: t };
+} }), te = (a, t) => {
+  const i = ae(a, "status"), { size2B: n } = oe(), s = [".mp4", ".avi", ".mkv", ".mov", ".wmv", ".flv", ".mpeg", ".webm"], f = [".mp3", ".wav", ".aac", ".flac", ".ogg", ".alff", ".wma", ".m4a"], r = z(() => {
+    var d;
+    let e = a.accept ? (d = a.accept) == null ? void 0 : d.split(",") : [];
+    return e.includes("image/jpg") && !e.includes("image/jpeg") && e.push("image/jpeg"), e.includes(".jpg") && !e.includes(".jpeg") && e.push(".jpeg"), a.acceptVideo && (e = [...e, ...s]), a.acceptAudio && (e = [...e, ...f]), e.join(",");
+  }), C = z(() => i.value === "uploading"), y = z(() => i.value === "error");
+  return { isAccept: r, uploadStatus: i, loading: C, errored: y, beforeupload: (e) => {
+    var x, T, V;
+    if (a.maxSize) {
+      const { finalSize: c, sizeText: u } = n(a.maxSize);
+      if (e.size > c) {
+        const h = a.acceptAudio || a.acceptVideo ? "das-ui-import-upload-key4" : "das-ui-import-upload-key3", p = U.value === "zh-CN" ? "、" : ", ", b = $(
+          h,
+          u,
+          ((V = (T = (x = r.value) == null ? void 0 : x.toUpperCase()) == null ? void 0 : T.replaceAll(".", "")) == null ? void 0 : V.replaceAll(",", p)) ?? ""
+        ).value, A = a.errorMessage || b;
+        return M.warning(A), t("update:status", "normal"), i.value = "normal", !1;
       }
     }
-    const n = () => (o.value = "uploading", t("update:status", "uploading"), t("image-upload", r), !1);
-    if (e.customCheck) {
-      const i = e.customCheck(r);
-      if (i instanceof Promise)
-        return new Promise(async (c, u) => {
-          let m;
+    const d = () => (i.value = "uploading", t("update:status", "uploading"), t("image-upload", e), !1);
+    if (a.customCheck) {
+      const c = a.customCheck(e);
+      if (c instanceof Promise)
+        return new Promise(async (u, h) => {
+          let p;
           try {
-            m = await i.then();
+            p = await c.then();
           } catch {
-            m = !1;
+            p = !1;
           }
-          m ? n() : u(!1);
+          p ? d() : h(!1);
         });
-      if (!i)
-        return t("update:status", "normal"), o.value = "normal", !1;
-    } else if (l.value)
-      if (!e.acceptAudio && !e.acceptVideo) {
-        const i = l.value.split(",").map((c) => {
-          let u = c.trim().slice(1);
-          return u === "svg" && (u = "svg+xml"), `image/${u}`;
-        }) ?? [];
-        if (i.includes("image/jpg") && !i.includes("image/jpeg") && i.push("image/jpeg"), !i.includes(r.type)) {
-          const c = e.errorMessage || b(
-            `上传的图片格式只能是${l.value.toUpperCase().replaceAll(".", "").replaceAll(",", "、")}格式`
-          ).value;
-          return M.warning(c), !1;
-        }
-      } else {
-        const i = l.value.split(",").map((d) => {
-          let f = d.trim().slice(1);
-          return f === "svg" && (f = "svg+xml"), `image/${f}`;
-        }) ?? [], c = s.map((d) => `video/${d.split(".")[1]}`) ?? [], u = g.map((d) => `audio/${d.split(".")[1]}`) ?? [], m = s.map((d) => `audio/${d.split(".")[1]}`) ?? [];
-        if (![...i, ...c, ...u, ...m].includes(r.type)) {
-          const d = e.errorMessage || b(`上传的文件格式只能是${(I = l.value) == null ? void 0 : I.toUpperCase()}格式`).value;
-          return M.warning(d), !1;
-        }
+      if (!c)
+        return t("update:status", "normal"), i.value = "normal", !1;
+    } else if (r.value) {
+      const c = r.value.split(",").filter((l) => l.trim().startsWith(".")).map((l) => l.trim()), u = r.value.split(",").filter((l) => !l.trim().startsWith(".")).map((l) => l.trim()), h = ee(e.name), p = c.includes(h);
+      let b = u.includes("image/*") && e.type.split("/")[0].trim() === "image", A = u.includes("video/*") && e.type.split("/")[0].trim() === "video", j = u.includes("audio/*") && e.type.split("/")[0].trim() === "audio", D = u.includes(e.type) || b || A || j;
+      if (!p && !D) {
+        const l = a.acceptAudio || a.acceptVideo ? "das-ui-import-upload-key2" : "das-ui-import-upload-key1", E = U.value === "zh-CN" ? "、" : ", ", F = a.errorMessage || $(l, r.value.toUpperCase().replaceAll(".", "").replaceAll(",", E)).value;
+        return M.warning(F), !1;
       }
-    return n();
+    }
+    return d();
   } };
-}, Q = { class: "das-ui-image-upload" }, X = { class: "das-ui-image-upload-dragger-context" }, Y = { class: "text" }, Z = { class: "das-ui-image-upload-error-container" }, ee = { class: "tips-container" }, ae = { class: "text" }, te = /* @__PURE__ */ k({
+}, ie = { class: "das-ui-image-upload" }, se = { class: "das-ui-image-upload-dragger-context" }, re = { class: "text" }, le = { class: "das-ui-image-upload-error-container" }, ne = { class: "tips-container" }, de = { class: "text" }, ce = /* @__PURE__ */ P({
   __name: "Index",
   props: {
     maxCount: { default: 1 },
@@ -94,35 +80,35 @@ const q = () => ({ size2B: (t) => {
     autoContentType: { type: Boolean }
   },
   emits: ["update:status", "image-upload"],
-  setup(e, { emit: t }) {
-    const o = e, p = t, { isAccept: s, uploadStatus: g, loading: l, errored: A, beforeupload: x } = L(o, p);
-    return (C, r) => (j(), E("div", Q, [
-      $(" 图片上传组件 "),
-      z(v(a(J), {
-        class: F([{ "loading-border": a(l) }]),
+  setup(a, { emit: t }) {
+    const i = a, n = t, { isAccept: s, uploadStatus: f, loading: r, errored: C, beforeupload: y } = te(i, n);
+    return (_, e) => (L(), H("div", ie, [
+      B(" 图片上传组件 "),
+      N(m(o(Q), {
+        class: O([{ "loading-border": o(r) }]),
         type: "component",
-        spinning: a(l)
+        spinning: o(r)
       }, {
-        default: y(() => [
-          v(a(P), {
+        default: g(() => [
+          m(o(G), {
             class: "das-ui-image-upload-dragger",
-            accept: a(s),
-            "max-count": C.maxCount,
-            "before-upload": a(x)
+            accept: o(s),
+            "max-count": _.maxCount,
+            "before-upload": o(y)
           }, {
-            itemRender: y(({ file: n, actions: _ }) => r[0] || (r[0] = [])),
-            default: y(() => [
-              z(h(
+            itemRender: g(({ file: d, actions: x }) => e[0] || (e[0] = [])),
+            default: g(() => [
+              N(v(
                 "div",
-                X,
+                se,
                 [
-                  v(a(K), {
-                    iconColor: a(S)("--das-ui-color-secondary")
+                  m(o(Y), {
+                    iconColor: o(k)("--das-ui-color-secondary")
                   }, null, 8, ["iconColor"]),
-                  h(
+                  v(
                     "div",
-                    Y,
-                    T(C.message || a(N)("das-image-upload-text")),
+                    re,
+                    S(_.message || o(w)("das-image-upload-text")),
                     1
                     /* TEXT */
                   )
@@ -130,7 +116,7 @@ const q = () => ({ size2B: (t) => {
                 512
                 /* NEED_PATCH */
               ), [
-                [V, a(g) === "normal"]
+                [I, o(f) === "normal"]
               ])
             ]),
             _: 1
@@ -140,40 +126,40 @@ const q = () => ({ size2B: (t) => {
         _: 1
         /* STABLE */
       }, 8, ["class", "spinning"]), [
-        [V, !a(A)]
+        [I, !o(C)]
       ]),
-      $(" 错误状态 "),
-      z(h(
+      B(" 错误状态 "),
+      N(v(
         "div",
-        Z,
+        le,
         [
-          h("div", ee, [
-            v(a(O), {
-              iconColor: a(S)("--das-ui-color-danger"),
+          v("div", ne, [
+            m(o(Z), {
+              iconColor: o(k)("--das-ui-color-danger"),
               size: "small"
             }, null, 8, ["iconColor"]),
-            h(
+            v(
               "div",
-              ae,
-              T(a(N)("das-image-upload-fail")),
+              de,
+              S(o(w)("das-image-upload-fail")),
               1
               /* TEXT */
             )
           ]),
-          v(a(R), {
-            accept: a(s),
-            "before-upload": a(x),
-            "max-count": C.maxCount
+          m(o(J), {
+            accept: o(s),
+            "before-upload": o(y),
+            "max-count": _.maxCount
           }, {
-            itemRender: y(({ file: n, actions: _ }) => r[1] || (r[1] = [])),
-            default: y(() => [
-              v(a(H), {
+            itemRender: g(({ file: d, actions: x }) => e[1] || (e[1] = [])),
+            default: g(() => [
+              m(o(X), {
                 "btn-type": "primary-text",
                 block: ""
               }, {
-                default: y(() => [
-                  G(
-                    T(a(N)("das-image-upload-reupload")),
+                default: g(() => [
+                  q(
+                    S(o(w)("das-image-upload-reupload")),
                     1
                     /* TEXT */
                   )
@@ -189,29 +175,49 @@ const q = () => ({ size2B: (t) => {
         512
         /* NEED_PATCH */
       ), [
-        [V, a(A)]
+        [I, o(C)]
       ])
     ]));
   }
-}), oe = (e, t) => {
-  const o = e.__vccOpts || e;
-  for (const [p, s] of t)
-    o[p] = s;
-  return o;
-}, re = /* @__PURE__ */ oe(te, [["__scopeId", "data-v-5821ad3e"]]), se = {
-  "das-image-upload-text": { "zh-CN": "上传图片", en: "test" },
-  "das-image-upload-reupload": { "zh-CN": "重新上传", en: "test" },
-  "das-image-upload-fail": { "zh-CN": "上传失败", en: "test" }
-}, ie = {
+}), ue = (a, t) => {
+  const i = a.__vccOpts || a;
+  for (const [n, s] of t)
+    i[n] = s;
+  return i;
+}, pe = /* @__PURE__ */ ue(ce, [["__scopeId", "data-v-5821ad3e"]]), me = {
+  "das-ui-import-upload-key1": {
+    "zh-CN": "上传的图片格式只能是$0",
+    en: "The uploaded picture format can only be $0",
+    _appCode: "framework"
+  },
+  "das-ui-import-upload-key2": {
+    "zh-CN": "上传的文件格式只能是$0",
+    en: "The uploaded file format can only be $0",
+    _appCode: "framework"
+  },
+  "das-ui-import-upload-key3": {
+    "zh-CN": "上传的图片大小不能超过$0的$1文件",
+    en: "The uploaded picture format can only be $0",
+    _appCode: "framework"
+  },
+  "das-ui-import-upload-key4": {
+    "zh-CN": "上传的文件大小不能超过$0的$1文件",
+    en: "The uploaded file format can only be $0",
+    _appCode: "framework"
+  },
+  "das-image-upload-text": { "zh-CN": "上传图片", en: "Upload Image", _appCode: "framework" },
+  "das-image-upload-reupload": { "zh-CN": "重新上传", en: "Re-upload", _appCode: "framework" },
+  "das-image-upload-fail": { "zh-CN": "上传失败", en: "Uploaded Failed", _appCode: "framework" }
+}, ge = {
   "--das-ui-image-upload-bgcolor": { light: "#FAFAFA" },
   "--das-ui-image-upload-border-color": { light: "#E5E5E5" },
-  "--das-ui-image-upload-bgcolor-hover": { light: S("--das-ui-color-primary-level1") },
+  "--das-ui-image-upload-bgcolor-hover": { light: k("--das-ui-color-primary-level1") },
   "--das-ui-image-upload-border-color-hover": { light: "#5582F3" },
-  "--das-ui-image-upload-border-color-error": { light: S("--das-ui-color-danger-level2") }
-}, Ce = B(re);
-U(se);
-D(ie);
+  "--das-ui-image-upload-border-color-error": { light: k("--das-ui-color-danger-level2") }
+}, Ie = R(pe);
+K(me);
+W(ge);
 export {
-  Ce as DasImageUpload,
-  Ce as default
+  Ie as DasImageUpload,
+  Ie as default
 };

package/packages/components/image-upload/src/hooks/use-imageUpload.d.ts

@@ -1,6 +1,6 @@
 import type { Props, Emits } from '../type';
 export declare const useImageUpload: (props: Props, emits: Emits) => {
-    isAccept: import("vue").ComputedRef<string | undefined>;
+    isAccept: import("vue").ComputedRef<string>;
     uploadStatus: any;
     loading: import("vue").ComputedRef<boolean>;
     errored: import("vue").ComputedRef<boolean>;

package/packages/components/image-upload/src/type.d.ts

@@ -25,7 +25,7 @@ export interface Props {
   maxSize?: number | string
 
   
-  customCheck?: (file: UploadFile) => boolean | Promise
+  customCheck?: (file: UploadFile) => boolean | Promise<any>
 
   
   autoContentType?: boolean