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

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

@@ -1,23 +1,23 @@
-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 D } from "../../utils/index.mjs";
-import { execFunc as q, diffFormItem as de } from "./utils.mjs";
+import { isDef as z } from "../../utils/index.mjs";
+import { execFunc as D, diffFormItem as de } from "./utils.mjs";
 import "./components/popover-filter.vue.mjs";
 import { useCountPerRow as fe } from "./hooks/use-count-per-row.mjs";
 import "./components/popover-sorter/index.vue.mjs";
 import { useNamespace as me } from "../../config-provider/hooks/use-namespace.mjs";
 import { useLocale as he } from "../../config-provider/hooks/use-locale.mjs";
-import z from "../item/index.vue.mjs";
+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",
@@ -108,59 +108,60 @@ const s = 24, Ue = /* @__PURE__ */ ae({
     sortable: {
       type: Boolean,
       default: !0
-    }
+    },
+    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();
-    function I() {
-      var a;
-      const e = (a = y.value) == null ? void 0 : a.getFieldsValueTransformed(!0);
-      q(o.onSubmit, e);
+    } = he(), G = fe(o), g = L();
+    function T() {
+      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), q(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) => D(e) ? (ue(e) ? e : [e]).join("") : Date.now();
-    let T = [];
-    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 K = (e) => z(e) ? (ue(e) ? e : [e]).join("") : Date.now();
+    let I = [];
+    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) => {
-      T = u.value, u.value = de(T, 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 : D(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
@@ -171,80 +172,80 @@ 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(z, null, {
+        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: I,
+                onSubmit: T,
                 config: l.value.collapseNodes,
                 submitLoading: o.submitLoading
               }, null) : null, o.sortable && u.value.length ? t(ye, {
                 children: u.value,
                 onClickConfirm: Q,
                 sorted: b.value
-              }, null) : null]), t(M, {
+              }, null) : null]) : null, t(W, {
                 type: "primary",
-                onClick: I,
+                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(z, null, {
+        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 { 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({
+import { defineComponent as p, useSlots as f, cloneVNode as d, onMounted as V, createElementBlock as _, openBlock as l, Fragment as y, renderList as C, createBlock as F, resolveDynamicComponent as k } from "vue";
+import { useInjectForm as g } from "../context.mjs";
+import { isFunction as h, cloneDeep as w } from "lodash-unified";
+import { isPromise as x } from "@fruits-chain/utils";
+const v = /* @__PURE__ */ p({
+  name: "ApFormSet",
   __name: "index",
   props: {
     name: {},
@@ -11,25 +12,24 @@ const j = /* @__PURE__ */ c({
     transform: {}
   },
   setup(s) {
-    const { internalInstance: t } = v(), a = u(), e = s, l = f([]);
-    return p(() => {
-      if (a != null && a.default) {
-        const n = a.default();
-        l.value = n.map((r, o) => {
-          const i = e.as === "array" ? [e.name, o] : [e.name, r.props.name];
-          return d(r, { name: i });
-        });
-      }
-    }), V(async () => {
-      let n = w(e.initialValue) ? e.initialValue() : e.initialValue;
-      B(n) && (n = await n), t == null || t.registerField({
+    const { internalInstance: t } = g(), a = f(), e = s, u = () => {
+      var o;
+      return (((o = a.default) == null ? void 0 : o.call(a)) || []).map((r, i) => {
+        var m;
+        const c = e.as === "array" ? [e.name, i] : [e.name, ((m = r.props) == null ? void 0 : m.name) || ""];
+        return d(r, { name: c });
+      });
+    };
+    return V(async () => {
+      let n = h(e.initialValue) ? e.initialValue() : e.initialValue;
+      x(n) && (n = await n), t == null || t.registerField({
         name: e.name,
-        initialValue: x(n),
+        initialValue: w(n),
         transform: e.transform
       });
-    }), (n, r) => (m(!0), _(y, null, k(l.value, (o, i) => (m(), F(h(o), { key: i }))), 128));
+    }), (n, o) => (l(!0), _(y, null, C(u(), (r, i) => (l(), F(k(r), { key: i }))), 128));
   }
 });
 export {
-  j as default
+  v as default
 };

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

@@ -1,4 +1,4 @@
-import { defineComponent as A, useSlots as H, toRef as W, ref as h, unref as r, watch as G, nextTick as U, createBlock as $, openBlock as q, mergeProps as y, withCtx as g, createVNode as J, createSlots as Q, renderList as X, renderSlot as Y, normalizeProps as Z, guardReactiveProps as I } from "vue";
+import { defineComponent as P, useSlots as A, toRef as W, ref as h, unref as r, watch as G, nextTick as U, createBlock as $, openBlock as q, mergeProps as y, withCtx as g, createVNode as J, createSlots as Q, renderList as X, renderSlot as Y, normalizeProps as Z, guardReactiveProps as I } from "vue";
 import { ApForm as C } from "../../ap-form/index.mjs";
 import { isArray as w, isUndefined as M, isNumber as m, cloneDeep as ee, omit as oe } from "lodash-unified";
 import "../../config-provider/index.mjs";
@@ -7,10 +7,10 @@ import { useGetEditableColumns as te } from "../hooks/use-editable-columns.mjs";
 import "../index.vue2.mjs";
 import { useInjectForm as ae } from "../../ap-form/context.mjs";
 import { useNamespace as le } from "../../config-provider/hooks/use-namespace.mjs";
-import { useGlobalConfig as fe } from "../../config-provider/hooks/use-global-config.mjs";
-import ne from "../index.vue.mjs";
-const Ce = /* @__PURE__ */ A({
-  name: "EditableGrid",
+import { useGlobalConfig as ne } from "../../config-provider/hooks/use-global-config.mjs";
+import fe from "../index.vue.mjs";
+const Ce = /* @__PURE__ */ P({
+  name: "EditableGridFormItem",
   __name: "form-item",
   props: {
     dropdownPrefixCls: {},
@@ -145,6 +145,9 @@ const Ce = /* @__PURE__ */ A({
     },
     expandable: {},
     value: {},
+    rowHighlightable: {
+      type: [Boolean, Function]
+    },
     columns: {},
     defaultValue: {},
     "onUpdate:value": {},
@@ -160,11 +163,11 @@ const Ce = /* @__PURE__ */ A({
   setup(x, {
     expose: R
   }) {
-    const B = H(), l = x, {
+    const B = A(), l = x, {
       b: S
     } = le("editable-grid");
     function F(e, t) {
-      return w(t) ? t.reduce((f, a) => f == null ? void 0 : f[a], e) : e == null ? void 0 : e[t];
+      return w(t) ? t.reduce((n, a) => n == null ? void 0 : n[a], e) : e == null ? void 0 : e[t];
     }
     const {
       internalInstance: o,
@@ -176,11 +179,11 @@ const Ce = /* @__PURE__ */ A({
     }, {
       deep: !0
     });
-    const c = h(), D = fe("valueTypeMap"), V = te(l, D);
+    const c = h(), D = ne("valueTypeMap"), V = te(l, D);
     function L(e, t) {
-      var n;
-      const f = ((n = r(d)) == null ? void 0 : n.length) || 0;
-      if (b(l.maxLength) && f >= l.maxLength)
+      var f;
+      const n = ((f = r(d)) == null ? void 0 : f.length) || 0;
+      if (b(l.maxLength) && n >= l.maxLength)
         return;
       const a = {
         ...e || {}
@@ -195,29 +198,29 @@ const Ce = /* @__PURE__ */ A({
     }
     function T(e, t = "suffix") {
       var s;
-      const f = ((s = r(d)) == null ? void 0 : s.length) || 0, a = m(e) ? e : e.length;
-      if (b(l.maxLength) && f + a > l.maxLength)
+      const n = ((s = r(d)) == null ? void 0 : s.length) || 0, a = m(e) ? e : e.length;
+      if (b(l.maxLength) && n + a > l.maxLength)
         return;
-      const n = m(e) ? new Array(e).fill(0).map(() => ({})) : ee(e);
-      o == null || o.setFieldValue(l.name, n, !0, (u, i) => {
+      const f = m(e) ? new Array(e).fill(0).map(() => ({})) : ee(e);
+      o == null || o.setFieldValue(l.name, f, !0, (u, i) => {
         if (!u[i]) {
-          u[i] = [...n];
+          u[i] = [...f];
           return;
         }
-        t === "suffix" ? u[i].push(...n) : u[i].unshift(...n);
+        t === "suffix" ? u[i].push(...f) : u[i].unshift(...f);
       });
     }
     function k(e) {
       const t = new Set(m(e) ? [e] : e);
-      o == null || o.setFieldValue(l.name, void 0, !0, (f, a) => {
-        f[a] = f[a].filter((n, s) => !t.has(s));
+      o == null || o.setFieldValue(l.name, void 0, !0, (n, a) => {
+        n[a] = n[a].filter((f, s) => !t.has(s));
       });
     }
     function _(e) {
-      var f;
+      var n;
       const t = new Set(w(e) ? e : [e]);
-      t.size !== 0 && ((f = o == null ? void 0 : o.setFieldValue) == null || f.call(o, l.name, void 0, !0, (a, n) => {
-        a[n] = a[n].filter((s) => !t.has(s[l.rowKey]));
+      t.size !== 0 && ((n = o == null ? void 0 : o.setFieldValue) == null || n.call(o, l.name, void 0, !0, (a, f) => {
+        a[f] = a[f].filter((s) => !t.has(s[l.rowKey]));
       }));
     }
     function j() {
@@ -227,15 +230,15 @@ const Ce = /* @__PURE__ */ A({
       var t;
       return (t = r(d)) == null ? void 0 : t[e];
     }
-    function O(e, t, f = !0) {
-      o == null || o.setFieldValue(l.name, void 0, !0, (a, n) => {
-        if (!(!a[n] || !a[n][e])) {
-          if (!f) {
-            const s = Object.keys(a[n][e]);
+    function O(e, t, n = !0) {
+      o == null || o.setFieldValue(l.name, void 0, !0, (a, f) => {
+        if (!(!a[f] || !a[f][e])) {
+          if (!n) {
+            const s = Object.keys(a[f][e]);
             for (const u of s)
-              u !== l.rowKey && delete a[n][e][u];
+              u !== l.rowKey && delete a[f][e][u];
           }
-          Object.assign(a[n][e], {
+          Object.assign(a[f][e], {
             ...t
           });
         }
@@ -245,11 +248,11 @@ const Ce = /* @__PURE__ */ A({
       o == null || o.setFieldValue(l.name, e);
     }
     function K(e) {
-      var f;
+      var n;
       const t = e === "end" ? d.value.length - 1 : e;
-      (f = c.value) == null || f.scrollToRow(t);
+      (n = c.value) == null || n.scrollToRow(t);
     }
-    function P() {
+    function H() {
       var e;
       (e = o == null ? void 0 : o.setFieldValue) == null || e.call(o, l.name, []);
     }
@@ -262,13 +265,13 @@ const Ce = /* @__PURE__ */ A({
       addMultiple: T,
       scrollTo: K,
       setTableData: z,
-      clear: P,
+      clear: H,
       removeByKey: _
     }), (e, t) => (q(), $(r(C).FormItem, y(e.formItem, {
       name: e.name,
       label: e.label
     }), {
-      default: g(() => [J(ne, y(r(oe)(l, ["name", "value", "onUpdate:value", "maxLength", "onChange", "defaultValue", "formItem"]), {
+      default: g(() => [J(fe, y(r(oe)(l, ["name", "value", "onUpdate:value", "maxLength", "onChange", "defaultValue", "formItem"]), {
         ref_key: "tableRef",
         ref: c,
         class: r(S)(),
@@ -277,9 +280,9 @@ const Ce = /* @__PURE__ */ A({
         "search-form": !1
       }), Q({
         _: 2
-      }, [X(B, (f, a) => ({
+      }, [X(B, (n, a) => ({
         name: a,
-        fn: g((n) => [Y(e.$slots, a, Z(I(n || {})))])
+        fn: g((f) => [Y(e.$slots, a, Z(I(f || {})))])
       }))]), 1040, ["class", "columns", "data-source"])]),
       _: 3
     }, 16, ["name", "label"]));

package/es/src/ap-grid/editable/index.vue.mjs

@@ -146,6 +146,9 @@ const Re = /* @__PURE__ */ $({
     },
     expandable: {},
     value: {},
+    rowHighlightable: {
+      type: [Boolean, Function]
+    },
     columns: {},
     defaultValue: {},
     "onUpdate:value": {},
@@ -158,12 +161,12 @@ const Re = /* @__PURE__ */ $({
   },
   emits: ["update:value"],
   setup(B, {
-    expose: S,
-    emit: F
+    expose: F,
+    emit: S
   }) {
     const N = q(), o = B, {
       b: V
-    } = re("editable-grid"), _ = F, w = v(), {
+    } = re("editable-grid"), _ = S, w = v(), {
       value: m,
       updateValue: L
     } = ue(o, _), i = v(), k = ie("valueTypeMap"), c = y.useWatch(o.name, i);
@@ -236,14 +239,14 @@ const Re = /* @__PURE__ */ $({
         s[n] = s[n].filter((r) => !t.has(r[o.rowKey]));
       }));
     }
-    function I() {
+    function H() {
       return u(m);
     }
-    function P(e) {
+    function I(e) {
       var t;
       (t = i.value) == null || t.setFieldValue(o.name, e);
     }
-    function H(e) {
+    function P(e) {
       var t;
       return (t = u(m)) == null ? void 0 : t[e];
     }
@@ -271,18 +274,18 @@ const Re = /* @__PURE__ */ $({
       var e, t;
       (t = (e = i.value) == null ? void 0 : e.setFieldValue) == null || t.call(e, o.name, []);
     }
-    return S({
+    return F({
       resetFields: E,
       validateFields: j,
       add: O,
       remove: A,
-      getRowData: H,
-      getRowsData: I,
+      getRowData: P,
+      getRowsData: H,
       setRowData: W,
       addMultiple: z,
       scrollTo: G,
       clear: U,
-      setTableData: P,
+      setTableData: I,
       removeByKey: K
     }), (e, t) => (Q(), J(u(y), {
       ref_key: "formRef",

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;

package/es/src/ap-grid/hooks/use-inner-params.d.ts

@@ -1,9 +1,10 @@
 import { ApGridProps } from '../interface';
 import { VxeTableEvents } from 'vxe-table';
+import { OptionalOnTableChange } from '../../ap-table/hooks/use-table-paging-ng';
 /**
  * 用于管理内部生成的查询参数（排序/筛选/分页等）
  */
-export declare const useInnerParams: <RecordType>(tableChangeCallback: ApGridProps["onChange"]) => {
+export declare const useInnerParams: <RecordType>(tableChangeCallback: OptionalOnTableChange<NonNullable<ApGridProps["onChange"]>>) => {
     sortChangeEvent: VxeTableEvents.SortChange<RecordType>;
     filterChangeEvent: VxeTableEvents.FilterChange<RecordType>;
     paginationChangeEvent: (page: number, pageSize: number) => void;