vft 0.0.385 → 0.0.387

package/es/components/config-provider/config-provider.vue2.js

@@ -1,18 +1,18 @@
-import { defineComponent as r, watch as m, computed as l, onActivated as d, onDeactivated as u, onBeforeUnmount as h, getCurrentInstance as g, createElementBlock as p, openBlock as v, normalizeStyle as C, normalizeClass as b, unref as k, renderSlot as V } from "vue";
-import { inBrowser as S, kebabCase as y } from "@vft/utils";
+import { defineComponent as m, watch as s, computed as d, onActivated as u, onDeactivated as h, onBeforeUnmount as g, getCurrentInstance as p, createElementBlock as v, openBlock as b, normalizeStyle as C, normalizeClass as k, unref as V, renderSlot as y } from "vue";
+import { inBrowser as S, kebabCase as B } from "@vft/utils";
 import "../button/index.js";
 import "@vueuse/core";
-import { provideGlobalConfig as B } from "./hooks/use-global-config.js";
+import { provideGlobalConfig as E } from "./hooks/use-global-config.js";
 import "lodash-es";
-import { useNamespace as z } from "../../hooks/use-namespace/index.js";
+import { useNamespace as j } from "../../hooks/use-namespace/index.js";
 import "../../hooks/use-model-toggle/index.js";
 import "@popperjs/core";
 import "../../hooks/use-z-index/index.js";
-import { messageConfig as D } from "./constants.js";
-const E = r({
+import { messageConfig as n } from "./constants.js";
+const z = m({
   name: "vft-config-provider"
-}), N = /* @__PURE__ */ r({
-  ...E,
+}), N = /* @__PURE__ */ m({
+  ...z,
   props: {
     theme: { default: "light" },
     themeVars: {},
@@ -29,17 +29,19 @@ const E = r({
     baseUnitSize: { default: 1080 }
   },
   setup(t) {
-    const s = z("config-provider");
-    m(
+    const i = j("config-provider");
+    s(
       () => t.message,
       (e) => {
-        Object.assign(D, e ?? {});
+        Object.keys(n).forEach((a) => {
+          delete n[a];
+        }), Object.assign(n, e ?? {});
       },
       { immediate: !0, deep: !0 }
     );
-    const i = l(() => {
+    const c = d(() => {
       const e = t.theme === "dark";
-      return c({
+      return f({
         ...t.themeVars,
         ...e ? t.themeVarsDark : t.themeVarsLight
       });
@@ -47,29 +49,29 @@ const E = r({
     if (S) {
       const e = () => {
         document.documentElement.classList.add(t.theme);
-      }, a = (n = t.theme) => {
-        document.documentElement.classList.remove(n);
+      }, a = (o = t.theme) => {
+        document.documentElement.classList.remove(o);
       };
-      m(
+      s(
         () => t.theme,
-        (n, o) => {
-          o && a(o), e();
+        (o, r) => {
+          r && a(r), e();
         },
         { immediate: !0 }
-      ), d(e), u(a), h(a);
+      ), u(e), h(a), g(a);
     }
-    function c(e) {
+    function f(e) {
       const a = {};
-      return Object.keys(e).forEach((n) => {
-        a[`--${t.namespace}-${y(n)}`] = e[n];
+      return Object.keys(e).forEach((o) => {
+        a[`--${t.namespace}-${B(o)}`] = e[o];
       }), a;
     }
-    const f = g();
-    return B(f.props), (e, a) => (v(), p("div", {
-      class: b(k(s).b()),
-      style: C(i.value)
+    const l = p();
+    return E(l.props), (e, a) => (b(), v("div", {
+      class: k(V(i).b()),
+      style: C(c.value)
     }, [
-      V(e.$slots, "default")
+      y(e.$slots, "default")
     ], 6));
   }
 });

package/es/components/upload/index.d.ts

@@ -95,6 +95,9 @@ export declare const VftUpload: import("vft/es/utils").SFCWithInstall<{
         onSizeInvalid: {
             type: import("vue").PropType<(file: File, width: number, height: number, expectedWidth: number, expectedHeight: number) => void>;
         };
+        onTypeInvalid: {
+            type: import("vue").PropType<(file: File, acceptedTypes: string) => void>;
+        };
         beforeUpload: {
             type: import("vue").PropType<(rawFile: import("./types").UploadRawFile) => import("../types").Awaitable<void | undefined | null | boolean | File | Blob>>;
         };
@@ -288,6 +291,9 @@ export declare const VftUpload: import("vft/es/utils").SFCWithInstall<{
         onSizeInvalid: {
             type: import("vue").PropType<(file: File, width: number, height: number, expectedWidth: number, expectedHeight: number) => void>;
         };
+        onTypeInvalid: {
+            type: import("vue").PropType<(file: File, acceptedTypes: string) => void>;
+        };
         beforeUpload: {
             type: import("vue").PropType<(rawFile: import("./types").UploadRawFile) => import("../types").Awaitable<void | undefined | null | boolean | File | Blob>>;
         };
@@ -478,6 +484,9 @@ export declare const VftUpload: import("vft/es/utils").SFCWithInstall<{
     onSizeInvalid: {
         type: import("vue").PropType<(file: File, width: number, height: number, expectedWidth: number, expectedHeight: number) => void>;
     };
+    onTypeInvalid: {
+        type: import("vue").PropType<(file: File, acceptedTypes: string) => void>;
+    };
     beforeUpload: {
         type: import("vue").PropType<(rawFile: import("./types").UploadRawFile) => import("../types").Awaitable<void | undefined | null | boolean | File | Blob>>;
     };

package/es/components/upload/types.d.ts

@@ -46,6 +46,8 @@ export interface UploadHooks {
     onExceed: (files: File[], uploadFiles: UploadUserFile[]) => void;
     /** 文件大小超出限制时的回调 */
     onSizeExceed?: (file: File, maxSize: number) => void;
+    /** 文件类型不符合要求时的回调 */
+    onTypeInvalid?: (file: File, acceptedTypes: string) => void;
 }
 export interface UploadBasicProps {
     action?: string;
@@ -77,6 +79,8 @@ export interface UploadBasicProps {
     sizeHeight?: number;
     /** 尺寸不符合时的回调函数 */
     onSizeInvalid?: (file: File, width: number, height: number, expectedWidth: number, expectedHeight: number) => void;
+    /** 文件类型不符合要求时的回调 */
+    onTypeInvalid?: (file: File, acceptedTypes: string) => void;
 }
 export interface UploadEventProps {
     beforeUpload?: UploadHooks['beforeUpload'];
@@ -90,6 +94,7 @@ export interface UploadEventProps {
     onExceed?: UploadHooks['onExceed'];
     onSizeExceed?: UploadHooks['onSizeExceed'];
     onSizeInvalid?: UploadBasicProps['onSizeInvalid'];
+    onTypeInvalid?: UploadBasicProps['onTypeInvalid'];
 }
 export interface UploadContentEventProps {
     beforeUpload?: UploadHooks['beforeUpload'];
@@ -100,6 +105,7 @@ export interface UploadContentEventProps {
     onError?: (err: UploadAjaxError, rawFile: UploadRawFile) => void;
     onExceed?: UploadHooks['onExceed'];
     onSizeExceed?: UploadHooks['onSizeExceed'];
+    onTypeInvalid?: UploadHooks['onTypeInvalid'];
 }
 export interface UploadContentBasicProps extends Omit<UploadBasicProps, 'fileList'> {
     fileList?: UploadUserFile[];

package/es/components/upload/upload-content.vue2.js

@@ -1,25 +1,25 @@
-import { defineComponent as O, shallowRef as R, createElementBlock as H, openBlock as U, withKeys as M, normalizeClass as q, withModifiers as x, unref as h, createBlock as T, renderSlot as w, createElementVNode as W, withCtx as $, nextTick as A } from "vue";
+import { defineComponent as F, shallowRef as I, createElementBlock as W, openBlock as q, withKeys as $, normalizeClass as x, withModifiers as T, unref as y, createBlock as A, renderSlot as w, createElementVNode as N, withCtx as X, nextTick as G } from "vue";
 import "../form/index.js";
 import "@vueuse/core";
-import { isObject as I, entriesOf as N } from "@vft/utils";
-import { debugWarn as X } from "../../utils/error.js";
+import { isObject as L, entriesOf as J } from "@vft/utils";
+import { debugWarn as Q } from "../../utils/error.js";
 import "../config-provider/hooks/use-global-config.js";
-import { cloneDeep as L, isEqual as G } from "lodash-es";
-import { useNamespace as J } from "../../hooks/use-namespace/index.js";
+import { cloneDeep as O, isEqual as Y } from "lodash-es";
+import { useNamespace as Z } from "../../hooks/use-namespace/index.js";
 import "../../hooks/use-model-toggle/index.js";
 import "@popperjs/core";
 import "../../hooks/use-z-index/index.js";
-import { ajaxUpload as Q } from "./ajax.js";
-import { genFileId as Y } from "./constants.js";
-import Z from "./upload-dragger.vue2.js";
-import { isImageOrVideo as ee, validateFileSize as te } from "./utils.js";
-import { useFormDisabled as oe } from "../form/hooks/use-form-common-props.js";
-import { useFormItem as ae } from "../form/hooks/use-form-item.js";
-const ne = ["onKeydown"], ie = ["name", "multiple", "accept"], se = O({
+import { ajaxUpload as ee } from "./ajax.js";
+import { genFileId as te } from "./constants.js";
+import oe from "./upload-dragger.vue2.js";
+import { validateFileType as _, isImageOrVideo as ae, validateFileSize as ne } from "./utils.js";
+import { useFormDisabled as ie } from "../form/hooks/use-form-common-props.js";
+import { useFormItem as le } from "../form/hooks/use-form-item.js";
+const se = ["onKeydown"], re = ["name", "multiple", "accept"], de = F({
   name: "VftUploadContent",
   inheritAttrs: !1
-}), Ce = /* @__PURE__ */ O({
-  ...se,
+}), Ie = /* @__PURE__ */ F({
+  ...de,
   props: {
     fileList: { default: [] },
     replaceOnLimit: { type: Boolean, default: !1 },
@@ -36,7 +36,7 @@ const ne = ["onKeydown"], ie = ["name", "multiple", "accept"], se = O({
     type: { default: "select" },
     autoUpload: { type: Boolean, default: !1 },
     listType: { default: "text" },
-    httpRequest: { type: Function, default: Q },
+    httpRequest: { type: Function, default: ee },
     disabled: { type: Boolean },
     limit: {},
     maxSize: { default: void 0 },
@@ -44,6 +44,7 @@ const ne = ["onKeydown"], ie = ["name", "multiple", "accept"], se = O({
     sizeWidth: { default: void 0 },
     sizeHeight: { default: void 0 },
     onSizeInvalid: {},
+    onTypeInvalid: {},
     beforeUpload: {},
     onRemove: {},
     onStart: {},
@@ -53,158 +54,167 @@ const ne = ["onKeydown"], ie = ["name", "multiple", "accept"], se = O({
     onExceed: {},
     onSizeExceed: {}
   },
-  setup(_, { expose: P }) {
-    const s = _, g = J("upload"), S = oe(), { formItem: D } = ae(), f = R(
+  setup(P, { expose: D }) {
+    const l = P, g = Z("upload"), k = ie(), { formItem: K } = le(), c = I(
       {}
-    ), y = R(), E = async (e) => {
+    ), v = I(), B = async (e) => {
       if (e.length === 0) return;
       const {
-        autoUpload: t,
+        autoUpload: o,
         limit: a,
-        fileList: n,
-        multiple: c,
-        onStart: u,
-        onExceed: b,
-        replaceOnLimit: z,
+        fileList: i,
+        multiple: u,
+        onStart: p,
+        onExceed: z,
+        replaceOnLimit: E,
         maxSize: r,
-        onSizeExceed: v,
-        sizeWidth: p,
-        sizeHeight: m,
-        onSizeInvalid: d
-      } = s;
+        onSizeExceed: b,
+        sizeWidth: m,
+        sizeHeight: h,
+        onSizeInvalid: d,
+        accept: s,
+        onTypeInvalid: f
+      } = l;
+      if (s) {
+        const n = e.filter((t) => !_(t, s));
+        if (n.length > 0 && (n.forEach((t) => {
+          f && f(t, s);
+        }), e = e.filter((t) => _(t, s)), e.length === 0))
+          return;
+      }
       if (r) {
-        const i = e.filter((o) => o.size > r);
-        if (i.length > 0 && (i.forEach((o) => {
-          v && v(o, r);
-        }), e = e.filter((o) => o.size <= r), e.length === 0))
+        const n = e.filter((t) => t.size > r);
+        if (n.length > 0 && (n.forEach((t) => {
+          b && b(t, r);
+        }), e = e.filter((t) => t.size <= r), e.length === 0))
           return;
       }
-      if (p && m) {
-        const i = [];
-        for (const o of e)
-          if (ee(o))
+      if (m && h) {
+        const n = [];
+        for (const t of e)
+          if (ae(t))
             try {
-              const { isValid: l, width: j, height: F } = await te(
-                o,
-                p,
-                m
+              const { isValid: S, width: H, height: M } = await ne(
+                t,
+                m,
+                h
               );
-              l ? i.push(o) : d && d(o, j, F, p, m);
-            } catch (l) {
-              console.error("尺寸校验失败:", l);
+              S ? n.push(t) : d && d(t, H, M, m, h);
+            } catch (S) {
+              console.error("尺寸校验失败:", S);
             }
           else
-            i.push(o);
-        if (e = i, e.length === 0) return;
+            n.push(t);
+        if (e = n, e.length === 0) return;
       }
-      if (a && n && n.length + e.length > a && !(a === 1 && z)) {
-        b?.(e, n);
+      if (a && i && i.length + e.length > a && !(a === 1 && E)) {
+        z?.(e, i);
         return;
       }
-      c || (e = e.slice(0, 1));
-      for (const i of e) {
-        const o = i;
-        o.uid = Y(), u?.(o), t && k(o);
+      u || (e = e.slice(0, 1));
+      for (const n of e) {
+        const t = n;
+        t.uid = te(), p?.(t), o && C(t);
       }
-    }, k = async (e) => {
-      if (y.value.value = "", !s.beforeUpload)
-        return B(e);
-      let t, a = {};
+    }, C = async (e) => {
+      if (v.value.value = "", !l.beforeUpload)
+        return R(e);
+      let o, a = {};
       try {
-        const c = s.data, u = s.beforeUpload(e);
-        a = I(s.data) ? L(s.data) : s.data, t = await u, I(s.data) && G(c, a) && (a = L(s.data));
+        const u = l.data, p = l.beforeUpload(e);
+        a = L(l.data) ? O(l.data) : l.data, o = await p, L(l.data) && Y(u, a) && (a = O(l.data));
       } catch {
-        t = !1;
+        o = !1;
       }
-      if (t === !1) {
-        s.onRemove?.(e);
+      if (o === !1) {
+        l.onRemove?.(e);
         return;
       }
-      let n = e;
-      t instanceof Blob && (t instanceof File ? n = t : n = new File([t], e.name, {
+      let i = e;
+      o instanceof Blob && (o instanceof File ? i = o : i = new File([o], e.name, {
         type: e.type
-      })), B(Object.assign(n, { uid: e.uid }), a);
-    }, B = (e, t) => {
+      })), R(Object.assign(i, { uid: e.uid }), a);
+    }, R = (e, o) => {
       const {
         headers: a,
-        data: n,
-        method: c,
-        withCredentials: u,
-        name: b,
-        action: z,
+        data: i,
+        method: u,
+        withCredentials: p,
+        name: z,
+        action: E,
         onProgress: r,
-        onSuccess: v,
-        onError: p,
-        httpRequest: m
-      } = s, { uid: d } = e, i = {
+        onSuccess: b,
+        onError: m,
+        httpRequest: h
+      } = l, { uid: d } = e, s = {
         headers: a || {},
-        withCredentials: u,
+        withCredentials: p,
         file: e,
-        data: t ?? (n || {}),
-        method: c,
-        filename: b,
-        action: z,
-        onProgress: (l) => {
-          r?.(l, e);
+        data: o ?? (i || {}),
+        method: u,
+        filename: z,
+        action: E,
+        onProgress: (n) => {
+          r?.(n, e);
         },
-        onSuccess: (l) => {
-          v?.(l, e), delete f.value[d];
+        onSuccess: (n) => {
+          b?.(n, e), delete c.value[d];
         },
-        onError: (l) => {
-          p?.(l, e), delete f.value[d];
+        onError: (n) => {
+          m?.(n, e), delete c.value[d];
         }
-      }, o = m(i);
-      f.value[d] = o, o instanceof Promise && o.then(i.onSuccess, i.onError);
-    }, K = async (e) => {
-      const t = e.target.files;
-      t && (await E(Array.from(t)), A(() => {
-        D?.validate("change").catch((a) => X(a));
+      }, f = h(s);
+      c.value[d] = f, f instanceof Promise && f.then(s.onSuccess, s.onError);
+    }, V = async (e) => {
+      const o = e.target.files;
+      o && (await B(Array.from(o)), G(() => {
+        K?.validate("change").catch((a) => Q(a));
       }));
-    }, C = () => {
-      S.value || (y.value.value = "", y.value.click());
-    }, V = () => {
-      C();
+    }, U = () => {
+      k.value || (v.value.value = "", v.value.click());
+    }, j = () => {
+      U();
     };
-    return P({
+    return D({
       abort: (e) => {
-        N(f.value).filter(
+        J(c.value).filter(
           e ? ([a]) => String(e.uid) === a : () => !0
-        ).forEach(([a, n]) => {
-          n instanceof XMLHttpRequest && n.abort(), delete f.value[a];
+        ).forEach(([a, i]) => {
+          i instanceof XMLHttpRequest && i.abort(), delete c.value[a];
         });
       },
-      upload: k
-    }), (e, t) => (U(), H("div", {
-      class: q([h(g).b(), h(g).m(e.listType), h(g).is("drag", e.drag)]),
+      upload: C
+    }), (e, o) => (q(), W("div", {
+      class: x([y(g).b(), y(g).m(e.listType), y(g).is("drag", e.drag)]),
       tabindex: "0",
-      onClick: C,
-      onKeydown: M(x(V, ["self"]), ["enter", "space"])
+      onClick: U,
+      onKeydown: $(T(j, ["self"]), ["enter", "space"])
     }, [
-      e.drag ? (U(), T(Z, {
+      e.drag ? (q(), A(oe, {
         key: 0,
-        disabled: h(S),
-        onFile: t[0] || (t[0] = (a) => E(a.file))
+        disabled: y(k),
+        onFile: o[0] || (o[0] = (a) => B(a.file))
       }, {
-        default: $(() => [
+        default: X(() => [
           w(e.$slots, "default")
         ]),
         _: 3
       }, 8, ["disabled"])) : w(e.$slots, "default", { key: 1 }),
-      W("input", {
+      N("input", {
         ref_key: "inputRef",
-        ref: y,
-        class: q(h(g).e("input")),
+        ref: v,
+        class: x(y(g).e("input")),
         name: e.name,
         multiple: e.multiple,
         accept: e.accept,
         type: "file",
-        onChange: K,
-        onClick: t[1] || (t[1] = x(() => {
+        onChange: V,
+        onClick: o[1] || (o[1] = T(() => {
         }, ["stop"]))
-      }, null, 42, ie)
-    ], 42, ne));
+      }, null, 42, re)
+    ], 42, se));
   }
 });
 export {
-  Ce as default
+  Ie as default
 };