@aplus-frontend/ui 7.9.1 → 7.10.1

package/es/src/ap-grid/editable/index.vue.d.ts

@@ -1,5 +1,5 @@
-import { EditableGridExpose, EditableGridProps } from './interface';
 import { Recordable } from '../../type';
+import { EditableGridExpose, EditableGridProps } from './interface';
 import { VNodeProps, AllowedComponentProps, ComponentCustomProps, PublicProps, ShallowUnwrapRef, VNode } from 'vue';
 declare const _default: <RecordType extends Recordable = any>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
     props: __VLS_PrettifyLocal<Pick<Partial<{}> & Omit<{

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

@@ -1,12 +1,12 @@
 import { defineComponent as W, useSlots as U, ref as y, watch as C, unref as r, createBlock as $, openBlock as q, withCtx as p, createVNode as w, mergeProps as J, createSlots as Q, renderList as X, renderSlot as Y, normalizeProps as Z, guardReactiveProps as M } from "vue";
-import { ApForm as m } from "../../ap-form/index.mjs";
-import { isEqual as ee, isArray as c, isUndefined as te, isNumber as g, cloneDeep as ae, omit as oe } from "lodash-unified";
+import { isEqual as ee, isArray as m, isUndefined as te, isNumber as c, cloneDeep as ae, omit as oe } from "lodash-unified";
+import { ApForm as g } from "../../ap-form/index.mjs";
 import "../../config-provider/index.mjs";
 import "../../hooks/index.mjs";
 import "../../utils/index.mjs";
-import { useGetEditableColumns as le } from "../hooks/use-editable-columns.mjs";
+import { useDevWarning as le } from "../../utils/warning.mjs";
+import { useGetEditableColumns as ne } from "../hooks/use-editable-columns.mjs";
 import "../index.vue2.mjs";
-import { useDevWarning as ne } from "../../utils/warning.mjs";
 import re from "../style/editable.mjs";
 import { useNamespace as se } from "../../config-provider/hooks/use-namespace.mjs";
 import { useControllableValue as ie } from "../../hooks/useControllableValue.mjs";
@@ -175,11 +175,11 @@ const Ee = /* @__PURE__ */ W({
     const B = U(), t = v, {
       b: S
     } = se("editable-grid"), F = re("editable-grid"), E = R;
-    ne("EditableGrid")(!1, "breaking", "EditableGrid has been EOL, Please use EditableAgGrid(https://aplus.aplnk.com/aplus-ui/components/ag-grid/editable/) instead.");
+    le("EditableGrid")(!1, "breaking", "EditableGrid has been EOL, Please use EditableAgGrid(https://aplus.aplnk.com/aplus-ui/components/ag-grid/editable/) instead.");
     const h = y(), {
       value: u,
       updateValue: N
-    } = ie(t, E), i = y(), V = ue("valueTypeMap"), f = m.useWatch(t.name, i);
+    } = ie(t, E), i = y(), V = ue("valueTypeMap"), f = g.useWatch(t.name, i);
     C(() => f.value, (e) => {
       N(e), t.onChange?.(e);
     }, {
@@ -190,12 +190,12 @@ const Ee = /* @__PURE__ */ W({
     }, {
       deep: !0
     });
-    const k = le(t, V);
+    const k = ne(t, V);
     function L() {
       i.value?.resetFields();
     }
     function _(e) {
-      return e ? (c(e) ? e : [e]).map((n) => c(n) ? [t.name, ...n] : [t.name, n]) : void 0;
+      return e ? (m(e) ? e : [e]).map((n) => m(n) ? [t.name, ...n] : [t.name, n]) : void 0;
     }
     async function D(e, l) {
       return (await i.value?.validateFields(_(e), l))?.[t.name];
@@ -216,10 +216,10 @@ const Ee = /* @__PURE__ */ W({
       });
     }
     function T(e, l = "suffix") {
-      const n = r(u)?.length || 0, a = g(e) ? e : e.length;
+      const n = r(u)?.length || 0, a = c(e) ? e : e.length;
       if (b(t.maxLength) && n + a > t.maxLength)
         return;
-      const o = g(e) ? new Array(e).fill(0).map(() => ({})) : ae(e);
+      const o = c(e) ? new Array(e).fill(0).map(() => ({})) : ae(e);
       i.value?.setFieldValue?.(t.name, o, !0, (s, d) => {
         if (!s[d]) {
           s[d] = [...o];
@@ -229,13 +229,13 @@ const Ee = /* @__PURE__ */ W({
       });
     }
     function j(e) {
-      const l = new Set(g(e) ? [e] : e);
+      const l = new Set(c(e) ? [e] : e);
       i.value?.setFieldValue?.(t.name, void 0, !0, (n, a) => {
         n[a] = n[a].filter((o, s) => !l.has(s));
       });
     }
     function A(e) {
-      const l = new Set(c(e) ? e : [e]);
+      const l = new Set(m(e) ? e : [e]);
       l.size !== 0 && i.value?.setFieldValue?.(t.name, void 0, !0, (n, a) => {
         n[a] = n[a].filter((o) => !l.has(o[t.rowKey]));
       });
@@ -283,7 +283,7 @@ const Ee = /* @__PURE__ */ W({
       clear: P,
       setTableData: G,
       removeByKey: A
-    }), (e, l) => (q(), $(r(m), {
+    }), (e, l) => (q(), $(r(g), {
       ref_key: "formRef",
       ref: i,
       "initial-values": {
@@ -293,7 +293,7 @@ const Ee = /* @__PURE__ */ W({
         height: "100%"
       }
     }, {
-      default: p(() => [w(r(m).FormItem, {
+      default: p(() => [w(r(g).FormItem, {
         name: e.name,
         "no-style": ""
       }, {

package/es/src/ap-grid/editable/interface.d.ts

@@ -1,11 +1,11 @@
-import { Recordable } from '../../type';
-import { ApTableValueFields, ApTableValueTypes, CommonFieldReturnType, FieldPropsType } from '../../ap-table/interface';
-import { ApGridColumnType, ApGridProps } from '../interface';
-import { VNode } from 'vue';
-import { DataIndex } from '@aplus-frontend/antdv/es/vc-table/interface';
-import { EditableTableExpose } from '../../editable-table';
 import { NamePath } from '@aplus-frontend/antdv/es/form/interface';
+import { DataIndex } from '@aplus-frontend/antdv/es/vc-table/interface';
+import { VNode } from 'vue';
 import { ApFormItemProps } from '../../ap-form';
+import { ApTableValueFields, ApTableValueTypes, CommonFieldReturnType, FieldPropsType } from '../../ap-table/interface';
+import { EditableTableExpose } from '../../editable-table';
+import { Recordable } from '../../type';
+import { ApGridColumnType, ApGridProps } from '../interface';
 export type EditableGridColumnType<RecordType = any, ExtraValueType = 'text', ValueType extends ApTableValueTypes = ApTableValueTypes, MergedValueType extends ExtraValueType | ValueType = ExtraValueType | ValueType> = MergedValueType extends ExtraValueType | ValueType ? Omit<ApGridColumnType<RecordType, ExtraValueType, ValueType, MergedValueType>, 'children' | 'customRender' | 'hideInSearch' | 'tooltip' | 'customRenderFormItem' | 'fieldProps'> & {
     children?: EditableGridColumnType<RecordType, ExtraValueType, ValueType, MergedValueType>[];
     /**

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

@@ -1,6 +1,6 @@
 import { ComputedRef, Ref } from 'vue';
-import { EditableGridProps } from '../editable/interface';
-import { ValueTypeRenderConfig } from '../../config-provider';
 import { ApGridColumnType } from '../interface';
+import { ValueTypeRenderConfig } from '../../config-provider';
+import { EditableGridProps } from '../editable/interface';
 export declare const useGetEditableColumns: (props: EditableGridProps, extraValueTypes: Ref<Record<string, ValueTypeRenderConfig> | undefined>) => ComputedRef<ApGridColumnType[]>;
 export default useGetEditableColumns;

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

@@ -1,65 +1,66 @@
-import { useSlots as p, computed as T, unref as u } from "vue";
-import { isFunction as y, isArray as s } from "lodash-unified";
-import { getEditableTableTitle as E, mergeClass as R } from "../../editable-table/utils.mjs";
+import { useToken as I } from "@aplus-frontend/antdv/es/theme/internal";
+import { clsx as T } from "clsx";
+import { isFunction as y, isArray as u } from "lodash-unified";
+import { useSlots as E, computed as R, unref as s } from "vue";
 import { updateFormProps as k, getFieldProps as A } from "../../ap-table/utils.mjs";
 import "../../config-provider/index.mjs";
-import { useToken as q } from "@aplus-frontend/antdv/es/theme/internal";
+import { getEditableTableTitle as q } from "../../editable-table/utils.mjs";
 import { getFinalEditableNode as v } from "../utils/editable.mjs";
 import { useNamespace as w } from "../../config-provider/hooks/use-namespace.mjs";
-const K = (t, m) => {
+const L = (o, m) => {
   const {
     em: f,
-    be: b
-  } = w("editable-grid"), x = p(), [, g] = q();
-  return T(() => {
-    const d = t.columns;
-    if (!d)
+    be: x
+  } = w("editable-grid"), b = E(), [, g] = I();
+  return R(() => {
+    const a = o.columns;
+    if (!a)
       return [];
     function r(h) {
       return h.map((e) => ({
         ...e,
         children: r(e.children || []),
-        title: E(e, b("table-header", "title"), f("header-cell", "required"), x.headerCell, u(g).colorTextTertiary),
+        title: q(e, x("table-header", "title"), f("header-cell", "required"), b.headerCell, s(g).colorTextTertiary),
         // tips: 已经处理了title，传递tooltip为undefined不会再内部处理
         tooltip: void 0,
         customRender({
           value: l,
-          originalNode: C,
+          originalNode: F,
           ...n
         }) {
           const i = y(e.editable) ? e.editable(n.text, n.record, n.index) : !!e.editable;
-          let a = C;
+          let d = F;
           if (i) {
-            const o = k(e, A(e.fieldProps, {
+            const t = k(e, A(e.fieldProps, {
               value: l,
               ...n
             })), c = {};
-            t.onFieldChange && (c[`onUpdate:${o.valuePropName || "value"}`] = (I) => t.onFieldChange?.(n.index, e.dataIndex, I));
-            const F = s(e.dataIndex) ? e.dataIndex : [e.dataIndex], N = {
-              name: [...s(t.name) ? t.name : [t.name], n.index, ...F],
-              ...o || {},
+            o.onFieldChange && (c[`onUpdate:${t.valuePropName || "value"}`] = (C) => o.onFieldChange?.(n.index, e.dataIndex, C));
+            const N = u(e.dataIndex) ? e.dataIndex : [e.dataIndex], p = {
+              name: [...u(o.name) ? o.name : [o.name], n.index, ...N],
+              ...t || {},
               field: {
                 style: "width: 100%",
-                ...o?.field || {},
+                ...t?.field || {},
                 ...c,
-                class: R("is-editable", o.class)
+                class: T("is-editable", t.class)
               }
             };
-            a = v(e, N, n.record, u(m));
+            d = v(e, p, n.record, s(m));
           }
           return e.customRender ? e.customRender({
             value: l,
             ...n,
             editable: i,
-            originalNode: a
-          }) : a;
+            originalNode: d
+          }) : d;
         }
       }));
     }
-    return r(d);
+    return r(a);
   });
 };
 export {
-  K as default,
-  K as useGetEditableColumns
+  L as default,
+  L as useGetEditableColumns
 };

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

@@ -1,6 +1,6 @@
-import { ApGridProps } from '../interface';
 import { VxeTableEvents } from 'vxe-table';
 import { OptionalOnTableChange } from '../../ap-table/hooks/use-table-paging-ng';
+import { ApGridProps } from '../interface';
 /**
  * 用于管理内部生成的查询参数（排序/筛选/分页等）
  */

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

@@ -1,12 +1,12 @@
-import { ref as a, watch as u, computed as p, unref as i } from "vue";
-import { useToken as m } from "@aplus-frontend/antdv/es/theme/internal";
+import { useToken as a } from "@aplus-frontend/antdv/es/theme/internal";
+import { ref as u, watch as p, computed as i, unref as m } from "vue";
 import "../../config-provider/index.mjs";
 import { renderWithColumns as l } from "../utils/renderer.mjs";
 import { useNamespace as s } from "../../config-provider/hooks/use-namespace.mjs";
 import { useGlobalConfig as f } from "../../config-provider/hooks/use-global-config.mjs";
 const h = (e) => {
-  const [, o] = m(), { be: t } = s("ap-grid"), n = f("valueTypeMap"), r = a(Date.now());
-  return u(
+  const [, o] = a(), { be: t } = s("ap-grid"), n = f("valueTypeMap"), r = u(Date.now());
+  return p(
     () => e.value,
     () => {
       r.value = Date.now();
@@ -15,11 +15,11 @@ const h = (e) => {
       deep: !0
     }
   ), {
-    renderConfig: p(() => l(
+    renderConfig: i(() => l(
       e.value,
       o.value.colorTextTertiary,
       t("table-header", "title"),
-      i(n)
+      m(n)
     )),
     updateSignal: r
   };

package/es/src/ap-grid/hooks/use-row-selection.mjs

@@ -1,5 +1,5 @@
-import { ref as F, computed as w, unref as l } from "vue";
-import { isFunction as v, cloneDeep as M } from "lodash-unified";
+import { isFunction as v, cloneDeep as w } from "lodash-unified";
+import { ref as F, computed as M, unref as l } from "vue";
 function T(o, a) {
   return !a?.length || v(o) ? [] : a.map((i) => ({ [o]: i }));
 }
@@ -10,7 +10,7 @@ const m = (o) => {
   function i(e, t) {
     a.value = t;
   }
-  const u = (e) => v(o.rowKey) ? o.rowKey(e) : e[o.rowKey], s = w(() => {
+  const u = (e) => v(o.rowKey) ? o.rowKey(e) : e[o.rowKey], s = M(() => {
     const e = /* @__PURE__ */ new Map();
     return l(a).forEach((t) => {
       e.set(u(t), t);
@@ -69,7 +69,7 @@ const m = (o) => {
     }), a.value = [...c.values()];
   }
   function b(e, t) {
-    const n = M(l(s));
+    const n = w(l(s));
     e ? S(n, t) : l(o.dataSource).forEach((c) => {
       f(c) && n.delete(u(c));
     }), a.value = [...n.values()];
@@ -79,7 +79,7 @@ const m = (o) => {
     return c && !r;
   }
   function A(e, t) {
-    const n = M(l(s));
+    const n = w(l(s));
     l(o.dataSource).forEach((c) => {
       e.find((d) => u(d) === u(c)) ? n.set(u(c), c) : n.delete(u(c));
     }), S(n, t), a.value = [...n.values()];
@@ -116,7 +116,7 @@ const m = (o) => {
     selectedRows: a,
     selectMulti: x,
     unSelectMulti: R,
-    rowSelection: w(() => ({
+    rowSelection: M(() => ({
       ...o,
       onChange: i,
       selectedRowKeys: l(a).map((e) => u(e))

package/es/src/ap-grid/index.d.ts

@@ -1,6 +1,6 @@
-import { default as ApGrid } from './index.vue';
-import { default as EditableGrid } from './editable/index.vue';
 import { default as EditableGridFormItem } from './editable/form-item.vue';
+import { default as EditableGrid } from './editable/index.vue';
+import { default as ApGrid } from './index.vue';
 export { ApGrid, EditableGrid, EditableGridFormItem };
 export * from './interface';
 export * from './editable/interface';

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

@@ -1,6 +1,6 @@
-import "./index.vue2.mjs";
-import "./editable/index.vue2.mjs";
 import "./editable/form-item.vue2.mjs";
+import "./editable/index.vue2.mjs";
+import "./index.vue2.mjs";
 import "./interface.mjs";
 import "./editable/interface.mjs";
 import { ROW_SELECTION_FIELD as E } from "./constants.mjs";

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

@@ -1,26 +1,26 @@
 import { defineComponent as Qe, useSlots as Ye, getCurrentInstance as Ze, ref as y, computed as n, unref as t, toRef as et, nextTick as ae, watch as E, createElementBlock as I, openBlock as s, normalizeStyle as K, normalizeClass as m, createCommentVNode as w, createElementVNode as S, createVNode as L, mergeProps as R, createSlots as V, withCtx as c, Fragment as re, renderList as O, createBlock as d, resolveDynamicComponent as B, renderSlot as D, normalizeProps as tt, guardReactiveProps as ot } from "vue";
-import { VxeUI as ne, VxeTable as at, VxeColumn as le } from "vxe-table";
+import { Spin as at, Empty as ne, Pagination as rt } from "@aplus-frontend/antdv";
+import { useToken as nt } from "@aplus-frontend/antdv/es/theme/internal";
+import { isUndefined as b, isFunction as $, isArray as lt, omit as st } from "lodash-unified";
+import { VxeUI as le, VxeTable as it, VxeColumn as se } from "vxe-table";
 import "vxe-table/es/style.css";
-import { isUndefined as b, isFunction as $, isArray as rt, omit as nt } from "lodash-unified";
-import { ApForm as lt } from "../ap-form/index.mjs";
-import "../config-provider/index.mjs";
-import { noRenderAsFormItemValueList as st } from "../ap-table/constants.mjs";
-import { getColumnOrder as se, updateFormProps as it, getFieldProps as dt, getSearchFormItemRenderNode as ut, recursionApColumns as ie } from "../ap-table/utils.mjs";
+import { noRenderAsFormItemValueList as dt } from "../ap-table/constants.mjs";
+import { useProvideApTable as ut } from "../ap-table/context.mjs";
 import { useTablePaging as ct } from "../ap-table/hooks/use-table-paging-ng.mjs";
-import { Spin as pt, Empty as de, Pagination as ft } from "@aplus-frontend/antdv";
-import { useInnerParams as mt } from "./hooks/use-inner-params.mjs";
-import { toVxeProps as gt, getRowExpandProps as ht, getRowSelectionProps as Ct } from "./utils/table.mjs";
-import vt from "./hooks/use-row-selection.mjs";
-import { useProvideApTable as yt } from "../ap-table/context.mjs";
-import { DEFAULT_ROW_SELECTION_CONFIG as ue, sizeReverseMap as wt, sizeMap as St, ROW_SELECTION_FIELD as Rt } from "./constants.mjs";
-import { useRenderColumns as bt } from "./hooks/use-render-columns.mjs";
-import { useToken as xt } from "@aplus-frontend/antdv/es/theme/internal";
+import { getColumnOrder as ie, updateFormProps as pt, getFieldProps as ft, getSearchFormItemRenderNode as mt, recursionApColumns as de } from "../ap-table/utils.mjs";
+import "../config-provider/index.mjs";
 import "../scroll-bar/index.mjs";
 import "../utils/index.mjs";
-import { getValidVNodeList as kt } from "../utils/slot.mjs";
-import { useTableStyle as Ft } from "./hooks/use-table-style.mjs";
-import { useDevWarning as Et } from "../utils/warning.mjs";
-import It from "./style/index.mjs";
+import { getValidVNodeList as gt } from "../utils/slot.mjs";
+import { useDevWarning as ht } from "../utils/warning.mjs";
+import { ApForm as Ct } from "../ap-form/index.mjs";
+import { DEFAULT_ROW_SELECTION_CONFIG as ue, sizeReverseMap as vt, sizeMap as yt, ROW_SELECTION_FIELD as wt } from "./constants.mjs";
+import { useInnerParams as St } from "./hooks/use-inner-params.mjs";
+import { useRenderColumns as Rt } from "./hooks/use-render-columns.mjs";
+import bt from "./hooks/use-row-selection.mjs";
+import { useTableStyle as xt } from "./hooks/use-table-style.mjs";
+import kt from "./style/index.mjs";
+import { toVxeProps as Ft, getRowExpandProps as Et, getRowSelectionProps as It } from "./utils/table.mjs";
 import { useNamespace as Bt } from "../config-provider/hooks/use-namespace.mjs";
 import { useGlobalConfig as ce } from "../config-provider/hooks/use-global-config.mjs";
 import { useLocale as Tt } from "../config-provider/hooks/use-locale.mjs";
@@ -121,16 +121,16 @@ const io = /* @__PURE__ */ Qe({
   },
   setup(pe, { expose: fe }) {
     const T = Ye(), o = pe, x = Ze()?.appContext.app;
-    x && !x.__VXE_PC_UI_INSTALLED__ && (x.use(ne), x.__VXE_PC_UI_INSTALLED__ = !0), Et("ApGrid")(
+    x && !x.__VXE_PC_UI_INSTALLED__ && (x.use(le), x.__VXE_PC_UI_INSTALLED__ = !0), ht("ApGrid")(
       !1,
       "breaking",
       "AgGrid has been EOL, Please use AgGrid(https://aplus.aplnk.com/aplus-ui/components/ag-grid/) instead."
     );
-    const { e: k, b: u, be: me } = Bt("ap-grid"), ge = It("ap-grid"), he = ce("valueTypeMap"), Ce = ce("apGrid"), i = y([]), W = y([]), l = y(), F = y(o.size), ve = Ft(), [, ye] = xt(), { t: we } = Tt(), N = y(!0);
-    ne.setConfig({
+    const { e: k, b: u, be: me } = Bt("ap-grid"), ge = kt("ap-grid"), he = ce("valueTypeMap"), Ce = ce("apGrid"), i = y([]), W = y([]), l = y(), F = y(o.size), ve = xt(), [, ye] = nt(), { t: we } = Tt(), N = y(!0);
+    le.setConfig({
       i18n: (e, a) => we(`ap.${e}`, a)
     });
-    const { renderConfig: Se, updateSignal: Re } = bt(i);
+    const { renderConfig: Se, updateSignal: Re } = Rt(i);
     let G = 0;
     const C = n(() => {
       let e = o.rowSelection || Ce.value?.rowSelection;
@@ -145,14 +145,14 @@ const io = /* @__PURE__ */ Qe({
           ".vxe-table--header-inner-wrapper"
         );
     }), M = n(() => (G++, o.columns?.filter(
-      (e) => !e.hideInSearch && e.dataIndex && (e.valueType || e.customRenderFormItem) && !st.includes(e.valueType)
+      (e) => !e.hideInSearch && e.dataIndex && (e.valueType || e.customRenderFormItem) && !dt.includes(e.valueType)
     )?.sort((e, a) => {
-      let r = se(e.order);
-      return se(a.order) - r;
+      let r = ie(e.order);
+      return ie(a.order) - r;
     })?.map((e) => {
-      const a = it(
+      const a = pt(
         e,
-        dt(e.fieldProps, {})
+        ft(e.fieldProps, {})
       ), r = {
         ...e,
         fieldProps: {
@@ -165,20 +165,20 @@ const io = /* @__PURE__ */ Qe({
         },
         renderNode: void 0
       };
-      return r.renderNode = ut(
+      return r.renderNode = mt(
         r,
         t(he)
       ), r;
-    }) || [])), xe = n(() => Nt(o.manual) ? o.manual : kt(T.searchFormExtra?.() || []).some((a) => a.type?.name === "ApView")), ke = n(() => [
+    }) || [])), xe = n(() => Nt(o.manual) ? o.manual : gt(T.searchFormExtra?.() || []).some((a) => a.type?.name === "ApView")), ke = n(() => [
       u(),
       o.card ? null : u("wrapper"),
       o.adaptive ? u("adaptive") : null,
       o.sticky ? u("sticky") : null,
       ge.value
-    ].filter(Boolean)), j = n(() => ie(t(i), (e) => {
+    ].filter(Boolean)), j = n(() => de(t(i), (e) => {
       if (e.sorter === !0)
         return e.key || e.dataIndex;
-    }).filter(Boolean)), H = n(() => ie(t(i), (e) => {
+    }).filter(Boolean)), H = n(() => de(t(i), (e) => {
       if (e.filters && !e.onFilter)
         return e.key || e.dataIndex;
     }).filter(Boolean)), {
@@ -218,16 +218,16 @@ const io = /* @__PURE__ */ Qe({
       pagination: o.pagination,
       onClickReset: Me,
       onAfterRequest: je
-    }), { sortChangeEvent: Te, filterChangeEvent: Ne, paginationChangeEvent: Pe } = mt(Ee);
-    yt({
+    }), { sortChangeEvent: Te, filterChangeEvent: Ne, paginationChangeEvent: Pe } = St(Ee);
+    ut({
       columns: n(() => i.value),
       columnsBackup: n(() => W.value),
-      size: n(() => St[F.value]),
+      size: n(() => yt[F.value]),
       updateColumns(e) {
         i.value = e, o.onShownColumnsChange?.(e);
       },
       updateSize(e) {
-        F.value = wt[e];
+        F.value = vt[e];
       },
       renderConfig: n(() => ({
         className: me("table-header", "title"),
@@ -252,7 +252,7 @@ const io = /* @__PURE__ */ Qe({
       () => b(o.loading) ? p.loading : o.loading
     ), _e = n(
       () => b(o.dataSource) ? p.records : o.dataSource
-    ), { selectedRows: z, rowSelection: h, ...v } = vt({
+    ), { selectedRows: z, rowSelection: h, ...v } = bt({
       ...C.value,
       dataSource: _e,
       rowKey: o.rowKey
@@ -349,7 +349,7 @@ const io = /* @__PURE__ */ Qe({
       const r = l.value;
       if (!r)
         return;
-      const f = rt(e) ? e : [e], Xe = (r.getData() || []).filter(
+      const f = lt(e) ? e : [e], Xe = (r.getData() || []).filter(
         (Je) => f.includes(qe(Je))
       );
       r.setRowExpand(Xe, a);
@@ -411,7 +411,7 @@ const io = /* @__PURE__ */ Qe({
         class: m(e.card ? t(k)("search-wrapper") : null),
         style: K(e.searchFormWrapperStyle)
       }, [
-        L(t(lt).SearchForm, R(e.searchForm || {}, {
+        L(t(Ct).SearchForm, R(e.searchForm || {}, {
           ref_key: "formRef",
           ref: g,
           "custom-reset": "",
@@ -452,7 +452,7 @@ const io = /* @__PURE__ */ Qe({
         S("div", {
           class: m(t(u)("vxe-wrapper"))
         }, [
-          (s(), d(t(at), R(t(gt)(o, C.value), {
+          (s(), d(t(it), R(t(Ft)(o, C.value), {
             ref_key: "tableRef",
             ref: l,
             key: t(Re),
@@ -476,19 +476,19 @@ const io = /* @__PURE__ */ Qe({
             onCurrentRowChange: De
           }), V({
             empty: c(() => [
-              L(t(de), {
-                image: t(de).PRESENTED_IMAGE_SIMPLE
+              L(t(ne), {
+                image: t(ne).PRESENTED_IMAGE_SIMPLE
               }, null, 8, ["image"])
             ]),
             loading: c(() => [
               S("div", {
                 class: m(t(k)("table-loading-wrapper"))
               }, [
-                L(t(pt))
+                L(t(at))
               ], 2)
             ]),
             default: c(() => [
-              o.expandable && i.value.length ? (s(), d(t(le), R({ key: 0 }, t(ht)(e.expandable), { fixed: Ae.value }), V({
+              o.expandable && i.value.length ? (s(), d(t(se), R({ key: 0 }, t(Et)(e.expandable), { fixed: Ae.value }), V({
                 content: c((r) => [
                   (s(), d(B(o.expandable.renderContent(r))))
                 ]),
@@ -507,12 +507,12 @@ const io = /* @__PURE__ */ Qe({
                   key: "0"
                 } : void 0
               ]), 1040, ["fixed"])) : w("", !0),
-              C.value && i.value.length ? (s(), d(t(le), R(
+              C.value && i.value.length ? (s(), d(t(se), R(
                 { key: 1 },
-                t(Ct)(t(h), i.value, o.size),
+                t(It)(t(h), i.value, o.size),
                 {
                   resizable: !1,
-                  field: t(Rt)
+                  field: t(wt)
                 }
               ), null, 16, ["field"])) : w("", !0),
               (s(!0), I(re, null, O(t(Se), (r) => (s(), d(B(r), {
@@ -521,7 +521,7 @@ const io = /* @__PURE__ */ Qe({
             ]),
             _: 2
           }, [
-            O(t(nt)(T, ["searchFormExtra"]), (r, f) => ({
+            O(t(st)(T, ["searchFormExtra"]), (r, f) => ({
               name: f,
               fn: c((oe) => [
                 D(e.$slots, f, tt(ot(oe || {})))
@@ -540,7 +540,7 @@ const io = /* @__PURE__ */ Qe({
             "bar-color": "var(--scrollbar-thumb-color-base)",
             "track-color": "var(--table-header-bg, #f2f6f9)"
           }, null, 8, ["scroll-container"])) : w("", !0),
-          e.pagination !== !1 ? (s(), d(t(ft), R({
+          e.pagination !== !1 ? (s(), d(t(rt), R({
             key: 1,
             class: t(u)("pagination")
           }, t(U).pagination, { onChange: t(Pe) }), null, 16, ["class", "onChange"])) : w("", !0)

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

@@ -1,11 +1,11 @@
-import { ApFormSearchFormPopoverSorterItem, ApFormSearchFormProps } from '../ap-form/interface';
-import { ApTablePaginationConfig, ApTableValueFields, ApTableValueTypes, CommonFieldReturnType, ExtraProColumnType, FieldPropsType, RequestData, ValueEnum } from '../ap-table/interface';
-import { Recordable } from '../type';
 import { TableProps } from '@aplus-frontend/antdv';
 import { ColumnFilterItem, SortOrder, TableRowSelection } from '@aplus-frontend/antdv/es/table/interface';
 import { ComputedRef, CSSProperties, VNode } from 'vue';
 import { VxeTablePropTypes, VxeColumnPropTypes, VxeTableProps, VxeTableDefines, VxeColumnSlots, VxeColumnProps } from 'vxe-table';
+import { ApFormSearchFormPopoverSorterItem, ApFormSearchFormProps } from '../ap-form/interface';
 import { InternalPagingType } from '../ap-table/hooks/use-table-paging-ng';
+import { ApTablePaginationConfig, ApTableValueFields, ApTableValueTypes, CommonFieldReturnType, ExtraProColumnType, FieldPropsType, RequestData, ValueEnum } from '../ap-table/interface';
+import { Recordable } from '../type';
 export type ColConfigType = VxeTableDefines.ColumnOptions;
 export type ApGridColumnType<RecordType = any, ExtraValueType = 'text', ValueType extends ApTableValueTypes = ApTableValueTypes, MergedValueType extends ExtraValueType | ValueType = ExtraValueType | ValueType> = MergedValueType extends ExtraValueType | ValueType ? Omit<ExtraProColumnType<RecordType>, 'sorter' | 'rowSpan' | 'customCell' | 'customHeaderCell' | 'minWidth' | 'className' | 'class'> & {
     children?: ApGridColumnType<RecordType, ExtraValueType, ValueType>[];

package/es/src/ap-grid/utils/col.d.ts

@@ -1,6 +1,6 @@
 import { DataIndex } from '@aplus-frontend/antdv/es/vc-table/interface';
-import { ApGridColumnType, ColConfigType } from '../interface';
 import { ValueTypeRenderConfig } from '../../config-provider';
+import { ApGridColumnType, ColConfigType } from '../interface';
 export declare function getValueByDataIndex(row: any, dataIndex?: DataIndex): any;
 export declare function dataIndexToField(dataIndex: DataIndex): string | undefined;
 export declare function transformFixed(fixed: ApGridColumnType['fixed']): "left" | "right" | undefined;

package/es/src/ap-grid/utils/col.mjs

@@ -1,8 +1,8 @@
 import { createVNode as u, Fragment as T } from "vue";
 import { isArray as x, isUndefined as E, isString as o, isBoolean as F, isNumber as O, pick as R } from "lodash-unified";
-import { valueEnumToArray as S, objectToString as $, getTableTitle as v, getTableRenderType as V, getTableRenderProps as B, getTableCellRenderNode as M } from "../../ap-table/utils.mjs";
-import { noRenderAsFormItemValueList as _ } from "../../ap-table/constants.mjs";
 import "../../ap-table/components/paragraph-ellipsis/index.vue.mjs";
+import { noRenderAsFormItemValueList as S } from "../../ap-table/constants.mjs";
+import { valueEnumToArray as $, objectToString as V, getTableTitle as v, getTableRenderType as B, getTableRenderProps as M, getTableCellRenderNode as _ } from "../../ap-table/utils.mjs";
 import j from "../../ap-table/components/paragraph-ellipsis/index.vue2.mjs";
 function c(e, t) {
   if (t)
@@ -29,7 +29,7 @@ function q(e) {
 }
 function I(e) {
   let t;
-  return F(e.filters) && e.valueEnum ? t = S(e.valueEnum) : t = e.filters, t?.map((r) => ({
+  return F(e.filters) && e.valueEnum ? t = $(e.valueEnum) : t = e.filters, t?.map((r) => ({
     label: o(r.text) ? r.text : "",
     value: r.value
   }));
@@ -52,10 +52,10 @@ function k(e, t) {
   } : !1;
 }
 function z(e, t, r) {
-  if (_.includes(e.valueType))
+  if (S.includes(e.valueType))
     return r;
   if (e.copyable || e.ellipsis) {
-    const n = k(e.ellipsis, t), i = $(t);
+    const n = k(e.ellipsis, t), i = V(t);
     return u(j, {
       rawValue: i,
       copyable: e.copyable,
@@ -79,13 +79,13 @@ const G = ({
   value: e,
   ...t
 }, r, n, i = !0) => {
-  const s = V(r), d = B({
+  const s = B(r), d = M({
     ...r,
     valueType: s
   }, {
     value: e,
     ...t
-  }), l = M(s, d, t.record, n), a = r.renderText?.({
+  }), l = _(s, d, t.record, n), a = r.renderText?.({
     value: e,
     ...t
   }) || e, p = r.renderText ? u(T, null, [r.renderText?.({

package/es/src/ap-grid/utils/editable.d.ts

@@ -1,4 +1,4 @@
+import { EditableAgGridColumnType } from '../../ag-grid/editable/interface';
 import { ValueTypeRenderConfig } from '../../config-provider';
 import { EditableGridColumnType } from '../editable/interface';
-import { EditableAgGridColumnType } from '../../ag-grid/editable/interface';
 export declare function getFinalEditableNode(column: EditableGridColumnType | EditableAgGridColumnType, innerProps: Record<string, any>, record: any, extraRenderMap?: Record<string, ValueTypeRenderConfig>): import("vue/jsx-runtime").JSX.Element | null;

package/es/src/ap-grid/utils/editable.mjs

@@ -1,6 +1,6 @@
 import { isVNode as u, createVNode as i } from "vue";
-import "../../ap-form/index.mjs";
 import { omit as c } from "lodash-unified";
+import "../../ap-form/index.mjs";
 import { getEditableComponent as a } from "../../editable-table/utils.mjs";
 import d from "../../ap-form/item/index.vue.mjs";
 function m(e) {