@aplus-frontend/ui 0.6.0-beta.9 → 0.6.1

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

@@ -1,11 +1,11 @@
-import { defineComponent as B, useSlots as _, ref as g, createBlock as x, openBlock as k, normalizeProps as t, guardReactiveProps as s, unref as o, createSlots as n, withCtx as d, createVNode as F, mergeProps as S, renderList as i, renderSlot as f } from "vue";
+import { defineComponent as B, useSlots as _, ref as g, createBlock as x, openBlock as k, normalizeProps as t, guardReactiveProps as s, unref as o, createSlots as n, withCtx as d, createVNode as F, mergeProps as P, renderList as i, renderSlot as f } from "vue";
 import "../../item/index.vue2.mjs";
-import { ApField as C } from "../../../ap-field/index.mjs";
-import { omit as u, pick as P } from "lodash-unified";
+import { ApField as S } from "../../../ap-field/index.mjs";
+import { omit as u, pick as w } from "lodash-unified";
 import { apFormItemSlotNames as m } from "../../constant.mjs";
-import w from "../../item/index.vue.mjs";
+import C from "../../item/index.vue.mjs";
 const z = /* @__PURE__ */ B({
-  name: "ApFormItemText",
+  name: "ApFormItemPassword",
   __name: "password",
   props: {
     htmlFor: {},
@@ -53,7 +53,7 @@ const z = /* @__PURE__ */ B({
     disabled: { type: Boolean, default: void 0 }
   },
   setup(c, { expose: b }) {
-    const { Text: h } = C, p = _(), v = c, a = g();
+    const { Text: h } = S, p = _(), v = c, a = g();
     return b({
       focus: () => {
         var e;
@@ -63,9 +63,9 @@ const z = /* @__PURE__ */ B({
         var e;
         (e = a.value) == null || e.blur();
       }
-    }), (e, R) => (k(), x(w, t(s(o(u)(v, ["field", "disabled", "placeholder"]))), n({
+    }), (e, R) => (k(), x(C, t(s(o(u)(v, ["field", "disabled", "placeholder"]))), n({
       default: d(() => [
-        F(o(h).Password, S({
+        F(o(h).Password, P({
           ref_key: "inputRef",
           ref: a,
           disabled: e.disabled,
@@ -81,7 +81,7 @@ const z = /* @__PURE__ */ B({
       ]),
       _: 2
     }, [
-      i(o(P)(p, o(m)), (y, l) => ({
+      i(o(w)(p, o(m)), (y, l) => ({
         name: l,
         fn: d((r) => [
           f(e.$slots, l, t(s(r || {})))

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

@@ -1,7 +1,7 @@
 import { ApFormItemTextAreaProps } from '../interface';
 import { InputFocusOptions } from '@aplus-frontend/antdv/es/vc-input/utils/commonUtils';
 import { ApFormItemSlots } from '../../interface';
-import { CreateComponentPublicInstanceWithMixins, ComputedRef, ComponentOptionsMixin, PublicProps, GlobalComponents, GlobalDirectives, ExtractPropTypes, PropType, ComponentProvideOptions, DefineComponent } from 'vue';
+import { CreateComponentPublicInstanceWithMixins, ComponentOptionsMixin, PublicProps, GlobalComponents, GlobalDirectives, ExtractPropTypes, PropType, ComponentProvideOptions, DefineComponent } from 'vue';
 import { ApFieldTextAreaProps, FieldMode } from '../../..';
 import { AutoSizeType } from '@aplus-frontend/antdv/es/input/inputProps';
 import { CompositionEventHandler, FocusEventHandler, ChangeEventHandler, KeyboardEventHandler, MouseEventHandler } from '@aplus-frontend/antdv/es/_util/EventInterface';
@@ -19,7 +19,7 @@ declare function __VLS_template(): {
         }>, {
             focus: (options?: InputFocusOptions) => void;
             blur: () => void;
-            resizableTextArea: ComputedRef<any>;
+            resizableTextArea: any;
         }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
             "update:value": (...args: any[]) => void;
         }, PublicProps, {
@@ -301,7 +301,7 @@ declare function __VLS_template(): {
         }>, {
             focus: (options?: InputFocusOptions) => void;
             blur: () => void;
-            resizableTextArea: ComputedRef<any>;
+            resizableTextArea: any;
         }, {}, {}, {}, {
             type: "number" | "reset" | "submit" | "button" | "search" | "time" | "month" | "date" | "week" | "hidden" | "checkbox" | "radio" | "color" | "text" | "range" | "tel" | "url" | "email" | "image" | "datetime-local" | "file" | "password";
             mode: FieldMode;
@@ -333,7 +333,7 @@ declare const __VLS_component: DefineComponent<ApFormItemTextAreaProps, {
     }>, {
         focus: (options?: InputFocusOptions) => void;
         blur: () => void;
-        resizableTextArea: ComputedRef<any>;
+        resizableTextArea: any;
     }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
         "update:value": (...args: any[]) => void;
     }, PublicProps, {
@@ -615,7 +615,7 @@ declare const __VLS_component: DefineComponent<ApFormItemTextAreaProps, {
     }>, {
         focus: (options?: InputFocusOptions) => void;
         blur: () => void;
-        resizableTextArea: ComputedRef<any>;
+        resizableTextArea: any;
     }, {}, {}, {}, {
         type: "number" | "reset" | "submit" | "button" | "search" | "time" | "month" | "date" | "week" | "hidden" | "checkbox" | "radio" | "color" | "text" | "range" | "tel" | "url" | "email" | "image" | "datetime-local" | "file" | "password";
         mode: FieldMode;

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

@@ -1,4 +1,4 @@
-import { defineComponent as B, ref as x, useSlots as S, computed as g, createBlock as k, openBlock as F, normalizeProps as n, guardReactiveProps as i, unref as l, createSlots as u, withCtx as p, createVNode as C, mergeProps as P, renderList as c, renderSlot as m } from "vue";
+import { defineComponent as B, useSlots as x, ref as S, computed as g, createBlock as k, openBlock as F, normalizeProps as n, guardReactiveProps as i, unref as l, createSlots as u, withCtx as p, createVNode as C, mergeProps as P, renderList as c, renderSlot as m } from "vue";
 import "../../item/index.vue2.mjs";
 import "../../../ap-field/index.mjs";
 import { isUndefined as q, omit as b, pick as $ } from "lodash-unified";
@@ -54,8 +54,16 @@ const E = /* @__PURE__ */ B({
     disabled: { type: Boolean, default: void 0 }
   },
   setup(v, { expose: h }) {
-    const o = v, a = x();
-    h({
+    const o = v, f = x(), a = S(), y = g(() => {
+      var e, r;
+      return {
+        placeholder: o.placeholder,
+        disabled: o.disabled,
+        ...o.field || {},
+        bordered: o.bordered ? !1 : q((e = o.field) == null ? void 0 : e.bordered) ? !0 : (r = o.field) == null ? void 0 : r.bordered
+      };
+    });
+    return h({
       focus: () => {
         var e;
         (e = a.value) == null || e.focus();
@@ -68,17 +76,7 @@ const E = /* @__PURE__ */ B({
         var d;
         (d = a.value) == null || d.request(e, r);
       }
-    });
-    const f = S(), y = g(() => {
-      var e, r;
-      return {
-        placeholder: o.placeholder,
-        disabled: o.disabled,
-        ...o.field || {},
-        bordered: o.bordered ? !1 : q((e = o.field) == null ? void 0 : e.bordered) ? !0 : (r = o.field) == null ? void 0 : r.bordered
-      };
-    });
-    return (e, r) => (F(), k(N, n(i(l(b)(o, ["field", "placeholder", "disabled"]))), u({
+    }), (e, r) => (F(), k(N, n(i(l(b)(o, ["field", "placeholder", "disabled"]))), u({
       default: p(() => [
         C(l(R), P(y.value, {
           ref_key: "treeSelectRef",

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

@@ -818,7 +818,7 @@ declare function __VLS_template(): {
             hideRequiredMark: boolean;
             validateOnRuleChange: boolean;
             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<{
+        }> & Omit<Readonly< ApFormProps> & Readonly<{}>, "validate" | "registerWatch" | "setFieldsValue" | "setFieldValue" | "resetFields" | "clearValidate" | "validateFields" | "getFieldsValue" | "scrollToField" | "getInternalInstance" | "validateFieldsReturnTransformed" | "getFieldsValueTransformed" | ("layout" | "colon" | "labelAlign" | "validateTrigger" | "hideRequiredMark" | "validateOnRuleChange" | "syncToUrl")> & ShallowUnwrapRef<{
             setFieldsValue: (fields: Partial<any>) => void;
             setFieldValue: (name: NamePath, value: any, triggerChange?: boolean, optimizeFn?: UpdateModelOptimizeFn) => void;
             resetFields: () => Promise<void>;
@@ -841,15 +841,17 @@ declare function __VLS_template(): {
 };
 type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
 declare const __VLS_component: DefineComponent<ApFormModalFormProps, {
-    resetFields: () => void;
+    validate: (nameList?: NamePath[] | string, options?: ValidateOptions) => Promise<Partial<any>> | undefined;
+    setFieldsValue: (fields: Partial<any>) => 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;
     getFieldsValue: (nameList?: true | InternalNamePath[]) => Partial<any> | undefined;
-    validate: (nameList?: NamePath[] | string, options?: ValidateOptions) => Promise<Partial<any>> | undefined;
-    scrollToField: (name: NamePath, options?: {}) => void;
-    setFieldValue: (key: string, newValue: any) => void;
-    setFieldsValue: (values: Record<string, any>) => void;
+    scrollToField: (name: NamePath, options?: any) => void;
     getInternalInstance: (mark: string) => ApFormInternalInstance | undefined;
+    validateFieldsReturnTransformed: (nameList?: NamePath[] | string, options?: ValidateOptions) => Promise<Partial<any>> | undefined;
+    getFieldsValueTransformed: (nameList?: true | InternalNamePath[]) => Partial<any> | undefined;
 }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
     "update:open": (...args: any[]) => void;
 }, string, PublicProps, Readonly<ApFormModalFormProps> & Readonly<{
@@ -1948,7 +1950,7 @@ declare const __VLS_component: DefineComponent<ApFormModalFormProps, {
         hideRequiredMark: boolean;
         validateOnRuleChange: boolean;
         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<{
+    }> & Omit<Readonly< ApFormProps> & Readonly<{}>, "validate" | "registerWatch" | "setFieldsValue" | "setFieldValue" | "resetFields" | "clearValidate" | "validateFields" | "getFieldsValue" | "scrollToField" | "getInternalInstance" | "validateFieldsReturnTransformed" | "getFieldsValueTransformed" | ("layout" | "colon" | "labelAlign" | "validateTrigger" | "hideRequiredMark" | "validateOnRuleChange" | "syncToUrl")> & ShallowUnwrapRef<{
         setFieldsValue: (fields: Partial<any>) => void;
         setFieldValue: (name: NamePath, value: any, triggerChange?: boolean, optimizeFn?: UpdateModelOptimizeFn) => void;
         resetFields: () => Promise<void>;

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

@@ -1,8 +1,8 @@
-import { isVNode as D, defineComponent as L, useSlots as A, ref as p, watch as G, cloneVNode as I, computed as K, createVNode as u, mergeProps as b, unref as s, createElementBlock as W, openBlock as g, Fragment as H, createBlock as P, createCommentVNode as J, withCtx as F, createElementVNode as Q, normalizeClass as X, normalizeStyle as Y, renderSlot as w, resolveDynamicComponent as N, createTextVNode as Z, toDisplayString as ee } from "vue";
-import { Button as V, Flex as te, Space as le, Modal as oe } from "@aplus-frontend/antdv";
+import { isVNode as A, defineComponent as D, useSlots as L, ref as p, watch as G, cloneVNode as I, computed as K, createVNode as u, mergeProps as b, unref as s, createElementBlock as W, openBlock as g, Fragment as H, createBlock as P, createCommentVNode as J, withCtx as h, createElementVNode as Q, normalizeClass as X, normalizeStyle as Y, renderSlot as w, resolveDynamicComponent as N, createTextVNode as Z, toDisplayString as ee } from "vue";
+import { Button as V, Flex as te, Space as le, Modal as ae } from "@aplus-frontend/antdv";
 import "../ap-form.vue.mjs";
 import "../../hooks/index.mjs";
-import { getSingleVNode as ae } from "../../utils/slot.mjs";
+import { getSingleVNode as oe } from "../../utils/slot.mjs";
 import "../../config-provider/index.mjs";
 import { omit as se } from "lodash-unified";
 import { useControllableValue as ne } from "../../hooks/useControllableValue.mjs";
@@ -10,10 +10,11 @@ import { useLocale as ie } from "../../config-provider/hooks/use-locale.mjs";
 import { useGlobalConfig as re } from "../../config-provider/hooks/use-global-config.mjs";
 import { useNamespace as ue } from "../../config-provider/hooks/use-namespace.mjs";
 import de from "../ap-form.vue2.mjs";
-function S(c) {
-  return typeof c == "function" || Object.prototype.toString.call(c) === "[object Object]" && !D(c);
+function S(m) {
+  return typeof m == "function" || Object.prototype.toString.call(m) === "[object Object]" && !A(m);
 }
-const Me = /* @__PURE__ */ L({
+const Re = /* @__PURE__ */ D({
+  name: "ApFormModalForm",
   __name: "index",
   props: {
     layout: {
@@ -90,48 +91,48 @@ const Me = /* @__PURE__ */ L({
     submitTimeout: {}
   },
   emits: ["update:open"],
-  setup(c, {
+  setup(m, {
     expose: x,
-    emit: _
+    emit: M
   }) {
-    const o = c, y = A(), M = _, a = p(), C = p(0), m = p(), i = p(!1), {
-      value: R,
+    const a = m, v = L(), R = M, o = p(), T = p(0), c = p(), i = p(!1), {
+      value: _,
       updateValue: f
-    } = ne(o, M, {
+    } = ne(a, R, {
       valuePropName: "open",
       defaultValue: !1,
       beforeUpdateValue(e) {
-        return e && (C.value += 1), !0;
+        return e && (T.value += 1), !0;
       }
     }), {
-      t: v
+      t: y
     } = ie(), U = re("uiMode", "aplus"), {
       b: j,
-      e: h
+      e: F
     } = ue("ap-form-modal-form");
-    G(() => a.value, (e) => {
+    G(() => o.value, (e) => {
       var t;
-      e && m.value && ((t = e.setFieldsValue) == null || t.call(e, m.value), m.value = void 0);
+      e && c.value && ((t = e.setFieldsValue) == null || t.call(e, c.value), c.value = void 0);
     });
-    const T = ae(y.trigger), B = T ? I(T, {
+    const C = oe(v.trigger), B = C ? I(C, {
       onClick: () => {
         f(!0);
       }
     }) : null, O = K(() => {
       var t, l, r, d;
       const e = [];
-      if (o.submitter === !1)
+      if (a.submitter === !1)
         return null;
-      if (o.showCancel) {
+      if (a.showCancel) {
         let n;
         e.push(u(V, {
           onClick: k,
           disabled: i.value
-        }, S(n = v("ap.common.cancelText")) ? n : {
+        }, S(n = y("ap.common.cancelText")) ? n : {
           default: () => [n]
         }));
       }
-      return ((t = o.submitter) == null ? void 0 : t.resetButtonProps) !== !1 && e.push(u(V, b(((l = o.submitter) == null ? void 0 : l.resetButtonProps) || {}, {
+      return ((t = a.submitter) == null ? void 0 : t.resetButtonProps) !== !1 && e.push(u(V, b(((l = a.submitter) == null ? void 0 : l.resetButtonProps) || {}, {
         key: "reset",
         disabled: i.value,
         onClick: z,
@@ -139,41 +140,41 @@ const Me = /* @__PURE__ */ L({
       }), {
         default: () => {
           var n;
-          return [((n = o.submitter) == null ? void 0 : n.resetText) || v("ap.common.resetText")];
+          return [((n = a.submitter) == null ? void 0 : n.resetText) || y("ap.common.resetText")];
         }
-      })), ((r = o.submitter) == null ? void 0 : r.submitButtonProps) !== !1 && e.push(u(V, b({
+      })), ((r = a.submitter) == null ? void 0 : r.submitButtonProps) !== !1 && e.push(u(V, b({
         type: "primary",
         key: "submit",
         htmlType: "submit"
-      }, ((d = o.submitter) == null ? void 0 : d.submitButtonProps) || {}, {
+      }, ((d = a.submitter) == null ? void 0 : d.submitButtonProps) || {}, {
         loading: i.value
       }), {
         default: () => {
           var n;
-          return [((n = o.submitter) == null ? void 0 : n.submitText) || v("ap.common.okText")];
+          return [((n = a.submitter) == null ? void 0 : n.submitText) || y("ap.common.okText")];
         }
       })), u(te, {
         justify: "flex-end",
-        key: s(C),
-        class: [h("footer"), s(U) === "admin" ? h("footer-admin") : null]
+        key: s(T),
+        class: [F("footer"), s(U) === "admin" ? F("footer-admin") : null]
       }, {
-        default: () => [y.submitter ? y.submitter(e) : u(le, null, S(e) ? e : {
+        default: () => [v.submitter ? v.submitter(e) : u(le, null, S(e) ? e : {
           default: () => [e]
         })]
       });
     });
     function z() {
       var e, t, l;
-      o.submitter !== !1 && ((e = a.value) == null || e.resetFields(), (l = (t = o.submitter) == null ? void 0 : t.onReset) == null || l.call(t));
+      a.submitter !== !1 && ((e = o.value) == null || e.resetFields(), (l = (t = a.submitter) == null ? void 0 : t.onReset) == null || l.call(t));
     }
     async function E(e) {
       var t, l, r;
-      if (o.submitter !== !1)
+      if (a.submitter !== !1)
         try {
-          (l = (t = o.submitter) == null ? void 0 : t.onSubmit) == null || l.call(t), i.value = !0;
-          const d = (r = o.onFinish) == null ? void 0 : r.call(o, e);
-          if (o.submitTimeout && d instanceof Promise) {
-            const q = setTimeout(() => i.value = !1, o.submitTimeout);
+          (l = (t = a.submitter) == null ? void 0 : t.onSubmit) == null || l.call(t), i.value = !0;
+          const d = (r = a.onFinish) == null ? void 0 : r.call(a, e);
+          if (a.submitTimeout && d instanceof Promise) {
+            const q = setTimeout(() => i.value = !1, a.submitTimeout);
             d.finally(() => {
               clearTimeout(q), i.value = !1;
             });
@@ -190,48 +191,56 @@ const Me = /* @__PURE__ */ L({
       !e && s(i) || f(e);
     }
     return x({
-      resetFields: () => {
+      resetFields: async () => {
         var e;
-        (e = a.value) == null || e.resetFields();
+        (e = o.value) == null || e.resetFields();
       },
       clearValidate: (e) => {
         var t;
-        (t = a.value) == null || t.clearValidate(e);
+        (t = o.value) == null || t.clearValidate(e);
       },
       validateFields: (e, t) => {
         var l;
-        return (l = a.value) == null ? void 0 : l.validateFields(e, t);
+        return (l = o.value) == null ? void 0 : l.validateFields(e, t);
       },
       getFieldsValue: (e) => {
         var t;
-        return (t = a.value) == null ? void 0 : t.getFieldsValue(e);
+        return (t = o.value) == null ? void 0 : t.getFieldsValue(e);
       },
       validate: (e, t) => {
         var l;
-        return (l = a.value) == null ? void 0 : l.validate(e, t);
+        return (l = o.value) == null ? void 0 : l.validate(e, t);
       },
       scrollToField: (e, t = {}) => {
         var l;
-        (l = a.value) == null || l.scrollToField(e, t);
+        (l = o.value) == null || l.scrollToField(e, t);
       },
       setFieldValue: (e, t) => {
         var l, r;
-        (r = (l = a.value) == null ? void 0 : l.setFieldValue) == null || r.call(l, e, t);
+        (r = (l = o.value) == null ? void 0 : l.setFieldValue) == null || r.call(l, e, t);
       },
       setFieldsValue: (e) => {
         var t, l;
-        if (!a.value) {
-          m.value = e;
+        if (!o.value) {
+          c.value = e;
           return;
         }
-        (l = (t = a.value) == null ? void 0 : t.setFieldsValue) == null || l.call(t, e);
+        (l = (t = o.value) == null ? void 0 : t.setFieldsValue) == null || l.call(t, e);
       },
       getInternalInstance: (e) => {
         var t;
-        return (t = a.value) == null ? void 0 : t.getInternalInstance(e);
+        return (t = o.value) == null ? void 0 : t.getInternalInstance(e);
+      },
+      getFieldsValueTransformed(e) {
+        var t;
+        return (t = o.value) == null ? void 0 : t.getFieldsValueTransformed(e);
+      },
+      validateFieldsReturnTransformed(e, t) {
+        var l;
+        return (l = o.value) == null ? void 0 : l.validateFieldsReturnTransformed(e, t);
       }
-    }), (e, t) => (g(), W(H, null, [u(s(oe), b(e.modalProps, {
-      open: s(R),
+    }), (e, t) => (g(), W(H, null, [u(s(ae), b(e.modalProps, {
+      open: s(_),
       footer: null,
       width: e.width,
       class: s(j)(),
@@ -241,18 +250,18 @@ const Me = /* @__PURE__ */ L({
       "onUpdate:open": $,
       onCancel: k
     }), {
-      title: F(() => [w(e.$slots, "title", {}, () => [Z(ee(o.title), 1)])]),
-      default: F(() => [u(de, b({
+      title: h(() => [w(e.$slots, "title", {}, () => [Z(ee(a.title), 1)])]),
+      default: h(() => [u(de, b({
         ref_key: "formRef",
-        ref: a
-      }, s(se)(o, ["modalProps", "open", "onUpdate:open", "title", "width", "onFinish", "submitter"]), {
+        ref: o
+      }, s(se)(a, ["modalProps", "open", "onUpdate:open", "title", "width", "onFinish", "submitter"]), {
         onFinish: E
       }), {
-        default: F(() => {
+        default: h(() => {
           var l;
           return [Q("div", {
             style: Y((l = e.modalProps) == null ? void 0 : l.bodyStyle),
-            class: X(s(h)("content"))
+            class: X(s(F)("content"))
           }, [w(e.$slots, "default")], 6), (g(), P(N(O.value)))];
         }),
         _: 3
@@ -264,5 +273,5 @@ const Me = /* @__PURE__ */ L({
   }
 });
 export {
-  Me as default
+  Re as default
 };

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

@@ -1,14 +1,15 @@
-import { defineComponent as s, ref as g, renderSlot as t } from "vue";
-import { useInjectFormProvider as u, useProvideFormProvider as m } from "./context.mjs";
+import { defineComponent as s, ref as g, renderSlot as m } from "vue";
+import { useInjectFormProvider as t, useProvideFormProvider as u } from "./context.mjs";
 const h = /* @__PURE__ */ s({
+  name: "ApFormProvider",
   __name: "index",
   props: {
     onFormChange: { type: Function },
     onFormFinish: { type: Function }
   },
   setup(F) {
-    const o = F, n = g({}), e = u();
-    return m({
+    const o = F, n = g({}), e = t();
+    return u({
       triggerFormChange(r, i) {
         o != null && o.onFormChange && o.onFormChange(r, {
           changedFields: i,
@@ -31,7 +32,7 @@ const h = /* @__PURE__ */ s({
         const i = { ...n.value };
         delete i[r], n.value = i, e == null || e.unregisterForm(r);
       }
-    }), (r, i) => t(r.$slots, "default");
+    }), (r, i) => m(r.$slots, "default");
   }
 });
 export {

package/es/src/ap-form/search-form/components/popover-sorter/index.vue2.mjs

@@ -60,7 +60,10 @@ const W = /* @__PURE__ */ S({
           s("span", {
             class: r(e(n)("header-title"))
           }, m(e(i)("ap.apForm.search.sorterTitle")), 3),
-          o(e(_), { justify: "space-between" }, {
+          o(e(_), {
+            justify: "space-between",
+            align: "center"
+          }, {
             default: a(() => [
               s("span", {
                 class: r(e(n)("header-desc"))

package/es/src/ap-form/search-form/hooks/use-count-per-row.mjs

@@ -1,17 +1,35 @@
-import { computed as c } from "vue";
-import { useBreakpoints as u } from "@vueuse/core";
-const t = [1, 2, 3, 4, 6, 8, 12, 24], P = (o) => {
-  const e = u({ sm: 0, md: 1280, lg: 1728 }).active();
-  return c(() => {
-    if (e.value === "lg") {
-      const n = t.findIndex(
-        (r) => r === o.countPerRow
-      );
-      return t[n + 1] || o.countPerRow;
-    }
-    return o.countPerRow;
+import { ref as w, watchEffect as a, computed as s, unref as i } from "vue";
+import { useResizeObserver as P } from "@vueuse/core";
+import { isUndefined as R } from "lodash-unified";
+const c = [1, 2, 3, 4, 6, 8, 12, 24], g = { xs: 0, sm: 768, md: 1280, lg: 1728 }, h = Object.entries(g).sort(
+  (t, r) => r[1] - t[1]
+), v = (t) => {
+  const r = w(0);
+  a(
+    (e) => {
+      const n = R(t.resizeTarget) ? document.documentElement : t.resizeTarget, { stop: o } = P(n, (f) => {
+        const m = f[0], { width: d } = m.contentRect;
+        r.value = d;
+      });
+      e(() => {
+        o();
+      });
+    },
+    { flush: "post" }
+  );
+  const u = s(() => {
+    for (const [e, n] of h)
+      if (i(r) > n)
+        return e;
+    return "md";
+  });
+  return s(() => {
+    const e = c.findIndex(
+      (o) => o === t.countPerRow
+    ), n = i(u);
+    return n === "lg" ? c[e + 1] || t.countPerRow : n === "xs" && c[e - 1] || t.countPerRow;
   });
 };
 export {
-  P as useCountPerRow
+  v as useCountPerRow
 };

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

@@ -383,9 +383,7 @@ declare function __VLS_template(): {
                             default: string | number | ColSize;
                         };
                         xxl: {
-                            type: PropType<string | number | **
-                             * extra区域展开占据的span数(占据剩余所有空间)
-                             */).ColSize>;
+                            type: PropType<string | number | ColSize>;
                             default: string | number | ColSize;
                         };
                         prefixCls: StringConstructor;
@@ -818,7 +816,7 @@ declare function __VLS_template(): {
             hideRequiredMark: boolean;
             validateOnRuleChange: boolean;
             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<{
+        }> & Omit<Readonly< ApFormProps> & Readonly<{}>, "validate" | "registerWatch" | "setFieldsValue" | "setFieldValue" | "resetFields" | "clearValidate" | "validateFields" | "getFieldsValue" | "scrollToField" | "getInternalInstance" | "validateFieldsReturnTransformed" | "getFieldsValueTransformed" | ("layout" | "colon" | "labelAlign" | "validateTrigger" | "hideRequiredMark" | "validateOnRuleChange" | "syncToUrl")> & ShallowUnwrapRef<{
             setFieldsValue: (fields: Partial<any>) => void;
             setFieldValue: (name: NamePath, value: any, triggerChange?: boolean, optimizeFn?: UpdateModelOptimizeFn) => void;
             resetFields: () => Promise<void>;
@@ -1220,9 +1218,7 @@ declare const __VLS_component: DefineComponent<ApFormSearchFormProps, {
                         default: string | number | ColSize;
                     };
                     xxl: {
-                        type: PropType<string | number | **
-                         * extra区域展开占据的span数(占据剩余所有空间)
-                         */).ColSize>;
+                        type: PropType<string | number | ColSize>;
                         default: string | number | ColSize;
                     };
                     prefixCls: StringConstructor;
@@ -1655,7 +1651,7 @@ declare const __VLS_component: DefineComponent<ApFormSearchFormProps, {
         hideRequiredMark: boolean;
         validateOnRuleChange: boolean;
         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<{
+    }> & Omit<Readonly< ApFormProps> & Readonly<{}>, "validate" | "registerWatch" | "setFieldsValue" | "setFieldValue" | "resetFields" | "clearValidate" | "validateFields" | "getFieldsValue" | "scrollToField" | "getInternalInstance" | "validateFieldsReturnTransformed" | "getFieldsValueTransformed" | ("layout" | "colon" | "labelAlign" | "validateTrigger" | "hideRequiredMark" | "validateOnRuleChange" | "syncToUrl")> & ShallowUnwrapRef<{
         setFieldsValue: (fields: Partial<any>) => void;
         setFieldValue: (name: NamePath, value: any, triggerChange?: boolean, optimizeFn?: UpdateModelOptimizeFn) => void;
         resetFields: () => Promise<void>;