@aplus-frontend/ui 0.5.22 → 0.5.24

package/es/src/ap-grid/utils/table.mjs

@@ -1,9 +1,9 @@
-import { omit as u, isUndefined as d, isFunction as f, isNumber as c } from "lodash-unified";
-const h = 20, v = 50;
-function y(e) {
-  var l, n, i;
+import { omit as l, isUndefined as u, isFunction as h, isNumber as b } from "lodash-unified";
+const w = 20, x = 50;
+function m(e) {
+  var i;
   const t = {
-    ...u(e, [
+    ...l(e, [
       "columns",
       "request",
       "searchForm",
@@ -15,62 +15,63 @@ function y(e) {
   if (e.adaptive && (t.autoResize = !0, t.height = "100%"), e.columnResizable && (t.columnConfig ? t.columnConfig.resizable = !0 : t.columnConfig = {
     resizable: !0
   }), e.rowSelection) {
-    const r = e.rowSelection === !0 ? {} : e.rowSelection;
-    r.type === "radio" ? t.radioConfig = {
+    const o = e.rowSelection === !0 ? {} : e.rowSelection;
+    o.type === "radio" ? t.radioConfig = {
       highlight: !0,
-      checkMethod({ row: o }) {
-        return r.disabled ? !r.disabled(o) : !0;
+      checkMethod({ row: r }) {
+        return o.disabled ? !o.disabled(r) : !0;
       },
-      visibleMethod({ row: o }) {
-        return r.shown ? r.shown(o) : !0;
+      visibleMethod({ row: r }) {
+        return o.shown ? o.shown(r) : !0;
       },
-      checkRowKey: (l = r.defaultSelectedRowKeys) == null ? void 0 : l[0],
-      reserve: d(r.preserveSelectedRowKeys) ? !0 : r.preserveSelectedRowKeys
+      checkRowKey: (i = o.defaultSelectedRowKeys) == null ? void 0 : i[0],
+      reserve: u(o.preserveSelectedRowKeys) ? !0 : o.preserveSelectedRowKeys
     } : t.checkboxConfig = {
       highlight: !0,
-      checkMethod({ row: o }) {
-        return r.disabled ? !r.disabled(o) : !0;
+      checkMethod({ row: r }) {
+        return o.disabled ? !o.disabled(r) : !0;
       },
-      visibleMethod({ row: o }) {
-        return r.shown ? r.shown(o) : !0;
+      visibleMethod({ row: r }) {
+        return o.shown ? o.shown(r) : !0;
       },
-      checkRowKeys: r.defaultSelectedRowKeys,
-      reserve: d(r.preserveSelectedRowKeys) ? !0 : r.preserveSelectedRowKeys,
-      range: r.range || !1
+      checkRowKeys: o.defaultSelectedRowKeys,
+      reserve: u(o.preserveSelectedRowKeys) ? !0 : o.preserveSelectedRowKeys,
+      range: o.range || !1
     };
   }
-  return t.border = e.bordered, e.expandable && (t.expandConfig = u(e.expandable, [
+  return t.border = e.bordered, e.expandable && (t.expandConfig = l(e.expandable, [
     "renderContent",
     "width",
     "title"
-  ])), e.footer && (t.showFooter = !0, f(e.footer) ? t.footerMethod = e.footer : t.footerData = e.footer), e.virtual === !1 ? (t.virtualXConfig = {
+  ])), e.footer && (t.showFooter = !0, h(e.footer) ? t.footerMethod = e.footer : t.footerData = e.footer), e.virtual === !1 ? (t.virtualXConfig = {
     enabled: !1
   }, t.virtualYConfig = {
     enabled: !1
-  }) : (s(t, "X", (n = e.virtual) == null ? void 0 : n.x), s(t, "Y", (i = e.virtual) == null ? void 0 : i.y)), t;
+  }) : (a(t, "X", e.virtual), a(t, "Y", e.virtual)), t;
 }
-function s(e, t, l) {
-  const n = t === "X", i = n ? "virtualXConfig" : "virtualYConfig", r = l !== !1, o = n ? h : v, a = c(l) && l >= 0 ? l : o;
-  e[i] = {
-    enabled: r,
-    gt: a
+function a(e, t, i) {
+  const o = t === "X", r = o ? "x" : "y", n = o ? "virtualXConfig" : "virtualYConfig", s = i == null ? void 0 : i[r], f = s !== !1, d = o ? w : x, c = b(s) && s >= 0 ? s : d;
+  e[n] = {
+    enabled: f,
+    gt: c,
+    oSize: (i == null ? void 0 : i.oSize) || 0
   };
 }
-function b(e) {
+function y(e) {
   return e === !0 ? "left" : e;
 }
-function R(e, t) {
-  const l = e === !0 || !e.type ? "checkbox" : e.type, n = e === !0 ? 60 : e.columnWidth || 60;
-  let i = e === !0 ? void 0 : b(e.fixed);
-  return i || (i === !1 ? i = void 0 : i = t.some(
-    (r) => r.fixed === "left" || r.fixed === !0
+function C(e, t) {
+  const i = e === !0 || !e.type ? "checkbox" : e.type, o = e === !0 ? 60 : e.columnWidth || 60;
+  let r = e === !0 ? void 0 : y(e.fixed);
+  return r || (r === !1 ? r = void 0 : r = t.some(
+    (n) => n.fixed === "left" || n.fixed === !0
   ) ? "left" : void 0), {
-    type: l,
-    width: n,
-    fixed: i
+    type: i,
+    width: o,
+    fixed: r
   };
 }
-function x(e) {
+function g(e) {
   const t = (e == null ? void 0 : e.width) || "auto";
   return {
     type: "expand",
@@ -79,7 +80,7 @@ function x(e) {
   };
 }
 export {
-  x as getRowExpandProps,
-  R as getRowSelectionProps,
-  y as toVxeProps
+  g as getRowExpandProps,
+  C as getRowSelectionProps,
+  m as toVxeProps
 };

package/es/src/ap-table/hooks/use-table-paging-ng.mjs

@@ -1,46 +1,52 @@
-import { ref as ne, reactive as j, unref as h, nextTick as ae, onMounted as se, watch as ie, computed as A, createVNode as x } from "vue";
-import { useTableSortedAndFiltered as ce } from "./use-sorted-filtered.mjs";
+import { ref as ae, reactive as j, unref as h, nextTick as se, onMounted as ie, watch as ce, computed as A, createVNode as x } from "vue";
+import { useTableSortedAndFiltered as ue } from "./use-sorted-filtered.mjs";
 import "../../config-provider/index.mjs";
-import { parseFieldValue as le, dataIndexToStr as ue, isEqualCustom as fe } from "../utils.mjs";
-import { isArray as q, isEqualWith as ge, isUndefined as pe } from "lodash-unified";
+import { parseFieldValue as le, dataIndexToStr as fe, isEqualCustom as ge } from "../utils.mjs";
+import { isArray as q, isEqualWith as de, isUndefined as pe } from "lodash-unified";
 import { isDef as N } from "../../utils/index.mjs";
-import { useLocale as de } from "../../config-provider/hooks/use-locale.mjs";
-import { useNamespace as me } from "../../config-provider/hooks/use-namespace.mjs";
-const S = 1, D = 10;
-function he(g) {
-  const u = {};
-  return g && (g === !0 ? (u.current = S, u.pageSize = D) : (u.current = g.defaultCurrent || S, u.pageSize = g.defaultPageSize || D)), u;
+import { useLocale as me } from "../../config-provider/hooks/use-locale.mjs";
+import { useNamespace as he } from "../../config-provider/hooks/use-namespace.mjs";
+const S = 1, D = 10, B = {
+  defaultCurrent: S,
+  defaultPageSize: D,
+  showLessItems: !1,
+  showTotal: !0
+};
+function Se(s) {
+  return s === !1 ? {} : s == null || s === !0 ? B : {
+    ...B,
+    ...s
+  };
 }
-const be = ({
-  manual: g = !1,
-  request: u,
+function ze(s) {
+  const f = {};
+  return s === !1 || (s === !0 || s == null ? (f.current = S, f.pageSize = D) : (f.current = s.defaultCurrent || S, f.pageSize = s.defaultPageSize || D)), f;
+}
+const Ae = ({
+  manual: s = !1,
+  request: f,
   defaultParams: L = {},
   defaultData: v = [],
   formatParams: y,
   paramsValueTypeMap: O,
   resetFieldsIgnores: R,
-  filterFields: B,
-  sortFields: J,
-  namespace: K = "ap-table",
-  pagination: p = {
-    defaultCurrent: S,
-    defaultPageSize: D,
-    showLessItems: !1,
-    showTotal: !0
-  }
+  filterFields: J,
+  sortFields: K,
+  namespace: M = "ap-table",
+  pagination: d
 }) => {
-  let b = 0, s = {};
-  const M = p ?? {}, Q = (e) => y ? y(e) : e, z = ne(), i = j(he(p)), {
-    getColumnSFConfig: $,
-    setSF: G,
-    clearAll: W,
-    sortedInfo: Z,
-    filteredInfo: H
-  } = ce(), {
+  let b = 0, i = {};
+  const Q = Se(d), $ = (e) => y ? y(e) : e, z = ae(), c = j(ze(d)), {
+    getColumnSFConfig: G,
+    setSF: W,
+    clearAll: Z,
+    sortedInfo: H,
+    filteredInfo: X
+  } = ue(), {
     t: T
-  } = de(), {
+  } = me(), {
     b: P
-  } = me(K), a = j({
+  } = he(M), a = j({
     total: v.length,
     records: v,
     loading: !1
@@ -48,15 +54,15 @@ const be = ({
     var e, t;
     return ((t = (e = z.value) == null ? void 0 : e.apForm) == null ? void 0 : t.getFieldsValueTransformed(!0)) || {};
   }, I = async (e) => {
-    var o;
-    const t = Q(e), r = Date.now();
+    var n;
+    const t = $(e), r = Date.now();
     b = r, a.loading = !0;
     try {
-      const n = await u({
+      const o = await f({
         ...h(L),
         ...t
       });
-      b === r && (a.total = n.total || ((o = n.data) == null ? void 0 : o.length) || 0, a.records = [...n.data || []]);
+      b === r && (a.total = o.total || ((n = o.data) == null ? void 0 : n.length) || 0, a.records = [...o.data || []]);
     } catch {
       b === r && (a.records = [], a.total = 0);
     } finally {
@@ -64,103 +70,103 @@ const be = ({
     }
   }, V = (e) => {
     const t = {};
-    return Object.entries(e).forEach(([r, o]) => {
-      if (t[r] = o, O && o) {
-        const n = O[r];
-        n && (t[r] = le(n, o));
+    return Object.entries(e).forEach(([r, n]) => {
+      if (t[r] = n, O && n) {
+        const o = O[r];
+        o && (t[r] = le(o, n));
       }
     }), t;
-  }, X = async (e) => {
-    var o, n, l, f, d;
+  }, Y = async (e) => {
+    var n, o, l, g, p;
     const t = w(), r = {};
-    Object.entries(t).forEach(([m, C]) => {
-      R && R.indexOf(m) > -1 && (r[m] = C);
-    }), await ((n = (o = z.value) == null ? void 0 : o.apForm) == null ? void 0 : n.resetFields()), (d = (f = (l = z.value) == null ? void 0 : l.apForm) == null ? void 0 : f.setFieldsValue) == null || d.call(f, r), ae(() => {
+    Object.entries(t).forEach(([m, F]) => {
+      R && R.indexOf(m) > -1 && (r[m] = F);
+    }), await ((o = (n = z.value) == null ? void 0 : n.apForm) == null ? void 0 : o.resetFields()), (p = (g = (l = z.value) == null ? void 0 : l.apForm) == null ? void 0 : g.setFieldsValue) == null || p.call(g, r), se(() => {
       e == null || e();
     });
-  }, F = (e) => {
-    s = e;
+  }, C = (e) => {
+    i = e;
     const t = V(e);
     I(t);
-  }, Y = (e) => {
-    F({
-      ...s,
+  }, k = (e) => {
+    C({
+      ...i,
       ...e
     });
   }, E = () => {
     const e = w();
-    p && (i.current = S), F({
+    d && (c.current = S), C({
       ...e,
-      filter: s.filter,
-      sort: s.sort,
-      current: p ? S : void 0,
-      pageSize: p ? s.pageSize || i.pageSize : void 0
+      filter: i.filter,
+      sort: i.sort,
+      current: d ? S : void 0,
+      pageSize: d ? i.pageSize || c.pageSize : void 0
     });
-  }, k = () => {
-    W(), s.sort = {}, s.filter = {}, X(E);
+  }, ee = () => {
+    Z(), i.sort = {}, i.filter = {}, Y(E);
   }, U = () => {
-    F(s);
-  }, ee = (e) => {
-    if (!p)
+    C(i);
+  }, te = (e) => {
+    if (!d)
       U();
     else {
       const {
         current: t,
         pageSize: r
-      } = i, o = a.total - e, n = Math.ceil(o / r), l = t > n ? n : t;
-      Y({
+      } = c, n = a.total - e, o = Math.ceil(n / r), l = t > o ? o : t;
+      k({
         current: l > 0 ? l : 1
       });
     }
   }, _ = (e, t, r) => {
-    var m, C;
-    const o = w();
-    i.current = e.current, i.pageSize = e.pageSize, G(t, r);
-    const n = q(r) ? [...r] : [r], l = {};
-    for (const c of n)
-      (m = h(J)) != null && m.includes(c.columnKey || c.field) && c.order && (l[ue(c.columnKey || c.field)] = c.order);
-    const f = {};
-    for (const c of Object.keys(t))
-      (C = h(B)) != null && C.includes(c) && t[c] && (f[c] = t[c]);
-    const d = {
-      ...o,
-      filter: f,
+    var m, F;
+    const n = w();
+    c.current = e.current, c.pageSize = e.pageSize, W(t, r);
+    const o = q(r) ? [...r] : [r], l = {};
+    for (const u of o)
+      (m = h(K)) != null && m.includes(u.columnKey || u.field) && u.order && (l[fe(u.columnKey || u.field)] = u.order);
+    const g = {};
+    for (const u of Object.keys(t))
+      (F = h(J)) != null && F.includes(u) && t[u] && (g[u] = t[u]);
+    const p = {
+      ...n,
+      filter: g,
       sort: l,
       current: e.current,
       pageSize: e.pageSize
     };
-    ge(s, d, fe) || F(d);
+    de(i, p, ge) || C(p);
   };
-  se(() => {
+  ie(() => {
     const e = w(), {
       current: t,
       pageSize: r
-    } = i;
-    if (s = {
+    } = c;
+    if (i = {
       current: t,
       pageSize: r,
       filter: {},
       sort: {},
       ...e
-    }, !g) {
-      const o = V(s);
-      I(o);
+    }, !s) {
+      const n = V(i);
+      I(n);
     }
-  }), ie(() => h(L), () => {
+  }), ce(() => h(L), () => {
     E();
   }, {
     deep: !0
   });
-  const te = A(() => {
+  const re = A(() => {
     if (a.total === 0)
       return "-";
     const {
       current: e,
       pageSize: t
-    } = i;
+    } = c;
     return `${e}/${Math.ceil(a.total / t)}`;
   });
-  function re(e) {
+  function ne(e) {
     q(e) && (a.records = e, a.total = e.length);
   }
   const oe = A(() => {
@@ -168,20 +174,20 @@ const be = ({
       showLessItems: e,
       showTotal: t,
       showQuickJumper: r,
-      showSizeChanger: o,
-      pageSizeOptions: n
-    } = M;
+      showSizeChanger: n,
+      pageSizeOptions: o
+    } = Q;
     return {
       loading: a.loading,
       pagination: {
-        current: i.current,
-        pageSize: i.pageSize,
+        current: c.current,
+        pageSize: c.pageSize,
         total: a.total,
-        showSizeChanger: N(o) ? o : !e,
+        showSizeChanger: N(n) ? n : !e,
         showQuickJumper: N(r) ? r : !e,
         showLessItems: e,
         size: "default",
-        pageSizeOptions: pe(n) ? ["10", "20", "50", "100"] : n,
+        pageSizeOptions: pe(o) ? ["10", "20", "50", "100"] : o,
         showTotal: t ? (l) => x("span", {
           class: P("pagination-total-wrapper")
         }, [T("ap.apTable.pagination.totalLeftPrefix"), " ", x("span", {
@@ -190,7 +196,7 @@ const be = ({
           class: P("pagination--total-right")
         }, [T("ap.apTable.pagination.totalRightPrefix"), " ", x("span", {
           class: P("pagination-count-text")
-        }, [h(te)]), " ", T("ap.apTable.pagination.totalRightSuffix")])]) : void 0
+        }, [h(re)]), " ", T("ap.apTable.pagination.totalRightSuffix")])]) : void 0
       },
       onChange: _,
       dataSource: a.records
@@ -199,23 +205,23 @@ const be = ({
   return {
     formRef: z,
     submit: E,
-    reset: k,
+    reset: ee,
     refresh: U,
-    refreshByDelete: ee,
+    refreshByDelete: te,
     data: a,
-    current: i.current,
-    pageSize: i.pageSize,
+    current: c.current,
+    pageSize: c.pageSize,
     handleTableChange: _,
     tableProps: oe,
     dataSource: A(() => a.records),
-    setDataSource: re,
-    getColumnSFConfig: $,
-    sortedInfo: Z,
-    filteredInfo: H
+    setDataSource: ne,
+    getColumnSFConfig: G,
+    sortedInfo: H,
+    filteredInfo: X
   };
 };
 export {
   S as DEFAULT_CURRENT,
   D as DEFAULT_PAGE_SIZE,
-  be as useTablePaging
+  Ae as useTablePaging
 };

package/es/src/work-order-modal/work-order-modal.vue.d.ts

@@ -9,7 +9,7 @@ import { Options } from '../../node_modules/scroll-into-view-if-needed';
 import { Recordable } from '../type';
 import { VueTypeDef, VueTypeValidableDef } from '../../node_modules/vue-types';
 import { VueNode } from '@aplus-frontend/antdv/es/_util/type';
-import { ApFormProps, ApFormInternalInstance, WatchFunc } from '..';
+import { ApFormProps, UpdateModelOptimizeFn, ApFormInternalInstance, WatchFunc } from '..';
 import { OnCleanup } from '@vue/reactivity';
 declare const _default: DefineComponent<WorkOrderModalProps, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {} & {
     "update:open": () => any;
@@ -766,7 +766,7 @@ declare const _default: DefineComponent<WorkOrderModalProps, {}, {}, {}, {}, Com
         $el: any;
         $options: ComponentOptionsBase<Readonly< ApFormProps> & Readonly<{}>, {
             setFieldsValue: (fields: Partial<any>) => void;
-            setFieldValue: (name: NamePath, value: any, triggerChange?: boolean) => void;
+            setFieldValue: (name: NamePath, value: any, triggerChange?: boolean, optimizeFn?: UpdateModelOptimizeFn) => void;
             resetFields: () => Promise<void>;
             clearValidate: (name?: NamePath) => void;
             validateFields: (nameList?: NamePath[] | string, options?: ValidateOptions) => Promise<Partial<any>> | undefined;
@@ -815,7 +815,7 @@ declare const _default: DefineComponent<WorkOrderModalProps, {}, {}, {}, {}, Com
         syncToUrl: boolean | ((values: Recordable, type: "get" | "set") => Recordable);
     }> & Omit<Readonly< ApFormProps> & Readonly<{}>, "validate" | "resetFields" | "clearValidate" | "validateFields" | "getFieldsValue" | "scrollToField" | "registerWatch" | "setFieldValue" | ("layout" | "colon" | "labelAlign" | "validateTrigger" | "hideRequiredMark" | "validateOnRuleChange" | "syncToUrl") | "setFieldsValue" | "getInternalInstance" | "validateFieldsReturnTransformed" | "getFieldsValueTransformed"> & ShallowUnwrapRef<{
         setFieldsValue: (fields: Partial<any>) => void;
-        setFieldValue: (name: NamePath, value: any, triggerChange?: boolean) => void;
+        setFieldValue: (name: NamePath, value: any, triggerChange?: boolean, optimizeFn?: UpdateModelOptimizeFn) => void;
         resetFields: () => Promise<void>;
         clearValidate: (name?: NamePath) => void;
         validateFields: (nameList?: NamePath[] | string, options?: ValidateOptions) => Promise<Partial<any>> | undefined;

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

@@ -1,4 +1,4 @@
-import { ApFormProps, WatchFunc, ApFormInternalInstance } from './interface';
+import { ApFormProps, UpdateModelOptimizeFn, WatchFunc, ApFormInternalInstance } from './interface';
 import { InternalNamePath, NamePath, ValidateOptions, FormLabelAlign, ValidateMessages, FieldData, ValidateErrorEntity } from '@aplus-frontend/antdv/es/form/interface';
 import { Recordable } from '../type';
 import { CreateComponentPublicInstanceWithMixins, ExtractPropTypes, PropType, HTMLAttributes, ComponentOptionsMixin, PublicProps, GlobalComponents, GlobalDirectives, ComponentProvideOptions, DefineComponent } from 'vue';
@@ -655,7 +655,7 @@ declare function __VLS_template(): {
 type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
 declare const __VLS_component: DefineComponent<ApFormProps, {
     setFieldsValue: (fields: Partial<any>) => void;
-    setFieldValue: (name: NamePath, value: any, triggerChange?: boolean) => void;
+    setFieldValue: (name: NamePath, value: any, triggerChange?: boolean, optimizeFn?: UpdateModelOptimizeFn) => void;
     resetFields: () => Promise<void>;
     clearValidate: (name?: NamePath) => void;
     validateFields: (nameList?: NamePath[] | string, options?: ValidateOptions) => Promise<Partial<any>> | undefined;

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

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const i=require("vue"),L=require("@aplus-frontend/antdv"),k=require("./context.js"),o=require("lodash-unified"),K=require("@vueuse/core"),G=require("./constant.js"),y=require("../utils/index.js"),H=require("./utils/set.js"),T=require("./utils/params.js"),J=require("./provider/context.js"),Q=i.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(M,{expose:R}){function O(e,t){return o.isArray(t)?t.reduce((r,l)=>r==null?void 0:r[l],e):e==null?void 0:e[t]}const n=M;function P(e,t,r=!0){var a;if(o.isArray(e)){let s=u;for(let f=0;f<e.length-1;f++)e[f]in s||(s[e[f]]={}),s=s[e[f]];s[e[e.length-1]]=t}else u[e]=t;let l=o.isArray(e)?e[0]:e;if(r){const s={[l]:u[l]};p.triggerFormChange(n.name,s),(a=n.onValuesChange)==null||a.call(n,s,u,e)}V()}const c=i.ref(),m=K.useUrlSearchParams(y.getRouteType()),p=J.useInjectFormProvider(),b=i.ref(n.syncToUrl?T.genParams(n.syncToUrl,m,"get"):{});let v=o.cloneDeep(U()),F={};const u=i.reactive(U());let g=[];function U(){const e=n.initialValues||{};return n.syncToUrlPriority?{...e,...i.unref(b)}:{...i.unref(b),...e}}function j(e){var r;const t=h(e,F);p.triggerFormFinish(n.name,e),n.syncToUrl&&T.setToParams(m,T.genParams(n.syncToUrl,t,"set")),(r=n.onFinish)==null||r.call(n,t)}const B=async()=>{var e;(e=c.value)==null||e.resetFields(),await i.nextTick(()=>{Object.keys(u).forEach(t=>delete u[t]),Object.assign(u,v),V(),n.syncToUrl&&T.setToParams(m,T.genParams(n.syncToUrl,h(v,F),"set"))})},w=e=>{var t;(t=c.value)==null||t.clearValidate(e)},x=(e,t)=>{var r;return(r=c.value)==null?void 0:r.validateFields(e,t)},E=async(e,t)=>{var l;const r=await((l=c.value)==null?void 0:l.validateFields(e,t));return h(r,F)},S=e=>{var t;return(t=c.value)==null?void 0:t.getFieldsValue(e)},C=e=>{var r;const t=(r=c.value)==null?void 0:r.getFieldsValue(e);return h(t,F)},D=(e,t)=>{var r;return(r=c.value)==null?void 0:r.validate(e,t)},N=(e,t={})=>{var r;(r=c.value)==null||r.scrollToField(e,t)},W=e=>{Object.assign(u,e),V()},q=(e,t,r=!0)=>{P(e,t,r),V()};function A(e,t){return t||e(i.toRaw(u)),g.push(e),()=>{g=g.filter(r=>r!==e)}}function _({initialValue:e,name:t,transform:r}){if(y.isDef(e)&&y.isDef(t)){const l=O(i.unref(b),t);if(!y.isDef(l)||!n.syncToUrlPriority)if(P(t,e,!1),o.isArray(t)){let a=v;for(let s=0;s<t.length-1;s++)y.isDef(a[t[s]])||(a[t[s]]={}),a=a[t[s]];a[t[t.length-1]]=e}else v[t]=e}r&&(F=H.default(F,[t].flat(1),r,!0))}function $(e){if(e!==G.INTERNAL_FORM_INSTANCE_MARK){console.warn("getInternalInstance should only used at internal");return}return{registerField:_,registerWatch:A,setFieldValue:q}}function V(){if(g.length){const e=i.toRaw(u);g.forEach(t=>{t(e)})}}function h(e,t){if(e==null)return;let r=o.isArray(e)?[]:{};return Object.keys(e).forEach(l=>{const a=e[l],s=t==null?void 0:t[l],f=o.isFunction(s)?s:s==null?void 0:s.transformer,z=o.isFunction(s)?!0:s==null?void 0:s.flat;if(o.isFunction(f)){const d=f(a);z?o.isArray(d)&&o.isArray(r)?r=[...r,...d]:o.isPlainObject(d)&&o.isPlainObject(r)?r={...r,...d}:r[l]=d:r[l]=d}else if(o.isPlainObject(a)||o.isArray(a)){const d=h(a,s);r[l]=d}else r[l]=a}),r}const I={resetFields:B,clearValidate:w,validateFields:x,getFieldsValue:S,validate:D,scrollToField:N,setFieldsValue:W,setFieldValue:q,registerWatch:A,validateFieldsReturnTransformed:E,getFieldsValueTransformed:C,getInternalInstance:$};return i.watch(()=>n.name,e=>{e&&(p.registerForm(e,I),i.onWatcherCleanup(()=>{p.unregisterForm(n.name)}))},{immediate:!0}),k.useProvideForm({model:i.computed(()=>u),updateModel:P,internalInstance:{registerWatch:A,registerField:_,setFieldValue:q}}),R(I),(e,t)=>(i.openBlock(),i.createBlock(i.unref(L.Form),i.mergeProps({ref_key:"formRef",ref:c},i.unref(o.omit)(n,["initialValues","onValuesChange","onFinish"]),{model:u,onFinish:j}),{default:i.withCtx(()=>[i.renderSlot(e.$slots,"default")]),_:3},16,["model"]))}});exports.default=Q;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const i=require("vue"),k=require("@aplus-frontend/antdv"),K=require("./context.js"),o=require("lodash-unified"),G=require("@vueuse/core"),H=require("./constant.js"),T=require("../utils/index.js"),J=require("./utils/set.js"),v=require("./utils/params.js"),Q=require("./provider/context.js"),X=i.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(O,{expose:j}){function B(e,t){return o.isArray(t)?t.reduce((r,n)=>r==null?void 0:r[n],e):e==null?void 0:e[t]}const s=O;function b(e,t,r=!0,n){var l;if(o.isArray(e)){let c=u;for(let g=0;g<e.length-1;g++)e[g]in c||(c[e[g]]={}),c=c[e[g]];n?n(c,e[e.length-1]):c[e[e.length-1]]=t}else n?n(u,e):u[e]=t;let a=o.isArray(e)?e[0]:e;if(r){const c={[a]:u[a]};V.triggerFormChange(s.name,c),(l=s.onValuesChange)==null||l.call(s,c,u,e)}P()}const f=i.ref(),q=G.useUrlSearchParams(T.getRouteType()),V=Q.useInjectFormProvider(),A=i.ref(s.syncToUrl?v.genParams(s.syncToUrl,q,"get"):{});let p=o.cloneDeep(I()),F={};const u=i.reactive(I());let h=[];function I(){const e=s.initialValues||{};return s.syncToUrlPriority?{...e,...i.unref(A)}:{...i.unref(A),...e}}function m(e){var r;const t=y(e,F);V.triggerFormFinish(s.name,e),s.syncToUrl&&v.setToParams(q,v.genParams(s.syncToUrl,t,"set")),(r=s.onFinish)==null||r.call(s,t)}const w=async()=>{var e;(e=f.value)==null||e.resetFields(),await i.nextTick(()=>{Object.keys(u).forEach(t=>delete u[t]),Object.assign(u,p),P(),s.syncToUrl&&v.setToParams(q,v.genParams(s.syncToUrl,y(p,F),"set"))})},x=e=>{var t;(t=f.value)==null||t.clearValidate(e)},E=(e,t)=>{var r;return(r=f.value)==null?void 0:r.validateFields(e,t)},S=async(e,t)=>{var n;const r=await((n=f.value)==null?void 0:n.validateFields(e,t));return y(r,F)},C=e=>{var t;return(t=f.value)==null?void 0:t.getFieldsValue(e)},D=e=>{var r;const t=(r=f.value)==null?void 0:r.getFieldsValue(e);return y(t,F)},N=(e,t)=>{var r;return(r=f.value)==null?void 0:r.validate(e,t)},W=(e,t={})=>{var r;(r=f.value)==null||r.scrollToField(e,t)},$=e=>{Object.assign(u,e),P()},U=(e,t,r=!0,n)=>{b(e,t,r,n),P()};function _(e,t){return t||e(i.toRaw(u)),h.push(e),()=>{h=h.filter(r=>r!==e)}}function M({initialValue:e,name:t,transform:r}){if(T.isDef(e)&&T.isDef(t)){const n=B(i.unref(A),t);if(!T.isDef(n)||!s.syncToUrlPriority)if(b(t,e,!1),o.isArray(t)){let a=p;for(let l=0;l<t.length-1;l++)T.isDef(a[t[l]])||(a[t[l]]={}),a=a[t[l]];a[t[t.length-1]]=e}else p[t]=e}r&&(F=J.default(F,[t].flat(1),r,!0))}function L(e){if(e!==H.INTERNAL_FORM_INSTANCE_MARK){console.warn("getInternalInstance should only used at internal");return}return{registerField:M,registerWatch:_,setFieldValue:U}}function P(){if(h.length){const e=i.toRaw(u);h.forEach(t=>{t(e)})}}function y(e,t){if(e==null)return;let r=o.isArray(e)?[]:{};return Object.keys(e).forEach(n=>{const a=e[n],l=t==null?void 0:t[n],c=o.isFunction(l)?l:l==null?void 0:l.transformer,g=o.isFunction(l)?!0:l==null?void 0:l.flat;if(o.isFunction(c)){const d=c(a);g?o.isArray(d)&&o.isArray(r)?r=[...r,...d]:o.isPlainObject(d)&&o.isPlainObject(r)?r={...r,...d}:r[n]=d:r[n]=d}else if(o.isPlainObject(a)||o.isArray(a)){const d=y(a,l);r[n]=d}else r[n]=a}),r}const R={resetFields:w,clearValidate:x,validateFields:E,getFieldsValue:C,validate:N,scrollToField:W,setFieldsValue:$,setFieldValue:U,registerWatch:_,validateFieldsReturnTransformed:S,getFieldsValueTransformed:D,getInternalInstance:L};return i.watch(()=>s.name,e=>{e&&(V.registerForm(e,R),i.onWatcherCleanup(()=>{V.unregisterForm(s.name)}))},{immediate:!0}),K.useProvideForm({model:i.computed(()=>u),updateModel:b,internalInstance:{registerWatch:_,registerField:M,setFieldValue:U}}),j(R),(e,t)=>(i.openBlock(),i.createBlock(i.unref(k.Form),i.mergeProps({ref_key:"formRef",ref:f},i.unref(o.omit)(s,["initialValues","onValuesChange","onFinish"]),{model:u,onFinish:m}),{default:i.withCtx(()=>[i.renderSlot(e.$slots,"default")]),_:3},16,["model"]))}});exports.default=X;

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

@@ -9,7 +9,7 @@ import { Options } from '../../../node_modules/scroll-into-view-if-needed';
 import { Recordable } from '../../type';
 import { VueTypeDef, VueTypeValidableDef } from '../../../node_modules/vue-types';
 import { VueNode } from '@aplus-frontend/antdv/es/_util/type';
-import { ApFormProps, ApFormInternalInstance, WatchFunc, ApFormSubmitterConfig } from '..';
+import { ApFormProps, UpdateModelOptimizeFn, ApFormInternalInstance, WatchFunc, ApFormSubmitterConfig } from '..';
 import { OnCleanup } from '@vue/reactivity';
 import { PushState } from '@aplus-frontend/antdv/es/drawer';
 import { MouseEventHandler, KeyboardEventHandler } from '@aplus-frontend/antdv/es/_util/EventInterface';
@@ -771,7 +771,7 @@ declare function __VLS_template(): {
             $el: any;
             $options: ComponentOptionsBase<Readonly< ApFormProps> & Readonly<{}>, {
                 setFieldsValue: (fields: Partial<any>) => void;
-                setFieldValue: (name: NamePath, value: any, triggerChange?: boolean) => void;
+                setFieldValue: (name: NamePath, value: any, triggerChange?: boolean, optimizeFn?: UpdateModelOptimizeFn) => void;
                 resetFields: () => Promise<void>;
                 clearValidate: (name?: NamePath) => void;
                 validateFields: (nameList?: NamePath[] | string, options?: ValidateOptions) => Promise<Partial<any>> | undefined;
@@ -820,7 +820,7 @@ declare function __VLS_template(): {
             syncToUrl: boolean | ((values: Recordable, type: "get" | "set") => Recordable);
         }> & Omit<Readonly< ApFormProps> & Readonly<{}>, "validate" | "resetFields" | "clearValidate" | "validateFields" | "getFieldsValue" | "scrollToField" | "registerWatch" | "setFieldValue" | ("layout" | "colon" | "labelAlign" | "validateTrigger" | "hideRequiredMark" | "validateOnRuleChange" | "syncToUrl") | "setFieldsValue" | "getInternalInstance" | "validateFieldsReturnTransformed" | "getFieldsValueTransformed"> & ShallowUnwrapRef<{
             setFieldsValue: (fields: Partial<any>) => void;
-            setFieldValue: (name: NamePath, value: any, triggerChange?: boolean) => void;
+            setFieldValue: (name: NamePath, value: any, triggerChange?: boolean, optimizeFn?: UpdateModelOptimizeFn) => void;
             resetFields: () => Promise<void>;
             clearValidate: (name?: NamePath) => void;
             validateFields: (nameList?: NamePath[] | string, options?: ValidateOptions) => Promise<Partial<any>> | undefined;
@@ -1713,7 +1713,7 @@ declare const __VLS_component: DefineComponent<ApFormDrawerFormProps, {
         $el: any;
         $options: ComponentOptionsBase<Readonly< ApFormProps> & Readonly<{}>, {
             setFieldsValue: (fields: Partial<any>) => void;
-            setFieldValue: (name: NamePath, value: any, triggerChange?: boolean) => void;
+            setFieldValue: (name: NamePath, value: any, triggerChange?: boolean, optimizeFn?: UpdateModelOptimizeFn) => void;
             resetFields: () => Promise<void>;
             clearValidate: (name?: NamePath) => void;
             validateFields: (nameList?: NamePath[] | string, options?: ValidateOptions) => Promise<Partial<any>> | undefined;
@@ -1762,7 +1762,7 @@ declare const __VLS_component: DefineComponent<ApFormDrawerFormProps, {
         syncToUrl: boolean | ((values: Recordable, type: "get" | "set") => Recordable);
     }> & Omit<Readonly< ApFormProps> & Readonly<{}>, "validate" | "resetFields" | "clearValidate" | "validateFields" | "getFieldsValue" | "scrollToField" | "registerWatch" | "setFieldValue" | ("layout" | "colon" | "labelAlign" | "validateTrigger" | "hideRequiredMark" | "validateOnRuleChange" | "syncToUrl") | "setFieldsValue" | "getInternalInstance" | "validateFieldsReturnTransformed" | "getFieldsValueTransformed"> & ShallowUnwrapRef<{
         setFieldsValue: (fields: Partial<any>) => void;
-        setFieldValue: (name: NamePath, value: any, triggerChange?: boolean) => void;
+        setFieldValue: (name: NamePath, value: any, triggerChange?: boolean, optimizeFn?: UpdateModelOptimizeFn) => void;
         resetFields: () => Promise<void>;
         clearValidate: (name?: NamePath) => void;
         validateFields: (nameList?: NamePath[] | string, options?: ValidateOptions) => Promise<Partial<any>> | undefined;

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

@@ -58,9 +58,10 @@ export type ApFormProps = Omit<FormProps, 'model' | 'onValuesChange'> & {
     syncToUrlPriority?: boolean;
 };
 export type WatchFunc = (values?: Recordable) => void;
+export type UpdateModelOptimizeFn = (currentModelValue: any, name: string | number) => void;
 export type ApFormExpose<ModelType = any> = {
     setFieldsValue: (fields: Partial<ModelType>) => void;
-    setFieldValue: (name: NamePath, value: any, triggerChange?: boolean) => void;
+    setFieldValue: (name: NamePath, value: any, triggerChange?: boolean, optimizeFn?: UpdateModelOptimizeFn) => void;
     resetFields: () => Promise<void>;
     clearValidate: (name?: NamePath) => void;
     validateFields: (nameList?: NamePath[] | string, options?: ValidateOptions) => Promise<Partial<ModelType>> | undefined;
@@ -117,7 +118,7 @@ export type ApFormInternalInstance = {
      * @param triggerChange
      * @returns
      */
-    setFieldValue: (name: NamePath, value: any, triggerChange?: boolean) => void;
+    setFieldValue: (name: NamePath, value: any, triggerChange?: boolean, optimizeFn?: UpdateModelOptimizeFn) => void;
 };
 export type ApFormItemExpose = FormItemExpose & {
     /**

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

@@ -9,7 +9,7 @@ import { RuleObject } from '@aplus-frontend/antdv/es/form';
 import { Options } from '../../../node_modules/scroll-into-view-if-needed';
 import { VueTypeDef, VueTypeValidableDef } from '../../../node_modules/vue-types';
 import { VueNode } from '@aplus-frontend/antdv/es/_util/type';
-import { ApFormProps, ApFormInternalInstance, WatchFunc, ApFormSubmitterConfig } from '..';
+import { ApFormProps, UpdateModelOptimizeFn, ApFormInternalInstance, WatchFunc, ApFormSubmitterConfig } from '..';
 import { OnCleanup } from '@vue/reactivity';
 import { LegacyButtonType, ButtonHTMLType } from '@aplus-frontend/antdv/es/button/buttonTypes';
 import { MouseEventHandler } from '@aplus-frontend/antdv/es/_util/EventInterface';
@@ -771,7 +771,7 @@ declare function __VLS_template(): {
             $el: any;
             $options: ComponentOptionsBase<Readonly< ApFormProps> & Readonly<{}>, {
                 setFieldsValue: (fields: Partial<any>) => void;
-                setFieldValue: (name: NamePath, value: any, triggerChange?: boolean) => void;
+                setFieldValue: (name: NamePath, value: any, triggerChange?: boolean, optimizeFn?: UpdateModelOptimizeFn) => void;
                 resetFields: () => Promise<void>;
                 clearValidate: (name?: NamePath) => void;
                 validateFields: (nameList?: NamePath[] | string, options?: ValidateOptions) => Promise<Partial<any>> | undefined;
@@ -820,7 +820,7 @@ declare function __VLS_template(): {
             syncToUrl: boolean | ((values: Recordable, type: "get" | "set") => Recordable);
         }> & Omit<Readonly< ApFormProps> & Readonly<{}>, "validate" | "resetFields" | "clearValidate" | "validateFields" | "getFieldsValue" | "scrollToField" | "registerWatch" | "setFieldValue" | ("layout" | "colon" | "labelAlign" | "validateTrigger" | "hideRequiredMark" | "validateOnRuleChange" | "syncToUrl") | "setFieldsValue" | "getInternalInstance" | "validateFieldsReturnTransformed" | "getFieldsValueTransformed"> & ShallowUnwrapRef<{
             setFieldsValue: (fields: Partial<any>) => void;
-            setFieldValue: (name: NamePath, value: any, triggerChange?: boolean) => void;
+            setFieldValue: (name: NamePath, value: any, triggerChange?: boolean, optimizeFn?: UpdateModelOptimizeFn) => void;
             resetFields: () => Promise<void>;
             clearValidate: (name?: NamePath) => void;
             validateFields: (nameList?: NamePath[] | string, options?: ValidateOptions) => Promise<Partial<any>> | undefined;
@@ -1901,7 +1901,7 @@ declare const __VLS_component: DefineComponent<ApFormModalFormProps, {
         $el: any;
         $options: ComponentOptionsBase<Readonly< ApFormProps> & Readonly<{}>, {
             setFieldsValue: (fields: Partial<any>) => void;
-            setFieldValue: (name: NamePath, value: any, triggerChange?: boolean) => void;
+            setFieldValue: (name: NamePath, value: any, triggerChange?: boolean, optimizeFn?: UpdateModelOptimizeFn) => void;
             resetFields: () => Promise<void>;
             clearValidate: (name?: NamePath) => void;
             validateFields: (nameList?: NamePath[] | string, options?: ValidateOptions) => Promise<Partial<any>> | undefined;
@@ -1950,7 +1950,7 @@ declare const __VLS_component: DefineComponent<ApFormModalFormProps, {
         syncToUrl: boolean | ((values: Recordable, type: "get" | "set") => Recordable);
     }> & Omit<Readonly< ApFormProps> & Readonly<{}>, "validate" | "resetFields" | "clearValidate" | "validateFields" | "getFieldsValue" | "scrollToField" | "registerWatch" | "setFieldValue" | ("layout" | "colon" | "labelAlign" | "validateTrigger" | "hideRequiredMark" | "validateOnRuleChange" | "syncToUrl") | "setFieldsValue" | "getInternalInstance" | "validateFieldsReturnTransformed" | "getFieldsValueTransformed"> & ShallowUnwrapRef<{
         setFieldsValue: (fields: Partial<any>) => void;
-        setFieldValue: (name: NamePath, value: any, triggerChange?: boolean) => void;
+        setFieldValue: (name: NamePath, value: any, triggerChange?: boolean, optimizeFn?: UpdateModelOptimizeFn) => void;
         resetFields: () => Promise<void>;
         clearValidate: (name?: NamePath) => void;
         validateFields: (nameList?: NamePath[] | string, options?: ValidateOptions) => Promise<Partial<any>> | undefined;