vft 0.0.507 → 0.0.511

package/es/components/table/field.js

@@ -1,19 +1,19 @@
 import { createVNode as r, Fragment as _, isVNode as g } from "vue";
-import { useLoadingDelay as L } from "@vft/use";
+import { useLoadingDelay as h } from "@vft/use";
 import { formatToDateTime as d } from "@vft/utils/date";
-import { isNullOrUndefined as M } from "@vft/utils";
+import { isNullOrUndefined as L } from "@vft/utils";
 import { VftButton as u } from "../button/index.js";
-import { VftPopconfirm as h } from "../popconfirm/index.js";
+import { VftPopconfirm as M } from "../popconfirm/index.js";
 import { VftTag as c } from "../tag/index.js";
 function m(t) {
   return typeof t == "function" || Object.prototype.toString.call(t) === "[object Object]" && !g(t);
 }
-const V = {
+const N = {
   type: "seq",
   title: "序号",
   fixed: "left",
   width: 53
-}, W = {
+}, V = {
   type: "checkbox",
   title: "",
   minWidth: 60,
@@ -29,46 +29,46 @@ const V = {
 }, O = ({
   format: t = "YYYY-MM-DD",
   field: e = "date",
-  title: o = "时间"
+  title: i = "时间"
 } = {}) => ({
   minWidth: 100,
   field: e,
-  title: o,
+  title: i,
   formatter: ({
-    row: i
-  }) => i[e] ? d(i[e], t) : "-"
+    row: o
+  }) => o[e] ? d(o[e], t) : "-"
 }), D = ({
   format: t = "YYYY-MM-DD HH:mm:ss",
   field: e = "date",
-  title: o = "时间"
+  title: i = "时间"
 } = {}) => ({
   minWidth: 190,
   field: e,
-  title: o,
+  title: i,
   formatter: ({
-    row: i
-  }) => i[e] ? d(i[e], t) : "-"
+    row: o
+  }) => o[e] ? d(o[e], t) : "-"
 }), P = ({
   format: t = "YYYY-MM-DD HH:mm:ss",
   field: e = "createTime",
-  title: o = "创建时间"
+  title: i = "创建时间"
 } = {}) => D({
   format: t,
   field: e,
-  title: o
+  title: i
 }), b = ({
   format: t = "YYYY-MM-DD HH:mm:ss",
   field: e = "updateTime",
-  title: o = "更新时间"
+  title: i = "更新时间"
 } = {}) => D({
   format: t,
   field: e,
-  title: o
+  title: i
 }), j = ({
   field: t = "status",
   title: e = "状态",
-  normalText: o = "正常",
-  disabledText: i = "禁用",
+  normalText: i = "正常",
+  disabledText: o = "禁用",
   strToNumber: l = !0
 } = {}) => ({
   field: t,
@@ -79,27 +79,28 @@ const V = {
       row: a
     }) => {
       let n = a?.[t];
-      return M(n) ? "-" : (l && Number(n) === 0 && (n = !1), n ? r(c, null, m(o) ? o : {
-        default: () => [o]
+      return L(n) ? "-" : (l && Number(n) === 0 && (n = !1), n ? r(c, null, m(i) ? i : {
+        default: () => [i]
       }) : r(c, {
         type: "danger"
-      }, m(i) ? i : {
-        default: () => [i]
+      }, m(o) ? o : {
+        default: () => [o]
       }));
     }
   }
 }), U = ({
   confirmText: t = "确认删除?",
   leftCallback: e,
-  rightCallback: o,
-  leftText: i = "编辑",
+  rightCallback: i,
+  leftText: o = "编辑",
   rightText: l = "删除",
   showLeft: a = !0,
   showRight: n = !0
 } = {}) => ({
-  title: "操作栏",
+  title: "操作",
   field: "custom-action",
   fixed: "right",
+  minWidth: 180,
   slots: {
     default: ({
       row: f
@@ -108,8 +109,8 @@ const V = {
         loading: p,
         start: E,
         cancel: I
-      } = L(), Y = () => {
-        E(), o?.(f)?.finally(() => {
+      } = h(), Y = () => {
+        E(), i?.(f)?.finally(() => {
           I();
         });
       };
@@ -119,9 +120,9 @@ const V = {
         onClick: (s) => {
           s.stopPropagation(), e?.(f);
         }
-      }, m(i) ? i : {
-        default: () => [i]
-      }) : null, n ? r(h, {
+      }, m(o) ? o : {
+        default: () => [o]
+      }) : null, n ? r(M, {
         width: "150",
         onConfirm: Y,
         title: t
@@ -142,13 +143,13 @@ const V = {
 });
 export {
   U as ACTION_FIELD,
-  W as CHECKED_FIELD,
+  V as CHECKED_FIELD,
   P as CREATE_TIME_FIELD,
   O as DATE_FIELD,
   D as DATE_TIME_FIELD,
   S as ID_FIELD,
   k as NAME_FIELD,
-  V as SEQ_FIELD,
+  N as SEQ_FIELD,
   j as STATUS_FIELD,
   b as UPDATE_TIME_FIELD
 };

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

@@ -1,33 +1,33 @@
-import { defineComponent as K, createVNode as i, useAttrs as ue, ref as d, getCurrentInstance as me, computed as _, unref as o, watch as pe, nextTick as G, toRaw as he, createElementBlock as Ce, openBlock as k, normalizeClass as be, withCtx as n, createBlock as M, createCommentVNode as S, mergeProps as q, withDirectives as ye, createElementVNode as we, vShow as ve, renderSlot as s, normalizeProps as p, guardReactiveProps as h, createSlots as xe, createTextVNode as ke } from "vue";
-import { VftClientOnly as Se } from "../client-only/index.js";
-import { VftEmpty as Be } from "../empty/index.js";
-import { vLoading as Re } from "../loading/directive.js";
-import { deepMerge as L, isClient as ze, omit as Pe, isFunction as B } from "@vft/utils";
+import { defineComponent as K, computed as m, createVNode as i, createTextVNode as he, useAttrs as Ce, ref as g, getCurrentInstance as be, unref as a, watch as ye, nextTick as L, toRaw as we, openBlock as S, createElementBlock as ve, normalizeClass as ke, withCtx as n, mergeProps as M, withDirectives as xe, createElementVNode as Se, vShow as Be, renderSlot as s, normalizeProps as p, guardReactiveProps as h, createCommentVNode as B, createBlock as q, createSlots as Re } from "vue";
+import { VftClientOnly as ze } from "../client-only/index.js";
+import { VftEmpty as Pe } from "../empty/index.js";
+import { vLoading as De } from "../loading/directive.js";
+import { deepMerge as G, isClient as He, omit as Oe, isFunction as R } from "@vft/utils";
 import { FormCompEnum as C } from "../../utils/form-register.js";
 import "@vueuse/core";
 import "../config-provider/hooks/use-global-config.js";
 import "lodash-es";
-import { useForm as De } from "../super-form/use/use-form.js";
-import { useNamespace as He } from "../../hooks/use-namespace/index.js";
+import { useForm as Fe } from "../super-form/use/use-form.js";
+import { useNamespace as Te } 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 { VftPagination as Oe } from "../pagination/index.js";
-import { VftSkeleton as Te } from "../skeleton/index.js";
-import { VftSuperForm as Fe } from "../super-form/index.js";
-import { VxeGrid as Ae } from "vxe-table";
-import Ee from "xe-utils";
+import { VftPagination as Ae } from "../pagination/index.js";
+import { VftSkeleton as Ee } from "../skeleton/index.js";
+import { VftSuperForm as Ne } from "../super-form/index.js";
+import { VxeGrid as Ve } from "vxe-table";
+import $e from "xe-utils";
 import { PageSize as I } from "./constants.js";
-import { useColumns as Ne } from "./use/use-columns.js";
-import { useDataSource as Ve } from "./use/use-data-source.js";
-import { useLoading as $e } from "./use/use-loading.js";
-import { usePagination as _e } from "./use/use-pagination.js";
+import { useColumns as _e } from "./use/use-columns.js";
+import { useDataSource as Le } from "./use/use-data-source.js";
+import { useLoading as Me } from "./use/use-loading.js";
+import { usePagination as qe } from "./use/use-pagination.js";
 import { EmptyEnum as Ge } from "../empty/constants.js";
-const Me = K({
+const Ie = K({
   name: "vft-table"
-}), ho = /* @__PURE__ */ K({
-  ...Me,
+}), Ca = /* @__PURE__ */ K({
+  ...Ie,
   props: {
     sticky: {
       type: [Boolean, Object]
@@ -82,14 +82,7 @@ const Me = K({
         type: Ge.NoData
       })
     },
-    loadingCfg: {
-      default: () => ({
-        customClass: "vft-card-loading",
-        text: i("div", null, [i("span", null, [ke("加载中")]), i("span", {
-          class: "dot"
-        }, null)])
-      })
-    },
+    loadingCfg: {},
     layouts: {},
     columns: {},
     pagerConfig: {},
@@ -399,68 +392,73 @@ const Me = K({
     "toolbar-tool-click",
     "zoom"
   ],
-  setup(qe, {
-    expose: X,
-    emit: j
+  setup(X, {
+    expose: j,
+    emit: Y
   }) {
-    const c = j, g = He("table"), Y = ue(), f = d(), R = d(), W = d([]), b = d(), y = d(), U = me(), a = _(() => L(U.props, o(b))), {
-      getLoading: J,
-      setLoading: Q
-    } = $e(a), {
-      getPaginationInfo: u,
-      setPagination: w,
-      getCurrentPage: Z
-    } = _e(a), {
-      getViewColumns: ee,
-      setColumns: oe
-    } = Ne(a);
-    pe(() => Z(), (e) => {
-      G(() => {
-        z({
+    const W = m(() => ({
+      customClass: "vft-card-loading",
+      text: i("div", null, [i("span", null, [he("加载中")]), i("span", {
+        class: "dot"
+      }, null)])
+    })), U = m(() => X.loadingCfg || W.value), c = Y, d = Te("table"), J = Ce(), b = g(), z = g(), Q = g([]), y = g(), w = g(), Z = be(), o = m(() => G(Z.props, a(y))), {
+      getLoading: ee,
+      setLoading: ae
+    } = Me(o), {
+      getPaginationInfo: f,
+      setPagination: v,
+      getCurrentPage: oe
+    } = qe(o), {
+      getViewColumns: te,
+      setColumns: le
+    } = _e(o);
+    ye(() => oe(), (e) => {
+      L(() => {
+        P({
           seqConfig: {
-            startIndex: (e - 1) * (u.value?.pageSize || o(a).pageSize || I)
+            startIndex: (e - 1) * (f.value?.pageSize || a(o).pageSize || I)
           }
         });
       });
     }, {
       immediate: !0
     });
-    function z(e) {
-      b.value = {
-        ...o(b),
+    function P(e) {
+      y.value = {
+        ...a(y),
         ...e
       };
     }
     const {
-      getDataSourceRef: P,
-      handleTableChange: ae,
-      reload: v,
-      deleteTableDataRecord: te,
-      insertTableDataRecord: le,
-      updateTableData: re,
-      updateTableDataRecord: ne,
-      setTableData: D,
-      getDataSource: ce,
-      getRawDataSource: H,
-      tableSearch: O,
-      expandTreeLevel: ie
-    } = Ve(a, {
-      tableData: W,
-      setLoading: Q,
-      getPaginationInfo: u,
-      setPagination: w,
-      getGridRef: () => f.value
+      getDataSourceRef: D,
+      handleTableChange: re,
+      reload: k,
+      deleteTableDataRecord: ne,
+      insertTableDataRecord: ce,
+      updateTableData: ie,
+      updateTableDataRecord: se,
+      setTableData: H,
+      getDataSource: ge,
+      getRawDataSource: O,
+      tableSearch: F,
+      expandTreeLevel: de
+    } = Le(o, {
+      tableData: Q,
+      setLoading: ae,
+      getPaginationInfo: f,
+      setPagination: v,
+      getGridRef: () => b.value
     }, c);
     function T(e) {
-      e?.pageSize && w({
+      e?.pageSize && v({
         currentPage: 1
-      }), ae(e), c("change", e);
+      }), re(e), c("change", e);
       const {
         onChange: t
-      } = o(a);
-      t && B(t) && t(e);
+      } = a(o);
+      t && R(t) && t(e);
     }
-    const F = {};
+    const A = {};
     [
       "update:data",
       "keydown-start",
@@ -582,52 +580,53 @@ const Me = K({
       "toolbar-tool-click",
       "zoom"
     ].forEach((e) => {
-      const t = Ee.camelCase(`on-${e}`);
-      F[t] = (...l) => c(e, ...l);
+      const t = $e.camelCase(`on-${e}`);
+      A[t] = (...l) => c(e, ...l);
     });
-    const r = _(() => {
-      const e = o(P), t = {
-        ...Y,
-        ...o(a),
-        columns: he(o(ee)),
-        loading: o(J),
+    const r = m(() => {
+      const e = a(D), t = {
+        ...J,
+        ...a(o),
+        columns: we(a(te)),
+        loading: a(ee),
         data: e,
-        ...F
+        loadingCfg: a(U),
+        ...A
       };
-      if (ze) {
-        (o(a)?.addMaxHeight || o(a)?.maxHeight) && (t.maxHeight = o(a)?.maxHeight ? o(a)?.maxHeight : `${window.innerHeight - o(a)?.extraSysHeight - (a.value?.showPager ? a.value?.pageHeight || 40 : 0)}px`);
-        const l = o(a)?.minHeight;
-        t.minHeight = l || (l !== 0 && o(a)?.toolbarConfig?.custom ? 300 : void 0);
+      if (He) {
+        (a(o)?.addMaxHeight || a(o)?.maxHeight) && (t.maxHeight = a(o)?.maxHeight ? a(o)?.maxHeight : `${window.innerHeight - a(o)?.extraSysHeight - (o.value?.showPager ? o.value?.pageHeight || 40 : 0)}px`);
+        const l = a(o)?.minHeight;
+        t.minHeight = l || (l !== 0 && a(o)?.toolbarConfig?.custom ? 300 : void 0);
       }
-      return o(a)?.toolbarConfig?.refresh && (t.proxyConfig = o(a)?.proxyConfig || {
+      return a(o)?.toolbarConfig?.refresh && (t.proxyConfig = a(o)?.proxyConfig || {
         response: {
-          result: o(a)?.fetchSetting?.listField,
-          total: o(a)?.fetchSetting?.totalField
+          result: a(o)?.fetchSetting?.listField,
+          total: a(o)?.fetchSetting?.totalField
         },
         autoLoad: !1,
         ajax: {
-          query: async () => await v()
+          query: async () => await k()
         }
       }), t;
-    }), A = {
-      setPagination: w,
+    }), E = {
+      setPagination: v,
       emit: c,
-      setProps: z,
-      reload: v,
-      deleteTableDataRecord: te,
-      insertTableDataRecord: le,
-      updateTableDataRecord: ne,
-      updateTableData: re,
-      setTableData: D,
-      getDataSource: ce,
-      getDataSourceRef: P,
-      setColumns: oe,
-      getRawDataSource: H,
-      tableSearch: O,
-      expandTreeLevel: ie
+      setProps: P,
+      reload: k,
+      deleteTableDataRecord: ne,
+      insertTableDataRecord: ce,
+      updateTableDataRecord: se,
+      updateTableData: ie,
+      setTableData: H,
+      getDataSource: ge,
+      getDataSourceRef: D,
+      setColumns: le,
+      getRawDataSource: O,
+      tableSearch: F,
+      expandTreeLevel: de
     };
-    c("register", A);
-    const se = {
+    c("register", E);
+    const fe = {
       field: "_filterTableData",
       label: "",
       type: C.Search,
@@ -636,13 +635,13 @@ const Me = K({
       },
       componentProps: () => ({
         onChange: (e) => {
-          V({
+          $({
             _filterTableData: e
           });
         }
       })
-    }, E = L({
-      schemas: [r.value?.formOptions?.addSearchAllSchema ? se : {}],
+    }, N = G({
+      schemas: [r.value?.formOptions?.addSearchAllSchema ? fe : {}],
       rowProps: {
         justify: "start"
       },
@@ -656,73 +655,71 @@ const Me = K({
         btnText: "搜索"
       },
       actionInline: !0
-    }, Pe(r.value?.formOptions, ["showActionForm", "addSearchAllSchema"]), "replace"), N = (e) => (...t) => {
-      e && B(e) && e(...t), G(() => {
-        v();
+    }, Oe(r.value?.formOptions, ["showActionForm", "addSearchAllSchema"]), "replace"), V = (e) => (...t) => {
+      e && R(e) && e(...t), L(() => {
+        k();
       });
-    }, [de] = De({
-      ...E,
-      schemas: (o(E)?.schemas || []).map((e) => {
-        if (!o(r)?.formOptions?.autoReloadOnClear)
+    }, [ue] = Fe({
+      ...N,
+      schemas: (a(N)?.schemas || []).map((e) => {
+        if (!a(r)?.formOptions?.autoReloadOnClear)
           return e;
         if (!e.type || e.type === C.Input || e.type === C.Search || e.type === C.Textarea) {
           const {
-            componentProps: m
+            componentProps: u
           } = e;
-          if (B(m))
+          if (R(u))
             return {
               ...e,
               componentProps: async (x) => {
-                const $ = await m(x), fe = $?.onClear;
+                const _ = await u(x), pe = _?.onClear;
                 return {
-                  ...$,
-                  onClear: N(fe)
+                  ..._,
+                  onClear: V(pe)
                 };
               }
             };
           {
-            const x = m?.onClear;
+            const x = u?.onClear;
             return {
               ...e,
               componentProps: {
-                ...m,
-                onClear: N(x)
+                ...u,
+                onClear: V(x)
               }
             };
           }
         }
         return e;
       })
-    }), V = (e) => {
-      Reflect.has(e, "_filterTableData") && O(e._filterTableData), c("form-submit", e);
-    }, ge = () => {
-      D(H()), c("form-reset");
+    }), $ = (e) => {
+      Reflect.has(e, "_filterTableData") && F(e._filterTableData), c("form-submit", e);
+    }, me = () => {
+      H(O()), c("form-reset");
     };
-    return setTimeout(() => {
-      console.log(f.value, "xGridxGrid");
-    }, 1500), X({
-      table: f,
-      formRef: y,
-      pageRef: R,
-      ...A
-    }), (e, t) => (k(), Ce("div", {
-      class: be([o(g).b(), {
-        [o(g).is("form-exceed-one-rows")]: y.value?.willExceedOneRow
+    return j({
+      table: b,
+      formRef: w,
+      pageRef: z,
+      ...E
+    }), (e, t) => (S(), ve("div", {
+      class: ke([a(d).b(), {
+        [a(d).is("form-exceed-one-rows")]: w.value?.willExceedOneRow
       }])
-    }, [i(o(Se), null, {
-      fallback: n(() => [i(o(Te))]),
-      default: n(() => [i(o(Ae), q({
+    }, [i(a(ze), null, {
+      fallback: n(() => [i(a(Ee))]),
+      default: n(() => [i(a(Ve), M({
         ref_key: "xGrid",
-        ref: f
+        ref: b
       }, r.value), {
-        toolbarButtons: n(() => [s(e.$slots, "toolbar-left"), r.value?.formOptions?.showActionForm ? (k(), M(o(Fe), {
+        toolbarButtons: n(() => [s(e.$slots, "toolbar-left"), r.value?.formOptions?.showActionForm ? (S(), q(a(Ne), {
           key: 0,
           ref_key: "formRef",
-          ref: y,
-          onRegister: o(de),
-          onSubmit: V,
-          onReset: ge
-        }, xe({
+          ref: w,
+          onRegister: a(ue),
+          onSubmit: $,
+          onReset: me
+        }, Re({
           _: 2
         }, [e.$slots.resetBefore ? {
           name: "resetBefore",
@@ -736,29 +733,29 @@ const Me = K({
           name: "submitAfter",
           fn: n((l) => [s(e.$slots, "submitAfter", p(h(l)))]),
           key: "2"
-        } : void 0]), 1032, ["onRegister"])) : S("", !0), s(e.$slots, "toolbar-right")]),
-        empty: n(() => [r.value.loading ? S("", !0) : s(e.$slots, "empty", {
+        } : void 0]), 1032, ["onRegister"])) : B("", !0), s(e.$slots, "toolbar-right")]),
+        empty: n(() => [r.value.loading ? B("", !0) : s(e.$slots, "empty", {
           key: 0
-        }, () => [i(o(Be), p(h(r.value.emptyCfg)), null, 16)])]),
-        loading: n(() => [ye(we("div", null, null, 512), [[ve, r.value.loading], [o(Re), r.value.loadingCfg]])]),
+        }, () => [i(a(Pe), p(h(r.value.emptyCfg)), null, 16)])]),
+        loading: n(() => [xe(Se("div", null, null, 512), [[Be, r.value.loading], [a(De), r.value.loadingCfg]])]),
         _: 3
-      }, 16), r.value.showPager ? (k(), M(o(Oe), q({
+      }, 16), r.value.showPager ? (S(), q(a(Ae), M({
         key: 0,
         ref_key: "pageRef",
-        ref: R
-      }, o(u), {
-        class: [o(g).e("pager"), o(g).m(`pager-${o(u)?.pagePlacement}`)],
+        ref: z
+      }, a(f), {
+        class: [a(d).e("pager"), a(d).m(`pager-${a(f)?.pagePlacement}`)],
         onCurrentChange: t[0] || (t[0] = (l) => T({
           currentPage: l
         })),
         onSizeChange: t[1] || (t[1] = (l) => T({
           pageSize: l
         }))
-      }), null, 16, ["class"])) : S("", !0)]),
+      }), null, 16, ["class"])) : B("", !0)]),
       _: 3
     })], 2));
   }
 });
 export {
-  ho as default
+  Ca as default
 };