vft 0.0.493 → 0.0.495

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

@@ -1,26 +1,26 @@
-import { defineComponent as J, useAttrs as le, reactive as ue, ref as m, computed as u, unref as n, watch as d, nextTick as ie, useSlots as me, createBlock as i, createCommentVNode as U, openBlock as l, mergeProps as B, withKeys as fe, withModifiers as ce, withCtx as h, renderSlot as O, normalizeProps as W, createElementBlock as pe, Fragment as de, renderList as j, createSlots as Be, resolveDynamicComponent as A, h as he } from "vue";
-import { VftCol as ye } from "../col/index.js";
-import { VftForm as ve } from "../form/index.js";
-import { VftRow as be } from "../row/index.js";
-import { useTimeoutFn as ge, useDebounceFn as we } from "@vueuse/core";
-import { cloneDeep as Fe, isEqual as Re, pick as Se, deepMerge as Ce } from "@vft/utils";
+import { defineComponent as j, useAttrs as ue, reactive as ie, ref as m, computed as u, unref as n, watch as d, nextTick as me, useSlots as fe, createBlock as i, createCommentVNode as K, openBlock as r, mergeProps as B, withKeys as ce, withModifiers as pe, withCtx as h, renderSlot as O, normalizeProps as U, createElementBlock as de, Fragment as Be, renderList as W, createSlots as he, resolveDynamicComponent as A, h as ye } from "vue";
+import { VftCol as ve } from "../col/index.js";
+import { VftForm as be } from "../form/index.js";
+import { VftRow as ge } from "../row/index.js";
+import { useTimeoutFn as we, useDebounceFn as Fe } from "@vueuse/core";
+import { cloneDeep as Re, isEqual as Se, pick as Ce, deepMerge as ke } from "@vft/utils";
 import "../config-provider/hooks/use-global-config.js";
 import "lodash-es";
-import { useNamespace as ke } from "../../hooks/use-namespace/index.js";
+import { useNamespace as Ee } from "../../hooks/use-namespace/index.js";
 import "../../hooks/use-model-toggle/index.js";
 import "@popperjs/core";
 import "../../hooks/use-z-index/index.js";
-import Ee from "./super-form-action.vue2.js";
-import Oe from "./super-form-item.vue2.js";
-import { useAutoFocus as Ae } from "./use/use-auto-focus.js";
+import Oe from "./super-form-action.vue2.js";
+import Ae from "./super-form-item.vue2.js";
+import { useAutoFocus as Me } from "./use/use-auto-focus.js";
 import { createFormContext as Pe } from "./use/use-form-context.js";
 import { useFormEvents as Ve } from "./use/use-form-events.js";
 import { useFormValues as Ie } from "./use/use-form-values.js";
-import { willFormExceedOneRow as Me } from "./use/helper.js";
-const _e = J({
+import { willFormExceedOneRow as _e } from "./use/helper.js";
+const De = j({
   name: "vft-super-form"
-}), et = /* @__PURE__ */ J({
-  ..._e,
+}), tt = /* @__PURE__ */ j({
+  ...De,
   props: {
     size: {
       default: "default"
@@ -111,6 +111,7 @@ const _e = J({
     labelWidth: {
       default: "auto"
     },
+    formatter: {},
     disabled: {
       type: Boolean
     },
@@ -149,30 +150,30 @@ const _e = J({
     }
   },
   emits: ["register", "reset", "submit", "field-value-change", "common-btn-click"],
-  setup(Q, {
-    expose: X,
-    emit: Y
+  setup(J, {
+    expose: Q,
+    emit: X
   }) {
-    const P = Q, y = Y, V = ke("super-form"), Z = le(), r = ue({}), p = m({}), v = m(!1), b = m({}), I = m(), g = m(null), M = m(), t = u(() => ({
-      ...P,
+    const M = J, y = X, P = Ee("super-form"), Y = ue(), l = ie({}), p = m({}), v = m(!1), b = m({}), V = m(), g = m(null), I = m(), t = u(() => ({
+      ...M,
       ...n(b)
     })), f = u(() => ({
-      ...Z,
-      ...P,
+      ...Y,
+      ...M,
       ...n(t)
     })), a = u(() => {
-      const e = n(I);
-      return Fe(e);
+      const e = n(V);
+      return Re(e);
     }), {
-      handleFormValues: _,
+      handleFormValues: Z,
       initDefault: ee
     } = Ie({
       getProps: t,
       defaultValueRef: p,
       getSchema: a,
-      formModel: r
+      formModel: l
     });
-    Ae({
+    Me({
       getSchema: a,
       getProps: t,
       isInitedDefault: v,
@@ -181,28 +182,29 @@ const _e = J({
     const {
       handleSubmit: c,
       setFieldsValue: w,
-      clearValidate: D,
-      validate: T,
-      validateField: x,
+      clearValidate: _,
+      validate: D,
+      validateField: T,
       getFieldsValue: F,
       updateSchema: R,
       resetSchema: S,
-      appendSchemaByField: q,
-      removeSchemaByField: L,
+      appendSchemaByField: x,
+      removeSchemaByField: q,
       resetFields: C,
       scrollToField: te,
-      getFieldValue: $,
-      setFormItemError: N
+      getFieldValue: L,
+      setFormItemError: $,
+      getFormattedFormModel: oe
     } = Ve({
       emit: y,
       getProps: t,
-      formModel: r,
+      formModel: l,
       getSchema: a,
       defaultValueRef: p,
       formElRef: g,
-      schemaRef: I,
-      handleFormValues: _,
-      initValues: M
+      schemaRef: V,
+      handleFormValues: Z,
+      initValues: I
     });
     Pe({
       resetAction: C,
@@ -216,24 +218,24 @@ const _e = J({
     }, {
       immediate: !0
     }), d(() => n(t).schemas, (e, o) => {
-      Re(e, o) || S(e ?? []);
+      Se(e, o) || S(e ?? []);
     }), d(() => a.value, (e) => {
-      ie(() => {
-      }), !n(v) && e?.length && (ee(), v.value = !0, t.value?.watchDataIsChange && ge(() => {
-        M.value = F();
+      me(() => {
+      }), !n(v) && e?.length && (ee(), v.value = !0, t.value?.watchDataIsChange && we(() => {
+        I.value = F();
       }, 40));
-    }), d(() => r, we(() => {
+    }), d(() => l, Fe(() => {
       n(t).submitOnChange && c();
     }, 300), {
       deep: !0
     });
-    async function G(e) {
-      b.value = Ce(n(b) || {}, e);
+    async function N(e) {
+      b.value = ke(n(b) || {}, e);
     }
-    function oe(e, o, s) {
-      r[e] = o;
+    function ne(e, o, s) {
+      l[e] = o;
     }
-    function ne(e) {
+    function ae(e) {
       const {
         autoSubmitOnEnter: o
       } = n(t);
@@ -242,113 +244,113 @@ const _e = J({
         s && s.tagName && s.tagName.toUpperCase() === "INPUT" && c();
       }
     }
-    const H = {
+    const G = {
       getFieldsValue: F,
-      getFieldValue: $,
+      getFieldValue: L,
       setFieldsValue: w,
       resetFields: C,
       updateSchema: R,
       resetSchema: S,
-      setProps: G,
-      removeSchemaByField: L,
-      appendSchemaByField: q,
-      clearValidate: D,
-      validateField: x,
-      setFormItemError: N,
-      validate: T,
+      setProps: N,
+      removeSchemaByField: q,
+      appendSchemaByField: x,
+      clearValidate: _,
+      validateField: T,
+      setFormItemError: $,
+      validate: D,
       submit: c,
       scrollToField: te
     };
-    y("register", H);
-    const ae = u(() => Se(t.value, ["showResetButton", "showCommonButton", "showSubmitButton", "resetButtonOptions", "submitButtonOptions", "commonButtonOptions", "actionRowOptions", "actionSpan", "submitResetReverse"])), se = u(() => {
+    y("register", G);
+    const se = u(() => Ce(t.value, ["showResetButton", "showCommonButton", "showSubmitButton", "resetButtonOptions", "submitButtonOptions", "commonButtonOptions", "actionRowOptions", "actionSpan", "submitResetReverse"])), re = u(() => {
       const {
         showCommonButton: e,
         showResetButton: o,
         showSubmitButton: s
       } = t.value;
       return !!(e || o || s);
-    }), z = u(() => {
+    }), H = u(() => {
       const e = n(a);
       if (!e || e.length === 0)
         return !1;
       try {
-        return Me(e, t.value, r, p.value).willExceed;
+        return _e(e, t.value, l, p.value).willExceed;
       } catch {
         return !1;
       }
-    }), k = me(), E = (e) => e ? he(Ee, ae.value, {
+    }), k = fe(), E = (e) => e ? ye(Oe, se.value, {
       resetBefore: (o) => k.resetBefore?.(o),
       submitBefore: (o) => k.submitBefore?.(o),
       submitAfter: (o) => k.submitAfter?.(o)
     }) : null;
-    return X({
+    return Q({
       getFieldsValue: F,
-      getFieldValue: $,
+      getFieldValue: L,
       setFieldsValue: w,
       resetFields: C,
       updateSchema: R,
       resetSchema: S,
-      setProps: G,
-      removeSchemaByField: L,
-      appendSchemaByField: q,
-      clearValidate: D,
-      validateField: x,
-      validate: T,
+      setProps: N,
+      removeSchemaByField: q,
+      appendSchemaByField: x,
+      clearValidate: _,
+      validateField: T,
+      validate: D,
       submit: c,
       getSchema: a,
-      setFormItemError: N,
-      formModel: u(() => _(r)),
-      hasActionButton: se,
-      willExceedOneRow: z
-    }), (e, o) => a.value?.length ? (l(), i(n(ve), B({
+      setFormItemError: $,
+      formModel: u(() => oe()),
+      hasActionButton: re,
+      willExceedOneRow: H
+    }), (e, o) => a.value?.length ? (r(), i(n(be), B({
       key: 0
     }, f.value, {
       ref_key: "formElRef",
       ref: g,
-      class: [n(V).b(), {
-        [n(V).is("exceed-one-row")]: z.value
+      class: [n(P).b(), {
+        [n(P).is("exceed-one-row")]: H.value
       }],
-      model: r,
-      onSubmit: o[0] || (o[0] = ce(() => {
+      model: l,
+      onSubmit: o[0] || (o[0] = pe(() => {
       }, ["prevent"])),
-      onKeypress: fe(ne, ["enter"])
+      onKeypress: ce(ae, ["enter"])
     }), {
-      default: h(() => [a.value?.length ? (l(), i(n(be), W(B({
+      default: h(() => [a.value?.length ? (r(), i(n(ge), U(B({
         key: 0
       }, f.value?.rowProps)), {
-        default: h(() => [O(e.$slots, "formHeader"), (l(!0), pe(de, null, j(a.value, (s) => (l(), i(Oe, {
+        default: h(() => [O(e.$slots, "formHeader"), (r(!0), de(Be, null, W(a.value, (s) => (r(), i(Ae, {
           key: s.field,
-          "form-action-type": H,
+          "form-action-type": G,
           schema: s,
           "form-props": t.value,
           "all-default-values": p.value,
-          "form-model": r,
-          "set-form-model": oe,
+          "form-model": l,
+          "set-form-model": ne,
           "update-schema": n(R)
-        }, Be({
+        }, he({
           _: 2
-        }, [j(Object.keys(e.$slots), (K) => ({
-          name: K,
-          fn: h((re) => [O(e.$slots, K, B({
+        }, [W(Object.keys(e.$slots), (z) => ({
+          name: z,
+          fn: h((le) => [O(e.$slots, z, B({
             ref_for: !0
-          }, re || {}))])
-        }))]), 1032, ["schema", "form-props", "all-default-values", "form-model", "update-schema"]))), 128)), t.value?.customLayout ? (l(), i(A(E(t.value?.showActionButtonGroup && t.value?.actionInline)), {
+          }, le || {}))])
+        }))]), 1032, ["schema", "form-props", "all-default-values", "form-model", "update-schema"]))), 128)), t.value?.customLayout ? (r(), i(A(E(t.value?.showActionButtonGroup && t.value?.actionInline)), {
           key: 1
-        })) : (l(), i(n(ye), W(B({
+        })) : (r(), i(n(ve), U(B({
           key: 0
         }, f.value?.quickColSpan ? {
           span: Math.ceil(24 / f.value?.quickColSpan),
           ...f.value?.baseColProps
         } : {})), {
-          default: h(() => [(l(), i(A(E(t.value?.showActionButtonGroup && t.value?.actionInline))))]),
+          default: h(() => [(r(), i(A(E(t.value?.showActionButtonGroup && t.value?.actionInline))))]),
           _: 1
         }, 16))]),
         _: 3
-      }, 16)) : U("", !0), (l(), i(A(E(t.value?.showActionButtonGroup && !t.value?.actionInline)))), O(e.$slots, "formFooter")]),
+      }, 16)) : K("", !0), (r(), i(A(E(t.value?.showActionButtonGroup && !t.value?.actionInline)))), O(e.$slots, "formFooter")]),
       _: 3
-    }, 16, ["class", "model"])) : U("", !0);
+    }, 16, ["class", "model"])) : K("", !0);
   }
 });
 export {
-  et as default
+  tt as default
 };

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

@@ -1,10 +1,25 @@
 import type { SwitchProps } from 'vft/es/components';
+import type { AutocompleteProps } from 'vft/es/components/autocomplete/autocomplete.vue';
 import type { ButtonProps } from 'vft/es/components/button';
+import type { CascaderProps } from 'vft/es/components/cascader-panel';
+import type { CheckboxGroupProps } from 'vft/es/components/checkbox/checkbox-group.vue';
 import type { ColProps } from 'vft/es/components/col';
+import type { ColorPickerProps } from 'vft/es/components/color-picker/color-picker.vue';
+import type { DatePickerProps } from 'vft/es/components/date-picker';
+import type { DividerProps } from 'vft/es/components/divider/divider.vue';
 import type { FormItemProp, FormItemProps, FormProps } from 'vft/es/components/form';
 import type { IconProps } from 'vft/es/components/icon';
+import type { InputProps } from 'vft/es/components/input';
+import type { InputNumberProps } from 'vft/es/components/input-number/input-number.vue';
+import type { InputTagProps } from 'vft/es/components/input-tag';
+import type { RadioGroupProps } from 'vft/es/components/radio/radio-group.vue';
 import type { RowProps } from 'vft/es/components/row';
+import type { SearchProps } from 'vft/es/components/search';
+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 { UploadProps } from 'vft/es/components/upload';
 import type { ComponentSize } from 'vft/es/constants';
 import type { Arrayable } from 'vft/es/utils';
 import { type FormCompEnumType } from 'vft/es/utils';
@@ -40,7 +55,7 @@ type FormItemRule = Omit<RuleItem, 'validator'> & Rule & {
 } & {
     isNumber?: boolean;
 };
-export type SchemaCompOptions = SwitchProps | Record<string, any>;
+export type SchemaCompOptions = InputProps | SelectV2Props | RadioGroupProps | CheckboxGroupProps | DatePickerProps | TimePickerDefaultProps | CascaderProps | AutocompleteProps | ColorPickerProps | UploadProps | SliderProps | InputNumberProps | InputTagProps | DividerProps | SearchProps | SwitchProps | Record<string, any>;
 /** 渲染回调参数接口 */
 export interface RenderCallbackParams {
     /** 表单配置模式 */
@@ -180,6 +195,8 @@ export interface SuperFormProps extends FormInnerProps {
     submitResetReverse?: boolean;
     labelPosition?: 'left' | 'right' | 'top';
     labelWidth?: string | number;
+    /** 表单值格式化函数，用于格式化 getFieldsValue 的输出值 */
+    formatter?: (values: Recordable) => Recordable;
 }
 /** 表单配置模式接口 */
 export interface FormSchema {
@@ -265,6 +282,8 @@ export interface FormSchema {
     helpIcon?: IconProps | string;
     /** 帮助提示配置 */
     helpTooltip?: string | ToolTipProps;
+    /** 字段值格式化函数，用于格式化该字段在 getFieldsValue 中的输出值 */
+    formatter?: (value: any, field: string, values: Recordable, schema: FormSchema) => any;
 }
 /** 表单项属性接口 */
 export interface SuperFormItemProps {

package/es/components/super-form/use/use-form-events.d.ts

@@ -27,5 +27,6 @@ export declare function useFormEvents({ emit, getProps, formModel, getSchema, de
     scrollToField: (name: any, options?: ScrollOptions | undefined) => Promise<void>;
     getFieldValue: (field: string) => string | number | Recordable;
     setFormItemError: (field: string, errMess: string) => Promise<void>;
+    getFormattedFormModel: () => Recordable;
 };
 export {};