@aplus-frontend/ui 0.3.3 → 0.3.5

package/es/src/ap-form/ap-form.vue2.mjs

@@ -28,12 +28,12 @@ const ye = /* @__PURE__ */ $({
     validateTrigger: { default: "change" },
     size: {},
     disabled: { type: Boolean },
-    onValuesChange: {},
     onFieldsChange: {},
     onFinish: {},
     onFinishFailed: {},
     onValidate: {},
     initialValues: {},
+    onValuesChange: {},
     syncToUrl: { type: [Boolean, Function], default: !1 },
     syncToUrlPriority: { type: Boolean }
   },

package/es/src/ap-form/drawer-form/index.vue.d.ts

@@ -110,12 +110,12 @@ declare function __VLS_template(): {
                 readonly hideRequiredMark?: boolean | undefined;
                 readonly validateOnRuleChange?: boolean | undefined;
                 readonly scrollToFirstError?: boolean | Options<any> | undefined;
-                readonly onValuesChange?: (((changedValues: any, values: any) => void) & ((changedValues: Recordable, allValues: Recordable, fieldName: NamePath) => void)) | undefined;
                 readonly onFieldsChange?: ((changedFields: FieldData[], allFields: FieldData[]) => void) | undefined;
                 readonly onFinish?: ((values: any) => void) | undefined;
                 readonly onFinishFailed?: ((errorInfo: ValidateErrorEntity<any>) => void) | undefined;
                 readonly onValidate?: ((name: string | number | string[] | number[], status: boolean, errors: string[]) => void) | undefined;
                 readonly initialValues?: Recordable | undefined;
+                readonly onValuesChange?: ((changedValues: Recordable, allValues: Recordable, fieldName: NamePath) => void) | undefined;
                 readonly syncToUrl?: boolean | ((values: Recordable, type: "get" | "set") => Recordable) | undefined;
                 readonly syncToUrlPriority?: boolean | undefined;
             } & VNodeProps & AllowedComponentProps & ComponentCustomProps;

package/es/src/ap-form/drawer-form/index.vue.mjs

@@ -53,11 +53,11 @@ const je = /* @__PURE__ */ Q({
     disabled: {
       type: Boolean
     },
-    onValuesChange: {},
     onFieldsChange: {},
     onFinishFailed: {},
     onValidate: {},
     initialValues: {},
+    onValuesChange: {},
     syncToUrl: {
       type: [Boolean, Function]
     },

package/es/src/ap-form/interface.d.ts

@@ -37,7 +37,7 @@ export type ApFormItemProps = FormItemProps & Partial<ApFormColProps> & {
 export type ApFormItemGroupProps = RowProps & {
     countPerRow?: number;
 };
-export type ApFormProps = Omit<FormProps, 'model'> & {
+export type ApFormProps = Omit<FormProps, 'model' | 'onValuesChange'> & {
     initialValues?: Recordable;
     /**
      * 字段值更新时触发

package/es/src/ap-form/modal-form/index.vue.d.ts

@@ -111,12 +111,12 @@ declare function __VLS_template(): {
                 readonly hideRequiredMark?: boolean | undefined;
                 readonly validateOnRuleChange?: boolean | undefined;
                 readonly scrollToFirstError?: boolean | Options<any> | undefined;
-                readonly onValuesChange?: (((changedValues: any, values: any) => void) & ((changedValues: Recordable, allValues: Recordable, fieldName: NamePath) => void)) | undefined;
                 readonly onFieldsChange?: ((changedFields: FieldData[], allFields: FieldData[]) => void) | undefined;
                 readonly onFinish?: ((values: any) => void) | undefined;
                 readonly onFinishFailed?: ((errorInfo: ValidateErrorEntity<any>) => void) | undefined;
                 readonly onValidate?: ((name: string | number | string[] | number[], status: boolean, errors: string[]) => void) | undefined;
                 readonly initialValues?: Recordable | undefined;
+                readonly onValuesChange?: ((changedValues: Recordable, allValues: Recordable, fieldName: NamePath) => void) | undefined;
                 readonly syncToUrl?: boolean | ((values: Recordable, type: "get" | "set") => Recordable) | undefined;
                 readonly syncToUrlPriority?: boolean | undefined;
             } & VNodeProps & AllowedComponentProps & ComponentCustomProps;

package/es/src/ap-form/modal-form/index.vue.mjs

@@ -54,11 +54,11 @@ const Me = /* @__PURE__ */ D({
     disabled: {
       type: Boolean
     },
-    onValuesChange: {},
     onFieldsChange: {},
     onFinishFailed: {},
     onValidate: {},
     initialValues: {},
+    onValuesChange: {},
     syncToUrl: {
       type: [Boolean, Function]
     },

package/es/src/ap-form/search-form/index.vue.d.ts

@@ -1,7 +1,7 @@
 import { ApFormExpose, ApFormSearchFormProps } from '../interface';
 import { ComponentInternalInstance, ExtractPropTypes, PropType, HTMLAttributes, VNodeProps, AllowedComponentProps, ComponentCustomProps, Slot, ComponentPublicInstance, ComponentOptionsBase, ComponentOptionsMixin, GlobalComponents, GlobalDirectives, ComponentProvideOptions, DebuggerEvent, nextTick, WatchOptions, WatchStopHandle, ShallowUnwrapRef, ComponentCustomProperties, DefineComponent, ComputedRef, PublicProps } from 'vue';
 import { ButtonSize } from '@aplus-frontend/antdv/es/button';
-import { ValidateMessages, FormLabelAlign, NamePath, FieldData, ValidateErrorEntity, ValidateOptions, InternalNamePath } from '@aplus-frontend/antdv/es/form/interface';
+import { ValidateMessages, FormLabelAlign, FieldData, ValidateErrorEntity, NamePath, ValidateOptions, InternalNamePath } from '@aplus-frontend/antdv/es/form/interface';
 import { RequiredMark } from '@aplus-frontend/antdv/es/form/Form';
 import { ColSize } from '@aplus-frontend/antdv/es/grid';
 import { RuleObject } from '@aplus-frontend/antdv/es/form';
@@ -107,12 +107,12 @@ declare function __VLS_template(): {
                 readonly hideRequiredMark?: boolean | undefined;
                 readonly validateOnRuleChange?: boolean | undefined;
                 readonly scrollToFirstError?: boolean | Options<any> | undefined;
-                readonly onValuesChange?: (((changedValues: any, values: any) => void) & ((changedValues: Recordable, allValues: Recordable, fieldName: NamePath) => void)) | undefined;
                 readonly onFieldsChange?: ((changedFields: FieldData[], allFields: FieldData[]) => void) | undefined;
                 readonly onFinish?: ((values: any) => void) | undefined;
                 readonly onFinishFailed?: ((errorInfo: ValidateErrorEntity<any>) => void) | undefined;
                 readonly onValidate?: ((name: string | number | string[] | number[], status: boolean, errors: string[]) => void) | undefined;
                 readonly initialValues?: Recordable | undefined;
+                readonly onValuesChange?: ((changedValues: Recordable, allValues: Recordable, fieldName: NamePath) => void) | undefined;
                 readonly syncToUrl?: boolean | ((values: Recordable, type: "get" | "set") => Recordable) | undefined;
                 readonly syncToUrlPriority?: boolean | undefined;
             } & VNodeProps & AllowedComponentProps & ComponentCustomProps;

package/es/src/ap-form/search-form/index.vue.mjs

@@ -59,12 +59,12 @@ const i = 24, qe = /* @__PURE__ */ re({
     disabled: {
       type: Boolean
     },
-    onValuesChange: {},
     onFieldsChange: {},
     onFinish: {},
     onFinishFailed: {},
     onValidate: {},
     initialValues: {},
+    onValuesChange: {},
     syncToUrl: {
       type: [Boolean, Function]
     },

package/es/src/editable-table/form-item.vue.mjs

@@ -1,15 +1,15 @@
-import { defineComponent as z, ref as h, unref as n, useSlots as O, watch as K, openBlock as M, createBlock as G, mergeProps as x, withCtx as g, createVNode as H, createSlots as W, renderList as $, renderSlot as U, normalizeProps as q, guardReactiveProps as J } from "vue";
-import { Table as Q } from "@aplus-frontend/antdv";
-import { ApForm as b } from "../ap-form/index.mjs";
-import { isArray as X, isNumber as d, cloneDeep as f, omit as w } from "lodash-unified";
+import { defineComponent as K, ref as d, unref as n, useSlots as M, watch as g, openBlock as G, createBlock as H, mergeProps as b, withCtx as w, createVNode as W, createSlots as $, renderList as q, renderSlot as U, normalizeProps as J, guardReactiveProps as Q } from "vue";
+import { Table as X } from "@aplus-frontend/antdv";
+import { ApForm as C } from "../ap-form/index.mjs";
+import { isArray as Y, isEqual as Z, isNumber as f, cloneDeep as m, omit as y } from "lodash-unified";
 import "../config-provider/index.mjs";
-import { useInjectForm as Y } from "../ap-form/context.mjs";
-import { isDef as m } from "../utils/index.mjs";
-import Z from "./hooks/use-get-columns.mjs";
-import { scrollToRowIndex as I } from "./utils.mjs";
-import { useNamespace as ee } from "../config-provider/hooks/use-namespace.mjs";
-import { useGlobalConfig as oe } from "../config-provider/hooks/use-global-config.mjs";
-const ce = /* @__PURE__ */ z({
+import { useInjectForm as I } from "../ap-form/context.mjs";
+import { isDef as i } from "../utils/index.mjs";
+import ee from "./hooks/use-get-columns.mjs";
+import { scrollToRowIndex as oe } from "./utils.mjs";
+import { useNamespace as te } from "../config-provider/hooks/use-namespace.mjs";
+import { useGlobalConfig as ae } from "../config-provider/hooks/use-global-config.mjs";
+const he = /* @__PURE__ */ K({
   name: "EditableTableInner",
   __name: "form-item",
   props: {
@@ -109,107 +109,111 @@ const ce = /* @__PURE__ */ z({
       default: () => ({})
     }
   },
-  setup(C, {
-    expose: y
+  setup(R, {
+    expose: B
   }) {
-    const l = C;
-    function R(e, o) {
-      return X(o) ? o.reduce((r, a) => r == null ? void 0 : r[a], e) : e == null ? void 0 : e[o];
+    const l = R;
+    function D(e, o) {
+      return Y(o) ? o.reduce((u, a) => u == null ? void 0 : u[a], e) : e == null ? void 0 : e[o];
     }
     const {
       internalInstance: t,
-      model: B
-    } = Y(), u = h(R(n(B), l.name) || []), D = O(), F = b.useWatch(l.name);
-    K(() => F.value, (e) => {
+      model: F
+    } = I(), r = d(D(n(F), l.name) || []), L = M(), c = d(l.name);
+    g(() => l.name, (e, o) => {
+      Z(e, o) || (c.value = e);
+    });
+    const T = C.useWatch(c);
+    g(() => T.value, (e) => {
       var o;
-      u.value = e, (o = l.onChange) == null || o.call(l, e);
+      r.value = e, (o = l.onChange) == null || o.call(l, e);
     }, {
       deep: !0
     });
     const {
-      b: L
-    } = ee("editable-table"), i = h(), T = oe("valueTypeMap"), V = Z(l, T);
-    function v(e, o) {
+      b: v
+    } = te("editable-table"), p = d(), E = ae("valueTypeMap"), N = ee(l, E);
+    function V(e, o) {
       var s;
-      const r = ((s = n(u)) == null ? void 0 : s.length) || 0;
-      if (m(l.maxLength) && r >= l.maxLength)
+      const u = ((s = n(r)) == null ? void 0 : s.length) || 0;
+      if (i(l.maxLength) && u >= l.maxLength)
         return;
-      const a = [...n(u) || []];
-      m(o) ? a.splice(o, 0, {
+      const a = [...n(r) || []];
+      i(o) ? a.splice(o, 0, {
         ...e || {}
       }) : a.push({
         ...e || {}
       }), t == null || t.setFieldValue(l.name, a);
     }
-    function E(e, o = "suffix") {
-      var p;
-      const r = ((p = n(u)) == null ? void 0 : p.length) || 0, a = d(e) ? e : e.length;
-      if (m(l.maxLength) && r + a > l.maxLength)
+    function S(e, o = "suffix") {
+      var x;
+      const u = ((x = n(r)) == null ? void 0 : x.length) || 0, a = f(e) ? e : e.length;
+      if (i(l.maxLength) && u + a > l.maxLength)
         return;
-      const s = [...n(u) || []], c = d(e) ? new Array(e).fill({}) : f(e);
-      o === "suffix" ? s.push(...c) : s.unshift(...c), t == null || t.setFieldValue(l.name, s);
+      const s = [...n(r) || []], h = f(e) ? new Array(e).fill({}) : m(e);
+      o === "suffix" ? s.push(...h) : s.unshift(...h), t == null || t.setFieldValue(l.name, s);
     }
-    function N(e) {
-      let o = f(n(u) || []);
-      const r = d(e) ? [e] : e;
-      o = o.filter((a, s) => !r.includes(s)), t == null || t.setFieldValue(l.name, o);
+    function _(e) {
+      let o = m(n(r) || []);
+      const u = f(e) ? [e] : e;
+      o = o.filter((a, s) => !u.includes(s)), t == null || t.setFieldValue(l.name, o);
     }
-    function S() {
-      return n(u);
+    function k() {
+      return n(r);
     }
-    function _(e) {
+    function j(e) {
       var o;
-      return (o = n(u)) == null ? void 0 : o[e];
+      return (o = n(r)) == null ? void 0 : o[e];
     }
-    function k(e, o, r = !0) {
-      const a = f(n(u));
+    function A(e, o, u = !0) {
+      const a = m(n(r));
       a[e] && (a[e] = {
-        ...r ? a[e] : {},
+        ...u ? a[e] : {},
         ...o
       }, t == null || t.setFieldValue(l.name, [...a]));
     }
-    function j(e) {
+    function P(e) {
       t == null || t.setFieldValue(l.name, e);
     }
-    function A(e, o) {
+    function z(e, o) {
       var a;
-      const r = e === "end" ? u.value.length - 1 : e;
-      I(r, (a = i.value) == null ? void 0 : a.$el, o);
+      const u = e === "end" ? r.value.length - 1 : e;
+      oe(u, (a = p.value) == null ? void 0 : a.$el, o);
     }
-    function P() {
+    function O() {
       var e;
       (e = t == null ? void 0 : t.setFieldValue) == null || e.call(t, l.name, []);
     }
-    return y({
-      add: v,
-      remove: N,
-      getRowData: _,
-      getRowsData: S,
-      setRowData: k,
-      addMultiple: E,
-      scrollTo: A,
-      setTableData: j,
-      clear: P
-    }), (e, o) => (M(), G(n(b).FormItem, x(e.formItem, {
+    return B({
+      add: V,
+      remove: _,
+      getRowData: j,
+      getRowsData: k,
+      setRowData: A,
+      addMultiple: S,
+      scrollTo: z,
+      setTableData: P,
+      clear: O
+    }), (e, o) => (G(), H(n(C).FormItem, b(e.formItem, {
       name: e.name,
       label: e.label
     }), {
-      default: g(() => [H(n(Q), x(n(w)(l, ["name", "maxLength", "onChange"]), {
+      default: w(() => [W(n(X), b(n(y)(l, ["name", "maxLength", "onChange"]), {
         ref_key: "tableRef",
-        ref: i,
-        class: n(L)(),
-        columns: n(V),
-        "data-source": u.value
-      }), W({
+        ref: p,
+        class: n(v)(),
+        columns: n(N),
+        "data-source": r.value
+      }), $({
         _: 2
-      }, [$(n(w)(D, ["headerCell"]), (r, a) => ({
+      }, [q(n(y)(L, ["headerCell"]), (u, a) => ({
         name: a,
-        fn: g((s) => [U(e.$slots, a, q(J(s || {})))])
+        fn: w((s) => [U(e.$slots, a, J(Q(s || {})))])
       }))]), 1040, ["class", "columns", "data-source"])]),
       _: 3
     }, 16, ["name", "label"]));
   }
 });
 export {
-  ce as default
+  he as default
 };

package/lib/src/ap-form/ap-form.vue2.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const l=require("vue"),z=require("@aplus-frontend/antdv"),C=require("./context.js"),a=require("lodash-unified"),L=require("@vueuse/core"),$=require("./constant.js"),T=require("../utils/index.js"),k=require("./utils/set.js"),y=require("./utils/params.js"),K=l.defineComponent({__name:"ap-form",props:{layout:{default:"horizontal"},labelCol:{},wrapperCol:{},colon:{type:Boolean,default:!0},labelAlign:{default:"right"},labelWrap:{type:Boolean},prefixCls:{},requiredMark:{},hideRequiredMark:{type:Boolean,default:!1},rules:{},validateMessages:{},validateOnRuleChange:{type:Boolean,default:!0},scrollToFirstError:{},onSubmit:{},name:{},validateTrigger:{default:"change"},size:{},disabled:{type:Boolean},onValuesChange:{},onFieldsChange:{},onFinish:{},onFinishFailed:{},onValidate:{},initialValues:{},syncToUrl:{type:[Boolean,Function],default:!1},syncToUrlPriority:{type:Boolean}},setup(U,{expose:m}){const i=U;function V(e,t,r=!0){var o;if(a.isArray(e)){let n=u;for(let d=0;d<e.length-1;d++)e[d]in n||(n[e[d]]={}),n=n[e[d]];n[e[e.length-1]]=t}else u[e]=t;let s=a.isArray(e)?e[0]:e;r&&((o=i.onValuesChange)==null||o.call(i,{[s]:u[s]},u,e)),p()}const c=l.ref(),P=L.useUrlSearchParams(T.getRouteType()),_=l.ref(i.syncToUrl?y.genParams(i.syncToUrl,P,"get"):{});let v=a.cloneDeep(q()),F={};const u=l.reactive(q());let g=[];function q(){const e=i.initialValues||{};return i.syncToUrlPriority?{...e,...l.unref(_)}:{...l.unref(_),...e}}function M(e){var r;const t=h(e,F);i.syncToUrl&&y.setToParams(P,y.genParams(i.syncToUrl,t,"set")),(r=i.onFinish)==null||r.call(i,t)}const O=async()=>{var e;(e=c.value)==null||e.resetFields(),await l.nextTick(()=>{Object.keys(u).forEach(t=>delete u[t]),Object.assign(u,v),p(),i.syncToUrl&&y.setToParams(P,y.genParams(i.syncToUrl,h(v,F),"set"))})},B=e=>{var t;(t=c.value)==null||t.clearValidate(e)},I=(e,t)=>{var r;return(r=c.value)==null?void 0:r.validateFields(e,t)},j=async(e,t)=>{var s;const r=await((s=c.value)==null?void 0:s.validateFields(e,t));return h(r,F)},w=e=>{var t;return(t=c.value)==null?void 0:t.getFieldsValue(e)},x=e=>{var r;const t=(r=c.value)==null?void 0:r.getFieldsValue(e);return h(t,F)},E=(e,t)=>{var r;return(r=c.value)==null?void 0:r.validate(e,t)},S=(e,t={})=>{var r;(r=c.value)==null||r.scrollToField(e,t)},N=e=>{Object.assign(u,e),p()},A=(e,t,r=!0)=>{V(e,t,r),p()};function b(e,t){return t||e(l.toRaw(u)),g.push(e),()=>{g=g.filter(r=>r!==e)}}function R({initialValue:e,name:t,transform:r}){if(T.isDef(e)&&T.isDef(t))if(V(t,e,!1),a.isArray(t)){let s=v;for(let o=0;o<t.length-1;o++)T.isDef(s[t[o]])||(s[t[o]]={}),s=s[t[o]];s[t[t.length-1]]=e}else v[t]=e;r&&(F=k.default(F,[t].flat(1),r,!0))}function D(e){if(e!==$.INTERNAL_FORM_INSTANCE_MARK){console.warn("getInternalInstance should only used at internal");return}return{registerField:R,registerWatch:b}}function p(){if(g.length){const e=l.toRaw(u);g.forEach(t=>{t(e)})}}function h(e,t){if(e==null)return;let r=a.isArray(e)?[]:{};return Object.keys(e).forEach(s=>{const o=e[s],n=t==null?void 0:t[s],d=a.isFunction(n)?n:n==null?void 0:n.transformer,W=a.isFunction(n)?!0:n==null?void 0:n.flat;if(a.isFunction(d)){const f=d(o);W?a.isArray(f)&&a.isArray(r)?r=[...r,...f]:a.isPlainObject(f)&&a.isPlainObject(r)?r={...r,...f}:r[s]=f:r[s]=f}else if(a.isPlainObject(o)||a.isArray(o)){const f=h(o,n);r[s]=f}else r[s]=o}),r}return C.useProvideForm({model:l.computed(()=>u),updateModel:V,internalInstance:{registerWatch:b,registerField:R,setFieldValue:A}}),m({resetFields:O,clearValidate:B,validateFields:I,getFieldsValue:w,validate:E,scrollToField:S,setFieldsValue:N,setFieldValue:A,registerWatch:b,validateFieldsReturnTransformed:j,getFieldsValueTransformed:x,getInternalInstance:D}),(e,t)=>(l.openBlock(),l.createBlock(l.unref(z.Form),l.mergeProps({ref_key:"formRef",ref:c},l.unref(a.omit)(i,["initialValues","onValuesChange","onFinish"]),{model:u,onFinish:M}),{default:l.withCtx(()=>[l.renderSlot(e.$slots,"default")]),_:3},16,["model"]))}});exports.default=K;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const l=require("vue"),z=require("@aplus-frontend/antdv"),C=require("./context.js"),a=require("lodash-unified"),L=require("@vueuse/core"),$=require("./constant.js"),T=require("../utils/index.js"),k=require("./utils/set.js"),y=require("./utils/params.js"),K=l.defineComponent({__name:"ap-form",props:{layout:{default:"horizontal"},labelCol:{},wrapperCol:{},colon:{type:Boolean,default:!0},labelAlign:{default:"right"},labelWrap:{type:Boolean},prefixCls:{},requiredMark:{},hideRequiredMark:{type:Boolean,default:!1},rules:{},validateMessages:{},validateOnRuleChange:{type:Boolean,default:!0},scrollToFirstError:{},onSubmit:{},name:{},validateTrigger:{default:"change"},size:{},disabled:{type:Boolean},onFieldsChange:{},onFinish:{},onFinishFailed:{},onValidate:{},initialValues:{},onValuesChange:{},syncToUrl:{type:[Boolean,Function],default:!1},syncToUrlPriority:{type:Boolean}},setup(U,{expose:m}){const i=U;function V(e,t,r=!0){var o;if(a.isArray(e)){let n=u;for(let d=0;d<e.length-1;d++)e[d]in n||(n[e[d]]={}),n=n[e[d]];n[e[e.length-1]]=t}else u[e]=t;let s=a.isArray(e)?e[0]:e;r&&((o=i.onValuesChange)==null||o.call(i,{[s]:u[s]},u,e)),p()}const c=l.ref(),P=L.useUrlSearchParams(T.getRouteType()),_=l.ref(i.syncToUrl?y.genParams(i.syncToUrl,P,"get"):{});let v=a.cloneDeep(q()),F={};const u=l.reactive(q());let g=[];function q(){const e=i.initialValues||{};return i.syncToUrlPriority?{...e,...l.unref(_)}:{...l.unref(_),...e}}function M(e){var r;const t=h(e,F);i.syncToUrl&&y.setToParams(P,y.genParams(i.syncToUrl,t,"set")),(r=i.onFinish)==null||r.call(i,t)}const O=async()=>{var e;(e=c.value)==null||e.resetFields(),await l.nextTick(()=>{Object.keys(u).forEach(t=>delete u[t]),Object.assign(u,v),p(),i.syncToUrl&&y.setToParams(P,y.genParams(i.syncToUrl,h(v,F),"set"))})},B=e=>{var t;(t=c.value)==null||t.clearValidate(e)},I=(e,t)=>{var r;return(r=c.value)==null?void 0:r.validateFields(e,t)},j=async(e,t)=>{var s;const r=await((s=c.value)==null?void 0:s.validateFields(e,t));return h(r,F)},w=e=>{var t;return(t=c.value)==null?void 0:t.getFieldsValue(e)},x=e=>{var r;const t=(r=c.value)==null?void 0:r.getFieldsValue(e);return h(t,F)},E=(e,t)=>{var r;return(r=c.value)==null?void 0:r.validate(e,t)},S=(e,t={})=>{var r;(r=c.value)==null||r.scrollToField(e,t)},N=e=>{Object.assign(u,e),p()},A=(e,t,r=!0)=>{V(e,t,r),p()};function b(e,t){return t||e(l.toRaw(u)),g.push(e),()=>{g=g.filter(r=>r!==e)}}function R({initialValue:e,name:t,transform:r}){if(T.isDef(e)&&T.isDef(t))if(V(t,e,!1),a.isArray(t)){let s=v;for(let o=0;o<t.length-1;o++)T.isDef(s[t[o]])||(s[t[o]]={}),s=s[t[o]];s[t[t.length-1]]=e}else v[t]=e;r&&(F=k.default(F,[t].flat(1),r,!0))}function D(e){if(e!==$.INTERNAL_FORM_INSTANCE_MARK){console.warn("getInternalInstance should only used at internal");return}return{registerField:R,registerWatch:b}}function p(){if(g.length){const e=l.toRaw(u);g.forEach(t=>{t(e)})}}function h(e,t){if(e==null)return;let r=a.isArray(e)?[]:{};return Object.keys(e).forEach(s=>{const o=e[s],n=t==null?void 0:t[s],d=a.isFunction(n)?n:n==null?void 0:n.transformer,W=a.isFunction(n)?!0:n==null?void 0:n.flat;if(a.isFunction(d)){const f=d(o);W?a.isArray(f)&&a.isArray(r)?r=[...r,...f]:a.isPlainObject(f)&&a.isPlainObject(r)?r={...r,...f}:r[s]=f:r[s]=f}else if(a.isPlainObject(o)||a.isArray(o)){const f=h(o,n);r[s]=f}else r[s]=o}),r}return C.useProvideForm({model:l.computed(()=>u),updateModel:V,internalInstance:{registerWatch:b,registerField:R,setFieldValue:A}}),m({resetFields:O,clearValidate:B,validateFields:I,getFieldsValue:w,validate:E,scrollToField:S,setFieldsValue:N,setFieldValue:A,registerWatch:b,validateFieldsReturnTransformed:j,getFieldsValueTransformed:x,getInternalInstance:D}),(e,t)=>(l.openBlock(),l.createBlock(l.unref(z.Form),l.mergeProps({ref_key:"formRef",ref:c},l.unref(a.omit)(i,["initialValues","onValuesChange","onFinish"]),{model:u,onFinish:M}),{default:l.withCtx(()=>[l.renderSlot(e.$slots,"default")]),_:3},16,["model"]))}});exports.default=K;

package/lib/src/ap-form/drawer-form/index.vue.d.ts

@@ -110,12 +110,12 @@ declare function __VLS_template(): {
                 readonly hideRequiredMark?: boolean | undefined;
                 readonly validateOnRuleChange?: boolean | undefined;
                 readonly scrollToFirstError?: boolean | Options<any> | undefined;
-                readonly onValuesChange?: (((changedValues: any, values: any) => void) & ((changedValues: Recordable, allValues: Recordable, fieldName: NamePath) => void)) | undefined;
                 readonly onFieldsChange?: ((changedFields: FieldData[], allFields: FieldData[]) => void) | undefined;
                 readonly onFinish?: ((values: any) => void) | undefined;
                 readonly onFinishFailed?: ((errorInfo: ValidateErrorEntity<any>) => void) | undefined;
                 readonly onValidate?: ((name: string | number | string[] | number[], status: boolean, errors: string[]) => void) | undefined;
                 readonly initialValues?: Recordable | undefined;
+                readonly onValuesChange?: ((changedValues: Recordable, allValues: Recordable, fieldName: NamePath) => void) | undefined;
                 readonly syncToUrl?: boolean | ((values: Recordable, type: "get" | "set") => Recordable) | undefined;
                 readonly syncToUrlPriority?: boolean | undefined;
             } & VNodeProps & AllowedComponentProps & ComponentCustomProps;

package/lib/src/ap-form/drawer-form/index.vue.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const t=require("vue"),c=require("@aplus-frontend/antdv");require("../ap-form.vue.js");require("../../hooks/index.js");const U=require("../../utils/slot.js");require("../../config-provider/index.js");const g=require("lodash-unified"),j=require("../../utils/index.js"),E=require("../../hooks/useControllableValue.js"),D=require("../../config-provider/hooks/use-locale.js"),I=require("../../config-provider/hooks/use-namespace.js"),$=require("../ap-form.vue2.js");function k(f){return typeof f=="function"||Object.prototype.toString.call(f)==="[object Object]"&&!t.isVNode(f)}const A=t.defineComponent({__name:"index",props:{layout:{default:"horizontal"},labelCol:{},wrapperCol:{},colon:{type:Boolean,default:!0},labelAlign:{default:"right"},labelWrap:{type:Boolean},prefixCls:{},requiredMark:{},hideRequiredMark:{type:Boolean,default:!1},rules:{},validateMessages:{},validateOnRuleChange:{type:Boolean,default:!0},scrollToFirstError:{},onSubmit:{},name:{},validateTrigger:{default:"change"},size:{},disabled:{type:Boolean},onValuesChange:{},onFieldsChange:{},onFinishFailed:{},onValidate:{},initialValues:{},syncToUrl:{type:[Boolean,Function]},syncToUrlPriority:{type:Boolean},open:{type:Boolean,default:void 0},"onUpdate:open":{},drawerProps:{default:()=>({})},title:{},width:{default:378},onFinish:{},submitter:{type:[Boolean,Object],default:()=>({resetButtonProps:!1})},showCancel:{type:Boolean,default:!0},submitTimeout:{},resize:{type:[Object,Boolean],default:!1}},emits:["update:open"],setup(f,{expose:x,emit:T}){const i=f,v=t.useSlots(),N=T,a=t.ref(),p=t.ref(),u=t.ref(!1),{value:y,updateValue:h}=E.useControllableValue(i,N,{valuePropName:"open",defaultValue:!1}),d=t.computed(()=>{var n,o,r,s;const e={onResize:()=>{},minWidth:300,maxWidth:window.innerWidth*.8,resizeOnOpen:!0};return g.isBoolean(i.resize)?i.resize?e:{}:{minWidth:((n=i.resize)==null?void 0:n.minWidth)??e.minWidth,maxWidth:((o=i.resize)==null?void 0:o.maxWidth)??e.maxWidth,onResize:((r=i.resize)==null?void 0:r.onResize)??e.onResize,resizeOnOpen:g.isUndefined((s=i.resize)==null?void 0:s.resizeOnOpen)?e.onResize:i.resize.resizeOnOpen}}),m=t.ref(F()),{t:b}=D.useLocale(),{e:O,em:V}=I.useNamespace("ap-form-drawer-form"),P=t.computed(()=>[O("resize-bar"),{[V("resize-bar","min-disabled")]:t.unref(m)===t.unref(d).minWidth},{[V("resize-bar","max-disabled")]:t.unref(m)===t.unref(d).maxWidth}]);t.watch(()=>a.value,e=>{var n;e&&p.value&&((n=e.setFieldsValue)==null||n.call(e,p.value),p.value=void 0)}),t.watch(()=>t.unref(y),e=>{var n;e&&(n=t.unref(d))!=null&&n.resizeOnOpen&&(m.value=F())});function F(){var n;const e=(n=t.unref(d))==null?void 0:n.minWidth;return!e||e&&e<i.width?i.width:e}const C=U.getSingleVNode(v.trigger),w=C?t.cloneVNode(C,{onClick:()=>{h(!0)}}):null,_=t.computed(()=>{var n,o,r,s;const e=[];if(i.submitter===!1)return null;if(i.showCancel){let l;e.push(t.createVNode(c.Button,{onClick:W,disabled:u.value},k(l=b("ap.common.cancelText"))?l:{default:()=>[l]}))}return((n=i.submitter)==null?void 0:n.resetButtonProps)!==!1&&e.push(t.createVNode(c.Button,t.mergeProps(((o=i.submitter)==null?void 0:o.resetButtonProps)||{},{key:"submit",disabled:u.value,onClick:q}),{default:()=>{var l;return[((l=i.submitter)==null?void 0:l.resetText)||b("ap.common.resetText")]}})),((r=i.submitter)==null?void 0:r.submitButtonProps)!==!1&&e.push(t.createVNode(c.Button,t.mergeProps({type:"primary",key:"submit"},((s=i.submitter)==null?void 0:s.submitButtonProps)||{},{loading:u.value,onClick:S}),{default:()=>{var l;return[((l=i.submitter)==null?void 0:l.submitText)||b("ap.common.okText")]}})),t.createVNode(c.Flex,{justify:"flex-end"},{default:()=>[v.submitter?v.submitter(e):t.createVNode(c.Space,null,k(e)?e:{default:()=>[e]})]})});function R(){var e,n;(n=(e=d.value)==null?void 0:e.onResize)==null||n.call(e),document.addEventListener("mousemove",B),document.addEventListener("mouseup",z)}function B(e){const n=t.unref(d),o=(document.body.offsetWidth||1e3)-(e.clientX-document.body.offsetLeft),r=(n==null?void 0:n.minWidth)??(i.width||800),s=(n==null?void 0:n.maxWidth)??window.innerWidth*.8;let l=o;o<r&&(l=r),o>s&&(l=s),m.value=l}function z(){document.removeEventListener("mousemove",B),document.removeEventListener("mouseup",z)}function q(){var e,n,o;i.submitter!==!1&&((e=a.value)==null||e.resetFields(),(o=(n=i.submitter)==null?void 0:n.onReset)==null||o.call(n))}async function S(){var e,n,o,r;if(i.submitter!==!1)try{const s=await((e=a.value)==null?void 0:e.validateFields());(o=(n=i.submitter)==null?void 0:n.onSubmit)==null||o.call(n),u.value=!0;const l=(r=i.onFinish)==null?void 0:r.call(i,j.convertReactiveToRaw(s));if(i.submitTimeout&&l instanceof Promise){const L=setTimeout(()=>u.value=!1,i.submitTimeout);l.finally(()=>{clearTimeout(L),u.value=!1})}await l&&h(!1)}finally{u.value=!1}}function W(){t.unref(u)||h(!1)}function M(e){!e&&t.unref(u)||h(e)}return x({resetFields:()=>{var e;(e=a.value)==null||e.resetFields()},clearValidate:e=>{var n;(n=a.value)==null||n.clearValidate(e)},validateFields:(e,n)=>{var o;return(o=a.value)==null?void 0:o.validateFields(e,n)},getFieldsValue:e=>{var n;return(n=a.value)==null?void 0:n.getFieldsValue(e)},validate:(e,n)=>{var o;return(o=a.value)==null?void 0:o.validate(e,n)},scrollToField:(e,n={})=>{var o;(o=a.value)==null||o.scrollToField(e,n)},setFieldValue:(e,n)=>{var o,r;(r=(o=a.value)==null?void 0:o.setFieldValue)==null||r.call(o,e,n)},setFieldsValue:e=>{var n,o;if(!a.value){p.value=e;return}(o=(n=a.value)==null?void 0:n.setFieldsValue)==null||o.call(n,e)},getInternalInstance:e=>{var n;return(n=a.value)==null?void 0:n.getInternalInstance(e)}}),(e,n)=>(t.openBlock(),t.createElementBlock(t.Fragment,null,[t.createVNode(t.unref(c.Drawer),t.mergeProps(e.drawerProps,{open:t.unref(y),width:m.value,"onUpdate:open":M,onCancel:W}),{title:t.withCtx(()=>[t.renderSlot(e.$slots,"title",{},()=>[t.createTextVNode(t.toDisplayString(i.title),1)])]),footer:t.withCtx(()=>[(t.openBlock(),t.createBlock(t.resolveDynamicComponent(_.value)))]),default:t.withCtx(()=>[t.createVNode($.default,t.mergeProps({ref_key:"formRef",ref:a},t.unref(g.omit)(i,["drawerProps","open","onUpdate:open","title","width","onFinish","submitter"])),{default:t.withCtx(()=>[t.renderSlot(e.$slots,"default")]),_:3},16),e.resize?(t.openBlock(),t.createElementBlock("div",{key:0,class:t.normalizeClass(P.value),onMousedown:t.withModifiers(R,["stop","prevent"])},null,34)):t.createCommentVNode("",!0)]),_:3},16,["open","width"]),t.unref(w)?(t.openBlock(),t.createBlock(t.resolveDynamicComponent(t.unref(w)),{key:0})):t.createCommentVNode("",!0)],64))}});exports.default=A;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const t=require("vue"),c=require("@aplus-frontend/antdv");require("../ap-form.vue.js");require("../../hooks/index.js");const U=require("../../utils/slot.js");require("../../config-provider/index.js");const g=require("lodash-unified"),j=require("../../utils/index.js"),E=require("../../hooks/useControllableValue.js"),D=require("../../config-provider/hooks/use-locale.js"),I=require("../../config-provider/hooks/use-namespace.js"),$=require("../ap-form.vue2.js");function k(f){return typeof f=="function"||Object.prototype.toString.call(f)==="[object Object]"&&!t.isVNode(f)}const A=t.defineComponent({__name:"index",props:{layout:{default:"horizontal"},labelCol:{},wrapperCol:{},colon:{type:Boolean,default:!0},labelAlign:{default:"right"},labelWrap:{type:Boolean},prefixCls:{},requiredMark:{},hideRequiredMark:{type:Boolean,default:!1},rules:{},validateMessages:{},validateOnRuleChange:{type:Boolean,default:!0},scrollToFirstError:{},onSubmit:{},name:{},validateTrigger:{default:"change"},size:{},disabled:{type:Boolean},onFieldsChange:{},onFinishFailed:{},onValidate:{},initialValues:{},onValuesChange:{},syncToUrl:{type:[Boolean,Function]},syncToUrlPriority:{type:Boolean},open:{type:Boolean,default:void 0},"onUpdate:open":{},drawerProps:{default:()=>({})},title:{},width:{default:378},onFinish:{},submitter:{type:[Boolean,Object],default:()=>({resetButtonProps:!1})},showCancel:{type:Boolean,default:!0},submitTimeout:{},resize:{type:[Object,Boolean],default:!1}},emits:["update:open"],setup(f,{expose:x,emit:T}){const i=f,v=t.useSlots(),N=T,a=t.ref(),p=t.ref(),u=t.ref(!1),{value:y,updateValue:h}=E.useControllableValue(i,N,{valuePropName:"open",defaultValue:!1}),d=t.computed(()=>{var n,o,r,s;const e={onResize:()=>{},minWidth:300,maxWidth:window.innerWidth*.8,resizeOnOpen:!0};return g.isBoolean(i.resize)?i.resize?e:{}:{minWidth:((n=i.resize)==null?void 0:n.minWidth)??e.minWidth,maxWidth:((o=i.resize)==null?void 0:o.maxWidth)??e.maxWidth,onResize:((r=i.resize)==null?void 0:r.onResize)??e.onResize,resizeOnOpen:g.isUndefined((s=i.resize)==null?void 0:s.resizeOnOpen)?e.onResize:i.resize.resizeOnOpen}}),m=t.ref(F()),{t:b}=D.useLocale(),{e:O,em:V}=I.useNamespace("ap-form-drawer-form"),P=t.computed(()=>[O("resize-bar"),{[V("resize-bar","min-disabled")]:t.unref(m)===t.unref(d).minWidth},{[V("resize-bar","max-disabled")]:t.unref(m)===t.unref(d).maxWidth}]);t.watch(()=>a.value,e=>{var n;e&&p.value&&((n=e.setFieldsValue)==null||n.call(e,p.value),p.value=void 0)}),t.watch(()=>t.unref(y),e=>{var n;e&&(n=t.unref(d))!=null&&n.resizeOnOpen&&(m.value=F())});function F(){var n;const e=(n=t.unref(d))==null?void 0:n.minWidth;return!e||e&&e<i.width?i.width:e}const C=U.getSingleVNode(v.trigger),w=C?t.cloneVNode(C,{onClick:()=>{h(!0)}}):null,_=t.computed(()=>{var n,o,r,s;const e=[];if(i.submitter===!1)return null;if(i.showCancel){let l;e.push(t.createVNode(c.Button,{onClick:W,disabled:u.value},k(l=b("ap.common.cancelText"))?l:{default:()=>[l]}))}return((n=i.submitter)==null?void 0:n.resetButtonProps)!==!1&&e.push(t.createVNode(c.Button,t.mergeProps(((o=i.submitter)==null?void 0:o.resetButtonProps)||{},{key:"submit",disabled:u.value,onClick:q}),{default:()=>{var l;return[((l=i.submitter)==null?void 0:l.resetText)||b("ap.common.resetText")]}})),((r=i.submitter)==null?void 0:r.submitButtonProps)!==!1&&e.push(t.createVNode(c.Button,t.mergeProps({type:"primary",key:"submit"},((s=i.submitter)==null?void 0:s.submitButtonProps)||{},{loading:u.value,onClick:S}),{default:()=>{var l;return[((l=i.submitter)==null?void 0:l.submitText)||b("ap.common.okText")]}})),t.createVNode(c.Flex,{justify:"flex-end"},{default:()=>[v.submitter?v.submitter(e):t.createVNode(c.Space,null,k(e)?e:{default:()=>[e]})]})});function R(){var e,n;(n=(e=d.value)==null?void 0:e.onResize)==null||n.call(e),document.addEventListener("mousemove",B),document.addEventListener("mouseup",z)}function B(e){const n=t.unref(d),o=(document.body.offsetWidth||1e3)-(e.clientX-document.body.offsetLeft),r=(n==null?void 0:n.minWidth)??(i.width||800),s=(n==null?void 0:n.maxWidth)??window.innerWidth*.8;let l=o;o<r&&(l=r),o>s&&(l=s),m.value=l}function z(){document.removeEventListener("mousemove",B),document.removeEventListener("mouseup",z)}function q(){var e,n,o;i.submitter!==!1&&((e=a.value)==null||e.resetFields(),(o=(n=i.submitter)==null?void 0:n.onReset)==null||o.call(n))}async function S(){var e,n,o,r;if(i.submitter!==!1)try{const s=await((e=a.value)==null?void 0:e.validateFields());(o=(n=i.submitter)==null?void 0:n.onSubmit)==null||o.call(n),u.value=!0;const l=(r=i.onFinish)==null?void 0:r.call(i,j.convertReactiveToRaw(s));if(i.submitTimeout&&l instanceof Promise){const L=setTimeout(()=>u.value=!1,i.submitTimeout);l.finally(()=>{clearTimeout(L),u.value=!1})}await l&&h(!1)}finally{u.value=!1}}function W(){t.unref(u)||h(!1)}function M(e){!e&&t.unref(u)||h(e)}return x({resetFields:()=>{var e;(e=a.value)==null||e.resetFields()},clearValidate:e=>{var n;(n=a.value)==null||n.clearValidate(e)},validateFields:(e,n)=>{var o;return(o=a.value)==null?void 0:o.validateFields(e,n)},getFieldsValue:e=>{var n;return(n=a.value)==null?void 0:n.getFieldsValue(e)},validate:(e,n)=>{var o;return(o=a.value)==null?void 0:o.validate(e,n)},scrollToField:(e,n={})=>{var o;(o=a.value)==null||o.scrollToField(e,n)},setFieldValue:(e,n)=>{var o,r;(r=(o=a.value)==null?void 0:o.setFieldValue)==null||r.call(o,e,n)},setFieldsValue:e=>{var n,o;if(!a.value){p.value=e;return}(o=(n=a.value)==null?void 0:n.setFieldsValue)==null||o.call(n,e)},getInternalInstance:e=>{var n;return(n=a.value)==null?void 0:n.getInternalInstance(e)}}),(e,n)=>(t.openBlock(),t.createElementBlock(t.Fragment,null,[t.createVNode(t.unref(c.Drawer),t.mergeProps(e.drawerProps,{open:t.unref(y),width:m.value,"onUpdate:open":M,onCancel:W}),{title:t.withCtx(()=>[t.renderSlot(e.$slots,"title",{},()=>[t.createTextVNode(t.toDisplayString(i.title),1)])]),footer:t.withCtx(()=>[(t.openBlock(),t.createBlock(t.resolveDynamicComponent(_.value)))]),default:t.withCtx(()=>[t.createVNode($.default,t.mergeProps({ref_key:"formRef",ref:a},t.unref(g.omit)(i,["drawerProps","open","onUpdate:open","title","width","onFinish","submitter"])),{default:t.withCtx(()=>[t.renderSlot(e.$slots,"default")]),_:3},16),e.resize?(t.openBlock(),t.createElementBlock("div",{key:0,class:t.normalizeClass(P.value),onMousedown:t.withModifiers(R,["stop","prevent"])},null,34)):t.createCommentVNode("",!0)]),_:3},16,["open","width"]),t.unref(w)?(t.openBlock(),t.createBlock(t.resolveDynamicComponent(t.unref(w)),{key:0})):t.createCommentVNode("",!0)],64))}});exports.default=A;

package/lib/src/ap-form/interface.d.ts

@@ -37,7 +37,7 @@ export type ApFormItemProps = FormItemProps & Partial<ApFormColProps> & {
 export type ApFormItemGroupProps = RowProps & {
     countPerRow?: number;
 };
-export type ApFormProps = Omit<FormProps, 'model'> & {
+export type ApFormProps = Omit<FormProps, 'model' | 'onValuesChange'> & {
     initialValues?: Recordable;
     /**
      * 字段值更新时触发

package/lib/src/ap-form/modal-form/index.vue.d.ts

@@ -111,12 +111,12 @@ declare function __VLS_template(): {
                 readonly hideRequiredMark?: boolean | undefined;
                 readonly validateOnRuleChange?: boolean | undefined;
                 readonly scrollToFirstError?: boolean | Options<any> | undefined;
-                readonly onValuesChange?: (((changedValues: any, values: any) => void) & ((changedValues: Recordable, allValues: Recordable, fieldName: NamePath) => void)) | undefined;
                 readonly onFieldsChange?: ((changedFields: FieldData[], allFields: FieldData[]) => void) | undefined;
                 readonly onFinish?: ((values: any) => void) | undefined;
                 readonly onFinishFailed?: ((errorInfo: ValidateErrorEntity<any>) => void) | undefined;
                 readonly onValidate?: ((name: string | number | string[] | number[], status: boolean, errors: string[]) => void) | undefined;
                 readonly initialValues?: Recordable | undefined;
+                readonly onValuesChange?: ((changedValues: Recordable, allValues: Recordable, fieldName: NamePath) => void) | undefined;
                 readonly syncToUrl?: boolean | ((values: Recordable, type: "get" | "set") => Recordable) | undefined;
                 readonly syncToUrlPriority?: boolean | undefined;
             } & VNodeProps & AllowedComponentProps & ComponentCustomProps;

package/lib/src/ap-form/modal-form/index.vue.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),i=require("@aplus-frontend/antdv");require("../ap-form.vue.js");require("../../hooks/index.js");const S=require("../../utils/slot.js");require("../../config-provider/index.js");const M=require("lodash-unified"),R=require("../../utils/index.js"),j=require("../../hooks/useControllableValue.js"),O=require("../../config-provider/hooks/use-locale.js"),U=require("../../config-provider/hooks/use-global-config.js"),z=require("../../config-provider/hooks/use-namespace.js"),D=require("../ap-form.vue2.js");function F(d){return typeof d=="function"||Object.prototype.toString.call(d)==="[object Object]"&&!e.isVNode(d)}const E=e.defineComponent({__name:"index",props:{layout:{default:"horizontal"},labelCol:{},wrapperCol:{},colon:{type:Boolean,default:!0},labelAlign:{default:"right"},labelWrap:{type:Boolean},prefixCls:{},requiredMark:{},hideRequiredMark:{type:Boolean,default:!1},rules:{},validateMessages:{},validateOnRuleChange:{type:Boolean,default:!0},scrollToFirstError:{},onSubmit:{},name:{},validateTrigger:{default:"change"},size:{},disabled:{type:Boolean},onValuesChange:{},onFieldsChange:{},onFinishFailed:{},onValidate:{},initialValues:{},syncToUrl:{type:[Boolean,Function]},syncToUrlPriority:{type:Boolean},open:{type:Boolean,default:void 0},"onUpdate:open":{},modalProps:{default:()=>({})},title:{},width:{default:800},onFinish:{},submitter:{type:[Boolean,Object],default:()=>({resetButtonProps:!1})},showCancel:{type:Boolean,default:!0},submitTimeout:{}},emits:["update:open"],setup(d,{expose:C,emit:B}){const o=d,p=e.useSlots(),T=B,n=e.ref(),c=e.ref(),r=e.ref(!1),{value:k,updateValue:f}=j.useControllableValue(o,T,{valuePropName:"open",defaultValue:!1}),{t:v}=O.useLocale(),b=U.useGlobalConfig("uiMode","aplus"),{b:N,e:g}=z.useNamespace("ap-form-modal-form");e.watch(()=>n.value,t=>{var l;t&&c.value&&((l=t.setFieldsValue)==null||l.call(t,c.value),c.value=void 0)});const y=S.getSingleVNode(p.trigger),h=y?e.cloneVNode(y,{onClick:()=>{f(!0)}}):null,P=e.computed(()=>{var l,a,u,m;const t=[];if(o.submitter===!1)return null;if(o.showCancel){let s;t.push(e.createVNode(i.Button,{onClick:V,disabled:r.value},F(s=v("ap.common.cancelText"))?s:{default:()=>[s]}))}return((l=o.submitter)==null?void 0:l.resetButtonProps)!==!1&&t.push(e.createVNode(i.Button,e.mergeProps(((a=o.submitter)==null?void 0:a.resetButtonProps)||{},{key:"submit",disabled:r.value,onClick:_}),{default:()=>{var s;return[((s=o.submitter)==null?void 0:s.resetText)||v("ap.common.resetText")]}})),((u=o.submitter)==null?void 0:u.submitButtonProps)!==!1&&t.push(e.createVNode(i.Button,e.mergeProps({type:"primary",key:"submit"},((m=o.submitter)==null?void 0:m.submitButtonProps)||{},{loading:r.value,onClick:q}),{default:()=>{var s;return[((s=o.submitter)==null?void 0:s.submitText)||v("ap.common.okText")]}})),e.createVNode(i.Flex,{justify:"flex-end",class:g(e.unref(b)==="admin"?"footer-admin":"footer")},{default:()=>[p.submitter?p.submitter(t):e.createVNode(i.Space,null,F(t)?t:{default:()=>[t]})]})});function _(){var t,l,a;o.submitter!==!1&&((t=n.value)==null||t.resetFields(),(a=(l=o.submitter)==null?void 0:l.onReset)==null||a.call(l))}async function q(){var t,l,a,u;if(o.submitter!==!1)try{const m=await((t=n.value)==null?void 0:t.validateFields());(a=(l=o.submitter)==null?void 0:l.onSubmit)==null||a.call(l),r.value=!0;const s=(u=o.onFinish)==null?void 0:u.call(o,R.convertReactiveToRaw(m));if(o.submitTimeout&&s instanceof Promise){const x=setTimeout(()=>r.value=!1,o.submitTimeout);s.finally(()=>{clearTimeout(x),r.value=!1})}await s&&f(!1)}finally{r.value=!1}}function V(){e.unref(r)||f(!1)}function w(t){!t&&e.unref(r)||f(t)}return C({resetFields:()=>{var t;(t=n.value)==null||t.resetFields()},clearValidate:t=>{var l;(l=n.value)==null||l.clearValidate(t)},validateFields:(t,l)=>{var a;return(a=n.value)==null?void 0:a.validateFields(t,l)},getFieldsValue:t=>{var l;return(l=n.value)==null?void 0:l.getFieldsValue(t)},validate:(t,l)=>{var a;return(a=n.value)==null?void 0:a.validate(t,l)},scrollToField:(t,l={})=>{var a;(a=n.value)==null||a.scrollToField(t,l)},setFieldValue:(t,l)=>{var a,u;(u=(a=n.value)==null?void 0:a.setFieldValue)==null||u.call(a,t,l)},setFieldsValue:t=>{var l,a;if(!n.value){c.value=t;return}(a=(l=n.value)==null?void 0:l.setFieldsValue)==null||a.call(l,t)},getInternalInstance:t=>{var l;return(l=n.value)==null?void 0:l.getInternalInstance(t)}}),(t,l)=>(e.openBlock(),e.createElementBlock(e.Fragment,null,[e.createVNode(e.unref(i.Modal),e.mergeProps(t.modalProps,{open:e.unref(k),footer:null,width:t.width,class:e.unref(N)(),"body-style":{padding:e.unref(b)==="admin"?"0px !important":"20px !important"},"onUpdate:open":w,onCancel:V}),{title:e.withCtx(()=>[e.renderSlot(t.$slots,"title",{},()=>[e.createTextVNode(e.toDisplayString(o.title),1)])]),default:e.withCtx(()=>[e.createElementVNode("div",{class:e.normalizeClass(e.unref(g)(e.unref(b)==="admin"?"content-admin":"content"))},[e.createVNode(D.default,e.mergeProps({ref_key:"formRef",ref:n},e.unref(M.omit)(o,["modalProps","open","onUpdate:open","title","width","onFinish","submitter"])),{default:e.withCtx(()=>[e.renderSlot(t.$slots,"default")]),_:3},16)],2),(e.openBlock(),e.createBlock(e.resolveDynamicComponent(P.value)))]),_:3},16,["open","width","class","body-style"]),e.unref(h)?(e.openBlock(),e.createBlock(e.resolveDynamicComponent(e.unref(h)),{key:0})):e.createCommentVNode("",!0)],64))}});exports.default=E;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),i=require("@aplus-frontend/antdv");require("../ap-form.vue.js");require("../../hooks/index.js");const S=require("../../utils/slot.js");require("../../config-provider/index.js");const M=require("lodash-unified"),R=require("../../utils/index.js"),j=require("../../hooks/useControllableValue.js"),O=require("../../config-provider/hooks/use-locale.js"),U=require("../../config-provider/hooks/use-global-config.js"),z=require("../../config-provider/hooks/use-namespace.js"),D=require("../ap-form.vue2.js");function F(d){return typeof d=="function"||Object.prototype.toString.call(d)==="[object Object]"&&!e.isVNode(d)}const E=e.defineComponent({__name:"index",props:{layout:{default:"horizontal"},labelCol:{},wrapperCol:{},colon:{type:Boolean,default:!0},labelAlign:{default:"right"},labelWrap:{type:Boolean},prefixCls:{},requiredMark:{},hideRequiredMark:{type:Boolean,default:!1},rules:{},validateMessages:{},validateOnRuleChange:{type:Boolean,default:!0},scrollToFirstError:{},onSubmit:{},name:{},validateTrigger:{default:"change"},size:{},disabled:{type:Boolean},onFieldsChange:{},onFinishFailed:{},onValidate:{},initialValues:{},onValuesChange:{},syncToUrl:{type:[Boolean,Function]},syncToUrlPriority:{type:Boolean},open:{type:Boolean,default:void 0},"onUpdate:open":{},modalProps:{default:()=>({})},title:{},width:{default:800},onFinish:{},submitter:{type:[Boolean,Object],default:()=>({resetButtonProps:!1})},showCancel:{type:Boolean,default:!0},submitTimeout:{}},emits:["update:open"],setup(d,{expose:C,emit:B}){const o=d,p=e.useSlots(),T=B,n=e.ref(),c=e.ref(),r=e.ref(!1),{value:k,updateValue:f}=j.useControllableValue(o,T,{valuePropName:"open",defaultValue:!1}),{t:v}=O.useLocale(),b=U.useGlobalConfig("uiMode","aplus"),{b:N,e:g}=z.useNamespace("ap-form-modal-form");e.watch(()=>n.value,t=>{var l;t&&c.value&&((l=t.setFieldsValue)==null||l.call(t,c.value),c.value=void 0)});const y=S.getSingleVNode(p.trigger),h=y?e.cloneVNode(y,{onClick:()=>{f(!0)}}):null,P=e.computed(()=>{var l,a,u,m;const t=[];if(o.submitter===!1)return null;if(o.showCancel){let s;t.push(e.createVNode(i.Button,{onClick:V,disabled:r.value},F(s=v("ap.common.cancelText"))?s:{default:()=>[s]}))}return((l=o.submitter)==null?void 0:l.resetButtonProps)!==!1&&t.push(e.createVNode(i.Button,e.mergeProps(((a=o.submitter)==null?void 0:a.resetButtonProps)||{},{key:"submit",disabled:r.value,onClick:_}),{default:()=>{var s;return[((s=o.submitter)==null?void 0:s.resetText)||v("ap.common.resetText")]}})),((u=o.submitter)==null?void 0:u.submitButtonProps)!==!1&&t.push(e.createVNode(i.Button,e.mergeProps({type:"primary",key:"submit"},((m=o.submitter)==null?void 0:m.submitButtonProps)||{},{loading:r.value,onClick:q}),{default:()=>{var s;return[((s=o.submitter)==null?void 0:s.submitText)||v("ap.common.okText")]}})),e.createVNode(i.Flex,{justify:"flex-end",class:g(e.unref(b)==="admin"?"footer-admin":"footer")},{default:()=>[p.submitter?p.submitter(t):e.createVNode(i.Space,null,F(t)?t:{default:()=>[t]})]})});function _(){var t,l,a;o.submitter!==!1&&((t=n.value)==null||t.resetFields(),(a=(l=o.submitter)==null?void 0:l.onReset)==null||a.call(l))}async function q(){var t,l,a,u;if(o.submitter!==!1)try{const m=await((t=n.value)==null?void 0:t.validateFields());(a=(l=o.submitter)==null?void 0:l.onSubmit)==null||a.call(l),r.value=!0;const s=(u=o.onFinish)==null?void 0:u.call(o,R.convertReactiveToRaw(m));if(o.submitTimeout&&s instanceof Promise){const x=setTimeout(()=>r.value=!1,o.submitTimeout);s.finally(()=>{clearTimeout(x),r.value=!1})}await s&&f(!1)}finally{r.value=!1}}function V(){e.unref(r)||f(!1)}function w(t){!t&&e.unref(r)||f(t)}return C({resetFields:()=>{var t;(t=n.value)==null||t.resetFields()},clearValidate:t=>{var l;(l=n.value)==null||l.clearValidate(t)},validateFields:(t,l)=>{var a;return(a=n.value)==null?void 0:a.validateFields(t,l)},getFieldsValue:t=>{var l;return(l=n.value)==null?void 0:l.getFieldsValue(t)},validate:(t,l)=>{var a;return(a=n.value)==null?void 0:a.validate(t,l)},scrollToField:(t,l={})=>{var a;(a=n.value)==null||a.scrollToField(t,l)},setFieldValue:(t,l)=>{var a,u;(u=(a=n.value)==null?void 0:a.setFieldValue)==null||u.call(a,t,l)},setFieldsValue:t=>{var l,a;if(!n.value){c.value=t;return}(a=(l=n.value)==null?void 0:l.setFieldsValue)==null||a.call(l,t)},getInternalInstance:t=>{var l;return(l=n.value)==null?void 0:l.getInternalInstance(t)}}),(t,l)=>(e.openBlock(),e.createElementBlock(e.Fragment,null,[e.createVNode(e.unref(i.Modal),e.mergeProps(t.modalProps,{open:e.unref(k),footer:null,width:t.width,class:e.unref(N)(),"body-style":{padding:e.unref(b)==="admin"?"0px !important":"20px !important"},"onUpdate:open":w,onCancel:V}),{title:e.withCtx(()=>[e.renderSlot(t.$slots,"title",{},()=>[e.createTextVNode(e.toDisplayString(o.title),1)])]),default:e.withCtx(()=>[e.createElementVNode("div",{class:e.normalizeClass(e.unref(g)(e.unref(b)==="admin"?"content-admin":"content"))},[e.createVNode(D.default,e.mergeProps({ref_key:"formRef",ref:n},e.unref(M.omit)(o,["modalProps","open","onUpdate:open","title","width","onFinish","submitter"])),{default:e.withCtx(()=>[e.renderSlot(t.$slots,"default")]),_:3},16)],2),(e.openBlock(),e.createBlock(e.resolveDynamicComponent(P.value)))]),_:3},16,["open","width","class","body-style"]),e.unref(h)?(e.openBlock(),e.createBlock(e.resolveDynamicComponent(e.unref(h)),{key:0})):e.createCommentVNode("",!0)],64))}});exports.default=E;

package/lib/src/ap-form/search-form/index.vue.d.ts

@@ -1,7 +1,7 @@
 import { ApFormExpose, ApFormSearchFormProps } from '../interface';
 import { ComponentInternalInstance, ExtractPropTypes, PropType, HTMLAttributes, VNodeProps, AllowedComponentProps, ComponentCustomProps, Slot, ComponentPublicInstance, ComponentOptionsBase, ComponentOptionsMixin, GlobalComponents, GlobalDirectives, ComponentProvideOptions, DebuggerEvent, nextTick, WatchOptions, WatchStopHandle, ShallowUnwrapRef, ComponentCustomProperties, DefineComponent, ComputedRef, PublicProps } from 'vue';
 import { ButtonSize } from '@aplus-frontend/antdv/es/button';
-import { ValidateMessages, FormLabelAlign, NamePath, FieldData, ValidateErrorEntity, ValidateOptions, InternalNamePath } from '@aplus-frontend/antdv/es/form/interface';
+import { ValidateMessages, FormLabelAlign, FieldData, ValidateErrorEntity, NamePath, ValidateOptions, InternalNamePath } from '@aplus-frontend/antdv/es/form/interface';
 import { RequiredMark } from '@aplus-frontend/antdv/es/form/Form';
 import { ColSize } from '@aplus-frontend/antdv/es/grid';
 import { RuleObject } from '@aplus-frontend/antdv/es/form';
@@ -107,12 +107,12 @@ declare function __VLS_template(): {
                 readonly hideRequiredMark?: boolean | undefined;
                 readonly validateOnRuleChange?: boolean | undefined;
                 readonly scrollToFirstError?: boolean | Options<any> | undefined;
-                readonly onValuesChange?: (((changedValues: any, values: any) => void) & ((changedValues: Recordable, allValues: Recordable, fieldName: NamePath) => void)) | undefined;
                 readonly onFieldsChange?: ((changedFields: FieldData[], allFields: FieldData[]) => void) | undefined;
                 readonly onFinish?: ((values: any) => void) | undefined;
                 readonly onFinishFailed?: ((errorInfo: ValidateErrorEntity<any>) => void) | undefined;
                 readonly onValidate?: ((name: string | number | string[] | number[], status: boolean, errors: string[]) => void) | undefined;
                 readonly initialValues?: Recordable | undefined;
+                readonly onValuesChange?: ((changedValues: Recordable, allValues: Recordable, fieldName: NamePath) => void) | undefined;
                 readonly syncToUrl?: boolean | ((values: Recordable, type: "get" | "set") => Recordable) | undefined;
                 readonly syncToUrlPriority?: boolean | undefined;
             } & VNodeProps & AllowedComponentProps & ComponentCustomProps;

package/lib/src/ap-form/search-form/index.vue.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),r=require("@aplus-frontend/antdv");require("../ap-form.vue.js");require("../item/index.vue2.js");require("../../hooks/index.js");const w=require("../item-group/helper.js"),K=require("@ant-design/icons-vue");require("../../config-provider/index.js");const _=require("lodash-unified"),A=require("../../utils/index.js"),g=require("./utils.js"),Q=require("../../hooks/useControllableValue.js"),X=require("../../config-provider/hooks/use-namespace.js"),Y=require("../../config-provider/hooks/use-global-config.js"),Z=require("../../config-provider/hooks/use-locale.js"),q=require("../item/index.vue.js"),ee=require("../ap-form.vue2.js");function te(m){return typeof m=="function"||Object.prototype.toString.call(m)==="[object Object]"&&!e.isVNode(m)}const s=24,ne=e.defineComponent({name:"ApFormSearchForm",__name:"index",props:{layout:{default:"horizontal"},labelCol:{},wrapperCol:{},colon:{type:Boolean,default:!0},labelAlign:{default:"right"},labelWrap:{type:Boolean},prefixCls:{},requiredMark:{},hideRequiredMark:{type:Boolean,default:!1},rules:{},validateMessages:{},validateOnRuleChange:{type:Boolean,default:!0},scrollToFirstError:{},onSubmit:{},name:{},validateTrigger:{default:"change"},size:{},disabled:{type:Boolean},onValuesChange:{},onFieldsChange:{},onFinish:{},onFinishFailed:{},onValidate:{},initialValues:{},syncToUrl:{type:[Boolean,Function]},syncToUrlPriority:{type:Boolean},collapse:{type:Boolean,default:void 0},defaultCollapse:{type:Boolean,default:!1},"onUpdate:collapse":{},searchText:{},resetText:{},onReset:{},customReset:{type:Boolean,default:!1},extraInAction:{type:Boolean,default:!1},forceExpand:{type:Boolean,default:!1},countPerRow:{default:4},submitLoading:{type:Boolean}},emits:["update:collapse"],setup(m,{expose:E,emit:I}){var v;const u=e.useSlots(),o=m,P=I,{value:c,updateValue:T}=Q.useControllableValue(o,P,{valuePropName:"collapse",defaultValuePropName:"defaultCollapse"}),{b:O}=X.useNamespace("ap-form-search-form"),D=Y.useGlobalConfig("uiMode"),{t:B}=Z.useLocale(),x=e.ref();function M(){T(!e.unref(c))}function j(){var t,n;(n=(t=x.value)==null?void 0:t.validateFields())==null||n.then(a=>g.execFunc(o.onSubmit,a))}function L(){var t,n;o.customReset||(n=(t=x.value)==null?void 0:t.resetFields)==null||n.call(t),g.execFunc(o.onReset)}let N=[];const y=e.shallowRef(w.genRealChildren(u.default())),d=e.shallowRef((v=u.extra)==null?void 0:v.call(u)),F=e.computed(()=>Math.floor(s/o.countPerRow));e.watch(()=>u.default(),t=>{N=y.value,y.value=g.diffFormItem(N,w.genRealChildren(t))}),e.watch(()=>{var t;return(t=u.extra)==null?void 0:t.call(u)},t=>{d.value=t});const U=t=>A.isDef(t)?(_.isArray(t)?t:[t]).join(""):Date.now(),C=e.computed(()=>{const t=y.value,n=[],a=[],l=e.unref(F);let p=0;t.forEach(i=>{const f=i.props;(_.isBoolean(f.hidden)?!!f.hidden:A.isDef(f.hidden))?n.push(i):(p+=f.span||l,a.push(i))});const R=s-(p+l)%s,$=p%s<l,z=R<l?s:R,S=s-l*(e.unref(d)&&!o.extraInAction?2:1),G=!o.forceExpand&&p>S;let V=0,k=0;const H=a.map((i,f)=>{const h=i.props,b=h.span||l;if(V+=b,!o.forceExpand&&e.unref(c)&&V>S){n.push(e.cloneVNode(i,{class:"ant-form-item-hidden",hidden:!0}));return}return k+=b,{node:i,span:h.span||l,key:`ApFormSearchFormItem-${f}-${U(h.name)}-${h._signal}`}}).filter(Boolean),J=s-k-l;return{hideNode:e.createVNode(e.Fragment,null,[n]),nodes:H,defaultExtraSpan:z,actualExtraSpan:J,showCollapse:G,lastRowOnlyIncludeActionAndExtra:$}}),W=e.computed(()=>{let t;const n=e.unref(C),a=e.createVNode(r.Col,{span:e.unref(F),key:"actionWrapper"},{default:()=>[e.createVNode(q.default,null,{default:()=>[e.createVNode(r.Flex,{justify:!e.unref(c)&&n.lastRowOnlyIncludeActionAndExtra&&!(e.unref(d)&&o.extraInAction)?"flex-end":"space-between"},{default:()=>[e.createVNode(r.Space,null,{default:()=>[e.createVNode(r.Button,{type:"primary",onClick:j,loading:o.submitLoading,htmlType:"submit"},{default:()=>[o.searchText||B("ap.apForm.search.search")]}),e.createVNode(r.Button,{onClick:L},{default:()=>[o.resetText||B("ap.apForm.search.reset")]}),n.showCollapse?e.createVNode(r.Button,{onClick:M,icon:e.createVNode(K.DoubleRightOutlined,{style:D.value==="aplus"?"color:#B8C3D1":"color:#BFBFBF",rotate:e.unref(c)?90:-90},null)},null):null]}),o.extraInAction?e.unref(d):null]})]})]}),l=!o.extraInAction&&e.unref(d)?e.createVNode(r.Col,{span:e.unref(c)?n.actualExtraSpan:n.defaultExtraSpan,key:"extraNode"},{default:()=>[e.createVNode(q.default,null,{default:()=>[e.createVNode(r.Flex,{justify:!e.unref(c)&&(n.defaultExtraSpan===s||n.lastRowOnlyIncludeActionAndExtra)?"start":"flex-end"},te(t=e.unref(d))?t:{default:()=>[t]})]})]}):null,p=e.createVNode(r.Col,{span:n.defaultExtraSpan},null);return!e.unref(c)&&n.lastRowOnlyIncludeActionAndExtra?e.createVNode(e.Fragment,null,[l||p,a]):e.createVNode(e.Fragment,null,[a,l])});return E({apForm:e.computed(()=>e.unref(x))}),(t,n)=>(e.openBlock(),e.createBlock(ee.default,e.mergeProps({ref_key:"apForm",ref:x,class:e.unref(O)()},e.unref(_.omit)(o,["collapse","defaultCollapse","onUpdate:collapse","searchText","resetText","onSubmit","onReset","extraInAction","forceExpand","countPerRow"])),{default:e.withCtx(()=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(C.value.hideNode))),e.createVNode(e.unref(r.Row),{gutter:16},{default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(C.value.nodes,a=>(e.openBlock(),e.createBlock(e.unref(r.Col),{key:a.key,span:a.span},{default:e.withCtx(()=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(a.node)))]),_:2},1032,["span"]))),128)),(e.openBlock(),e.createBlock(e.resolveDynamicComponent(W.value)))]),_:1})]),_:1},16,["class"]))}});exports.default=ne;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),r=require("@aplus-frontend/antdv");require("../ap-form.vue.js");require("../item/index.vue2.js");require("../../hooks/index.js");const w=require("../item-group/helper.js"),K=require("@ant-design/icons-vue");require("../../config-provider/index.js");const _=require("lodash-unified"),A=require("../../utils/index.js"),g=require("./utils.js"),Q=require("../../hooks/useControllableValue.js"),X=require("../../config-provider/hooks/use-namespace.js"),Y=require("../../config-provider/hooks/use-global-config.js"),Z=require("../../config-provider/hooks/use-locale.js"),q=require("../item/index.vue.js"),ee=require("../ap-form.vue2.js");function te(m){return typeof m=="function"||Object.prototype.toString.call(m)==="[object Object]"&&!e.isVNode(m)}const s=24,ne=e.defineComponent({name:"ApFormSearchForm",__name:"index",props:{layout:{default:"horizontal"},labelCol:{},wrapperCol:{},colon:{type:Boolean,default:!0},labelAlign:{default:"right"},labelWrap:{type:Boolean},prefixCls:{},requiredMark:{},hideRequiredMark:{type:Boolean,default:!1},rules:{},validateMessages:{},validateOnRuleChange:{type:Boolean,default:!0},scrollToFirstError:{},onSubmit:{},name:{},validateTrigger:{default:"change"},size:{},disabled:{type:Boolean},onFieldsChange:{},onFinish:{},onFinishFailed:{},onValidate:{},initialValues:{},onValuesChange:{},syncToUrl:{type:[Boolean,Function]},syncToUrlPriority:{type:Boolean},collapse:{type:Boolean,default:void 0},defaultCollapse:{type:Boolean,default:!1},"onUpdate:collapse":{},searchText:{},resetText:{},onReset:{},customReset:{type:Boolean,default:!1},extraInAction:{type:Boolean,default:!1},forceExpand:{type:Boolean,default:!1},countPerRow:{default:4},submitLoading:{type:Boolean}},emits:["update:collapse"],setup(m,{expose:E,emit:I}){var v;const u=e.useSlots(),o=m,P=I,{value:c,updateValue:T}=Q.useControllableValue(o,P,{valuePropName:"collapse",defaultValuePropName:"defaultCollapse"}),{b:O}=X.useNamespace("ap-form-search-form"),D=Y.useGlobalConfig("uiMode"),{t:B}=Z.useLocale(),x=e.ref();function M(){T(!e.unref(c))}function j(){var t,n;(n=(t=x.value)==null?void 0:t.validateFields())==null||n.then(a=>g.execFunc(o.onSubmit,a))}function L(){var t,n;o.customReset||(n=(t=x.value)==null?void 0:t.resetFields)==null||n.call(t),g.execFunc(o.onReset)}let N=[];const y=e.shallowRef(w.genRealChildren(u.default())),d=e.shallowRef((v=u.extra)==null?void 0:v.call(u)),F=e.computed(()=>Math.floor(s/o.countPerRow));e.watch(()=>u.default(),t=>{N=y.value,y.value=g.diffFormItem(N,w.genRealChildren(t))}),e.watch(()=>{var t;return(t=u.extra)==null?void 0:t.call(u)},t=>{d.value=t});const U=t=>A.isDef(t)?(_.isArray(t)?t:[t]).join(""):Date.now(),C=e.computed(()=>{const t=y.value,n=[],a=[],l=e.unref(F);let p=0;t.forEach(i=>{const f=i.props;(_.isBoolean(f.hidden)?!!f.hidden:A.isDef(f.hidden))?n.push(i):(p+=f.span||l,a.push(i))});const R=s-(p+l)%s,$=p%s<l,z=R<l?s:R,S=s-l*(e.unref(d)&&!o.extraInAction?2:1),G=!o.forceExpand&&p>S;let V=0,k=0;const H=a.map((i,f)=>{const h=i.props,b=h.span||l;if(V+=b,!o.forceExpand&&e.unref(c)&&V>S){n.push(e.cloneVNode(i,{class:"ant-form-item-hidden",hidden:!0}));return}return k+=b,{node:i,span:h.span||l,key:`ApFormSearchFormItem-${f}-${U(h.name)}-${h._signal}`}}).filter(Boolean),J=s-k-l;return{hideNode:e.createVNode(e.Fragment,null,[n]),nodes:H,defaultExtraSpan:z,actualExtraSpan:J,showCollapse:G,lastRowOnlyIncludeActionAndExtra:$}}),W=e.computed(()=>{let t;const n=e.unref(C),a=e.createVNode(r.Col,{span:e.unref(F),key:"actionWrapper"},{default:()=>[e.createVNode(q.default,null,{default:()=>[e.createVNode(r.Flex,{justify:!e.unref(c)&&n.lastRowOnlyIncludeActionAndExtra&&!(e.unref(d)&&o.extraInAction)?"flex-end":"space-between"},{default:()=>[e.createVNode(r.Space,null,{default:()=>[e.createVNode(r.Button,{type:"primary",onClick:j,loading:o.submitLoading,htmlType:"submit"},{default:()=>[o.searchText||B("ap.apForm.search.search")]}),e.createVNode(r.Button,{onClick:L},{default:()=>[o.resetText||B("ap.apForm.search.reset")]}),n.showCollapse?e.createVNode(r.Button,{onClick:M,icon:e.createVNode(K.DoubleRightOutlined,{style:D.value==="aplus"?"color:#B8C3D1":"color:#BFBFBF",rotate:e.unref(c)?90:-90},null)},null):null]}),o.extraInAction?e.unref(d):null]})]})]}),l=!o.extraInAction&&e.unref(d)?e.createVNode(r.Col,{span:e.unref(c)?n.actualExtraSpan:n.defaultExtraSpan,key:"extraNode"},{default:()=>[e.createVNode(q.default,null,{default:()=>[e.createVNode(r.Flex,{justify:!e.unref(c)&&(n.defaultExtraSpan===s||n.lastRowOnlyIncludeActionAndExtra)?"start":"flex-end"},te(t=e.unref(d))?t:{default:()=>[t]})]})]}):null,p=e.createVNode(r.Col,{span:n.defaultExtraSpan},null);return!e.unref(c)&&n.lastRowOnlyIncludeActionAndExtra?e.createVNode(e.Fragment,null,[l||p,a]):e.createVNode(e.Fragment,null,[a,l])});return E({apForm:e.computed(()=>e.unref(x))}),(t,n)=>(e.openBlock(),e.createBlock(ee.default,e.mergeProps({ref_key:"apForm",ref:x,class:e.unref(O)()},e.unref(_.omit)(o,["collapse","defaultCollapse","onUpdate:collapse","searchText","resetText","onSubmit","onReset","extraInAction","forceExpand","countPerRow"])),{default:e.withCtx(()=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(C.value.hideNode))),e.createVNode(e.unref(r.Row),{gutter:16},{default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(C.value.nodes,a=>(e.openBlock(),e.createBlock(e.unref(r.Col),{key:a.key,span:a.span},{default:e.withCtx(()=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(a.node)))]),_:2},1032,["span"]))),128)),(e.openBlock(),e.createBlock(e.resolveDynamicComponent(W.value)))]),_:1})]),_:1},16,["class"]))}});exports.default=ne;

package/lib/src/editable-table/form-item.vue.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const o=require("vue"),V=require("@aplus-frontend/antdv"),p=require("../ap-form/index.js"),d=require("lodash-unified");require("../config-provider/index.js");const E=require("../ap-form/context.js"),f=require("../utils/index.js"),P=require("./hooks/use-get-columns.js"),j=require("./utils.js"),k=require("../config-provider/hooks/use-namespace.js"),A=require("../config-provider/hooks/use-global-config.js"),M=o.defineComponent({name:"EditableTableInner",__name:"form-item",props:{dropdownPrefixCls:{},pagination:{type:[Boolean,Object],default:!1},loading:{type:[Boolean,Object],default:void 0},size:{default:"middle"},bordered:{type:Boolean,default:!1},locale:{},onResizeColumn:{},rowSelection:{},getPopupContainer:{},scroll:{},sortDirections:{default:()=>["ascend","descend"]},showSorterTooltip:{type:[Boolean,Object],default:!0},prefixCls:{},rowKey:{default:"key"},tableLayout:{default:"fixed"},rowClassName:{},title:{},footer:{},id:{},showHeader:{type:Boolean,default:!0},components:{},customRow:{},customHeaderRow:{},direction:{},expandFixed:{type:[String,Boolean],default:!1},expandColumnWidth:{},expandedRowKeys:{},defaultExpandedRowKeys:{},expandedRowRender:{},expandRowByClick:{type:Boolean,default:!1},expandIcon:{},onExpand:{},onExpandedRowsChange:{},defaultExpandAllRows:{type:Boolean,default:!1},indentSize:{default:15},expandIconColumnIndex:{},showExpandColumn:{type:Boolean,default:!0},expandedRowClassName:{},childrenColumnName:{default:"children"},rowExpandable:{},sticky:{type:[Boolean,Object]},transformCellText:{},columns:{},value:{},defaultValue:{},"onUpdate:value":{},onChange:{},maxLength:{},onFieldChange:{},label:{},name:{},formItem:{default:()=>({})}},setup(h,{expose:x}){const u=h;function g(e,t){return d.isArray(t)?t.reduce((l,a)=>l==null?void 0:l[a],e):e==null?void 0:e[t]}const{internalInstance:n,model:b}=E.useInjectForm(),r=o.ref(g(o.unref(b),u.name)||[]),C=o.useSlots(),w=p.ApForm.useWatch(u.name);o.watch(()=>w.value,e=>{var t;r.value=e,(t=u.onChange)==null||t.call(u,e)},{deep:!0});const{b:y}=k.useNamespace("editable-table"),i=o.ref(),R=A.useGlobalConfig("valueTypeMap"),D=P.default(u,R);function B(e,t){var s;const l=((s=o.unref(r))==null?void 0:s.length)||0;if(f.isDef(u.maxLength)&&l>=u.maxLength)return;const a=[...o.unref(r)||[]];f.isDef(t)?a.splice(t,0,{...e||{}}):a.push({...e||{}}),n==null||n.setFieldValue(u.name,a)}function F(e,t="suffix"){var m;const l=((m=o.unref(r))==null?void 0:m.length)||0,a=d.isNumber(e)?e:e.length;if(f.isDef(u.maxLength)&&l+a>u.maxLength)return;const s=[...o.unref(r)||[]],c=d.isNumber(e)?new Array(e).fill({}):d.cloneDeep(e);t==="suffix"?s.push(...c):s.unshift(...c),n==null||n.setFieldValue(u.name,s)}function q(e){let t=d.cloneDeep(o.unref(r)||[]);const l=d.isNumber(e)?[e]:e;t=t.filter((a,s)=>!l.includes(s)),n==null||n.setFieldValue(u.name,t)}function v(){return o.unref(r)}function N(e){var t;return(t=o.unref(r))==null?void 0:t[e]}function T(e,t,l=!0){const a=d.cloneDeep(o.unref(r));a[e]&&(a[e]={...l?a[e]:{},...t},n==null||n.setFieldValue(u.name,[...a]))}function L(e){n==null||n.setFieldValue(u.name,e)}function S(e,t){var a;const l=e==="end"?r.value.length-1:e;j.scrollToRowIndex(l,(a=i.value)==null?void 0:a.$el,t)}function _(){var e;(e=n==null?void 0:n.setFieldValue)==null||e.call(n,u.name,[])}return x({add:B,remove:q,getRowData:N,getRowsData:v,setRowData:T,addMultiple:F,scrollTo:S,setTableData:L,clear:_}),(e,t)=>(o.openBlock(),o.createBlock(o.unref(p.ApForm).FormItem,o.mergeProps(e.formItem,{name:e.name,label:e.label}),{default:o.withCtx(()=>[o.createVNode(o.unref(V.Table),o.mergeProps(o.unref(d.omit)(u,["name","maxLength","onChange"]),{ref_key:"tableRef",ref:i,class:o.unref(y)(),columns:o.unref(D),"data-source":r.value}),o.createSlots({_:2},[o.renderList(o.unref(d.omit)(C,["headerCell"]),(l,a)=>({name:a,fn:o.withCtx(s=>[o.renderSlot(e.$slots,a,o.normalizeProps(o.guardReactiveProps(s||{})))])}))]),1040,["class","columns","data-source"])]),_:3},16,["name","label"]))}});exports.default=M;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const o=require("vue"),V=require("@aplus-frontend/antdv"),h=require("../ap-form/index.js"),d=require("lodash-unified");require("../config-provider/index.js");const P=require("../ap-form/context.js"),f=require("../utils/index.js"),j=require("./hooks/use-get-columns.js"),k=require("./utils.js"),A=require("../config-provider/hooks/use-namespace.js"),M=require("../config-provider/hooks/use-global-config.js"),O=o.defineComponent({name:"EditableTableInner",__name:"form-item",props:{dropdownPrefixCls:{},pagination:{type:[Boolean,Object],default:!1},loading:{type:[Boolean,Object],default:void 0},size:{default:"middle"},bordered:{type:Boolean,default:!1},locale:{},onResizeColumn:{},rowSelection:{},getPopupContainer:{},scroll:{},sortDirections:{default:()=>["ascend","descend"]},showSorterTooltip:{type:[Boolean,Object],default:!0},prefixCls:{},rowKey:{default:"key"},tableLayout:{default:"fixed"},rowClassName:{},title:{},footer:{},id:{},showHeader:{type:Boolean,default:!0},components:{},customRow:{},customHeaderRow:{},direction:{},expandFixed:{type:[String,Boolean],default:!1},expandColumnWidth:{},expandedRowKeys:{},defaultExpandedRowKeys:{},expandedRowRender:{},expandRowByClick:{type:Boolean,default:!1},expandIcon:{},onExpand:{},onExpandedRowsChange:{},defaultExpandAllRows:{type:Boolean,default:!1},indentSize:{default:15},expandIconColumnIndex:{},showExpandColumn:{type:Boolean,default:!0},expandedRowClassName:{},childrenColumnName:{default:"children"},rowExpandable:{},sticky:{type:[Boolean,Object]},transformCellText:{},columns:{},value:{},defaultValue:{},"onUpdate:value":{},onChange:{},maxLength:{},onFieldChange:{},label:{},name:{},formItem:{default:()=>({})}},setup(x,{expose:g}){const l=x;function b(e,t){return d.isArray(t)?t.reduce((u,n)=>u==null?void 0:u[n],e):e==null?void 0:e[t]}const{internalInstance:a,model:w}=P.useInjectForm(),r=o.ref(b(o.unref(w),l.name)||[]),C=o.useSlots(),i=o.ref(l.name);o.watch(()=>l.name,(e,t)=>{d.isEqual(e,t)||(i.value=e)});const y=h.ApForm.useWatch(i);o.watch(()=>y.value,e=>{var t;r.value=e,(t=l.onChange)==null||t.call(l,e)},{deep:!0});const{b:R}=A.useNamespace("editable-table"),c=o.ref(),D=M.useGlobalConfig("valueTypeMap"),B=j.default(l,D);function q(e,t){var s;const u=((s=o.unref(r))==null?void 0:s.length)||0;if(f.isDef(l.maxLength)&&u>=l.maxLength)return;const n=[...o.unref(r)||[]];f.isDef(t)?n.splice(t,0,{...e||{}}):n.push({...e||{}}),a==null||a.setFieldValue(l.name,n)}function v(e,t="suffix"){var p;const u=((p=o.unref(r))==null?void 0:p.length)||0,n=d.isNumber(e)?e:e.length;if(f.isDef(l.maxLength)&&u+n>l.maxLength)return;const s=[...o.unref(r)||[]],m=d.isNumber(e)?new Array(e).fill({}):d.cloneDeep(e);t==="suffix"?s.push(...m):s.unshift(...m),a==null||a.setFieldValue(l.name,s)}function F(e){let t=d.cloneDeep(o.unref(r)||[]);const u=d.isNumber(e)?[e]:e;t=t.filter((n,s)=>!u.includes(s)),a==null||a.setFieldValue(l.name,t)}function N(){return o.unref(r)}function T(e){var t;return(t=o.unref(r))==null?void 0:t[e]}function L(e,t,u=!0){const n=d.cloneDeep(o.unref(r));n[e]&&(n[e]={...u?n[e]:{},...t},a==null||a.setFieldValue(l.name,[...n]))}function S(e){a==null||a.setFieldValue(l.name,e)}function _(e,t){var n;const u=e==="end"?r.value.length-1:e;k.scrollToRowIndex(u,(n=c.value)==null?void 0:n.$el,t)}function E(){var e;(e=a==null?void 0:a.setFieldValue)==null||e.call(a,l.name,[])}return g({add:q,remove:F,getRowData:T,getRowsData:N,setRowData:L,addMultiple:v,scrollTo:_,setTableData:S,clear:E}),(e,t)=>(o.openBlock(),o.createBlock(o.unref(h.ApForm).FormItem,o.mergeProps(e.formItem,{name:e.name,label:e.label}),{default:o.withCtx(()=>[o.createVNode(o.unref(V.Table),o.mergeProps(o.unref(d.omit)(l,["name","maxLength","onChange"]),{ref_key:"tableRef",ref:c,class:o.unref(R)(),columns:o.unref(B),"data-source":r.value}),o.createSlots({_:2},[o.renderList(o.unref(d.omit)(C,["headerCell"]),(u,n)=>({name:n,fn:o.withCtx(s=>[o.renderSlot(e.$slots,n,o.normalizeProps(o.guardReactiveProps(s||{})))])}))]),1040,["class","columns","data-source"])]),_:3},16,["name","label"]))}});exports.default=O;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aplus-frontend/ui",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "main": "./lib/index.js",
   "type": "module",
   "files": [
@@ -64,8 +64,8 @@
     "sortablejs": "^1.15.2",
     "vue-virtual-scroller": "2.0.0-beta.8",
     "vuedraggable": "^4.1.0",
-    "@aplus-frontend/hooks": "1.0.7",
-    "@aplus-frontend/utils": "1.0.43"
+    "@aplus-frontend/utils": "1.0.43",
+    "@aplus-frontend/hooks": "1.0.7"
   },
   "peerDependencies": {
     "@aplus-frontend/antdv": "^1.0.8",