@aplus-frontend/ui 6.26.4 → 6.26.5

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

@@ -116,6 +116,7 @@ declare function __VLS_template(): {
                 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 variant?: "filled" | "outlined" | "borderless" | "underlined" | 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;
@@ -350,11 +351,16 @@ declare function __VLS_template(): {
                         type: PropType<(name: string | number | string[] | number[], status: boolean, errors: string[]) => void>;
                         default: (name: string | number | string[] | number[], status: boolean, errors: string[]) => void;
                     };
+                    variant: {
+                        type: PropType<"filled" | "outlined" | "borderless" | "underlined">;
+                        default: "filled" | "outlined" | "borderless" | "underlined";
+                    };
                 }>> & Readonly<{}>, () => VueNode, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, PublicProps, {
                     size: ButtonSize;
                     onSubmit: (e: Event) => void;
                     disabled: boolean;
                     validateTrigger: string | string[];
+                    variant: "filled" | "outlined" | "borderless" | "underlined";
                     onFinish: (values: any) => void;
                     validateMessages: ValidateMessages;
                     requiredMark: "" | RequiredMark;
@@ -670,11 +676,16 @@ declare function __VLS_template(): {
                         type: PropType<(name: string | number | string[] | number[], status: boolean, errors: string[]) => void>;
                         default: (name: string | number | string[] | number[], status: boolean, errors: string[]) => void;
                     };
+                    variant: {
+                        type: PropType<"filled" | "outlined" | "borderless" | "underlined">;
+                        default: "filled" | "outlined" | "borderless" | "underlined";
+                    };
                 }>> & Readonly<{}>, () => VueNode, {}, {}, {}, {
                     size: ButtonSize;
                     onSubmit: (e: Event) => void;
                     disabled: boolean;
                     validateTrigger: string | string[];
+                    variant: "filled" | "outlined" | "borderless" | "underlined";
                     onFinish: (values: any) => void;
                     validateMessages: ValidateMessages;
                     requiredMark: "" | RequiredMark;
@@ -1276,6 +1287,7 @@ declare const __VLS_component: DefineComponent<ApFormModalFormProps, {
             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 variant?: "filled" | "outlined" | "borderless" | "underlined" | 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;
@@ -1510,11 +1522,16 @@ declare const __VLS_component: DefineComponent<ApFormModalFormProps, {
                     type: PropType<(name: string | number | string[] | number[], status: boolean, errors: string[]) => void>;
                     default: (name: string | number | string[] | number[], status: boolean, errors: string[]) => void;
                 };
+                variant: {
+                    type: PropType<"filled" | "outlined" | "borderless" | "underlined">;
+                    default: "filled" | "outlined" | "borderless" | "underlined";
+                };
             }>> & Readonly<{}>, () => VueNode, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, PublicProps, {
                 size: ButtonSize;
                 onSubmit: (e: Event) => void;
                 disabled: boolean;
                 validateTrigger: string | string[];
+                variant: "filled" | "outlined" | "borderless" | "underlined";
                 onFinish: (values: any) => void;
                 validateMessages: ValidateMessages;
                 requiredMark: "" | RequiredMark;
@@ -1830,11 +1847,16 @@ declare const __VLS_component: DefineComponent<ApFormModalFormProps, {
                     type: PropType<(name: string | number | string[] | number[], status: boolean, errors: string[]) => void>;
                     default: (name: string | number | string[] | number[], status: boolean, errors: string[]) => void;
                 };
+                variant: {
+                    type: PropType<"filled" | "outlined" | "borderless" | "underlined">;
+                    default: "filled" | "outlined" | "borderless" | "underlined";
+                };
             }>> & Readonly<{}>, () => VueNode, {}, {}, {}, {
                 size: ButtonSize;
                 onSubmit: (e: Event) => void;
                 disabled: boolean;
                 validateTrigger: string | string[];
+                variant: "filled" | "outlined" | "borderless" | "underlined";
                 onFinish: (values: any) => void;
                 validateMessages: ValidateMessages;
                 requiredMark: "" | RequiredMark;

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

@@ -1,4 +1,4 @@
-import { isVNode as O, defineComponent as z, useSlots as E, ref as d, watch as $, cloneVNode as q, computed as A, createVNode as n, mergeProps as m, unref as a, createElementBlock as D, openBlock as b, Fragment as L, createBlock as T, createCommentVNode as G, withCtx as v, createElementVNode as K, normalizeClass as W, normalizeStyle as H, renderSlot as C, resolveDynamicComponent as B, createTextVNode as J, toDisplayString as Q } from "vue";
+import { isVNode as O, defineComponent as z, useSlots as E, ref as d, watch as $, cloneVNode as q, computed as A, createVNode as n, mergeProps as m, unref as o, createElementBlock as D, openBlock as b, Fragment as L, createBlock as T, createCommentVNode as G, withCtx as v, createElementVNode as K, normalizeClass as W, normalizeStyle as H, renderSlot as C, resolveDynamicComponent as B, createTextVNode as J, toDisplayString as Q } from "vue";
 import { Button as y, Flex as X, Space as Y, Modal as Z } from "@aplus-frontend/antdv";
 import "../ap-form.vue.mjs";
 import "../../hooks/index.mjs";
@@ -6,8 +6,8 @@ import { getSingleVNode as ee } from "../../utils/slot.mjs";
 import "../../config-provider/index.mjs";
 import { omit as te } from "lodash-unified";
 import { useControllableValue as le } from "../../hooks/useControllableValue.mjs";
-import { useLocale as oe } from "../../config-provider/hooks/use-locale.mjs";
-import { useGlobalConfig as ae } from "../../config-provider/hooks/use-global-config.mjs";
+import { useLocale as ae } from "../../config-provider/hooks/use-locale.mjs";
+import { useGlobalConfig as oe } from "../../config-provider/hooks/use-global-config.mjs";
 import { useNamespace as se } from "../../config-provider/hooks/use-namespace.mjs";
 import ne from "../ap-form.vue2.mjs";
 function k(i) {
@@ -57,6 +57,7 @@ const Se = /* @__PURE__ */ z({
     onFieldsChange: {},
     onFinishFailed: {},
     onValidate: {},
+    variant: {},
     initialValues: {},
     onValuesChange: {},
     syncToUrl: {
@@ -95,7 +96,7 @@ const Se = /* @__PURE__ */ z({
     expose: P,
     emit: w
   }) {
-    const t = i, c = E(), N = w, o = d(), F = d(0), r = d(), s = d(!1), {
+    const t = i, c = E(), N = w, a = d(), F = d(0), r = d(), s = d(!1), {
       value: S,
       updateValue: u
     } = le(t, N, {
@@ -106,11 +107,11 @@ const Se = /* @__PURE__ */ z({
       }
     }), {
       t: f
-    } = oe(), x = ae("uiMode", "aplus"), {
+    } = ae(), x = oe("uiMode", "aplus"), {
       b: M,
       e: p
     } = se("ap-form-modal-form");
-    $(() => o.value, (e) => {
+    $(() => a.value, (e) => {
       e && r.value && (e.setFieldsValue?.(r.value), r.value = void 0);
     });
     const g = ee(c.trigger), h = g ? q(g, {
@@ -147,8 +148,8 @@ const Se = /* @__PURE__ */ z({
         default: () => [t.submitter?.submitText || f("ap.common.okText")]
       })), n(X, {
         justify: "flex-end",
-        key: a(F),
-        class: [p("footer"), a(x) === "admin" ? p("footer-admin") : null]
+        key: o(F),
+        class: [p("footer"), o(x) === "admin" ? p("footer-admin") : null]
       }, {
         default: () => [c.submitter ? c.submitter(e) : n(Y, null, k(e) ? e : {
           default: () => [e]
@@ -156,7 +157,7 @@ const Se = /* @__PURE__ */ z({
       });
     });
     function _() {
-      t.submitter !== !1 && (o.value?.resetFields(), t.submitter?.onReset?.());
+      t.submitter !== !1 && (a.value?.resetFields(), t.submitter?.onReset?.());
     }
     async function U(e) {
       if (t.submitter !== !1)
@@ -175,46 +176,46 @@ const Se = /* @__PURE__ */ z({
         }
     }
     function V() {
-      a(s) || u(!1);
+      o(s) || u(!1);
     }
     function j(e) {
-      !e && a(s) || u(e);
+      !e && o(s) || u(e);
     }
     return P({
       resetFields: async () => {
-        o.value?.resetFields();
+        a.value?.resetFields();
       },
       clearValidate: (e) => {
-        o.value?.clearValidate(e);
+        a.value?.clearValidate(e);
       },
-      validateFields: (e, l) => o.value?.validateFields(e, l),
-      getFieldsValue: (e) => o.value?.getFieldsValue(e),
-      validate: (e, l) => o.value?.validate(e, l),
+      validateFields: (e, l) => a.value?.validateFields(e, l),
+      getFieldsValue: (e) => a.value?.getFieldsValue(e),
+      validate: (e, l) => a.value?.validate(e, l),
       scrollToField: (e, l = {}) => {
-        o.value?.scrollToField(e, l);
+        a.value?.scrollToField(e, l);
       },
       setFieldValue: (e, l) => {
-        o.value?.setFieldValue?.(e, l);
+        a.value?.setFieldValue?.(e, l);
       },
       setFieldsValue: (e) => {
-        if (!o.value) {
+        if (!a.value) {
           r.value = e;
           return;
         }
-        o.value?.setFieldsValue?.(e);
+        a.value?.setFieldsValue?.(e);
       },
-      getInternalInstance: (e) => o.value?.getInternalInstance(e),
+      getInternalInstance: (e) => a.value?.getInternalInstance(e),
       getFieldsValueTransformed(e) {
-        return o.value?.getFieldsValueTransformed(e);
+        return a.value?.getFieldsValueTransformed(e);
       },
       validateFieldsReturnTransformed(e, l) {
-        return o.value?.validateFieldsReturnTransformed(e, l);
+        return a.value?.validateFieldsReturnTransformed(e, l);
       }
-    }), (e, l) => (b(), D(L, null, [n(a(Z), m(e.modalProps, {
-      open: a(S),
+    }), (e, l) => (b(), D(L, null, [n(o(Z), m(e.modalProps, {
+      open: o(S),
       footer: null,
       width: e.width,
-      class: a(M)(),
+      class: o(M)(),
       "body-style": {
         padding: "0px !important"
       },
@@ -224,18 +225,18 @@ const Se = /* @__PURE__ */ z({
       title: v(() => [C(e.$slots, "title", {}, () => [J(Q(t.title), 1)])]),
       default: v(() => [n(ne, m({
         ref_key: "formRef",
-        ref: o
-      }, a(te)(t, ["modalProps", "open", "onUpdate:open", "title", "width", "onFinish", "submitter"]), {
+        ref: a
+      }, o(te)(t, ["modalProps", "open", "onUpdate:open", "title", "width", "onFinish", "submitter"]), {
         onFinish: U
       }), {
         default: v(() => [K("div", {
           style: H(e.modalProps?.bodyStyle),
-          class: W(a(p)("content"))
+          class: W(o(p)("content"))
         }, [C(e.$slots, "default")], 6), (b(), T(B(R.value)))]),
         _: 3
       }, 16)]),
       _: 3
-    }, 16, ["open", "width", "class"]), a(h) ? (b(), T(B(a(h)), {
+    }, 16, ["open", "width", "class"]), o(h) ? (b(), T(B(o(h)), {
       key: 0
     })) : G("", !0)], 64));
   }

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

@@ -113,6 +113,7 @@ declare function __VLS_template(): {
                 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 variant?: "filled" | "outlined" | "borderless" | "underlined" | 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;
@@ -347,11 +348,16 @@ declare function __VLS_template(): {
                         type: PropType<(name: string | number | string[] | number[], status: boolean, errors: string[]) => void>;
                         default: (name: string | number | string[] | number[], status: boolean, errors: string[]) => void;
                     };
+                    variant: {
+                        type: PropType<"filled" | "outlined" | "borderless" | "underlined">;
+                        default: "filled" | "outlined" | "borderless" | "underlined";
+                    };
                 }>> & Readonly<{}>, () => VueNode, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, PublicProps, {
                     size: ButtonSize;
                     onSubmit: (e: Event) => void;
                     disabled: boolean;
                     validateTrigger: string | string[];
+                    variant: "filled" | "outlined" | "borderless" | "underlined";
                     onFinish: (values: any) => void;
                     validateMessages: ValidateMessages;
                     requiredMark: "" | RequiredMark;
@@ -515,7 +521,7 @@ declare function __VLS_template(): {
                         }>> & HTMLAttributes;
                     };
                     wrapperCol: {
-                        type: PropType<Partial< ExtractPropTypes<{
+                        type: ** @type { [typeof ApForm, typeof ApForm, ] } */).PropType<Partial< ExtractPropTypes<{
                             span: (StringConstructor | NumberConstructor)[];
                             order: (StringConstructor | NumberConstructor)[];
                             offset: (StringConstructor | NumberConstructor)[];
@@ -667,11 +673,16 @@ declare function __VLS_template(): {
                         type: PropType<(name: string | number | string[] | number[], status: boolean, errors: string[]) => void>;
                         default: (name: string | number | string[] | number[], status: boolean, errors: string[]) => void;
                     };
+                    variant: {
+                        type: PropType<"filled" | "outlined" | "borderless" | "underlined">;
+                        default: "filled" | "outlined" | "borderless" | "underlined";
+                    };
                 }>> & Readonly<{}>, () => VueNode, {}, {}, {}, {
                     size: ButtonSize;
                     onSubmit: (e: Event) => void;
                     disabled: boolean;
                     validateTrigger: string | string[];
+                    variant: "filled" | "outlined" | "borderless" | "underlined";
                     onFinish: (values: any) => void;
                     validateMessages: ValidateMessages;
                     requiredMark: "" | RequiredMark;
@@ -952,6 +963,7 @@ declare const __VLS_component: DefineComponent<ApFormSearchFormProps, {
             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 variant?: "filled" | "outlined" | "borderless" | "underlined" | 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;
@@ -1186,11 +1198,16 @@ declare const __VLS_component: DefineComponent<ApFormSearchFormProps, {
                     type: PropType<(name: string | number | string[] | number[], status: boolean, errors: string[]) => void>;
                     default: (name: string | number | string[] | number[], status: boolean, errors: string[]) => void;
                 };
+                variant: {
+                    type: PropType<"filled" | "outlined" | "borderless" | "underlined">;
+                    default: "filled" | "outlined" | "borderless" | "underlined";
+                };
             }>> & Readonly<{}>, () => VueNode, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, PublicProps, {
                 size: ButtonSize;
                 onSubmit: (e: Event) => void;
                 disabled: boolean;
                 validateTrigger: string | string[];
+                variant: "filled" | "outlined" | "borderless" | "underlined";
                 onFinish: (values: any) => void;
                 validateMessages: ValidateMessages;
                 requiredMark: "" | RequiredMark;
@@ -1354,7 +1371,7 @@ declare const __VLS_component: DefineComponent<ApFormSearchFormProps, {
                     }>> & HTMLAttributes;
                 };
                 wrapperCol: {
-                    type: PropType<Partial< ExtractPropTypes<{
+                    type: ** @type { [typeof ApForm, typeof ApForm, ] } */).PropType<Partial< ExtractPropTypes<{
                         span: (StringConstructor | NumberConstructor)[];
                         order: (StringConstructor | NumberConstructor)[];
                         offset: (StringConstructor | NumberConstructor)[];
@@ -1506,11 +1523,16 @@ declare const __VLS_component: DefineComponent<ApFormSearchFormProps, {
                     type: PropType<(name: string | number | string[] | number[], status: boolean, errors: string[]) => void>;
                     default: (name: string | number | string[] | number[], status: boolean, errors: string[]) => void;
                 };
+                variant: {
+                    type: PropType<"filled" | "outlined" | "borderless" | "underlined">;
+                    default: "filled" | "outlined" | "borderless" | "underlined";
+                };
             }>> & Readonly<{}>, () => VueNode, {}, {}, {}, {
                 size: ButtonSize;
                 onSubmit: (e: Event) => void;
                 disabled: boolean;
                 validateTrigger: string | string[];
+                variant: "filled" | "outlined" | "borderless" | "underlined";
                 onFinish: (values: any) => void;
                 validateMessages: ValidateMessages;
                 requiredMark: "" | RequiredMark;

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

@@ -1,28 +1,28 @@
-import { isVNode as re, defineComponent as se, useSlots as ie, ref as V, shallowRef as D, computed as _, unref as a, watch as U, createVNode as o, Fragment as w, createBlock as y, openBlock as p, mergeProps as ue, withCtx as B, resolveDynamicComponent as I, createElementBlock as ce, renderList as pe, normalizeStyle as de } from "vue";
-import { Col as R, Flex as k, Button as z, Row as fe } from "@aplus-frontend/antdv";
+import { isVNode as se, defineComponent as ie, useSlots as ue, ref as D, shallowRef as U, computed as _, unref as a, watch as z, createVNode as o, Fragment as w, createBlock as y, openBlock as p, mergeProps as ce, withCtx as B, resolveDynamicComponent as I, createElementBlock as pe, renderList as de, normalizeStyle as fe } from "vue";
+import { Col as R, Flex as k, Button as M, Row as me } from "@aplus-frontend/antdv";
 import "../ap-form.vue.mjs";
 import "../item/index.vue2.mjs";
-import { genRealChildren as M } from "../item-group/helper.mjs";
+import { genRealChildren as q } from "../item-group/helper.mjs";
 import "../../config-provider/index.mjs";
-import { isArray as me, isBoolean as he, omit as xe } from "lodash-unified";
-import { isDef as q } from "../../utils/index.mjs";
-import { execFunc as H, diffFormItem as ye } from "./utils.mjs";
+import { isArray as he, isBoolean as xe, omit as ye } from "lodash-unified";
+import { isDef as H } from "../../utils/index.mjs";
+import { execFunc as G, diffFormItem as ge } from "./utils.mjs";
 import "./components/popover-filter.vue.mjs";
-import { useCountPerRow as ge } from "./hooks/use-count-per-row.mjs";
+import { useCountPerRow as ve } from "./hooks/use-count-per-row.mjs";
 import "./components/popover-sorter/index.vue.mjs";
-import { useSorter as ve } from "./hooks/use-sorter.mjs";
-import { getTargetNode as Ce } from "./hooks/use-collapse-input-count.mjs";
-import { floorWith as G } from "@fruits-chain/utils";
-import { useNamespace as Se } from "../../config-provider/hooks/use-namespace.mjs";
-import { useLocale as _e } from "../../config-provider/hooks/use-locale.mjs";
-import J from "../item/index.vue.mjs";
-import we from "./components/popover-filter.vue2.mjs";
-import Re from "./components/popover-sorter/index.vue2.mjs";
-import be from "../ap-form.vue2.mjs";
-function Fe(d) {
-  return typeof d == "function" || Object.prototype.toString.call(d) === "[object Object]" && !re(d);
+import { useSorter as Ce } from "./hooks/use-sorter.mjs";
+import { getTargetNode as Se } from "./hooks/use-collapse-input-count.mjs";
+import { floorWith as J } from "@fruits-chain/utils";
+import { useNamespace as _e } from "../../config-provider/hooks/use-namespace.mjs";
+import { useLocale as we } from "../../config-provider/hooks/use-locale.mjs";
+import K from "../item/index.vue.mjs";
+import Re from "./components/popover-filter.vue2.mjs";
+import be from "./components/popover-sorter/index.vue2.mjs";
+import Fe from "../ap-form.vue2.mjs";
+function Ae(d) {
+  return typeof d == "function" || Object.prototype.toString.call(d) === "[object Object]" && !se(d);
 }
-const r = 100, Qe = /* @__PURE__ */ se({
+const r = 100, Qe = /* @__PURE__ */ ie({
   name: "ApFormSearchForm",
   __name: "index",
   props: {
@@ -67,6 +67,7 @@ const r = 100, Qe = /* @__PURE__ */ se({
     onFinish: {},
     onFinishFailed: {},
     onValidate: {},
+    variant: {},
     initialValues: {},
     onValuesChange: {},
     syncToUrl: {
@@ -118,68 +119,71 @@ const r = 100, Qe = /* @__PURE__ */ se({
     }
   },
   setup(d, {
-    expose: K
+    expose: Q
   }) {
-    const g = ie(), t = d, {
+    const g = ue(), t = d, {
       b: f
-    } = Se("ap-form-search-form"), {
+    } = _e("ap-form-search-form"), {
       t: T
-    } = _e(), Q = ge(t), v = V(), X = V();
+    } = we(), X = ve(t), v = D(), Y = D();
     function P() {
       const e = v.value?.getFieldsValueTransformed(!0);
-      H(t.onSubmit, e);
+      G(t.onSubmit, e);
     }
-    function Y() {
-      t.customReset || v.value?.resetFields?.(), H(t.onReset);
+    function Z() {
+      t.customReset || v.value?.resetFields?.(), G(t.onReset);
     }
-    const Z = (e) => q(e) ? (me(e) ? e : [e]).join("") : Date.now();
+    const ee = (e) => H(e) ? (he(e) ? e : [e]).join("") : Date.now();
     let E = [];
-    const m = D(M(g.default())), u = D(g.extra?.()), O = _(() => G(r / a(Q), 4)), {
+    const m = U(q(g.default())), u = U(g.extra?.()), O = _(() => J(r / a(X), 4)), {
       items: b,
       sorted: L,
       handleClickConfirm: F
-    } = ve(m);
-    U(() => g.default(), (e) => {
-      E = m.value, m.value = ye(E, M(e)), L.value = !1;
-    }), U(() => g.extra?.(), (e) => {
+    } = Ce(m);
+    z(() => g.default(), (e) => {
+      E = m.value, m.value = ge(E, q(e)), L.value = !1;
+    }), z(() => g.extra?.(), (e) => {
       u.value = e;
     });
-    function ee(e) {
-      return G(e * (r / 24), 4);
+    function te(e) {
+      return J(e * (r / 24), 4);
     }
     const n = _(() => {
       const e = m.value, c = [], l = [], x = [], s = a(O);
-      let C = 0, N = 0;
-      const ae = r * t.maxRows - s * (a(u) && !t.extraInAction ? 2 : 1);
-      e.forEach((A) => {
-        const i = Ce(A).props;
-        if (he(i.hidden) ? !!i.hidden : q(i.hidden))
-          c.push(A);
+      let C = 0, A = 0;
+      const ne = r * t.maxRows - s * (a(u) && !t.extraInAction ? 2 : 1);
+      e.forEach((N) => {
+        const $ = Se(N);
+        if (!$)
+          return;
+        const i = $.props;
+        if (xe(i.hidden) ? !!i.hidden : H(i.hidden))
+          c.push(N);
         else {
-          let S = i.span ? ee(i.span) : s;
-          const $ = {
-            node: A,
+          let S = i.span ? te(i.span) : s;
+          const j = {
+            node: N,
             span: S,
-            key: `ApFormSearchFormItem-${Z(i.name)}-${i._signal}`
-          }, j = r - C % r;
-          j < S && (S += j), C += S, C > ae ? l.push($) : (N = C, x.push($));
+            key: `ApFormSearchFormItem-${ee(i.name)}-${i._signal}`
+          }, V = r - C % r;
+          V < S && (S += V), C += S, C > ne ? l.push(j) : (A = C, x.push(j));
         }
       });
-      const W = r - (N + s) % r, ne = Math.ceil(N) % r < s, le = W < s ? r : W;
+      const W = r - (A + s) % r, le = Math.ceil(A) % r < s, re = W < s ? r : W;
       return {
         hideNode: o(w, null, [c]),
         nodes: x,
         collapseNodes: l,
-        extraSpan: le,
-        lastRowOnlyIncludeActionAndExtra: ne
+        extraSpan: re,
+        lastRowOnlyIncludeActionAndExtra: le
       };
-    }), h = (e) => `${e}%`, te = _(() => {
+    }), h = (e) => `${e}%`, oe = _(() => {
       let e;
       const c = n.value.collapseNodes.length || t.sortable && m.value.length, l = o(R, {
         flex: h(a(O)),
         key: "actionWrapper"
       }, {
-        default: () => [o(J, null, {
+        default: () => [o(K, null, {
           default: () => [o(k, {
             wrap: "wrap",
             justify: n.value.lastRowOnlyIncludeActionAndExtra && !(a(u) && t.extraInAction) ? "flex-end" : "space-between"
@@ -190,16 +194,16 @@ const r = 100, Qe = /* @__PURE__ */ se({
             }, {
               default: () => [c ? o("div", {
                 class: f("column-setting-trigger-wrapper")
-              }, [n.value.collapseNodes.length ? o(we, {
+              }, [n.value.collapseNodes.length ? o(Re, {
                 onSubmit: P,
                 config: n.value.collapseNodes,
                 submitLoading: t.submitLoading
-              }, null) : null, t.sortable && b.value.length ? o(Re, {
+              }, null) : null, t.sortable && b.value.length ? o(be, {
                 ref: "sorterIns",
                 items: b.value,
                 onClickConfirm: F,
                 sorted: L.value
-              }, null) : null]) : null, o(z, {
+              }, null) : null]) : null, o(M, {
                 type: "primary",
                 onClick: P,
                 loading: t.submitLoading ? {
@@ -209,8 +213,8 @@ const r = 100, Qe = /* @__PURE__ */ se({
                 class: f("action-btn")
               }, {
                 default: () => [t.searchText || T("ap.apForm.search.search")]
-              }), o(z, {
-                onClick: Y,
+              }), o(M, {
+                onClick: Z,
                 type: "text",
                 class: [f("action-btn"), f("action-btn-reset")]
               }, {
@@ -223,10 +227,10 @@ const r = 100, Qe = /* @__PURE__ */ se({
         flex: h(n.value.extraSpan),
         key: "extraNode"
       }, {
-        default: () => [o(J, null, {
+        default: () => [o(K, null, {
           default: () => [o(k, {
             justify: n.value.extraSpan === r || n.value.lastRowOnlyIncludeActionAndExtra ? "start" : "flex-end"
-          }, Fe(e = a(u)) ? e : {
+          }, Ae(e = a(u)) ? e : {
             default: () => [e]
           })]
         })]
@@ -235,33 +239,33 @@ const r = 100, Qe = /* @__PURE__ */ se({
       }, null);
       return n.value.lastRowOnlyIncludeActionAndExtra ? o(w, null, [x || s, l]) : o(w, null, [l, x]);
     });
-    function oe() {
-      const e = X.value?.getCachedList();
+    function ae() {
+      const e = Y.value?.getCachedList();
       F(e);
     }
-    return K({
+    return Q({
       apForm: _(() => a(v)),
       getSorterItems: () => b.value,
       setSorterItems: F,
-      resetSorterItems: oe
-    }), (e, c) => (p(), y(be, ue({
+      resetSorterItems: ae
+    }), (e, c) => (p(), y(Fe, ce({
       ref_key: "apForm",
       ref: v,
       class: a(f)()
-    }, a(xe)(t, ["collapse", "defaultCollapse", "onUpdate:collapse", "searchText", "resetText", "onSubmit", "onReset", "extraInAction", "forceExpand", "countPerRow"])), {
-      default: B(() => [(p(), y(I(n.value.hideNode))), o(a(fe), {
+    }, a(ye)(t, ["collapse", "defaultCollapse", "onUpdate:collapse", "searchText", "resetText", "onSubmit", "onReset", "extraInAction", "forceExpand", "countPerRow"])), {
+      default: B(() => [(p(), y(I(n.value.hideNode))), o(a(me), {
         gutter: 8
       }, {
-        default: B(() => [(p(!0), ce(w, null, pe(n.value.nodes, (l) => (p(), y(a(R), {
+        default: B(() => [(p(!0), pe(w, null, de(n.value.nodes, (l) => (p(), y(a(R), {
           key: l.key,
           flex: h(l.span),
-          style: de({
+          style: fe({
             maxWidth: h(l.span)
           })
         }, {
           default: B(() => [(p(), y(I(l.node)))]),
           _: 2
-        }, 1032, ["flex", "style"]))), 128)), (p(), y(I(te.value)))]),
+        }, 1032, ["flex", "style"]))), 128)), (p(), y(I(oe.value)))]),
         _: 1
       })]),
       _: 1