@das-fed/ui 6.4.0-test.8.1 → 7.0.0

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

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

package/packages/components/image-upload/src/Index.vue.d.ts

@@ -12,5 +12,6 @@ declare const _default: import("vue").DefineComponent<Props, {}, {}, {}, {}, imp
     maxCount: number;
     errorMessage: string;
     accept: string;
+    openFileDialogOnClick: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 export default _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,10 +25,13 @@ export interface Props {
   maxSize?: number | string
 
   
-  customCheck?: (file: UploadFile) => boolean | Promise
+  customCheck?: (file: UploadFile) => boolean | Promise<any>
 
   
   autoContentType?: boolean
+
+  
+  openFileDialogOnClick?: boolean
 }
 
 export interface Emits {

package/packages/components/image-upload/style.css

@@ -1 +1 @@
-.das-ui-image-upload[data-v-5821ad3e]{height:100px;width:100px}.das-ui-image-upload .loading-border[data-v-5821ad3e]{border:1px dashed var(--das-ui-image-upload-border-color)}.das-ui-image-upload[data-v-5821ad3e] .das-ui-image-upload-dragger.ant-upload-drag{width:100%;height:100%;background:var(--das-ui-image-upload-bgcolor);border-color:var(--das-ui-image-upload-border-color)}.das-ui-image-upload[data-v-5821ad3e] .das-ui-image-upload-dragger.ant-upload-drag:hover{background:var(--das-ui-image-upload-bgcolor-hover);border-color:var(--das-ui-image-upload-border-color-hover)}.das-ui-image-upload[data-v-5821ad3e] .das-ui-image-upload-dragger.ant-upload-drag .ant-upload-btn{padding:31px 0}.das-ui-image-upload[data-v-5821ad3e] .das-ui-image-upload-dragger.ant-upload-drag .ant-upload-btn .das-ui-image-upload-dragger-context{height:100%;display:flex;flex-direction:column;justify-content:center;align-items:center}.das-ui-image-upload[data-v-5821ad3e] .das-ui-image-upload-dragger.ant-upload-drag .ant-upload-btn .das-ui-image-upload-dragger-context .text{font-size:12px;color:var(--das-ui-color-help);letter-spacing:0;text-align:center;line-height:18px;font-weight:400}.das-ui-image-upload .das-ui-image-upload-error-container[data-v-5821ad3e]{width:100px;height:100px;display:flex;flex-direction:column;justify-content:center;align-items:center;border:1px solid var(--das-ui-color-danger);background-color:var(--das-ui-image-upload-border-color-error)}.das-ui-image-upload .das-ui-image-upload-error-container .tips-container[data-v-5821ad3e]{display:flex;align-items:center;color:var(--das-ui-color-danger);font-size:12px}.das-ui-image-upload .das-ui-image-upload-error-container .tips-container .text[data-v-5821ad3e]{margin-left:4px}
+.das-ui-image-upload[data-v-1159eda2]{height:100px;width:100px}.das-ui-image-upload .loading-border[data-v-1159eda2]{border:1px dashed var(--das-ui-image-upload-border-color)}.das-ui-image-upload[data-v-1159eda2] .das-ui-image-upload-dragger.ant-upload-drag{width:100%;height:100%;background:var(--das-ui-image-upload-bgcolor);border-color:var(--das-ui-image-upload-border-color)}.das-ui-image-upload[data-v-1159eda2] .das-ui-image-upload-dragger.ant-upload-drag:hover{background:var(--das-ui-image-upload-bgcolor-hover);border-color:var(--das-ui-image-upload-border-color-hover)}.das-ui-image-upload[data-v-1159eda2] .das-ui-image-upload-dragger.ant-upload-drag .ant-upload-btn{padding:31px 0}.das-ui-image-upload[data-v-1159eda2] .das-ui-image-upload-dragger.ant-upload-drag .ant-upload-btn .das-ui-image-upload-dragger-context{height:100%;display:flex;flex-direction:column;justify-content:center;align-items:center}.das-ui-image-upload[data-v-1159eda2] .das-ui-image-upload-dragger.ant-upload-drag .ant-upload-btn .das-ui-image-upload-dragger-context .text{font-size:12px;color:var(--das-ui-color-help);letter-spacing:0;text-align:center;line-height:18px;font-weight:400}.das-ui-image-upload .das-ui-image-upload-error-container[data-v-1159eda2]{width:100px;height:100px;display:flex;flex-direction:column;justify-content:center;align-items:center;border:1px solid var(--das-ui-color-danger);background-color:var(--das-ui-image-upload-border-color-error)}.das-ui-image-upload .das-ui-image-upload-error-container .tips-container[data-v-1159eda2]{display:flex;align-items:center;color:var(--das-ui-color-danger);font-size:12px}.das-ui-image-upload .das-ui-image-upload-error-container .tips-container .text[data-v-1159eda2]{margin-left:4px}

package/packages/components/image-viewer/index.d.ts

@@ -3,15 +3,17 @@ declare const DasImageViewer: import("@das-fed/utils").SFCWithInstall<import("vu
     "update:modelValue": (val: string) => any;
     "update:status": (val: string) => any;
     "image-upload": (file: import("ant-design-vue").UploadFile<any>) => any;
-    deleteImage: (val: string) => any;
+    clickChangeIcon: (url: string) => any;
     downloadImage: (val: string) => any;
+    deleteImage: (val: string) => any;
     "upload-success": (file: import("ant-design-vue").UploadFile<any>, url: string) => any;
 }, string, import("vue").PublicProps, Readonly<import("./src/type.js").Props> & Readonly<{
     "onUpdate:modelValue"?: ((val: string) => any) | undefined;
     "onUpdate:status"?: ((val: string) => any) | undefined;
     "onImage-upload"?: ((file: import("ant-design-vue").UploadFile<any>) => any) | undefined;
-    onDeleteImage?: ((val: string) => any) | undefined;
+    onClickChangeIcon?: ((url: string) => any) | undefined;
     onDownloadImage?: ((val: string) => any) | undefined;
+    onDeleteImage?: ((val: string) => any) | undefined;
     "onUpload-success"?: ((file: import("ant-design-vue").UploadFile<any>, url: string) => any) | undefined;
 }>, {
     style: any;
@@ -26,6 +28,7 @@ declare const DasImageViewer: import("@das-fed/utils").SFCWithInstall<import("vu
         full_screen?: boolean;
     };
     accept: string;
+    openFileDialogOnClick: boolean;
     minioTokenApi: string;
     limitNum: number;
     needDownloadBtn: boolean;