vft 0.0.499 → 0.0.501

package/es/components/super-form/types.d.ts

@@ -19,6 +19,8 @@ import type { SelectV2Props } from 'vft/es/components/select';
 import type { SliderProps } from 'vft/es/components/slider/slider.vue';
 import type { TimePickerDefaultProps } from 'vft/es/components/time-picker';
 import type { ToolTipProps } from 'vft/es/components/tooltip';
+import type { TreeProps } from 'vft/es/components/tree/tree.vue';
+import type { TreeSelectProps } from 'vft/es/components/tree-select/tree-select.vue';
 import type { UploadProps } from 'vft/es/components/upload';
 import type { ComponentSize } from 'vft/es/constants';
 import type { Arrayable } from 'vft/es/utils';
@@ -55,7 +57,7 @@ type FormItemRule = Omit<RuleItem, 'validator'> & Rule & {
 } & {
     isNumber?: boolean;
 };
-export type SchemaCompOptions = InputProps | SelectV2Props | RadioGroupProps | CheckboxGroupProps | DatePickerProps | TimePickerDefaultProps | CascaderProps | AutocompleteProps | ColorPickerProps | UploadProps | SliderProps | InputNumberProps | InputTagProps | DividerProps | SearchProps | SwitchProps | {
+export type SchemaCompOptions = InputProps | SelectV2Props | RadioGroupProps | CheckboxGroupProps | DatePickerProps | TimePickerDefaultProps | CascaderProps | AutocompleteProps | ColorPickerProps | UploadProps | SliderProps | InputNumberProps | InputTagProps | DividerProps | SearchProps | SwitchProps | TreeProps | TreeSelectProps | {
     onClear?: Function;
 } | {
     /** 组件异步请求数据 */

package/es/components/table/field.js

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

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

@@ -1,8 +1,8 @@
-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 _, toRaw as he, createElementBlock as Ce, openBlock as k, normalizeClass as be, withCtx as n, createBlock as G, createCommentVNode as M, 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 { 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 S } from "@vft/utils";
+import { deepMerge as L, isClient as ze, omit as Pe, isFunction as B } from "@vft/utils";
 import { FormCompEnum as C } from "../../utils/form-register.js";
 import "@vueuse/core";
 import "../config-provider/hooks/use-global-config.js";
@@ -403,7 +403,7 @@ const Me = K({
     expose: X,
     emit: j
   }) {
-    const c = j, g = He("table"), Y = ue(), f = d(), B = d(), W = d([]), b = d(), y = d(), U = me(), a = $(() => L(U.props, o(b))), {
+    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), {
@@ -415,8 +415,8 @@ const Me = K({
       setColumns: oe
     } = Ne(a);
     pe(() => Z(), (e) => {
-      _(() => {
-        R({
+      G(() => {
+        z({
           seqConfig: {
             startIndex: (e - 1) * (u.value?.pageSize || o(a).pageSize || I)
           }
@@ -425,24 +425,24 @@ const Me = K({
     }, {
       immediate: !0
     });
-    function R(e) {
+    function z(e) {
       b.value = {
         ...o(b),
         ...e
       };
     }
     const {
-      getDataSourceRef: z,
+      getDataSourceRef: P,
       handleTableChange: ae,
       reload: v,
       deleteTableDataRecord: te,
       insertTableDataRecord: le,
       updateTableData: re,
       updateTableDataRecord: ne,
-      setTableData: P,
+      setTableData: D,
       getDataSource: ce,
-      getRawDataSource: D,
-      tableSearch: H,
+      getRawDataSource: H,
+      tableSearch: O,
       expandTreeLevel: ie
     } = Ve(a, {
       tableData: W,
@@ -451,16 +451,16 @@ const Me = K({
       setPagination: w,
       getGridRef: () => f.value
     }, c);
-    function O(e) {
+    function T(e) {
       e?.pageSize && w({
         currentPage: 1
       }), ae(e), c("change", e);
       const {
         onChange: t
       } = o(a);
-      t && S(t) && t(e);
+      t && B(t) && t(e);
     }
-    const T = {};
+    const F = {};
     [
       "update:data",
       "keydown-start",
@@ -583,16 +583,16 @@ const Me = K({
       "zoom"
     ].forEach((e) => {
       const t = Ee.camelCase(`on-${e}`);
-      T[t] = (...l) => c(e, ...l);
+      F[t] = (...l) => c(e, ...l);
     });
-    const r = $(() => {
-      const e = o(z), t = {
+    const r = _(() => {
+      const e = o(P), t = {
         ...Y,
         ...o(a),
         columns: he(o(ee)),
         loading: o(J),
         data: e,
-        ...T
+        ...F
       };
       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`);
@@ -609,24 +609,24 @@ const Me = K({
           query: async () => await v()
         }
       }), t;
-    }), F = {
+    }), A = {
       setPagination: w,
       emit: c,
-      setProps: R,
+      setProps: z,
       reload: v,
       deleteTableDataRecord: te,
       insertTableDataRecord: le,
       updateTableDataRecord: ne,
       updateTableData: re,
-      setTableData: P,
+      setTableData: D,
       getDataSource: ce,
-      getDataSourceRef: z,
+      getDataSourceRef: P,
       setColumns: oe,
-      getRawDataSource: D,
-      tableSearch: H,
+      getRawDataSource: H,
+      tableSearch: O,
       expandTreeLevel: ie
     };
-    c("register", F);
+    c("register", A);
     const se = {
       field: "_filterTableData",
       label: "",
@@ -636,12 +636,12 @@ const Me = K({
       },
       componentProps: () => ({
         onChange: (e) => {
-          N({
+          V({
             _filterTableData: e
           });
         }
       })
-    }, A = L({
+    }, E = L({
       schemas: [r.value?.formOptions?.addSearchAllSchema ? se : {}],
       rowProps: {
         justify: "start"
@@ -656,27 +656,27 @@ const Me = K({
         btnText: "搜索"
       },
       actionInline: !0
-    }, Pe(r.value?.formOptions, ["showActionForm", "addSearchAllSchema"]), "replace"), E = (e) => (...t) => {
-      e && S(e) && e(...t), _(() => {
+    }, Pe(r.value?.formOptions, ["showActionForm", "addSearchAllSchema"]), "replace"), N = (e) => (...t) => {
+      e && B(e) && e(...t), G(() => {
         v();
       });
     }, [de] = De({
-      ...A,
-      schemas: (o(A)?.schemas || []).map((e) => {
+      ...E,
+      schemas: (o(E)?.schemas || []).map((e) => {
         if (!o(r)?.formOptions?.autoReloadOnClear)
           return e;
         if (!e.type || e.type === C.Input || e.type === C.Search || e.type === C.Textarea) {
           const {
             componentProps: m
           } = e;
-          if (S(m))
+          if (B(m))
             return {
               ...e,
               componentProps: async (x) => {
-                const V = await m(x), fe = V?.onClear;
+                const $ = await m(x), fe = $?.onClear;
                 return {
-                  ...V,
-                  onClear: E(fe)
+                  ...$,
+                  onClear: N(fe)
                 };
               }
             };
@@ -686,25 +686,25 @@ const Me = K({
               ...e,
               componentProps: {
                 ...m,
-                onClear: E(x)
+                onClear: N(x)
               }
             };
           }
         }
         return e;
       })
-    }), N = (e) => {
-      Reflect.has(e, "_filterTableData") && H(e._filterTableData), c("form-submit", e);
+    }), V = (e) => {
+      Reflect.has(e, "_filterTableData") && O(e._filterTableData), c("form-submit", e);
     }, ge = () => {
-      P(D()), c("form-reset");
+      D(H()), c("form-reset");
     };
     return setTimeout(() => {
       console.log(f.value, "xGridxGrid");
     }, 1500), X({
       table: f,
       formRef: y,
-      pageRef: B,
-      ...F
+      pageRef: R,
+      ...A
     }), (e, t) => (k(), Ce("div", {
       class: be([o(g).b(), {
         [o(g).is("form-exceed-one-rows")]: y.value?.willExceedOneRow
@@ -715,12 +715,12 @@ const Me = K({
         ref_key: "xGrid",
         ref: f
       }, r.value), {
-        toolbarButtons: n(() => [s(e.$slots, "toolbar-left"), r.value?.formOptions?.showActionForm ? (k(), G(o(Fe), {
+        toolbarButtons: n(() => [s(e.$slots, "toolbar-left"), r.value?.formOptions?.showActionForm ? (k(), M(o(Fe), {
           key: 0,
           ref_key: "formRef",
           ref: y,
           onRegister: o(de),
-          onSubmit: N,
+          onSubmit: V,
           onReset: ge
         }, xe({
           _: 2
@@ -736,23 +736,25 @@ const Me = K({
           name: "submitAfter",
           fn: n((l) => [s(e.$slots, "submitAfter", p(h(l)))]),
           key: "2"
-        } : void 0]), 1032, ["onRegister"])) : M("", !0), s(e.$slots, "toolbar-right")]),
-        empty: n(() => [s(e.$slots, "empty", {}, () => [i(o(Be), p(h(r.value.emptyCfg)), null, 16)])]),
+        } : void 0]), 1032, ["onRegister"])) : S("", !0), s(e.$slots, "toolbar-right")]),
+        empty: n(() => [r.value.loading ? S("", !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]])]),
         _: 3
-      }, 16), r.value.showPager ? (k(), G(o(Oe), q({
+      }, 16), r.value.showPager ? (k(), M(o(Oe), q({
         key: 0,
         ref_key: "pageRef",
-        ref: B
+        ref: R
       }, o(u), {
         class: [o(g).e("pager"), o(g).m(`pager-${o(u)?.pagePlacement}`)],
-        onCurrentChange: t[0] || (t[0] = (l) => O({
+        onCurrentChange: t[0] || (t[0] = (l) => T({
           currentPage: l
         })),
-        onSizeChange: t[1] || (t[1] = (l) => O({
+        onSizeChange: t[1] || (t[1] = (l) => T({
           pageSize: l
         }))
-      }), null, 16, ["class"])) : M("", !0)]),
+      }), null, 16, ["class"])) : S("", !0)]),
       _: 3
     })], 2));
   }