@aplus-frontend/ui 0.6.0-beta.8 → 0.6.0

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

@@ -1,19 +1,20 @@
-import { isVNode as K, defineComponent as Q, useSlots as Y, ref as v, computed as w, unref as l, watch as P, cloneVNode as Z, createVNode as d, mergeProps as b, createElementBlock as N, openBlock as y, Fragment as ee, createBlock as M, createCommentVNode as S, withCtx as g, renderSlot as _, withModifiers as te, normalizeClass as ie, resolveDynamicComponent as L, createTextVNode as ne, toDisplayString as oe } from "vue";
-import { Button as V, Flex as le, Space as ae, Drawer as se } from "@aplus-frontend/antdv";
+import { isVNode as K, defineComponent as Q, useSlots as Y, ref as h, computed as V, unref as l, watch as P, cloneVNode as Z, createVNode as d, mergeProps as b, createElementBlock as N, openBlock as F, Fragment as ee, createBlock as M, createCommentVNode as S, withCtx as g, renderSlot as _, withModifiers as te, normalizeClass as ie, resolveDynamicComponent as L, createTextVNode as ne, toDisplayString as oe } from "vue";
+import { Button as w, Flex as ae, Space as le, Drawer as se } from "@aplus-frontend/antdv";
 import "../ap-form.vue.mjs";
 import "../../hooks/index.mjs";
 import { getSingleVNode as re } from "../../utils/slot.mjs";
 import "../../config-provider/index.mjs";
-import { isBoolean as ue, isUndefined as de, omit as ce } from "lodash-unified";
-import { convertReactiveToRaw as me } from "../../utils/index.mjs";
+import { isBoolean as ue, isUndefined as de, omit as me } from "lodash-unified";
+import { convertReactiveToRaw as ce } from "../../utils/index.mjs";
 import { useControllableValue as fe } from "../../hooks/useControllableValue.mjs";
 import { useLocale as pe } from "../../config-provider/hooks/use-locale.mjs";
-import { useNamespace as he } from "../../config-provider/hooks/use-namespace.mjs";
-import ve from "../ap-form.vue2.mjs";
-function U(m) {
-  return typeof m == "function" || Object.prototype.toString.call(m) === "[object Object]" && !K(m);
+import { useNamespace as ve } from "../../config-provider/hooks/use-namespace.mjs";
+import he from "../ap-form.vue2.mjs";
+function U(c) {
+  return typeof c == "function" || Object.prototype.toString.call(c) === "[object Object]" && !K(c);
 }
 const je = /* @__PURE__ */ Q({
+  name: "ApFormDrawerForm",
   __name: "index",
   props: {
     layout: {
@@ -94,17 +95,17 @@ const je = /* @__PURE__ */ Q({
     }
   },
   emits: ["update:open"],
-  setup(m, {
+  setup(c, {
     expose: j,
     emit: E
   }) {
-    const n = m, F = Y(), D = E, a = v(), p = v(), u = v(!1), {
+    const n = c, y = Y(), D = E, a = h(), p = h(), u = h(!1), {
       value: C,
-      updateValue: h
+      updateValue: v
     } = fe(n, D, {
       valuePropName: "open",
       defaultValue: !1
-    }), c = w(() => {
+    }), m = V(() => {
       var t, i, s, r;
       const e = {
         onResize: () => {
@@ -119,47 +120,47 @@ const je = /* @__PURE__ */ Q({
         onResize: ((s = n.resize) == null ? void 0 : s.onResize) ?? e.onResize,
         resizeOnOpen: de((r = n.resize) == null ? void 0 : r.resizeOnOpen) ? e.onResize : n.resize.resizeOnOpen
       };
-    }), f = v(B()), {
+    }), f = h(W()), {
       t: z
     } = pe(), {
       e: $,
-      em: W
-    } = he("ap-form-drawer-form"), q = w(() => [$("resize-bar"), {
-      [W("resize-bar", "min-disabled")]: l(f) === l(c).minWidth
+      em: T
+    } = ve("ap-form-drawer-form"), q = V(() => [$("resize-bar"), {
+      [T("resize-bar", "min-disabled")]: l(f) === l(m).minWidth
     }, {
-      [W("resize-bar", "max-disabled")]: l(f) === l(c).maxWidth
+      [T("resize-bar", "max-disabled")]: l(f) === l(m).maxWidth
     }]);
     P(() => a.value, (e) => {
       var t;
       e && p.value && ((t = e.setFieldsValue) == null || t.call(e, p.value), p.value = void 0);
     }), P(() => l(C), (e) => {
       var t;
-      e && (t = l(c)) != null && t.resizeOnOpen && (f.value = B());
+      e && (t = l(m)) != null && t.resizeOnOpen && (f.value = W());
     });
-    function B() {
+    function W() {
       var t;
-      const e = (t = l(c)) == null ? void 0 : t.minWidth;
+      const e = (t = l(m)) == null ? void 0 : t.minWidth;
       return !e || e && e < n.width ? n.width : e;
     }
-    const T = re(F.trigger), x = T ? Z(T, {
+    const B = re(y.trigger), x = B ? Z(B, {
       onClick: () => {
-        h(!0);
+        v(!0);
       }
-    }) : null, I = w(() => {
+    }) : null, A = V(() => {
       var t, i, s, r;
       const e = [];
       if (n.submitter === !1)
         return null;
       if (n.showCancel) {
         let o;
-        e.push(d(V, {
-          onClick: R,
+        e.push(d(w, {
+          onClick: O,
           disabled: u.value
         }, U(o = z("ap.common.cancelText")) ? o : {
           default: () => [o]
         }));
       }
-      return ((t = n.submitter) == null ? void 0 : t.resetButtonProps) !== !1 && e.push(d(V, b(((i = n.submitter) == null ? void 0 : i.resetButtonProps) || {}, {
+      return ((t = n.submitter) == null ? void 0 : t.resetButtonProps) !== !1 && e.push(d(w, b(((i = n.submitter) == null ? void 0 : i.resetButtonProps) || {}, {
         key: "submit",
         disabled: u.value,
         onClick: X
@@ -168,7 +169,7 @@ const je = /* @__PURE__ */ Q({
           var o;
           return [((o = n.submitter) == null ? void 0 : o.resetText) || z("ap.common.resetText")];
         }
-      })), ((s = n.submitter) == null ? void 0 : s.submitButtonProps) !== !1 && e.push(d(V, b({
+      })), ((s = n.submitter) == null ? void 0 : s.submitButtonProps) !== !1 && e.push(d(w, b({
         type: "primary",
         key: "submit"
       }, ((r = n.submitter) == null ? void 0 : r.submitButtonProps) || {}, {
@@ -179,25 +180,25 @@ const je = /* @__PURE__ */ Q({
           var o;
           return [((o = n.submitter) == null ? void 0 : o.submitText) || z("ap.common.okText")];
         }
-      })), d(le, {
+      })), d(ae, {
         justify: "flex-end"
       }, {
-        default: () => [F.submitter ? F.submitter(e) : d(ae, null, U(e) ? e : {
+        default: () => [y.submitter ? y.submitter(e) : d(le, null, U(e) ? e : {
           default: () => [e]
         })]
       });
     });
-    function A() {
+    function I() {
       var e, t;
-      (t = (e = c.value) == null ? void 0 : e.onResize) == null || t.call(e), document.addEventListener("mousemove", k), document.addEventListener("mouseup", O);
+      (t = (e = m.value) == null ? void 0 : e.onResize) == null || t.call(e), document.addEventListener("mousemove", R), document.addEventListener("mouseup", k);
     }
-    function k(e) {
-      const t = l(c), i = (document.body.offsetWidth || 1e3) - (e.clientX - document.body.offsetLeft), s = (t == null ? void 0 : t.minWidth) ?? (n.width || 800), r = (t == null ? void 0 : t.maxWidth) ?? window.innerWidth * 0.8;
+    function R(e) {
+      const t = l(m), i = (document.body.offsetWidth || 1e3) - (e.clientX - document.body.offsetLeft), s = (t == null ? void 0 : t.minWidth) ?? (n.width || 800), r = (t == null ? void 0 : t.maxWidth) ?? window.innerWidth * 0.8;
       let o = i;
       i < s && (o = s), i > r && (o = r), f.value = o;
     }
-    function O() {
-      document.removeEventListener("mousemove", k), document.removeEventListener("mouseup", O);
+    function k() {
+      document.removeEventListener("mousemove", R), document.removeEventListener("mouseup", k);
     }
     function X() {
       var e, t, i;
@@ -209,26 +210,26 @@ const je = /* @__PURE__ */ Q({
         try {
           const r = await ((e = a.value) == null ? void 0 : e.validateFieldsReturnTransformed());
           (i = (t = n.submitter) == null ? void 0 : t.onSubmit) == null || i.call(t), u.value = !0;
-          const o = (s = n.onFinish) == null ? void 0 : s.call(n, me(r));
+          const o = (s = n.onFinish) == null ? void 0 : s.call(n, ce(r));
           if (n.submitTimeout && o instanceof Promise) {
             const J = setTimeout(() => u.value = !1, n.submitTimeout);
             o.finally(() => {
               clearTimeout(J), u.value = !1;
             });
           }
-          await o && h(!1);
+          await o && v(!1);
         } finally {
           u.value = !1;
         }
     }
-    function R() {
-      l(u) || h(!1);
+    function O() {
+      l(u) || v(!1);
     }
     function H(e) {
-      !e && l(u) || h(e);
+      !e && l(u) || v(e);
     }
     return j({
-      resetFields: () => {
+      resetFields: async () => {
         var e;
         (e = a.value) == null || e.resetFields();
       },
@@ -267,28 +268,36 @@ const je = /* @__PURE__ */ Q({
       getInternalInstance: (e) => {
         var t;
         return (t = a.value) == null ? void 0 : t.getInternalInstance(e);
+      },
+      getFieldsValueTransformed: (e) => {
+        var t;
+        return (t = a.value) == null ? void 0 : t.getFieldsValueTransformed(e);
+      },
+      validateFieldsReturnTransformed: (e) => {
+        var t;
+        return (t = a.value) == null ? void 0 : t.validateFieldsReturnTransformed(e);
       }
-    }), (e, t) => (y(), N(ee, null, [d(l(se), b(e.drawerProps, {
+    }), (e, t) => (F(), N(ee, null, [d(l(se), b(e.drawerProps, {
       open: l(C),
       width: f.value,
       "onUpdate:open": H,
-      onCancel: R
+      onCancel: O
     }), {
       title: g(() => [_(e.$slots, "title", {}, () => [ne(oe(n.title), 1)])]),
-      footer: g(() => [(y(), M(L(I.value)))]),
-      default: g(() => [d(ve, b({
+      footer: g(() => [(F(), M(L(A.value)))]),
+      default: g(() => [d(he, b({
         ref_key: "formRef",
         ref: a
-      }, l(ce)(n, ["drawerProps", "open", "onUpdate:open", "title", "width", "onFinish", "submitter"])), {
+      }, l(me)(n, ["drawerProps", "open", "onUpdate:open", "title", "width", "onFinish", "submitter"])), {
         default: g(() => [_(e.$slots, "default")]),
         _: 3
-      }, 16), e.resize ? (y(), N("div", {
+      }, 16), e.resize ? (F(), N("div", {
         key: 0,
         class: ie(q.value),
-        onMousedown: te(A, ["stop", "prevent"])
+        onMousedown: te(I, ["stop", "prevent"])
       }, null, 34)) : S("", !0)]),
       _: 3
-    }, 16, ["open", "width"]), l(x) ? (y(), M(L(l(x)), {
+    }, 16, ["open", "width"]), l(x) ? (F(), M(L(l(x)), {
       key: 0
     })) : S("", !0)], 64));
   }

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

@@ -162,6 +162,10 @@ export type ApFormSearchFormProps = ApFormProps & {
      * 是否可排序
      */
     sortable?: boolean;
+    /**
+     * 尺寸监听目标元素（用于响应式）
+     */
+    resizeTarget?: HTMLElement | null;
 };
 export type ApFormSearchFormPopoverFilterProps = {
     config: Array<{
@@ -183,6 +187,10 @@ export type ApFormSearchFormPopoverSorterProps = {
      * @returns
      */
     onClickConfirm: (sortedChildren: VNode[]) => void;
+    /**
+     * 当前的children是否已经排序过了
+     */
+    sorted?: boolean;
 };
 export type ApFormSearchFormExpose = {
     apForm: ApFormExpose;
@@ -233,15 +241,15 @@ export type ApFormDrawerFormProps = Omit<ApFormProps, 'onFinish'> & {
      */
     resize?: CustomizeResizeType | boolean;
 };
-export type ApFormModalFormExpose = ApFormExpose;
-export type ApFormDrawerFormExpose = ApFormExpose;
+export type ApFormModalFormExpose = Omit<ApFormExpose, 'registerWatch'>;
+export type ApFormDrawerFormExpose = ApFormModalFormExpose;
 /**
  * ApFormItem支持的插槽
  */
 export type ApFormItemSlots = {
-    help: any;
-    label: any;
-    extra: any;
+    help?: any;
+    label?: any;
+    extra?: any;
     default: () => VNode[];
 };
 export type ApFormDependencyProps = {

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

@@ -6,11 +6,6 @@ import { RuleObject } from '@aplus-frontend/antdv/es/form';
 import { VueTypeValidableDef, VueTypeDef } from '../../../node_modules/vue-types';
 import { CustomSlotsType } from '@aplus-frontend/antdv/es/_util/type';
 import { OnCleanup } from '@vue/reactivity';
-declare function onFieldBlur(): void;
-declare function onFieldChange(): void;
-declare function clearValidate(): void;
-declare function resetField(): void;
-declare function getFieldValue(shouldFormat?: boolean): any;
 declare function __VLS_template(): {
     attrs: Partial<{}>;
     slots: Readonly<ApFormItemSlots> & ApFormItemSlots;
@@ -795,11 +790,11 @@ declare function __VLS_template(): {
 };
 type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
 declare const __VLS_component: DefineComponent<ApFormItemProps, {
-    onFieldBlur: typeof onFieldBlur;
-    onFieldChange: typeof onFieldChange;
-    clearValidate: typeof clearValidate;
-    resetField: typeof resetField;
-    getFieldValue: typeof getFieldValue;
+    onFieldBlur: () => void;
+    onFieldChange: () => void;
+    clearValidate: () => void;
+    resetField: () => void;
+    getFieldValue: (shouldFormat?: boolean) => any;
 }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<ApFormItemProps> & Readonly<{}>, {
     hasFeedback: boolean;
     colon: boolean;

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

@@ -1,15 +1,15 @@
-import { defineComponent as D, useSlots as $, ref as f, onMounted as j, computed as F, unref as l, watch as q, cloneVNode as E, createBlock as g, openBlock as h, mergeProps as K, createSlots as O, withCtx as i, createCommentVNode as Q, resolveDynamicComponent as U, renderList as G, createElementVNode as H, normalizeClass as J, createVNode as p, normalizeStyle as M, renderSlot as W, normalizeProps as X, guardReactiveProps as Y } from "vue";
-import { Form as Z, Tooltip as ee, TypographyText as oe } from "@aplus-frontend/antdv";
-import { useToken as le } from "@aplus-frontend/antdv/es/theme/internal";
-import { isFunction as B, cloneDeep as te, isArray as re, omit as C } from "lodash-unified";
-import { apFormItemColPropKeys as ae } from "../constant.mjs";
-import { QuestionCircleOutlined as ne } from "@ant-design/icons-vue";
+import { defineComponent as D, useSlots as L, ref as b, onMounted as _, computed as $, unref as l, cloneVNode as j, createBlock as v, openBlock as F, mergeProps as q, createSlots as E, withCtx as i, resolveDynamicComponent as K, renderList as O, createElementVNode as Q, normalizeClass as U, createVNode as p, normalizeStyle as Y, renderSlot as G, normalizeProps as H, guardReactiveProps as J } from "vue";
+import { Form as M, Tooltip as W, TypographyText as X } from "@aplus-frontend/antdv";
+import { useToken as Z } from "@aplus-frontend/antdv/es/theme/internal";
+import { isFunction as V, cloneDeep as ee, isArray as oe, omit as g } from "lodash-unified";
+import { apFormItemColPropKeys as le } from "../constant.mjs";
+import { QuestionCircleOutlined as te } from "@ant-design/icons-vue";
 import "../../config-provider/index.mjs";
-import { useInjectForm as ie } from "../context.mjs";
-import { isPromise as se } from "@fruits-chain/utils";
-import { getSingleVNode as ue, getValidVNodeList as me } from "../../utils/slot.mjs";
-import { useNamespace as de } from "../../config-provider/hooks/use-namespace.mjs";
-const Ce = /* @__PURE__ */ D({
+import { useInjectForm as re } from "../context.mjs";
+import { isPromise as ae } from "@fruits-chain/utils";
+import { getValidVNodeList as ne } from "../../utils/slot.mjs";
+import { useNamespace as ie } from "../../config-provider/hooks/use-namespace.mjs";
+const Ve = /* @__PURE__ */ D({
   name: "ApFormItem",
   __name: "index",
   props: {
@@ -54,109 +54,105 @@ const Ce = /* @__PURE__ */ D({
     transform: {},
     description: {}
   },
-  setup(N, { expose: k }) {
-    const o = N, a = $(), { model: s, updateModel: u, internalInstance: m } = ie(), { m: c, b: P } = de("ap-form-item"), d = f(!1), n = f(), [, x] = le();
-    j(async () => {
-      let e = B(o.initialValue) ? o.initialValue() : o.initialValue;
-      se(e) && (e = await e), m == null || m.registerField({
+  setup(B, { expose: h }) {
+    const o = B, s = L(), { model: u, updateModel: f, internalInstance: m } = re(), { m: c, b: x } = ie("ap-form-item"), d = b(!1), a = b(), [, C] = Z();
+    _(async () => {
+      let e = V(o.initialValue) ? o.initialValue() : o.initialValue;
+      ae(e) && (e = await e), m == null || m.registerField({
         name: o.name,
-        initialValue: te(e),
+        initialValue: ee(e),
         transform: o.transform
       });
     });
-    const y = F(() => o.name ? re(o.name) ? o.name.reduce((e, t) => e == null ? void 0 : e[t], l(s)) : s == null ? void 0 : s.value[o.name] : null), v = f(ue(a.default));
-    q(
-      () => {
-        var e;
-        return (e = a.default) == null ? void 0 : e.call(a);
-      },
-      (e) => {
-        v.value = me(e)[0];
-      }
-    );
-    function w(e) {
-      u == null || u(o.name, e);
+    const y = $(() => o.name ? oe(o.name) ? o.name.reduce((e, t) => e == null ? void 0 : e[t], l(u)) : u == null ? void 0 : u.value[o.name] : null);
+    function k() {
+      var r, n;
+      const e = ((r = s.default) == null ? void 0 : r.call(s)) || [];
+      if (!o.name)
+        return e[0];
+      const t = ne(e)[0];
+      return t ? j(t, {
+        [o.valuePropName]: l(y),
+        [`onUpdate:${o.valuePropName}`]: N,
+        bordered: o.bordered ? !1 : (n = t == null ? void 0 : t.props) == null ? void 0 : n.bordered,
+        onFocus: P,
+        onBlur: S
+      }) : null;
     }
-    function S() {
+    function N(e) {
+      f == null || f(o.name, e);
+    }
+    function P() {
       d.value = !0;
     }
-    function I() {
+    function S() {
       d.value = !1;
     }
-    const V = F(() => {
-      var t, r;
-      if (!o.name)
-        return (t = a.default()) == null ? void 0 : t[0];
-      const e = l(v);
-      return e ? E(e, {
-        [o.valuePropName]: l(y),
-        [`onUpdate:${o.valuePropName}`]: w,
-        bordered: o.bordered ? !1 : (r = e == null ? void 0 : e.props) == null ? void 0 : r.bordered,
-        onFocus: S,
-        onBlur: I
-      }) : null;
-    });
     function T() {
       var e;
-      (e = n.value) == null || e.onFieldBlur();
+      (e = a.value) == null || e.onFieldBlur();
     }
-    function z() {
+    function w() {
       var e;
-      (e = n.value) == null || e.onFieldChange();
+      (e = a.value) == null || e.onFieldChange();
     }
-    function A() {
+    function I() {
       var e;
-      (e = n.value) == null || e.clearValidate();
+      (e = a.value) == null || e.clearValidate();
     }
-    function L() {
+    function z() {
       var e;
-      (e = n.value) == null || e.resetField();
+      (e = a.value) == null || e.resetField();
     }
     function R(e = !1) {
       const t = l(y);
       if (!e || !o.transform)
         return t;
-      const r = B(o.transform) ? o.transform : o.transform.transformer;
+      const r = V(o.transform) ? o.transform : o.transform.transformer;
       return o.transform ? r(t) : t;
     }
-    return k({
+    return h({
       onFieldBlur: T,
-      onFieldChange: z,
-      clearValidate: A,
-      resetField: L,
+      onFieldChange: w,
+      clearValidate: I,
+      resetField: z,
       getFieldValue: R
-    }), (e, t) => (h(), g(l(Z).Item, K(
+    }), (e, t) => (F(), v(l(M).Item, q(
       {
         ref_key: "formItemRef",
-        ref: n
+        ref: a
       },
-      l(C)(o, [...l(ae), "tooltip", "label", "description"]),
+      l(g)(o, [...l(le), "tooltip", "label", "description"]),
       {
         class: {
           [l(c)("bordered")]: e.bordered,
           [l(c)("focused")]: e.bordered && d.value,
-          [l(P)()]: !0
+          [l(x)()]: !0
         },
         colon: e.bordered ? !1 : o.colon
       }
-    ), O({
+    ), E({
       default: i(() => [
-        V.value ? (h(), g(U(V.value), { key: 0 })) : Q("", !0)
+        (F(), v(K(k())))
       ]),
       _: 2
     }, [
       o.tooltip ? {
         name: "tooltip",
         fn: i(({ class: r }) => [
-          H("span", {
-            class: J(r)
+          Q("span", {
+            class: U(r)
           }, [
-            p(l(ee), {
+            p(l(W), {
               title: o.tooltip
             }, {
               default: i(() => [
-                p(l(ne), {
-                  style: M({ color: l(x).colorPrimary })
+                p(l(te), {
+                  style: Y({
+                    color: l(C).colorTextTertiary,
+                    fontSize: "14px",
+                    transform: "translateY(1px)"
+                  })
                 }, null, 8, ["style"])
               ]),
               _: 1
@@ -168,7 +164,7 @@ const Ce = /* @__PURE__ */ D({
       e.label ? {
         name: "label",
         fn: i(() => [
-          p(l(oe), {
+          p(l(X), {
             content: e.label,
             ellipsis: { tooltip: e.label },
             style: { "min-width": "0px", flex: "1" }
@@ -176,15 +172,15 @@ const Ce = /* @__PURE__ */ D({
         ]),
         key: "1"
       } : void 0,
-      G(l(C)(a, "default"), (r, b) => ({
-        name: b,
-        fn: i((_) => [
-          W(e.$slots, b, X(Y(_ || {})))
+      O(l(g)(s, "default"), (r, n) => ({
+        name: n,
+        fn: i((A) => [
+          G(e.$slots, n, H(J(A || {})))
         ])
       }))
     ]), 1040, ["class", "colon"]));
   }
 });
 export {
-  Ce as default
+  Ve as default
 };

package/es/src/ap-form/item-group/index.vue.mjs

@@ -1,15 +1,15 @@
-import { isVNode as C, defineComponent as h, useSlots as w, onBeforeUpdate as k, shallowRef as _, watch as B, computed as P, unref as r, createVNode as R, mergeProps as u, createBlock as d, openBlock as s, withCtx as S, createElementBlock as b, Fragment as x, renderList as N, resolveDynamicComponent as j } from "vue";
-import { Col as v, Row as F } from "@aplus-frontend/antdv";
-import { pick as D, isBoolean as I, omit as O } from "lodash-unified";
-import { apFormItemColPropKeys as V } from "../constant.mjs";
-import { genRealChildren as l, buildColSpan as $, getStringName as A } from "./helper.mjs";
+import { isVNode as C, defineComponent as _, useSlots as k, unref as r, createVNode as w, mergeProps as u, createBlock as l, openBlock as i, withCtx as P, createElementBlock as R, Fragment as S, renderList as b, resolveDynamicComponent as h } from "vue";
+import { Col as x, Row as B } from "@aplus-frontend/antdv";
+import { pick as N, isBoolean as j, omit as F } from "lodash-unified";
+import { apFormItemColPropKeys as D } from "../constant.mjs";
+import { genRealChildren as I, buildColSpan as O, getStringName as V } from "./helper.mjs";
 import "../../config-provider/index.mjs";
-import { isDef as E } from "../../utils/index.mjs";
-import { useNamespace as G } from "../../config-provider/hooks/use-namespace.mjs";
-function H(t) {
-  return typeof t == "function" || Object.prototype.toString.call(t) === "[object Object]" && !C(t);
+import { isDef as $ } from "../../utils/index.mjs";
+import { useNamespace as v } from "../../config-provider/hooks/use-namespace.mjs";
+function A(o) {
+  return typeof o == "function" || Object.prototype.toString.call(o) === "[object Object]" && !C(o);
 }
-const T = /* @__PURE__ */ h({
+const M = /* @__PURE__ */ _({
   name: "ApFormItemGroup",
   __name: "index",
   props: {
@@ -27,30 +27,29 @@ const T = /* @__PURE__ */ h({
       default: 3
     }
   },
-  setup(t) {
-    const {
-      b: c
-    } = G("ap-form-item-group"), i = t, a = w();
-    k(() => {
-      p.value = l(a.default());
-    }), B(() => a.default(), (o) => {
-      p.value = l(o);
-    });
-    const p = _(l(a.default())), f = P(() => r(p).map((o, m) => {
-      const e = o.props, n = D(e, V), g = n != null && n.span ? {} : $(i.countPerRow), y = I(e.hidden) ? !!e.hidden : E(e.hidden);
-      return {
-        key: `${m}-${A(e.name)}`,
-        node: R(v, u(g, n, {
-          class: y ? c("col-hidden") : ""
-        }), H(o) ? o : {
-          default: () => [o]
-        })
-      };
-    }));
-    return (o, m) => (s(), d(r(F), u({
-      class: r(c)()
-    }, r(O)(i, ["countPerRow"])), {
-      default: S(() => [(s(!0), b(x, null, N(f.value, (e) => (s(), d(j(e.node), {
+  setup(o) {
+    const m = o, p = k(), {
+      b: s
+    } = v("ap-form-item-group");
+    function d() {
+      var a;
+      const c = I(((a = p.default) == null ? void 0 : a.call(p)) || []);
+      return r(c).map((e, f) => {
+        const t = e.props, n = N(t, D), g = n != null && n.span ? {} : O(m.countPerRow), y = j(t.hidden) ? !!t.hidden : $(t.hidden);
+        return {
+          key: `${f}-${V(t.name)}`,
+          node: w(x, u(g, n, {
+            class: y ? s("col-hidden") : ""
+          }), A(e) ? e : {
+            default: () => [e]
+          })
+        };
+      });
+    }
+    return (c, a) => (i(), l(r(B), u({
+      class: r(s)()
+    }, r(F)(m, ["countPerRow"])), {
+      default: P(() => [(i(!0), R(S, null, b(d(), (e) => (i(), l(h(e.node), {
         key: e.key
       }))), 128))]),
       _: 1
@@ -58,5 +57,5 @@ const T = /* @__PURE__ */ h({
   }
 });
 export {
-  T as default
+  M as default
 };

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

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