@aplus-frontend/ui 0.6.0-beta.16 → 0.6.0-beta.18

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/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>;

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

@@ -1,8 +1,8 @@
-import { isVNode as oe, defineComponent as ae, useSlots as ne, ref as L, shallowRef as U, computed as _, unref as n, watch as V, createVNode as t, Fragment as w, createBlock as x, openBlock as d, mergeProps as le, withCtx as A, resolveDynamicComponent as B, createElementBlock as re, renderList as se } from "vue";
-import { Col as R, Flex as N, Button as M, Row as ie } from "@aplus-frontend/antdv";
+import { isVNode as oe, defineComponent as ae, useSlots as ne, ref as L, shallowRef as U, computed as _, unref as a, watch as V, createVNode as t, Fragment as w, createBlock as y, openBlock as f, mergeProps as le, withCtx as A, resolveDynamicComponent as B, createElementBlock as re, renderList as se } from "vue";
+import { Col as R, Flex as N, Button as W, Row as ie } from "@aplus-frontend/antdv";
 import "../ap-form.vue.mjs";
 import "../item/index.vue2.mjs";
-import { genRealChildren as W } from "../item-group/helper.mjs";
+import { genRealChildren as M } from "../item-group/helper.mjs";
 import "../../config-provider/index.mjs";
 import { isArray as ue, isBoolean as ce, omit as pe } from "lodash-unified";
 import { isDef as z } from "../../utils/index.mjs";
@@ -16,8 +16,8 @@ import q from "../item/index.vue.mjs";
 import xe from "./components/popover-filter.vue2.mjs";
 import ye from "./components/popover-sorter/index.vue2.mjs";
 import ge from "../ap-form.vue2.mjs";
-function ve(f) {
-  return typeof f == "function" || Object.prototype.toString.call(f) === "[object Object]" && !oe(f);
+function ve(m) {
+  return typeof m == "function" || Object.prototype.toString.call(m) === "[object Object]" && !oe(m);
 }
 const s = 24, Ue = /* @__PURE__ */ ae({
   name: "ApFormSearchForm",
@@ -111,57 +111,57 @@ const s = 24, Ue = /* @__PURE__ */ ae({
     },
     resizeTarget: {}
   },
-  setup(f, {
+  setup(m, {
     expose: H
   }) {
     var P;
-    const i = ne(), o = f, {
-      b: m
+    const i = ne(), o = m, {
+      b: h
     } = me("ap-form-search-form"), {
       t: k
-    } = he(), G = fe(o), y = L();
+    } = he(), G = fe(o), g = L();
     function T() {
-      var a;
-      const e = (a = y.value) == null ? void 0 : a.getFieldsValueTransformed(!0);
+      var n;
+      const e = (n = g.value) == null ? void 0 : n.getFieldsValueTransformed(!0);
       D(o.onSubmit, e);
     }
     function J() {
-      var e, a;
-      o.customReset || (a = (e = y.value) == null ? void 0 : e.resetFields) == null || a.call(e), D(o.onReset);
+      var e, n;
+      o.customReset || (n = (e = g.value) == null ? void 0 : e.resetFields) == null || n.call(e), D(o.onReset);
     }
     const K = (e) => z(e) ? (ue(e) ? e : [e]).join("") : Date.now();
     let I = [];
-    const u = U(W(i.default())), b = L(!1), c = U((P = i.extra) == null ? void 0 : P.call(i)), E = _(() => Math.floor(s / n(G)));
+    const u = U(M(i.default())), b = L(!1), p = U((P = i.extra) == null ? void 0 : P.call(i)), E = _(() => Math.floor(s / a(G)));
     V(() => i.default(), (e) => {
-      I = u.value, u.value = de(I, W(e)), b.value = !1;
+      I = u.value, u.value = de(I, M(e)), b.value = !1;
     }), V(() => {
       var e;
       return (e = i.extra) == null ? void 0 : e.call(i);
     }, (e) => {
-      c.value = e;
+      p.value = e;
     });
     const l = _(() => {
-      const e = u.value, a = [], r = [], g = [], h = n(E);
+      const e = u.value, n = [], r = [], x = [], c = a(E);
       let v = 0, S = 0;
-      const Y = s * o.maxRows - h * (n(c) && !o.extraInAction ? 2 : 1);
+      const Y = s * o.maxRows - c * (a(p) && !o.extraInAction ? 2 : 1);
       e.forEach((F, te) => {
-        const p = F.props;
-        if (ce(p.hidden) ? !!p.hidden : z(p.hidden))
-          a.push(F);
+        const d = F.props;
+        if (ce(d.hidden) ? !!d.hidden : z(d.hidden))
+          n.push(F);
         else {
-          let C = p.span || h;
+          let C = d.span || c;
           const $ = {
             node: F,
             span: C,
-            key: `ApFormSearchFormItem-${te}-${K(p.name)}-${p._signal}`
+            key: `ApFormSearchFormItem-${te}-${K(d.name)}-${d._signal}`
           }, j = s - v % s;
-          j < C && (C += j), v += C, v > Y ? r.push($) : (S = v, g.push($));
+          j < C && (C += j), v += C, v > Y ? r.push($) : (S = v, x.push($));
         }
       });
-      const O = s - (S + h) % s, Z = S % s < h, ee = O < h ? s : O;
+      const O = s - (S + c) % s, Z = S % s < c, ee = O < c ? s : O;
       return {
-        hideNode: t(w, null, [a]),
-        nodes: g,
+        hideNode: t(w, null, [n]),
+        nodes: x,
         collapseNodes: r,
         extraSpan: ee,
         lastRowOnlyIncludeActionAndExtra: Z
@@ -172,21 +172,21 @@ const s = 24, Ue = /* @__PURE__ */ ae({
     }
     const X = _(() => {
       let e;
-      const a = t(R, {
-        span: n(E),
+      const n = l.value.collapseNodes.length || o.sortable && u.value.length, r = t(R, {
+        span: a(E),
         key: "actionWrapper"
       }, {
         default: () => [t(q, null, {
           default: () => [t(N, {
             wrap: "wrap",
-            justify: l.value.lastRowOnlyIncludeActionAndExtra && !(n(c) && o.extraInAction) ? "flex-end" : "space-between"
+            justify: l.value.lastRowOnlyIncludeActionAndExtra && !(a(p) && o.extraInAction) ? "flex-end" : "space-between"
           }, {
             default: () => [t(N, {
               gap: 8,
               wrap: "wrap"
             }, {
-              default: () => [t("div", {
-                class: m("column-setting-trigger-wrapper")
+              default: () => [n ? t("div", {
+                class: h("column-setting-trigger-wrapper")
               }, [l.value.collapseNodes.length ? t(xe, {
                 onSubmit: T,
                 config: l.value.collapseNodes,
@@ -195,57 +195,57 @@ const s = 24, Ue = /* @__PURE__ */ ae({
                 children: u.value,
                 onClickConfirm: Q,
                 sorted: b.value
-              }, null) : null]), t(M, {
+              }, null) : null]) : null, t(W, {
                 type: "primary",
                 onClick: T,
                 loading: o.submitLoading,
                 htmlType: "submit",
-                class: m("action-btn")
+                class: h("action-btn")
               }, {
                 default: () => [o.searchText || k("ap.apForm.search.search")]
-              }), t(M, {
+              }), t(W, {
                 onClick: J,
                 type: "text",
-                class: [m("action-btn"), m("action-btn-reset")]
+                class: [h("action-btn"), h("action-btn-reset")]
               }, {
                 default: () => [o.resetText || k("ap.apForm.search.reset")]
               })]
-            }), o.extraInAction ? n(c) : null]
+            }), o.extraInAction ? a(p) : null]
           })]
         })]
-      }), r = !o.extraInAction && n(c) ? t(R, {
+      }), x = !o.extraInAction && a(p) ? t(R, {
         span: l.value.extraSpan,
         key: "extraNode"
       }, {
         default: () => [t(q, null, {
           default: () => [t(N, {
             justify: l.value.extraSpan === s || l.value.lastRowOnlyIncludeActionAndExtra ? "start" : "flex-end"
-          }, ve(e = n(c)) ? e : {
+          }, ve(e = a(p)) ? e : {
             default: () => [e]
           })]
         })]
-      }) : null, g = t(R, {
+      }) : null, c = t(R, {
         span: l.value.extraSpan
       }, null);
-      return l.value.lastRowOnlyIncludeActionAndExtra ? t(w, null, [r || g, a]) : t(w, null, [a, r]);
+      return l.value.lastRowOnlyIncludeActionAndExtra ? t(w, null, [x || c, r]) : t(w, null, [r, x]);
     });
     return H({
-      apForm: _(() => n(y))
-    }), (e, a) => (d(), x(ge, le({
+      apForm: _(() => a(g))
+    }), (e, n) => (f(), y(ge, le({
       ref_key: "apForm",
-      ref: y,
-      class: n(m)()
-    }, n(pe)(o, ["collapse", "defaultCollapse", "onUpdate:collapse", "searchText", "resetText", "onSubmit", "onReset", "extraInAction", "forceExpand", "countPerRow"])), {
-      default: A(() => [(d(), x(B(l.value.hideNode))), t(n(ie), {
+      ref: g,
+      class: a(h)()
+    }, a(pe)(o, ["collapse", "defaultCollapse", "onUpdate:collapse", "searchText", "resetText", "onSubmit", "onReset", "extraInAction", "forceExpand", "countPerRow"])), {
+      default: A(() => [(f(), y(B(l.value.hideNode))), t(a(ie), {
         gutter: 8
       }, {
-        default: A(() => [(d(!0), re(w, null, se(l.value.nodes, (r) => (d(), x(n(R), {
+        default: A(() => [(f(!0), re(w, null, se(l.value.nodes, (r) => (f(), y(a(R), {
           key: r.key,
           span: r.span
         }, {
-          default: A(() => [(d(), x(B(r.node)))]),
+          default: A(() => [(f(), y(B(r.node)))]),
           _: 2
-        }, 1032, ["span"]))), 128)), (d(), x(B(X.value)))]),
+        }, 1032, ["span"]))), 128)), (f(), y(B(X.value)))]),
         _: 1
       })]),
       _: 1

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

@@ -1,8 +1,9 @@
-import { defineComponent as c, useSlots as u, ref as f, watchEffect as p, cloneVNode as d, onMounted as V, createElementBlock as _, openBlock as m, Fragment as y, renderList as k, createBlock as F, resolveDynamicComponent as h } from "vue";
+import { defineComponent as c, useSlots as u, ref as f, watchEffect as p, cloneVNode as d, onMounted as V, createElementBlock as _, openBlock as l, Fragment as y, renderList as F, createBlock as k, resolveDynamicComponent as h } from "vue";
 import { useInjectForm as v } from "../context.mjs";
 import { isFunction as w, cloneDeep as x } from "lodash-unified";
 import { isPromise as B } from "@fruits-chain/utils";
-const j = /* @__PURE__ */ c({
+const S = /* @__PURE__ */ c({
+  name: "ApFormSet",
   __name: "index",
   props: {
     name: {},
@@ -11,11 +12,11 @@ const j = /* @__PURE__ */ c({
     transform: {}
   },
   setup(s) {
-    const { internalInstance: t } = v(), a = u(), e = s, l = f([]);
+    const { internalInstance: t } = v(), a = u(), e = s, m = f([]);
     return p(() => {
       if (a != null && a.default) {
         const n = a.default();
-        l.value = n.map((r, o) => {
+        m.value = n.map((r, o) => {
           const i = e.as === "array" ? [e.name, o] : [e.name, r.props.name];
           return d(r, { name: i });
         });
@@ -27,9 +28,9 @@ const j = /* @__PURE__ */ c({
         initialValue: x(n),
         transform: e.transform
       });
-    }), (n, r) => (m(!0), _(y, null, k(l.value, (o, i) => (m(), F(h(o), { key: i }))), 128));
+    }), (n, r) => (l(!0), _(y, null, F(m.value, (o, i) => (l(), k(h(o), { key: i }))), 128));
   }
 });
 export {
-  j as default
+  S as default
 };

package/es/src/ap-grid/editable/form-item.vue.mjs

@@ -10,7 +10,7 @@ import { useNamespace as le } from "../../config-provider/hooks/use-namespace.mj
 import { useGlobalConfig as ne } from "../../config-provider/hooks/use-global-config.mjs";
 import fe from "../index.vue.mjs";
 const Ce = /* @__PURE__ */ P({
-  name: "EditableGrid",
+  name: "EditableGridFormItem",
   __name: "form-item",
   props: {
     dropdownPrefixCls: {},

package/es/src/ap-grid/hooks/use-editable-columns.mjs

@@ -1,5 +1,5 @@
-import { useSlots as E, computed as R, unref as m } from "vue";
-import { isFunction as T, isArray as s } from "lodash-unified";
+import { useSlots as y, computed as E, unref as m } from "vue";
+import { isFunction as R, isArray as s } from "lodash-unified";
 import { getEditableTableTitle as k, mergeClass as A } from "../../editable-table/utils.mjs";
 import { updateFormProps as q, getFieldProps as v } from "../../ap-table/utils.mjs";
 import "../../config-provider/index.mjs";
@@ -10,8 +10,8 @@ const M = (n, f) => {
   const {
     em: b,
     be: x
-  } = S("editable-grid"), g = E(), [, h] = w();
-  return R(() => {
+  } = S("editable-grid"), g = y(), [, h] = w();
+  return E(() => {
     const l = n.columns;
     if (!l)
       return [];
@@ -19,40 +19,40 @@ const M = (n, f) => {
       return C.map((e) => ({
         ...e,
         children: o(e.children || []),
-        title: k(e, x("table-header", "title"), b("header-cell", "required"), g.headerCell, m(h).colorPrimary),
+        title: k(e, x("table-header", "title"), b("header-cell", "required"), g.headerCell, m(h).colorTextTertiary),
         // tips: 已经处理了title，传递tooltip为undefined不会再内部处理
         tooltip: void 0,
         customRender({
           value: r,
           originalNode: F,
-          ...a
+          ...t
         }) {
-          const i = T(e.editable) ? e.editable(a.text, a.record, a.index) : !!e.editable;
+          const i = R(e.editable) ? e.editable(t.text, t.record, t.index) : !!e.editable;
           let d = F;
           if (i) {
-            const t = q(e, v(e.fieldProps, {
+            const a = q(e, v(e.fieldProps, {
               value: r,
-              ...a
+              ...t
             })), c = {};
-            n.onFieldChange && (c[`onUpdate:${t.valuePropName || "value"}`] = (y) => {
+            n.onFieldChange && (c[`onUpdate:${a.valuePropName || "value"}`] = (T) => {
               var u;
-              return (u = n.onFieldChange) == null ? void 0 : u.call(n, a.index, e.dataIndex, y);
+              return (u = n.onFieldChange) == null ? void 0 : u.call(n, t.index, e.dataIndex, T);
             });
             const N = s(e.dataIndex) ? e.dataIndex : [e.dataIndex], I = {
-              name: [...s(n.name) ? n.name : [n.name], a.index, ...N],
-              ...t || {},
+              name: [...s(n.name) ? n.name : [n.name], t.index, ...N],
+              ...a || {},
               field: {
                 style: "width: 100%",
-                ...(t == null ? void 0 : t.field) || {},
+                ...(a == null ? void 0 : a.field) || {},
                 ...c,
-                class: A("is-editable", t.class)
+                class: A("is-editable", a.class)
               }
             };
-            d = G(e, I, a.record, m(f));
+            d = G(e, I, t.record, m(f));
           }
           return e.customRender ? e.customRender({
             value: r,
-            ...a,
+            ...t,
             editable: i,
             originalNode: d
           }) : d;