vft 0.0.455 → 0.0.457

package/es/components/carousel/use-carousel.js

@@ -11,7 +11,7 @@ import "../../hooks/use-model-toggle/index.js";
 import { useOrderedChildren as ge } from "../../hooks/use-ordered-children/index.js";
 import "@popperjs/core";
 import "../../hooks/use-z-index/index.js";
-import { carouselContextKey as Se, CAROUSEL_ITEM_NAME as H } from "./constants.js";
+import { CAROUSEL_ITEM_NAME as H, carouselContextKey as Se } from "./constants.js";
 const L = 300, ze = (t, O, M) => {
   const {
     children: o,

package/es/components/config-provider/hooks/use-global-config.js

@@ -1,7 +1,7 @@
 import { keysOf as f } from "@vft/utils";
 import "@vueuse/core";
 import { debugWarn as v } from "../../../utils/error.js";
-import { ref as g, getCurrentInstance as l, computed as i, unref as p, provide as C, inject as x } from "vue";
+import { getCurrentInstance as l, computed as i, unref as p, provide as g, ref as C, inject as x } from "vue";
 import "lodash-es";
 import "../../form/index.js";
 import { namespaceContextKey as I, useNamespace as b, defaultNamespace as y } from "../../../hooks/use-namespace/index.js";
@@ -9,7 +9,7 @@ import "../../../hooks/use-model-toggle/index.js";
 import "@popperjs/core";
 import { zIndexContextKey as G, useZIndex as z, defaultInitialZIndex as K } from "../../../hooks/use-z-index/index.js";
 import { configProviderContextKey as m } from "../constants.js";
-const a = g();
+const a = C();
 function d(o, e = void 0) {
   const n = l() ? x(m, a) : a;
   return o ? i(() => n?.value?.[o] ?? e) : n;
@@ -27,7 +27,7 @@ function B(o) {
   };
 }
 const S = (o, e, n = !1) => {
-  const t = !!l(), r = t ? d() : void 0, u = e?.provide ?? (t ? C : void 0);
+  const t = !!l(), r = t ? d() : void 0, u = e?.provide ?? (t ? g : void 0);
   if (!u) {
     v(
       "provideGlobalConfig",

package/es/components/input/input.vue2.js

@@ -13,8 +13,8 @@ import "../../hooks/use-z-index/index.js";
 import { UPDATE_MODEL_EVENT as Q } from "@vft/constants";
 import { useAttrs as Ze, useCursor as _e } from "@vft/use";
 import { calcTextareaHeight as he } from "./utils.js";
-import { useFormItem as et, useFormItemInputId as tt } from "../form/hooks/use-form-item.js";
-import { useFormSize as at, useFormDisabled as nt } from "../form/hooks/use-form-common-props.js";
+import { useFormSize as et, useFormDisabled as tt } from "../form/hooks/use-form-common-props.js";
+import { useFormItem as at, useFormItemInputId as nt } from "../form/hooks/use-form-item.js";
 const ot = ["role"], lt = ["id", "type", "disabled", "formatter", "parser", "readonly", "autocomplete", "tabindex", "aria-label", "placeholder", "form"], st = ["id", "tabindex", "disabled", "readonly", "autocomplete", "aria-label", "placeholder", "form"], It = /* @__PURE__ */ Oe({
   __name: "input",
   props: {
@@ -85,9 +85,9 @@ const ot = ["role"], lt = ["id", "type", "disabled", "formatter", "parser", "rea
       n.is("focus", v.value)
     ]), d = Ze({
       excludeKeys: l(() => Object.keys(X.value))
-    }), { form: Ce, formItem: F } = et(), { inputId: Y } = tt(we.props, {
+    }), { form: Ce, formItem: F } = at(), { inputId: Y } = nt(we.props, {
       formItemContext: F
-    }), ke = at(), x = nt(), n = ye("input"), Z = ye("textarea"), M = H(), p = H(), v = S(!1), N = S(!1), C = S(!1), K = S(!1), _ = S(), O = H(e.inputStyle), k = l(() => M.value || p.value), T = l(() => G(e.prefixIcon, "icon", { size: 16 })), ee = l(() => G(e.suffixIcon, "icon", { size: 16 })), Ie = l(() => G(e.clearIcon, "icon", {
+    }), ke = et(), x = tt(), n = ye("input"), Z = ye("textarea"), M = H(), p = H(), v = S(!1), N = S(!1), C = S(!1), K = S(!1), _ = S(), O = H(e.inputStyle), k = l(() => M.value || p.value), T = l(() => G(e.prefixIcon, "icon", { size: 16 })), ee = l(() => G(e.suffixIcon, "icon", { size: 16 })), Ie = l(() => G(e.clearIcon, "icon", {
       icon: "icon-circle-close",
       size: 16
     })), te = l(() => Ce?.statusIcon ?? !1), I = l(() => F?.validateState || ""), ae = l(

package/es/components/input-tag/composables/use-input-tag.js

@@ -1,6 +1,6 @@
 import { shallowRef as B, ref as L, computed as c, watch as G } from "vue";
 import { EVENT_CODE as g } from "../../../constants/aria.js";
-import { CHANGE_EVENT as i, UPDATE_MODEL_EVENT as d, INPUT_EVENT as H } from "../../../constants/event.js";
+import { CHANGE_EVENT as i, INPUT_EVENT as H, UPDATE_MODEL_EVENT as d } from "../../../constants/event.js";
 import "@vueuse/core";
 import { isUndefined as K } from "@vft/utils";
 import { debugWarn as C } from "../../../utils/error.js";

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

@@ -1,11 +1,11 @@
 import type { App } from 'vue';
-import { vLoading, createLoadingDirective } from './directive';
+import { vLoading, createLoadingDirective, type LoadingBinding } from './directive';
 import { Loading } from './service';
 export declare const VftLoading: {
     install(app: App): void;
-    directive: import("vue").Directive<import("./directive").VftLoading, import("./directive").LoadingBinding>;
+    directive: import("vue").Directive<import("./directive").VftLoading, LoadingBinding>;
     service: (options?: import("./types").LoadingOptions) => import("./loading").LoadingInstance;
 };
 export default VftLoading;
-export { vLoading as VftLoadingDirective, Loading as VftLoadingService, vLoading, createLoadingDirective };
+export { vLoading as VftLoadingDirective, Loading as VftLoadingService, vLoading, createLoadingDirective, type LoadingBinding, };
 export * from './types';

package/es/components/loading/loading.js

@@ -76,7 +76,7 @@ function K(r) {
               fill: "none"
             })
           ]
-        ), h = e.text ? o("p", { class: n.b("text") }, e.text) : void 0;
+        ), h = e.text ? o("p", { class: n.b("text") }, [e.text]) : void 0;
         return o(
           k,
           {

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

@@ -1,5 +1,6 @@
 import type { IconProps } from 'vft/es/components/icon';
 import type { MaybeRef } from '@vueuse/core';
+import type { VNode } from 'vue';
 export type LoadingOptionsResolved = {
     parent: LoadingParentElement;
     background: MaybeRef<string>;
@@ -8,7 +9,7 @@ export type LoadingOptionsResolved = {
     spinner: MaybeRef<boolean | string>;
     img: MaybeRef<boolean | string>;
     icon: MaybeRef<IconProps | string>;
-    text: MaybeRef<string>;
+    text: MaybeRef<string | VNode | VNode[]>;
     fullscreen: boolean;
     rotate: MaybeRef<boolean | string>;
     lock: boolean;

package/es/components/super-form/super-form-item.vue2.js

@@ -1,4 +1,4 @@
-import { defineComponent as X, computed as j, ref as re, unref as c, useSlots as oe, createVNode as a, mergeProps as q, withDirectives as ie, vShow as ne, createTextVNode as O, isVNode as le, resolveComponent as N } from "vue";
+import { defineComponent as X, computed as j, ref as re, unref as c, useSlots as oe, createVNode as a, mergeProps as q, withDirectives as ie, vShow as ne, isVNode as le, createTextVNode as O, resolveComponent as N } from "vue";
 import "../alert/index.js";
 import "../avatar/index.js";
 import "../avatar-stack/index.js";

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

@@ -69,6 +69,9 @@ export declare const VftTable: import("vft/es/utils").SFCWithInstall<{
         emptyCfg: {
             type: import("vue").PropType<import("vft/es/vft").EmptyProps>;
         };
+        loadingCfg: {
+            type: import("vue").PropType<import("vft/es/vft").LoadingBinding>;
+        };
         layouts: {
             type: import("vue").PropType<import("vxe-table").VxeGridPropTypes.Layouts>;
         };
@@ -982,6 +985,9 @@ export declare const VftTable: import("vft/es/utils").SFCWithInstall<{
         emptyCfg: {
             type: import("vue").PropType<import("vft/es/vft").EmptyProps>;
         };
+        loadingCfg: {
+            type: import("vue").PropType<import("vft/es/vft").LoadingBinding>;
+        };
         layouts: {
             type: import("vue").PropType<import("vxe-table").VxeGridPropTypes.Layouts>;
         };
@@ -1779,6 +1785,9 @@ export declare const VftTable: import("vft/es/utils").SFCWithInstall<{
     emptyCfg: {
         type: import("vue").PropType<import("vft/es/vft").EmptyProps>;
     };
+    loadingCfg: {
+        type: import("vue").PropType<import("vft/es/vft").LoadingBinding>;
+    };
     layouts: {
         type: import("vue").PropType<import("vxe-table").VxeGridPropTypes.Layouts>;
     };

package/es/components/table/table.vue2.js

@@ -1,42 +1,40 @@
-import { defineComponent as N, useAttrs as ae, ref as s, getCurrentInstance as te, computed as P, unref as e, watch as oe, nextTick as le, toRaw as re, createBlock as f, openBlock as m, withCtx as c, createElementVNode as H, normalizeClass as ne, createVNode as p, createCommentVNode as D, mergeProps as _, withDirectives as ce, renderSlot as h, normalizeProps as ie, guardReactiveProps as se } from "vue";
-import { VftEmpty as ge } from "../empty/index.js";
-import { vLoading as de } from "../loading/directive.js";
-import { deepMerge as F, isClient as ue, omit as fe, isFunction as me } from "@vft/utils";
-import { FormCompEnum as pe } from "../../utils/form-register.js";
+import { defineComponent as V, createVNode as c, useAttrs as ae, ref as g, getCurrentInstance as te, computed as D, unref as e, watch as oe, nextTick as le, toRaw as re, createBlock as m, openBlock as p, withCtx as i, createElementVNode as H, normalizeClass as ne, createCommentVNode as F, mergeProps as T, withDirectives as ce, vShow as ie, renderSlot as h, normalizeProps as se, guardReactiveProps as ge, createTextVNode as de } from "vue";
+import { VftEmpty as ue } from "../empty/index.js";
+import { vLoading as fe } from "../loading/directive.js";
+import { deepMerge as _, isClient as me, omit as pe, isFunction as he } from "@vft/utils";
+import { FormCompEnum as be } from "../../utils/form-register.js";
 import "@vueuse/core";
 import "../config-provider/hooks/use-global-config.js";
 import "lodash-es";
-import { useForm as he } from "../super-form/use/use-form.js";
-import { useNamespace as be } from "../../hooks/use-namespace/index.js";
+import { useForm as Ce } from "../super-form/use/use-form.js";
+import { useNamespace as ye } from "../../hooks/use-namespace/index.js";
 import "../../hooks/use-model-toggle/index.js";
 import "@popperjs/core";
 import "../../hooks/use-z-index/index.js";
 import "../icon/index.js";
-import { VftClientOnly as Ce } from "../client-only/index.js";
-import { VftPagination as ye } from "../pagination/index.js";
-import { VftSkeleton as we } from "../skeleton/index.js";
-import { VftSuperForm as ve } from "../super-form/index.js";
-import { VxeGrid as xe } from "vxe-table";
-import ke from "xe-utils";
-import { PageSize as T } from "./constants.js";
-import { useColumns as Se } from "./use/use-columns.js";
-import { useDataSource as Be } from "./use/use-data-source.js";
-import { useLoading as ze } from "./use/use-loading.js";
-import { usePagination as Re } from "./use/use-pagination.js";
-import { EmptyEnum as Pe } from "../empty/constants.js";
-const He = {
-  "vft-loading-text": "加载中..."
-}, De = N({
+import { VftClientOnly as we } from "../client-only/index.js";
+import { VftPagination as ve } from "../pagination/index.js";
+import { VftSkeleton as xe } from "../skeleton/index.js";
+import { VftSuperForm as ke } from "../super-form/index.js";
+import { VxeGrid as Se } from "vxe-table";
+import Be from "xe-utils";
+import { PageSize as N } from "./constants.js";
+import { useColumns as ze } from "./use/use-columns.js";
+import { useDataSource as Re } from "./use/use-data-source.js";
+import { useLoading as Pe } from "./use/use-loading.js";
+import { usePagination as De } from "./use/use-pagination.js";
+import { EmptyEnum as He } from "../empty/constants.js";
+const Fe = V({
   name: "vft-table"
-}), la = /* @__PURE__ */ N({
-  ...De,
+}), ra = /* @__PURE__ */ V({
+  ...Fe,
   props: {
     sticky: {
       type: [Boolean, Object]
     },
     api: {},
     pageSize: {
-      default: T
+      default: N
     },
     total: {},
     rowkey: {
@@ -81,7 +79,16 @@ const He = {
     onChange: {},
     emptyCfg: {
       default: () => ({
-        type: Pe.NoData
+        type: He.NoData
+      })
+    },
+    loadingCfg: {
+      type: Boolean,
+      default: () => ({
+        customClass: "vft-card-loading",
+        text: c("div", null, [c("span", null, [de("加载中")]), c("span", {
+          class: "dot"
+        }, null)])
       })
     },
     layouts: {},
@@ -393,26 +400,26 @@ const He = {
     "toolbar-tool-click",
     "zoom"
   ],
-  setup(_e, {
-    expose: O,
-    emit: V
+  setup(Te, {
+    expose: A,
+    emit: E
   }) {
-    const r = V, g = be("table"), A = ae(), b = s(), C = s(), E = s([]), d = s(), M = te(), t = P(() => F(M.props, e(d))), {
+    const n = E, d = ye("table"), O = ae(), b = g(), C = g(), q = g([]), u = g(), M = te(), t = D(() => _(M.props, e(u))), {
       getLoading: $,
-      setLoading: q
-    } = ze(t), {
-      getPaginationInfo: i,
-      setPagination: u,
+      setLoading: L
+    } = Pe(t), {
+      getPaginationInfo: s,
+      setPagination: f,
       getCurrentPage: G
-    } = Re(t), {
+    } = De(t), {
       getViewColumns: I,
       setColumns: K
-    } = Se(t);
+    } = ze(t);
     oe(() => G(), (a) => {
       le(() => {
         y({
           seqConfig: {
-            startIndex: (a - 1) * (i.value?.pageSize || e(t).pageSize || T)
+            startIndex: (a - 1) * (s.value?.pageSize || e(t).pageSize || N)
           }
         });
       });
@@ -420,39 +427,39 @@ const He = {
       immediate: !0
     });
     function y(a) {
-      d.value = {
-        ...e(d),
+      u.value = {
+        ...e(u),
         ...a
       };
     }
     const {
       getDataSourceRef: w,
-      handleTableChange: L,
-      reload: X,
-      deleteTableDataRecord: Y,
-      insertTableDataRecord: j,
+      handleTableChange: X,
+      reload: v,
+      deleteTableDataRecord: j,
+      insertTableDataRecord: Y,
       updateTableData: W,
       updateTableDataRecord: U,
-      setTableData: v,
+      setTableData: x,
       getDataSource: J,
-      getRawDataSource: x,
-      tableSearch: k
-    } = Be(t, {
-      tableData: E,
-      setLoading: q,
-      getPaginationInfo: i,
-      setPagination: u
-    }, r);
-    function S(a) {
-      a?.pageSize && u({
+      getRawDataSource: k,
+      tableSearch: S
+    } = Re(t, {
+      tableData: q,
+      setLoading: L,
+      getPaginationInfo: s,
+      setPagination: f
+    }, n);
+    function B(a) {
+      a?.pageSize && f({
         currentPage: 1
-      }), L(a), r("change", a);
+      }), X(a), n("change", a);
       const {
         onChange: o
       } = e(t);
-      o && me(o) && o(a);
+      o && he(o) && o(a);
     }
-    const B = {};
+    const z = {};
     [
       "update:data",
       "keydown-start",
@@ -574,57 +581,66 @@ const He = {
       "toolbar-tool-click",
       "zoom"
     ].forEach((a) => {
-      const o = ke.camelCase(`on-${a}`);
-      B[o] = (...l) => r(a, ...l);
+      const o = Be.camelCase(`on-${a}`);
+      z[o] = (...r) => n(a, ...r);
     });
-    const n = P(() => {
+    const l = D(() => {
       const a = e(w), o = {
-        ...A,
+        ...O,
         ...e(t),
         columns: re(e(I)),
         loading: e($),
         data: a,
-        ...B
+        ...z
       };
-      if (ue) {
+      if (me) {
         (e(t)?.addMaxHeight || e(t)?.maxHeight) && (o.maxHeight = e(t)?.maxHeight ? e(t)?.maxHeight : `${window.innerHeight - e(t)?.extraSysHeight - (t.value?.showPager ? t.value?.pageHeight || 40 : 0)}px`);
-        const l = e(t)?.minHeight;
-        o.minHeight = l || (l !== 0 && e(t)?.toolbarConfig?.custom ? 300 : void 0);
+        const r = e(t)?.minHeight;
+        o.minHeight = r || (r !== 0 && e(t)?.toolbarConfig?.custom ? 300 : void 0);
       }
-      return o;
-    }), z = {
-      setPagination: u,
-      emit: r,
+      return e(t)?.toolbarConfig?.refresh && (o.proxyConfig = e(t)?.proxyConfig || {
+        response: {
+          result: e(t)?.fetchSetting?.listField,
+          total: e(t)?.fetchSetting?.totalField
+        },
+        autoLoad: !1,
+        ajax: {
+          query: async () => await v()
+        }
+      }), o;
+    }), R = {
+      setPagination: f,
+      emit: n,
       setProps: y,
-      reload: X,
-      deleteTableDataRecord: Y,
-      insertTableDataRecord: j,
+      reload: v,
+      deleteTableDataRecord: j,
+      insertTableDataRecord: Y,
       updateTableDataRecord: U,
       updateTableData: W,
-      setTableData: v,
+      setTableData: x,
       getDataSource: J,
       getDataSourceRef: w,
       setColumns: K,
-      getRawDataSource: x,
-      tableSearch: k
+      getRawDataSource: k,
+      tableSearch: S
     };
-    r("register", z);
+    n("register", R);
     const Q = {
       field: "_filterTableData",
       label: "",
-      type: pe.Search,
+      type: be.Search,
       itemProps: {
         class: "search-all-form-item"
       },
       componentProps: () => ({
         onChange: (a) => {
-          R({
+          P({
             _filterTableData: a
           });
         }
       })
-    }, [Z] = he(F({
-      schemas: [n.value?.formOptions?.addSearchAllSchema ? Q : {}],
+    }, [Z] = Ce(_({
+      schemas: [l.value?.formOptions?.addSearchAllSchema ? Q : {}],
       rowProps: {
         justify: "start"
       },
@@ -638,53 +654,53 @@ const He = {
         btnText: "搜索"
       },
       actionInline: !0
-    }, fe(
-      n.value?.formOptions,
+    }, pe(
+      l.value?.formOptions,
       ["showActionForm", "addSearchAllSchema"]
       // 'union' | 'intersection' | 'concat' | 'replace' = 'union'
-    ), "replace")), R = (a) => {
-      Reflect.has(a, "_filterTableData") && k(a._filterTableData), r("form-submit", a);
+    ), "replace")), P = (a) => {
+      Reflect.has(a, "_filterTableData") && S(a._filterTableData), n("form-submit", a);
     }, ee = () => {
-      v(x()), r("form-reset");
+      x(k()), n("form-reset");
     };
-    return O({
+    return A({
       table: b,
       pageRef: C,
-      ...z
-    }), (a, o) => (m(), f(e(Ce), null, {
-      fallback: c(() => [p(e(we))]),
-      default: c(() => [H("div", {
-        class: ne([e(g).b()])
-      }, [p(e(xe), _({
+      ...R
+    }), (a, o) => (p(), m(e(we), null, {
+      fallback: i(() => [c(e(xe))]),
+      default: i(() => [H("div", {
+        class: ne([e(d).b()])
+      }, [c(e(Se), T({
         ref_key: "xGrid",
         ref: b
-      }, n.value), {
-        toolbarButtons: c(() => [h(a.$slots, "toolbar-left"), n.value?.formOptions?.showActionForm ? (m(), f(e(ve), {
+      }, l.value), {
+        toolbarButtons: i(() => [h(a.$slots, "toolbar-left"), l.value?.formOptions?.showActionForm ? (p(), m(e(ke), {
           key: 0,
           onRegister: e(Z),
-          onSubmit: R,
+          onSubmit: P,
           onReset: ee
-        }, null, 8, ["onRegister"])) : D("", !0), h(a.$slots, "toolbar-right")]),
-        empty: c(() => [h(a.$slots, "empty", {}, () => [p(e(ge), ie(se(n.value.emptyCfg)), null, 16)])]),
-        loading: c(() => [ce(H("div", He, null, 512), [[e(de), !!n.value.loading]])]),
+        }, null, 8, ["onRegister"])) : F("", !0), h(a.$slots, "toolbar-right")]),
+        empty: i(() => [h(a.$slots, "empty", {}, () => [c(e(ue), se(ge(l.value.emptyCfg)), null, 16)])]),
+        loading: i(() => [ce(H("div", null, null, 512), [[ie, l.value.loading], [e(fe), l.value.loadingCfg || {}]])]),
         _: 3
-      }, 16), n.value.showPager ? (m(), f(e(ye), _({
+      }, 16), l.value.showPager ? (p(), m(e(ve), T({
         key: 0,
         ref_key: "pageRef",
         ref: C
-      }, e(i), {
-        class: [e(g).e("pager"), e(g).m(`pager-${e(i)?.pagePlacement}`)],
-        onCurrentChange: o[0] || (o[0] = (l) => S({
-          currentPage: l
+      }, e(s), {
+        class: [e(d).e("pager"), e(d).m(`pager-${e(s)?.pagePlacement}`)],
+        onCurrentChange: o[0] || (o[0] = (r) => B({
+          currentPage: r
         })),
-        onSizeChange: o[1] || (o[1] = (l) => S({
-          pageSize: l
+        onSizeChange: o[1] || (o[1] = (r) => B({
+          pageSize: r
         }))
-      }), null, 16, ["class"])) : D("", !0)], 2)]),
+      }), null, 16, ["class"])) : F("", !0)], 2)]),
       _: 3
     }));
   }
 });
 export {
-  la as default
+  ra as default
 };

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

@@ -1,4 +1,5 @@
 import type { EmptyProps } from 'vft/es/components/empty';
+import type { LoadingBinding } from 'vft/es/components/loading';
 import { type PaginationProps } from 'vft/es/components/pagination';
 import type { VxeGridInstance, VxeGridProps, VxeTableDefines } from 'vxe-table';
 import { type SuperFormProps } from '../super-form';
@@ -76,6 +77,7 @@ export interface TableProps extends VxeGridProps {
     onChange?: (...args: any[]) => void;
     /** 空状态配置，用于自定义空数据时的显示内容 */
     emptyCfg?: EmptyProps;
+    loadingCfg?: LoadingBinding;
 }
 /** 列项属性类型，继承自 VXE Table 的列选项 */
 export type ColumnItemProps = VxeTableDefines.ColumnOptions;