@aplus-frontend/ui 0.0.30 → 0.0.32

package/es/src/ap-form/items/radio/index.vue.mjs

@@ -1,4 +1,4 @@
-import { defineComponent as u, useSlots as m, ref as c, openBlock as b, createBlock as v, normalizeProps as a, guardReactiveProps as t, unref as r, createSlots as y, withCtx as s, createVNode as B, mergeProps as _, renderList as x, renderSlot as g } from "vue";
+import { defineComponent as u, useSlots as m, ref as c, openBlock as b, createBlock as _, normalizeProps as a, guardReactiveProps as t, unref as r, createSlots as v, withCtx as s, createVNode as y, mergeProps as B, renderList as x, renderSlot as g } from "vue";
 import "../../ap-form-item.vue2.mjs";
 import "../../../ap-field/index.mjs";
 import { omit as h } from "lodash-unified";
@@ -44,6 +44,7 @@ const q = /* @__PURE__ */ u({
     flex: {},
     valuePropName: {},
     initialValue: {},
+    _signal: {},
     field: { default: () => ({}) },
     disabled: { type: Boolean, default: !1 }
   },
@@ -58,9 +59,9 @@ const q = /* @__PURE__ */ u({
         var e;
         (e = o.value) == null || e.blur();
       }
-    }), (e, P) => (b(), v(k, a(t(r(h)(n, ["field", "disabled"]))), y({
+    }), (e, P) => (b(), _(k, a(t(r(h)(n, ["field", "disabled"]))), v({
       default: s(() => [
-        B(r(C), _({
+        y(r(C), B({
           ref_key: "radioRef",
           ref: o,
           disabled: e.disabled

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

@@ -1,7 +1,7 @@
 import { ApFormItemSelectProps } from '../interface';
 import { ApFormItemSlots } from '../../interface';
 import { DefineComponent, ComponentOptionsMixin, PublicProps, ExtractPropTypes, PropType } from 'vue';
-import { ApFieldSelectProps } from '../../../ap-field';
+import { ApFieldSelectProps } from 'src/ap-field/interface';
 
 declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<ApFormItemSelectProps>, {
     hasFeedback: boolean;
@@ -25,11 +25,11 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefau
 }>>>, {
     disabled: boolean;
     required: boolean;
-    field: Omit< ApFieldSelectProps, "value" | "onUpdate:value">;
-    colon: boolean;
     hasFeedback: boolean;
+    colon: boolean;
     autoLink: boolean;
     validateFirst: boolean;
+    field: Omit< ApFieldSelectProps, "value" | "onUpdate:value">;
 }, {}>, Readonly<{
     notFoundContent: any;
     suffixIcon: any;

package/es/src/ap-form/items/select/index.vue.mjs

@@ -1,4 +1,4 @@
-import { defineComponent as x, ref as y, useSlots as S, computed as g, openBlock as F, createBlock as k, normalizeProps as t, guardReactiveProps as a, unref as l, createSlots as f, withCtx as n, createVNode as C, renderList as u, renderSlot as m } from "vue";
+import { defineComponent as x, ref as y, useSlots as g, computed as S, openBlock as F, createBlock as k, normalizeProps as t, guardReactiveProps as a, unref as l, createSlots as f, withCtx as n, createVNode as C, renderList as u, renderSlot as m } from "vue";
 import "../../ap-form-item.vue2.mjs";
 import "../../../ap-field/index.mjs";
 import { isUndefined as P, omit as c, pick as $ } from "lodash-unified";
@@ -46,23 +46,24 @@ const j = /* @__PURE__ */ x({
     bordered: { type: Boolean },
     valuePropName: {},
     initialValue: {},
+    _signal: {},
     field: { default: () => ({}) },
     placeholder: {},
     disabled: { type: Boolean, default: !1 }
   },
   setup(_, { expose: h }) {
-    const o = _, p = y();
+    const o = _, i = y();
     h({
       focus: () => {
         var e;
-        (e = p.value) == null || e.focus();
+        (e = i.value) == null || e.focus();
       },
       blur: () => {
         var e;
-        (e = p.value) == null || e.blur();
+        (e = i.value) == null || e.blur();
       }
     });
-    const i = S(), v = g(() => {
+    const p = g(), v = S(() => {
       var e, d;
       return {
         placeholder: o.placeholder,
@@ -74,7 +75,7 @@ const j = /* @__PURE__ */ x({
     return (e, d) => (F(), k(N, t(a(l(c)(o, ["field", "placeholder", "disabled"]))), f({
       default: n(() => [
         C(l(V), t(a(v.value)), f({ _: 2 }, [
-          u(l(c)(i, l(b)), (B, r) => ({
+          u(l(c)(p, l(b)), (B, r) => ({
             name: r,
             fn: n((s) => [
               m(e.$slots, r, t(a(s || {})))
@@ -84,7 +85,7 @@ const j = /* @__PURE__ */ x({
       ]),
       _: 2
     }, [
-      u(l($)(i, l(b)), (B, r) => ({
+      u(l($)(p, l(b)), (B, r) => ({
         name: r,
         fn: n((s) => [
           m(e.$slots, r, t(a(s || {})))

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

@@ -1,7 +1,7 @@
 import { ApFormItemSwitchProps } from '../interface';
 import { ApFormItemSlots } from '../../interface';
 import { DefineComponent, ComponentOptionsMixin, PublicProps, ExtractPropTypes, PropType } from 'vue';
-import { ApFieldSwitchProps } from '../../..';
+import { ApFieldSwitchProps } from 'src';
 
 declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<ApFormItemSwitchProps>, {
     hasFeedback: boolean;
@@ -24,12 +24,12 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefau
 }>>>, {
     disabled: boolean;
     required: boolean;
-    field: Omit< ApFieldSwitchProps, "checked" | "onUpdate:checked">;
-    colon: boolean;
     hasFeedback: boolean;
+    colon: boolean;
     autoLink: boolean;
     validateFirst: boolean;
     valuePropName: string;
+    field: Omit< ApFieldSwitchProps, "checked" | "onUpdate:checked">;
 }, {}>, Readonly<{
     checkedChildren: any;
     unCheckedChildren: any;

package/es/src/ap-form/items/switch/index.vue.mjs

@@ -1,11 +1,11 @@
-import { defineComponent as B, useSlots as _, openBlock as h, createBlock as y, normalizeProps as t, guardReactiveProps as r, unref as o, createSlots as d, withCtx as s, createVNode as v, mergeProps as g, renderList as n, renderSlot as p } from "vue";
+import { defineComponent as b, useSlots as B, openBlock as h, createBlock as y, normalizeProps as t, guardReactiveProps as r, unref as o, createSlots as d, withCtx as s, createVNode as g, mergeProps as v, renderList as n, renderSlot as p } from "vue";
 import "../../ap-form-item.vue2.mjs";
 import "../../../ap-field/switch/index.vue2.mjs";
 import { omit as m, pick as x } from "lodash-unified";
 import { apFormItemSlotNames as f } from "../../constant.mjs";
 import S from "../../ap-form-item.vue.mjs";
 import k from "../../../ap-field/switch/index.vue.mjs";
-const I = /* @__PURE__ */ B({
+const I = /* @__PURE__ */ b({
   name: "ApFormItemSwitch",
   __name: "index",
   props: {
@@ -45,15 +45,16 @@ const I = /* @__PURE__ */ B({
     flex: {},
     valuePropName: { default: "checked" },
     initialValue: {},
+    _signal: {},
     field: { default: () => ({}) },
     disabled: { type: Boolean, default: !1 }
   },
   setup(u) {
-    const c = u, i = _();
+    const c = u, i = B();
     return (l, C) => (h(), y(S, t(r(o(m)(c, ["field", "disabled"]))), d({
       default: s(() => [
-        v(k, g({ disabled: l.disabled }, l.field), d({ _: 2 }, [
-          n(o(m)(i, o(f)), (b, e) => ({
+        g(k, v({ disabled: l.disabled }, l.field), d({ _: 2 }, [
+          n(o(m)(i, o(f)), (_, e) => ({
             name: e,
             fn: s((a) => [
               p(l.$slots, e, t(r(a || {})))
@@ -63,7 +64,7 @@ const I = /* @__PURE__ */ B({
       ]),
       _: 2
     }, [
-      n(o(x)(i, o(f)), (b, e) => ({
+      n(o(x)(i, o(f)), (_, e) => ({
         name: e,
         fn: s((a) => [
           p(l.$slots, e, t(r(a || {})))

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

@@ -2,7 +2,7 @@ import { ApFormItemTextProps } from '../interface';
 import { InputFocusOptions } from 'ant-design-vue/es/vc-input/utils/commonUtils';
 import { ApFormItemSlots } from '../../interface';
 import { DefineComponent, ComponentOptionsMixin, PublicProps, ExtractPropTypes, PropType } from 'vue';
-import { ApFieldTextProps } from '../../../ap-field';
+import { ApFieldTextProps } from 'src/ap-field/interface';
 
 declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<ApFormItemTextProps>, {
     hasFeedback: boolean;
@@ -29,11 +29,11 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefau
 }>>>, {
     disabled: boolean;
     required: boolean;
-    field: Omit< ApFieldTextProps, "value" | "onUpdate:value">;
-    colon: boolean;
     hasFeedback: boolean;
+    colon: boolean;
     autoLink: boolean;
     validateFirst: boolean;
+    field: Omit< ApFieldTextProps, "value" | "onUpdate:value">;
 }, {}>, Readonly<{
     addonAfter: any;
     addonBefore: any;

package/es/src/ap-form/items/text/index.vue2.mjs

@@ -1,10 +1,10 @@
-import { defineComponent as g, useSlots as x, ref as S, computed as _, openBlock as k, createBlock as F, normalizeProps as n, guardReactiveProps as p, unref as t, createSlots as u, withCtx as d, createVNode as R, mergeProps as C, renderList as f, renderSlot as c } from "vue";
+import { defineComponent as B, useSlots as x, ref as S, computed as _, openBlock as k, createBlock as F, normalizeProps as n, guardReactiveProps as p, unref as t, createSlots as u, withCtx as d, createVNode as R, mergeProps as C, renderList as f, renderSlot as c } from "vue";
 import "../../ap-form-item.vue2.mjs";
 import { ApField as P } from "../../../ap-field/index.mjs";
 import { omit as m, pick as A } from "lodash-unified";
 import { apFormItemSlotNames as b } from "../../constant.mjs";
 import N from "../../ap-form-item.vue.mjs";
-const E = /* @__PURE__ */ g({
+const E = /* @__PURE__ */ B({
   name: "ApFormItemText",
   __name: "index",
   props: {
@@ -45,12 +45,13 @@ const E = /* @__PURE__ */ g({
     bordered: { type: Boolean },
     valuePropName: {},
     initialValue: {},
+    _signal: {},
     field: { default: () => ({}) },
     placeholder: {},
     disabled: { type: Boolean, default: !1 }
   },
   setup(v, { expose: h }) {
-    const { Text: y } = P, i = x(), B = v, o = S();
+    const { Text: g } = P, i = x(), y = v, o = S();
     return h({
       focus: (e) => {
         var a;
@@ -72,9 +73,9 @@ const E = /* @__PURE__ */ g({
         var e;
         return (e = o.value) == null ? void 0 : e.input;
       })
-    }), (e, a) => (k(), F(N, n(p(t(m)(B, ["field", "disabled", "placeholder"]))), u({
+    }), (e, a) => (k(), F(N, n(p(t(m)(y, ["field", "disabled", "placeholder"]))), u({
       default: d(() => [
-        R(t(y), C({
+        R(t(g), C({
           ref_key: "inputRef",
           ref: o,
           disabled: e.disabled,

package/es/src/ap-form/items/text/password.vue.d.ts

@@ -1,7 +1,7 @@
 import { ApFormItemTextPasswordProps } from '../interface';
 import { ApFormItemSlots } from '../../interface';
 import { DefineComponent, ComponentOptionsMixin, PublicProps, ExtractPropTypes, PropType } from 'vue';
-import { ApFieldTextPasswordProps } from '../../../ap-field';
+import { ApFieldTextPasswordProps } from 'src/ap-field/interface';
 
 declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<ApFormItemTextPasswordProps>, {
     hasFeedback: boolean;
@@ -25,11 +25,11 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefau
 }>>>, {
     disabled: boolean;
     required: boolean;
-    field: Omit< ApFieldTextPasswordProps, "value" | "onUpdate:value">;
-    colon: boolean;
     hasFeedback: boolean;
+    colon: boolean;
     autoLink: boolean;
     validateFirst: boolean;
+    field: Omit< ApFieldTextPasswordProps, "value" | "onUpdate:value">;
 }, {}>, Readonly<{
     addonAfter: any;
     addonBefore: any;

package/es/src/ap-form/items/text/password.vue.mjs

@@ -1,4 +1,4 @@
-import { defineComponent as v, useSlots as x, ref as _, openBlock as g, createBlock as k, normalizeProps as t, guardReactiveProps as s, unref as o, createSlots as n, withCtx as p, createVNode as F, mergeProps as S, renderList as i, renderSlot as f } from "vue";
+import { defineComponent as v, useSlots as _, ref as g, openBlock as x, createBlock as k, normalizeProps as t, guardReactiveProps as s, unref as o, createSlots as n, withCtx as p, createVNode as F, mergeProps as S, renderList as i, renderSlot as f } from "vue";
 import "../../ap-form-item.vue2.mjs";
 import { ApField as C } from "../../../ap-field/index.mjs";
 import { omit as u, pick as P } from "lodash-unified";
@@ -45,12 +45,13 @@ const z = /* @__PURE__ */ v({
     bordered: { type: Boolean },
     valuePropName: {},
     initialValue: {},
+    _signal: {},
     field: { default: () => ({}) },
     placeholder: {},
     disabled: { type: Boolean, default: !1 }
   },
   setup(c, { expose: b }) {
-    const { Text: h } = C, d = x(), y = c, a = _();
+    const { Text: h } = C, d = _(), y = c, a = g();
     return b({
       focus: () => {
         var e;
@@ -60,7 +61,7 @@ const z = /* @__PURE__ */ v({
         var e;
         (e = a.value) == null || e.blur();
       }
-    }), (e, R) => (g(), k(w, t(s(o(u)(y, ["field", "disabled", "placeholder"]))), n({
+    }), (e, R) => (x(), k(w, t(s(o(u)(y, ["field", "disabled", "placeholder"]))), n({
       default: p(() => [
         F(o(h).Password, S({
           ref_key: "inputRef",

package/es/src/ap-form/items/text-area/index.vue.d.ts

@@ -2,7 +2,7 @@ import { ApFormItemTextAreaProps } from '../interface';
 import { InputFocusOptions } from 'ant-design-vue/es/vc-input/utils/commonUtils';
 import { ApFormItemSlots } from '../../interface';
 import { DefineComponent, ComponentOptionsMixin, PublicProps, ExtractPropTypes, PropType } from 'vue';
-import { ApFieldTextAreaProps } from '../../../ap-field';
+import { ApFieldTextAreaProps } from 'src/ap-field/interface';
 
 type ApFormItemTextAreaSlots = Omit<ApFormItemSlots, 'default'>;
 declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<ApFormItemTextAreaProps>, {
@@ -28,11 +28,11 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefau
 }>>>, {
     disabled: boolean;
     required: boolean;
-    field: Omit< ApFieldTextAreaProps, "value" | "onUpdate:value">;
-    colon: boolean;
     hasFeedback: boolean;
+    colon: boolean;
     autoLink: boolean;
     validateFirst: boolean;
+    field: Omit< ApFieldTextAreaProps, "value" | "onUpdate:value">;
 }, {}>, Readonly<ApFormItemTextAreaSlots> & ApFormItemTextAreaSlots>;
 export default _default;
 type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;

package/es/src/ap-form/items/text-area/index.vue.mjs

@@ -43,6 +43,7 @@ const $ = /* @__PURE__ */ c({
     flex: {},
     valuePropName: {},
     initialValue: {},
+    _signal: {},
     field: { default: () => ({}) },
     placeholder: {},
     disabled: { type: Boolean, default: !1 }
@@ -51,8 +52,8 @@ const $ = /* @__PURE__ */ c({
     const { TextArea: n } = C, u = b(), f = p, l = x();
     return i({
       focus: (e) => {
-        var o;
-        (o = l.value) == null || o.focus(e);
+        var a;
+        (a = l.value) == null || a.focus(e);
       },
       blur: () => {
         var e;
@@ -62,7 +63,7 @@ const $ = /* @__PURE__ */ c({
         var e;
         return (e = l.value) == null ? void 0 : e.resizableTextArea;
       })
-    }), (e, o) => (v(), y(S, r(t(s(F)(f, ["field", "disabled", "placeholder"]))), B({
+    }), (e, a) => (v(), y(S, r(t(s(F)(f, ["field", "disabled", "placeholder"]))), B({
       default: d(() => [
         A(s(n), g({
           ref_key: "textAreaRef",
@@ -73,10 +74,10 @@ const $ = /* @__PURE__ */ c({
       ]),
       _: 2
     }, [
-      _(u, (z, a) => ({
-        name: a,
+      _(u, (z, o) => ({
+        name: o,
         fn: d((m) => [
-          k(e.$slots, a, r(t(m || {})))
+          k(e.$slots, o, r(t(m || {})))
         ])
       }))
     ]), 1040));

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

@@ -58,10 +58,10 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefau
     open: boolean;
     width: number;
     showCancel: boolean;
-    layout: string;
-    validateTrigger: string | string[];
     colon: boolean;
     labelAlign: FormLabelAlign;
+    validateTrigger: string | string[];
+    layout: string;
     hideRequiredMark: boolean;
     validateOnRuleChange: boolean;
     modalProps: Omit<Partial< ExtractPropTypes<{

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

@@ -16,7 +16,7 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefau
     collapse: undefined;
     customReset: boolean;
 }>, {
-    apForm: ComputedRef<ApFormExpose<any> | undefined>;
+    apForm: ComputedRef<ApFormExpose | undefined>;
 }, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
     "update:collapse": (...args: any[]) => void;
 }, string, PublicProps, Readonly< ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<ApFormSearchFormProps>, {
@@ -35,13 +35,13 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefau
 }>>> & {
     "onUpdate:collapse"?: ((...args: any[]) => any) | undefined;
 }, {
-    collapse: boolean;
-    layout: string;
-    validateTrigger: string | string[];
     colon: boolean;
     labelAlign: FormLabelAlign;
+    validateTrigger: string | string[];
+    layout: string;
     hideRequiredMark: boolean;
     validateOnRuleChange: boolean;
+    collapse: boolean;
     countPerRow: number;
     defaultCollapse: boolean;
     customReset: boolean;

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

@@ -1,23 +1,24 @@
-import { isVNode as ee, defineComponent as te, useSlots as ae, ref as oe, unref as t, shallowRef as j, computed as C, watch as I, cloneVNode as le, createVNode as l, Fragment as S, openBlock as c, createBlock as h, mergeProps as ne, withCtx as R, resolveDynamicComponent as F, createElementBlock as re, renderList as se } from "vue";
-import { Col as B, Flex as D, Space as ue, Button as b, Row as pe } from "ant-design-vue";
+import { isVNode as te, defineComponent as ae, useSlots as oe, ref as le, unref as t, shallowRef as j, computed as g, watch as D, cloneVNode as ne, createVNode as l, Fragment as F, openBlock as c, createBlock as h, mergeProps as re, withCtx as R, resolveDynamicComponent as b, createElementBlock as se, renderList as ue } from "vue";
+import { Col as v, Flex as O, Space as ie, Button as B, Row as pe } from "ant-design-vue";
 import "../ap-form.vue.mjs";
 import "../ap-form-item.vue2.mjs";
 import "../../hooks/index.mjs";
-import { genRealChildren as O } from "../ap-form-item-group/helper.mjs";
-import { DoubleRightOutlined as ie } from "@ant-design/icons-vue";
+import { genRealChildren as $ } from "../ap-form-item-group/helper.mjs";
+import { DoubleRightOutlined as ce } from "@ant-design/icons-vue";
 import "../../config-provider/index.mjs";
 import "../style/search-form.css";
-import { isArray as ce, omit as de } from "lodash-unified";
-import { isDef as fe } from "../../utils/index.mjs";
-import { useControllableValue as me } from "../../hooks/useControllableValue.mjs";
-import { useNamespace as he } from "../../config-provider/hooks/use-namespace.mjs";
-import { useLocale as xe } from "../../config-provider/hooks/use-locale.mjs";
+import { isArray as de, omit as fe } from "lodash-unified";
+import { isDef as me } from "../../utils/index.mjs";
+import { diffFormItem as he } from "./utils.mjs";
+import { useControllableValue as xe } from "../../hooks/useControllableValue.mjs";
+import { useNamespace as Ce } from "../../config-provider/hooks/use-namespace.mjs";
+import { useLocale as ge } from "../../config-provider/hooks/use-locale.mjs";
 import L from "../ap-form-item.vue.mjs";
-import Ce from "../ap-form.vue2.mjs";
-function ge(d) {
-  return typeof d == "function" || Object.prototype.toString.call(d) === "[object Object]" && !ee(d);
+import ye from "../ap-form.vue2.mjs";
+function _e(d) {
+  return typeof d == "function" || Object.prototype.toString.call(d) === "[object Object]" && !te(d);
 }
-const p = 24, Ie = /* @__PURE__ */ te({
+const i = 24, $e = /* @__PURE__ */ ae({
   name: "ApFormSearchForm",
   __name: "index",
   props: {
@@ -98,94 +99,96 @@ const p = 24, Ie = /* @__PURE__ */ te({
   emits: ["update:collapse"],
   setup(d, {
     expose: M,
-    emit: $
+    emit: q
   }) {
-    var N;
-    const r = ae(), a = d, q = $, {
+    var k;
+    const r = oe(), a = d, z = q, {
       value: f,
-      updateValue: z
-    } = me(a, q, {
+      updateValue: U
+    } = xe(a, z, {
       valuePropName: "collapse",
       defaultValuePropName: "defaultCollapse"
     }), {
-      b: U
-    } = he("ap-form-search-form"), {
-      t: v
-    } = xe(), x = oe();
-    function W() {
-      z(!t(f));
-    }
+      b: W
+    } = Ce("ap-form-search-form"), {
+      t: w
+    } = ge(), x = le();
     function G() {
+      U(!t(f));
+    }
+    function H() {
       var e, o;
       (o = (e = x.value) == null ? void 0 : e.validateFields()) == null || o.then(a.onSubmit);
     }
-    function H() {
+    function J() {
       var e, o, n;
       a.customReset || (o = (e = x.value) == null ? void 0 : e.resetFields) == null || o.call(e), (n = a.onReset) == null || n.call(a);
     }
-    const w = j(O(r.default())), m = j((N = r.extra) == null ? void 0 : N.call(r)), E = C(() => Math.floor(p / a.countPerRow));
-    I(() => r.default(), (e) => {
-      w.value = O(e);
-    }), I(() => {
+    let E = [];
+    const y = j($(r.default())), m = j((k = r.extra) == null ? void 0 : k.call(r)), N = g(() => Math.floor(i / a.countPerRow));
+    D(() => r.default(), (e) => {
+      E = y.value, y.value = $(e);
+    }), D(() => {
       var e;
       return (e = r.extra) == null ? void 0 : e.call(r);
     }, (e) => {
       m.value = e;
     });
-    const J = (e) => fe(e) ? (ce(e) ? e : [e]).join("") : Date.now(), g = C(() => {
-      const e = [...t(w)], o = [], n = [], s = t(E);
-      let y = 0;
+    const K = (e) => me(e) ? (de(e) ? e : [e]).join("") : Date.now(), _ = g(() => {
+      const e = he(E, y.value), o = [], n = [], s = t(N);
+      let S = 0;
       e.forEach((u) => {
-        const i = u.props;
-        i != null && i.hidden ? o.push(u) : (y += i.span || s, n.push(u));
+        const p = u.props;
+        p != null && p.hidden ? o.push(u) : (S += p.span || s, n.push(u));
       });
-      const k = p - (y + s) % p, Q = k < s ? p : k, A = p - s * (t(m) && !a.extraInAction ? 2 : 1), X = !a.forceExpand && y > A;
-      let P = 0, T = 0;
-      const Y = n.map((u, i) => {
-        const _ = u.props, V = _.span || s;
-        if (P += V, !a.forceExpand && t(f) && P > A) {
-          o.push(le(u, {
+      const A = i - (S + s) % i, X = A < s ? i : A, P = i - s * (t(m) && !a.extraInAction ? 2 : 1), Y = !a.forceExpand && S > P;
+      let T = 0, V = 0;
+      const Z = n.map((u, p) => {
+        const C = u.props, I = C.span || s;
+        if (T += I, !a.forceExpand && t(f) && T > P) {
+          o.push(ne(u, {
             hidden: !0
           }));
           return;
         }
-        return T += V, {
+        return V += I, {
           node: u,
-          span: _.span || s,
-          key: `ApFormSearchFormItem-${i}-${J(_.name)}`
+          span: C.span || s,
+          key: `ApFormSearchFormItem-${p}-${K(C.name)}-${C._signal}`
         };
-      }).filter(Boolean), Z = p - T - s;
+      }).filter(Boolean), ee = i - V - s;
       return {
-        hideNode: l(S, null, [o]),
-        nodes: Y,
-        defaultExtraSpan: Q,
-        actualExtraSpan: Z,
-        showCollapse: X
+        hideNode: l(F, null, [o]),
+        nodes: Z,
+        defaultExtraSpan: X,
+        actualExtraSpan: ee,
+        showCollapse: Y
       };
-    }), K = C(() => {
+    }), Q = g(() => {
       let e;
-      const o = t(g);
-      return l(S, null, [l(B, {
-        span: t(t(E))
+      const o = t(_);
+      return l(F, null, [l(v, {
+        span: t(t(N))
       }, {
         default: () => [l(L, null, {
-          default: () => [l(D, {
+          default: () => [l(O, {
             justify: "space-between"
           }, {
-            default: () => [l(ue, null, {
-              default: () => [l(b, {
+            default: () => [l(ie, null, {
+              default: () => [l(B, {
                 type: "primary",
-                onClick: G,
-                loading: a.submitLoading
+                onClick: H,
+                loading: a.submitLoading,
+                htmlType: "submit"
               }, {
-                default: () => [a.searchText || v("ap.apForm.search.search")]
-              }), l(b, {
-                onClick: H
+                default: () => [a.searchText || w("ap.apForm.search.search")]
+              }), l(B, {
+                onClick: J
               }, {
-                default: () => [a.resetText || v("ap.apForm.search.reset")]
-              }), o.showCollapse ? l(b, {
-                onClick: W,
-                icon: l(ie, {
+                default: () => [a.resetText || w("ap.apForm.search.reset")]
+              }), o.showCollapse ? l(B, {
+                onClick: G,
+                icon: l(ce, {
                   style: "color:#B8C3D1",
                   rotate: t(f) ? 90 : -90
                 }, null)
@@ -193,35 +196,35 @@ const p = 24, Ie = /* @__PURE__ */ te({
             }), a.extraInAction ? t(m) : null]
           })]
         })]
-      }), !a.extraInAction && t(m) ? l(B, {
+      }), !a.extraInAction && t(m) ? l(v, {
         span: t(f) ? o.actualExtraSpan : o.defaultExtraSpan
       }, {
         default: () => [l(L, null, {
-          default: () => [l(D, {
-            justify: !t(f) && o.defaultExtraSpan === p ? "start" : "end"
-          }, ge(e = t(m)) ? e : {
+          default: () => [l(O, {
+            justify: !t(f) && o.defaultExtraSpan === i ? "start" : "end"
+          }, _e(e = t(m)) ? e : {
             default: () => [e]
           })]
         })]
       }) : null]);
     });
     return M({
-      apForm: C(() => t(x))
-    }), (e, o) => (c(), h(Ce, ne({
-      class: t(U)(),
+      apForm: g(() => t(x))
+    }), (e, o) => (c(), h(ye, re({
+      class: t(W)(),
       ref_key: "apForm",
       ref: x
-    }, t(de)(a, ["collapse", "defaultCollapse", "onUpdate:collapse", "searchText", "resetText", "onSubmit", "onReset", "extraInAction", "forceExpand", "countPerRow"])), {
-      default: R(() => [(c(), h(F(g.value.hideNode))), l(t(pe), {
+    }, t(fe)(a, ["collapse", "defaultCollapse", "onUpdate:collapse", "searchText", "resetText", "onSubmit", "onReset", "extraInAction", "forceExpand", "countPerRow"])), {
+      default: R(() => [(c(), h(b(_.value.hideNode))), l(t(pe), {
         gutter: 16
       }, {
-        default: R(() => [(c(!0), re(S, null, se(g.value.nodes, (n) => (c(), h(t(B), {
+        default: R(() => [(c(!0), se(F, null, ue(_.value.nodes, (n) => (c(), h(t(v), {
           key: n.key,
           span: n.span
         }, {
-          default: R(() => [(c(), h(F(n.node)))]),
+          default: R(() => [(c(), h(b(n.node)))]),
           _: 2
-        }, 1032, ["span"]))), 128)), (c(), h(F(K.value)))]),
+        }, 1032, ["span"]))), 128)), (c(), h(b(Q.value)))]),
         _: 1
       })]),
       _: 1
@@ -229,5 +232,5 @@ const p = 24, Ie = /* @__PURE__ */ te({
   }
 });
 export {
-  Ie as default
+  $e as default
 };

package/es/src/ap-form/search-form/utils.d.ts

@@ -0,0 +1,5 @@
+import { VNode, RendererNode, RendererElement } from 'vue';
+
+export declare function diffFormItem(prevNodes: VNode[], current: VNode[]): VNode< RendererNode, RendererElement, {
+    [key: string]: any;
+}>[];