@aplus-frontend/ui 7.10.0 → 7.10.1

package/es/index.mjs

@@ -76,7 +76,7 @@ import { ApBatchAction as mr } from "./src/business/ap-batch-action/index.mjs";
 import { ApBatchActionGroup as xr } from "./src/business/ap-batch-action-group/index.mjs";
 import { ApButtonGroup as sr } from "./src/business/ap-button-group/index.mjs";
 import { ApCard as Ar } from "./src/business/ap-card/index.mjs";
-import { ApExpandAlert as nr } from "./src/business/ap-expand-alert/index.mjs";
+import { default as nr } from "./src/business/ap-expand-alert/ApExpandAlert.vue.mjs";
 import { ApExportGroupActionType as Fr } from "./src/business/ap-export-group/interface.mjs";
 import { ApExportGroup as Ir } from "./src/business/ap-export-group/index.mjs";
 import { handleExportDownload as Tr } from "./src/business/ap-export-group/handleExportDownload.mjs";

package/es/src/ag-grid/components/header-cell/index.vue2.mjs

@@ -1,9 +1,9 @@
 import { defineComponent as B, computed as d, createElementBlock as f, openBlock as l, normalizeClass as r, unref as e, createBlock as _, createCommentVNode as D, resolveDynamicComponent as O, createVNode as g } from "vue";
-import { useToken as V } from "@aplus-frontend/antdv/es/theme/internal";
-import { CaretUpOutlined as j, CaretDownOutlined as z } from "@ant-design/icons-vue";
-import { getTableTitle as A } from "../../../ap-table/utils.mjs";
+import { CaretUpOutlined as V, CaretDownOutlined as j } from "@ant-design/icons-vue";
+import { useToken as z } from "@aplus-frontend/antdv/es/theme/internal";
+import { useInjectSorter as A } from "../../context.mjs";
+import { getTableTitle as E } from "../../../ap-table/utils.mjs";
 import "../../../config-provider/index.mjs";
-import { useInjectSorter as E } from "../../context.mjs";
 import U from "../../style/custom-header.mjs";
 import { useNamespace as C } from "../../../config-provider/hooks/use-namespace.mjs";
 const P = /* @__PURE__ */ B({
@@ -12,7 +12,7 @@ const P = /* @__PURE__ */ B({
     params: {}
   },
   setup(S) {
-    const o = S, { b: v, e: a } = C("ag-custom-header"), { be: b, bem: h } = C("ag-grid"), k = U("ag-custom-header"), [, I] = V(), { sorter: c, setSorter: T } = E(), n = d(() => o.params.column.sorter);
+    const o = S, { b: v, e: a } = C("ag-custom-header"), { be: b, bem: h } = C("ag-grid"), k = U("ag-custom-header"), [, I] = z(), { sorter: c, setSorter: T } = A(), n = d(() => o.params.column.sorter);
     function y(t) {
       return t ? t === "asc" ? "desc" : null : "asc";
     }
@@ -38,7 +38,7 @@ const P = /* @__PURE__ */ B({
       onClick: x
     }, [
       (l(), _(O(
-        e(A)(
+        e(E)(
           t.params.column,
           [
             e(b)("table-header", "title"),
@@ -52,10 +52,10 @@ const P = /* @__PURE__ */ B({
         key: 0,
         class: r(e(a)("sort-wrapper"))
       }, [
-        g(e(j), {
+        g(e(V), {
           class: r({ [e(a)("sorter-up")]: !0, active: e(c)[m.value] === "asc" })
         }, null, 8, ["class"]),
-        g(e(z), {
+        g(e(j), {
           class: r({ [e(a)("sorter-down")]: !0, active: e(c)[m.value] === "desc" })
         }, null, 8, ["class"])
       ], 2)) : D("", !0)

package/es/src/ag-grid/editable/form-item.vue.d.ts

@@ -1,5 +1,5 @@
-import { EditableAgGridFormItemExpose, EditableAgGridFormItemProps } from './interface';
 import { Recordable } from '../../type';
+import { EditableAgGridFormItemExpose, EditableAgGridFormItemProps } 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<{} & VNodeProps & AllowedComponentProps & ComponentCustomProps, never>, never> & EditableAgGridFormItemProps<RecordType> & Partial<{}>> & PublicProps;

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

@@ -1,16 +1,16 @@
 import { defineComponent as A, useSlots as L, ref as y, onMounted as O, watch as P, createElementBlock as G, openBlock as W, Fragment as U, createVNode as u, unref as l, withCtx as g, mergeProps as $, createSlots as q, renderList as J, renderSlot as Q, normalizeProps as X, guardReactiveProps as Y } from "vue";
-import { ApForm as h } from "../../ap-form/index.mjs";
 import { cloneDeep as m, isEqual as Z, omit as ee } from "lodash-unified";
+import { ApForm as h } from "../../ap-form/index.mjs";
+import { useInjectForm as oe } from "../../ap-form/context.mjs";
+import { useWatch as ae } from "../../ap-form/hooks/use-watch.mjs";
+import { getModelValue as te } from "../../ap-form/utils/get.mjs";
 import "../../config-provider/index.mjs";
-import { useGetEditableColumns as oe } from "../hooks/use-editable-columns.mjs";
+import { useGetEditableColumns as le } from "../hooks/use-editable-columns.mjs";
+import { useEditableFormItemApi as ne } from "../hooks/use-editable-form-item-api.mjs";
 import "../index.vue2.mjs";
-import { useEditableFormItemApi as ae } from "../hooks/use-editable-form-item-api.mjs";
-import { useInjectForm as te } from "../../ap-form/context.mjs";
-import { getModelValue as le } from "../../ap-form/utils/get.mjs";
-import { getShadowName as ne } from "../utils.mjs";
-import { useWatch as re } from "../../ap-form/hooks/use-watch.mjs";
+import re from "../style/editable.mjs";
+import { getShadowName as ie } from "../utils.mjs";
 import { arrayToObject as b } from "./utils.mjs";
-import ie from "../style/editable.mjs";
 import { useNamespace as se } from "../../config-provider/hooks/use-namespace.mjs";
 import { useGlobalConfig as me } from "../../config-provider/hooks/use-global-config.mjs";
 import de from "../index.vue.mjs";
@@ -135,22 +135,22 @@ const Ee = /* @__PURE__ */ A({
   }) {
     const v = L(), o = C, {
       b: B
-    } = se("editable-aggrid"), x = ie("editable-aggrid"), i = y(), {
+    } = se("editable-aggrid"), x = re("editable-aggrid"), i = y(), {
       internalInstance: n
-    } = te(), s = ne(o.name);
+    } = oe(), s = ie(o.name);
     let p = [];
     O(() => {
-      const e = o.formItem?.initialValue ?? le(n?.getInitialValues() ?? {}, o.name);
+      const e = o.formItem?.initialValue ?? te(n?.getInitialValues() ?? {}, o.name);
       e && (n?.updateInitialModel(s, b(m(e), o.rowKey)), p = m(e), _(m(e), "suffix", !0));
     });
-    const r = y([]), I = re(o.name);
+    const r = y([]), I = ae(o.name);
     P(() => I.value, (e) => {
       Z(e, r.value) || c(e ?? m(p));
     }, {
       deep: !0,
       flush: "post"
     });
-    const S = me("valueTypeMap"), E = oe(o, S, s), {
+    const S = me("valueTypeMap"), E = le(o, S, s), {
       add: F,
       addMultiple: T,
       __addMultiple: _,
@@ -161,7 +161,7 @@ const Ee = /* @__PURE__ */ A({
       setRowData: k,
       clear: H,
       refreshRowIds: d
-    } = ae(o, n, r, s);
+    } = ne(o, n, r, s);
     function K() {
       const e = i.value?._internalGridApi;
       if (!d.value?.length || !e)

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

@@ -1,5 +1,5 @@
-import { EditableAgGridExpose, EditableAgGridProps } from './interface';
 import { Recordable } from '../../type';
+import { EditableAgGridExpose, EditableAgGridProps } 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/ag-grid/editable/index.vue.mjs

@@ -1,13 +1,13 @@
 import { defineComponent as G, useSlots as U, ref as y, watch as W, unref as n, createBlock as M, openBlock as $, withCtx as d, createVNode as w, mergeProps as q, createSlots as J, renderList as Q, renderSlot as X, normalizeProps as Y, guardReactiveProps as Z } from "vue";
-import { ApForm as u } from "../../ap-form/index.mjs";
 import { isEqual as ee, isArray as g, omit as oe } from "lodash-unified";
+import { ApForm as u } from "../../ap-form/index.mjs";
 import "../../config-provider/index.mjs";
 import "../../hooks/index.mjs";
-import { useGetEditableColumns as ae } from "../hooks/use-editable-columns.mjs";
+import { useEditableApi as ae } from "../hooks/use-editable-api.mjs";
+import { useGetEditableColumns as te } from "../hooks/use-editable-columns.mjs";
 import "../index.vue2.mjs";
-import { useEditableApi as te } from "../hooks/use-editable-api.mjs";
-import { arrayToObject as p } from "./utils.mjs";
 import ne from "../style/editable.mjs";
+import { arrayToObject as p } from "./utils.mjs";
 import { useNamespace as le } from "../../config-provider/hooks/use-namespace.mjs";
 import { useControllableValue as re } from "../../hooks/useControllableValue.mjs";
 import { useGlobalConfig as se } from "../../config-provider/hooks/use-global-config.mjs";
@@ -147,7 +147,7 @@ const xe = /* @__PURE__ */ G({
     }, {
       deep: !0
     });
-    const T = se("valueTypeMap"), _ = ae(o, T), {
+    const T = se("valueTypeMap"), _ = te(o, T), {
       add: F,
       addMultiple: E,
       remove: N,
@@ -157,7 +157,7 @@ const xe = /* @__PURE__ */ G({
       setRowData: k,
       clear: D,
       refreshRowIds: i
-    } = te(o, l, r, m);
+    } = ae(o, l, r, m);
     function K() {
       const e = s.value?._internalGridApi;
       if (!i.value?.length || !e)

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

@@ -1,11 +1,11 @@
-import { Recordable } from '../../type';
-import { ApTableValueFields, ApTableValueTypes, CommonFieldReturnType, FieldPropsType } from '../../ap-table/interface';
-import { AgGridColumnType, AgGridProps } 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 { AgGridColumnType, AgGridProps } from '../interface';
 export type EditableAgGridColumnType<RecordType = any, ExtraValueType = 'text', ValueType extends ApTableValueTypes = ApTableValueTypes, MergedValueType extends ExtraValueType | ValueType = ExtraValueType | ValueType> = MergedValueType extends ExtraValueType | ValueType ? Omit<AgGridColumnType<RecordType, ExtraValueType, ValueType>, 'children' | 'customRender' | 'hideInSearch' | 'customRenderFormItem' | 'fieldProps'> & {
     children?: EditableAgGridColumnType<RecordType, ExtraValueType, ValueType>[];
     /**

package/es/src/ag-grid/hooks/use-columns-def.d.ts

@@ -1,6 +1,6 @@
 import { CellClassFunc, ColDef, ColGroupDef } from 'ag-grid-community';
-import { AgGridColumnType, AgGridProps } from '../interface';
 import { Ref, ComputedRef } from 'vue';
+import { AgGridColumnType, AgGridProps } from '../interface';
 /**
  * 维护AgGrid列配置
  * @param shownColumns

package/es/src/ag-grid/hooks/use-columns-def.mjs

@@ -1,13 +1,13 @@
-import { getTableRenderProps as c, objectToString as S } from "../../ap-table/utils.mjs";
-import { rendererMap as x } from "../renderer/index.mjs";
-import { isNumber as u, isFunction as m } from "lodash-unified";
-import { ref as D, unref as v, computed as y } from "vue";
+import { isNumber as u, isFunction as c } from "lodash-unified";
+import { ref as S, unref as v, computed as y } from "vue";
+import { dataIndexToField as D } from "../../ap-grid/utils/col.mjs";
+import { getTableRenderProps as m, objectToString as P } from "../../ap-table/utils.mjs";
+import "../../config-provider/index.mjs";
+import "../../utils/index.mjs";
 import "../components/body-cell/index.vue.mjs";
 import "../components/header-cell/index.vue.mjs";
 import "../components/tooltip/index.vue.mjs";
-import "../../config-provider/index.mjs";
-import { dataIndexToField as P } from "../../ap-grid/utils/col.mjs";
-import "../../utils/index.mjs";
+import { rendererMap as x } from "../renderer/index.mjs";
 import { useGlobalConfig as I } from "../../config-provider/hooks/use-global-config.mjs";
 import { useNamespace as _ } from "../../config-provider/hooks/use-namespace.mjs";
 import G from "../components/body-cell/index.vue2.mjs";
@@ -19,7 +19,7 @@ function F(t) {
 }
 function M(t, i) {
   if (i.bodyCellTooltip)
-    return m(i.bodyCellTooltip) ? i.bodyCellTooltip(t.value, t.data) : i.bodyCellTooltip;
+    return c(i.bodyCellTooltip) ? i.bodyCellTooltip(t.value, t.data) : i.bodyCellTooltip;
   if (i.renderText)
     return i.renderText({
       value: t.value,
@@ -29,7 +29,7 @@ function M(t, i) {
     });
   const d = i.valueType || "text", p = x[d];
   if (p) {
-    const f = c(
+    const f = m(
       { ...i, valueType: d },
       {
         value: t.value,
@@ -42,10 +42,10 @@ function M(t, i) {
     );
     return p(f);
   }
-  return S(t.value);
+  return P(t.value);
 }
 const Y = (t, i, d) => {
-  const p = I("valueTypeMap"), C = D(), { em: f } = _("ag-grid"), b = (r) => {
+  const p = I("valueTypeMap"), C = S(), { em: f } = _("ag-grid"), b = (r) => {
     const a = {
       cellRenderer: G,
       cellRendererParams: {
@@ -68,7 +68,7 @@ const Y = (t, i, d) => {
     const l = r.valueType || "text", e = x[l];
     return e ? {
       valueFormatter: (o) => {
-        const s = c(
+        const s = m(
           { ...r, valueType: l },
           {
             value: o.value,
@@ -95,7 +95,7 @@ const Y = (t, i, d) => {
     function a(l) {
       return l.map((e) => {
         const o = {
-          field: P(e.dataIndex),
+          field: D(e.dataIndex),
           colId: z(e.key) ? String(e.key) : void 0,
           sortable: !!e.sorter,
           comparator: e.sorter === !0 ? () => 0 : e.sorter,
@@ -113,7 +113,7 @@ const Y = (t, i, d) => {
           colSpan: e.colSpan,
           spanRows: e.spanRows,
           cellClass: d((s) => {
-            const n = e.cellClass || "", T = m(n) ? n(s.data, s.node) : n;
+            const n = e.cellClass || "", T = c(n) ? n(s.data, s.node) : n;
             return [
               `${f("cell", e.align || "left")}`,
               F(e.ellipsis) ? f("cell", "multiline") : null,

package/es/src/ag-grid/hooks/use-editable-api.d.ts

@@ -1,7 +1,7 @@
+import { Key } from '@aplus-frontend/antdv/es/_util/type';
 import { Ref, ShallowRef } from 'vue';
 import { ApFormInternalInstance, ApFormExpose } from '../../ap-form';
 import { EditableAgGridProps } from '../editable/interface';
-import { Key } from '@aplus-frontend/antdv/es/_util/type';
 export declare const useEditableApi: <RecordType>(props: EditableAgGridProps<RecordType>, formApi: Ref<ApFormExpose | undefined> | ApFormInternalInstance | undefined, tableData: Ref<RecordType[]>, updateTableData?: (newData: RecordType[]) => void) => {
     add: (defaultValue?: Partial<RecordType>, insertIndex?: number) => void;
     addMultiple: (list: number | Partial<RecordType>[], insetIn?: "prefix" | "suffix") => void;

package/es/src/ag-grid/hooks/use-editable-api.mjs

@@ -1,6 +1,6 @@
-import { shallowRef as _, computed as S, unref as d, isRef as z } from "vue";
+import { isFunction as h, isUndefined as _, isNumber as K, cloneDeep as S, isArray as x, isString as z } from "lodash-unified";
+import { shallowRef as A, computed as E, unref as d, isRef as N } from "vue";
 import "../../utils/index.mjs";
-import { isFunction as h, isUndefined as A, isNumber as K, cloneDeep as E, isArray as x, isString as N } from "lodash-unified";
 import { arrayToObject as U } from "../editable/utils.mjs";
 import { isDef as I } from "../../utils/is.mjs";
 let $ = 0;
@@ -8,7 +8,7 @@ function R() {
   return `_ag_grid${$++}`;
 }
 const P = (n, m, i, g) => {
-  const w = _([]), y = S(() => z(m) ? d(m) : m);
+  const w = A([]), y = E(() => N(m) ? d(m) : m);
   function F(u, r) {
     const l = d(i)?.length || 0;
     if (I(n.maxLength) && l >= n.maxLength || !u && h(n.rowKey))
@@ -26,7 +26,7 @@ const P = (n, m, i, g) => {
           i.value = [f];
           return;
         }
-        A(r) ? i.value.push(f) : (w.value = i.value.map(
+        _(r) ? i.value.push(f) : (w.value = i.value.map(
           (t, v) => v < r ? null : c(t, v, n.rowKey)
         ).filter(Boolean), i.value.splice(r, 0, f));
       }
@@ -36,7 +36,7 @@ const P = (n, m, i, g) => {
     const l = d(i)?.length || 0, f = K(u) ? u : u.length;
     if (I(n.maxLength) && l + f > n.maxLength || K(u) && h(n.rowKey))
       return;
-    const o = K(u) ? new Array(u).fill(0).map(() => ({ [n.rowKey]: R() })) : E(u), s = U(o, n.rowKey);
+    const o = K(u) ? new Array(u).fill(0).map(() => ({ [n.rowKey]: R() })) : S(u), s = U(o, n.rowKey);
     y.value?.setFieldValue?.(
       n.name,
       o,
@@ -76,7 +76,7 @@ const P = (n, m, i, g) => {
   }
   function c(u, r, l) {
     if (l)
-      return N(l) ? u[l] : l(u, r);
+      return z(l) ? u[l] : l(u, r);
   }
   function L(u) {
     const r = new Set(x(u) ? u : [u]);

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

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

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

@@ -1,8 +1,9 @@
-import { unref as k, computed as w } from "vue";
-import { isArray as m, isFunction as E } from "lodash-unified";
-import { mergeClass as F, getColumnIsRequired as v } from "../../editable-table/utils.mjs";
+import { clsx as k } from "clsx";
+import { isArray as g, isFunction as w } from "lodash-unified";
+import { unref as E, computed as F } from "vue";
+import { getFinalEditableNode as v } from "../../ap-grid/utils/editable.mjs";
 import { updateFormProps as y, getFieldProps as q } from "../../ap-table/utils.mjs";
-import { getFinalEditableNode as A } from "../../ap-grid/utils/editable.mjs";
+import { getColumnIsRequired as A } from "../../editable-table/utils.mjs";
 import "../../utils/index.mjs";
 import { getRowKey as K } from "../editable/utils.mjs";
 import { isDef as M } from "../../utils/is.mjs";
@@ -12,52 +13,52 @@ function b(t, n, i) {
 function S(t, n, i) {
   t.__prevEditable ? t.__prevEditable[n] = i : t.__prevEditable = { [n]: i };
 }
-const L = (t, n, i) => {
+const O = (t, n, i) => {
   function I(e) {
-    const s = e.editable, o = i ? [i] : m(t.name) ? t.name : [t.name];
+    const s = e.editable, o = i ? [i] : g(t.name) ? t.name : [t.name];
     return !s || e.children?.length ? {
       _path: [...o]
     } : {
-      customRender({ value: d, originalNode: C, params: a, ...r }) {
-        const c = E(e.editable) ? e.editable(
+      customRender({ value: d, originalNode: R, params: a, ...r }) {
+        const c = w(e.editable) ? e.editable(
           r.text,
           r.record,
           r.rowIndex
         ) : !!e.editable;
-        let u = C;
-        const R = m(e.dataIndex) ? e.dataIndex : [e.dataIndex], x = K(
+        let u = R;
+        const p = g(e.dataIndex) ? e.dataIndex : [e.dataIndex], _ = K(
           r.record,
           r.rowIndex,
           t.rowKey
         );
         if (c) {
-          const _ = y(
+          const x = y(
             e,
             q(e.fieldProps, {
               value: d,
               ...r
             })
           ), h = {};
-          t.onFieldChange && (h[`onUpdate:${_.valuePropName || "value"}`] = (N) => t.onFieldChange?.(
+          t.onFieldChange && (h[`onUpdate:${x.valuePropName || "value"}`] = (N) => t.onFieldChange?.(
             r.rowIndex,
             e.dataIndex,
             N
           ));
-          const p = {
-            name: [...o, String(x), ...R],
-            ..._ || {},
+          const C = {
+            name: [...o, String(_), ...p],
+            ...x || {},
             field: {
               style: "width: 100%",
-              ..._?.field || {},
+              ...x?.field || {},
               ...h,
-              class: F("is-editable", _.class)
+              class: k("is-editable", x.class)
             }
           };
-          u = A(
+          u = v(
             e,
-            p,
+            C,
             r.record,
-            k(n)
+            E(n)
           );
         }
         e.customRender && (u = e.customRender({
@@ -67,10 +68,10 @@ const L = (t, n, i) => {
           originalNode: u,
           index: r.rowIndex,
           renderIndex: r.rowIndex,
-          path: [...o, String(x)]
+          path: [...o, String(_)]
         }));
-        const l = a.node, f = a.column.getColId(), g = l.__prevEditable?.[f];
-        return !l.__skipNextRefresh?.[f] && M(g) && g !== c && (b(l, f, !0), setTimeout(() => {
+        const l = a.node, f = a.column.getColId(), m = l.__prevEditable?.[f];
+        return !l.__skipNextRefresh?.[f] && M(m) && m !== c && (b(l, f, !0), setTimeout(() => {
           a?.api.refreshCells({
             rowNodes: [a.node],
             columns: [a.column.getColId()],
@@ -81,14 +82,14 @@ const L = (t, n, i) => {
       _path: [...o]
     };
   }
-  return w(() => {
+  return F(() => {
     const e = t.columns;
     if (!e)
       return [];
     function s(o) {
       return o.map((d) => ({
         ...d,
-        _requireMark: v(d),
+        _requireMark: A(d),
         children: s(d.children || []),
         // 处理可编辑/不可编辑下的单元格渲染
         ...I(d)
@@ -98,6 +99,6 @@ const L = (t, n, i) => {
   });
 };
 export {
-  L as default,
-  L as useGetEditableColumns
+  O as default,
+  O as useGetEditableColumns
 };

package/es/src/ag-grid/hooks/use-editable-form-item-api.d.ts

@@ -1,7 +1,7 @@
+import { Key } from '@aplus-frontend/antdv/es/_util/type';
 import { Ref, ShallowRef } from 'vue';
 import { ApFormInternalInstance } from '../../ap-form';
 import { EditableAgGridProps } from '../editable/interface';
-import { Key } from '@aplus-frontend/antdv/es/_util/type';
 export declare const useEditableFormItemApi: <RecordType>(props: EditableAgGridProps<RecordType>, formApi: ApFormInternalInstance | undefined, tableData: Ref<RecordType[]>, shadowName: string) => {
     add: (defaultValue?: Partial<RecordType>, insertIndex?: number) => void;
     addMultiple: (list: number | Partial<RecordType>[], insetIn?: "prefix" | "suffix") => void;

package/es/src/ag-grid/hooks/use-editable-form-item-api.mjs

@@ -1,6 +1,6 @@
-import { shallowRef as U, unref as h } from "vue";
+import { isFunction as V, isUndefined as R, isNumber as F, cloneDeep as U, isArray as I } from "lodash-unified";
+import { shallowRef as $, unref as h } from "vue";
 import "../../utils/index.mjs";
-import { isFunction as V, isUndefined as R, isNumber as F, cloneDeep as $, isArray as I } from "lodash-unified";
 import { getRowKey as y, arrayToObject as q } from "../editable/utils.mjs";
 import { isDef as j } from "../../utils/is.mjs";
 let C = 0;
@@ -8,7 +8,7 @@ function k() {
   return `_ag_grid${C++}`;
 }
 const W = (l, c, n, w) => {
-  const d = U([]);
+  const d = $([]);
   function L(i, t) {
     const v = h(n)?.length || 0;
     if (j(l.maxLength) && v >= l.maxLength || !i && V(l.rowKey))
@@ -45,7 +45,7 @@ const W = (l, c, n, w) => {
     const f = h(n)?.length || 0, o = F(i) ? i : i.length;
     if (j(l.maxLength) && f + o > l.maxLength || F(i) && V(l.rowKey))
       return;
-    const s = F(i) ? new Array(i).fill(0).map(() => ({ [l.rowKey]: k() })) : $(i), e = q(s, l.rowKey);
+    const s = F(i) ? new Array(i).fill(0).map(() => ({ [l.rowKey]: k() })) : U(i), e = q(s, l.rowKey);
     c?.setFieldValue(
       w,
       e,

package/es/src/ag-grid/hooks/use-pinned-row.d.ts

@@ -1,6 +1,6 @@
+import { CellClassFunc, GridOptions } from 'ag-grid-community';
 import { Ref, ComputedRef } from 'vue';
 import { AgGridProps } from '../interface';
-import { CellClassFunc, GridOptions } from 'ag-grid-community';
 export declare const usePinnedRow: (summary: Ref<AgGridProps["summary"]>) => {
     getRowPinnedCellClass: (prevCellClass: CellClassFunc) => CellClassFunc;
     rowPinnedGridConfig: ComputedRef<GridOptions<any>>;

package/es/src/ag-grid/hooks/use-pinned-row.mjs

@@ -1,5 +1,5 @@
-import { computed as s } from "vue";
 import { isFunction as l } from "lodash-unified";
+import { computed as s } from "vue";
 const P = (r) => {
   const d = s(() => {
     const o = r.value;

package/es/src/ag-grid/hooks/use-row-selection.d.ts

@@ -1,8 +1,8 @@
 import { Ref } from 'vue';
 import { ApTableProps } from '../../ap-table';
+import { Key } from '../../ap-table/components/interface';
 import { Recordable } from '../../type';
 import { AgGridRowSelection } from '../interface';
-import { Key } from '../../ap-table/components/interface';
 export interface RowSelectionReturnType<RecordType = any> {
     selectedRows: Ref<Partial<RecordType>[]>;
     selectedRowKeys: Ref<Key[]>;

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

@@ -1,5 +1,5 @@
-import { ref as E, computed as M, unref as o } from "vue";
 import { isFunction as d } from "lodash-unified";
+import { ref as E, computed as M, unref as o } from "vue";
 function I(n) {
   const { rowKey: a, defaultSelectedRowKeys: c, defaultSelectedRows: u } = n;
   return a ? c?.length ? d(a) ? [] : i(c, n.type).map(

package/es/src/ag-grid/hooks/use-search-form.d.ts

@@ -1,3 +1,3 @@
-import { AgGridProps } from '../interface';
 import { Ref } from 'vue';
+import { AgGridProps } from '../interface';
 export declare const useSearchForm: <RecordType>(props: AgGridProps<RecordType>) => Ref<any[]>;

package/es/src/ag-grid/hooks/use-search-form.mjs

@@ -1,13 +1,13 @@
-import { noRenderAsFormItemValueList as s } from "../../ap-table/constants.mjs";
-import { computed as p, unref as l } from "vue";
+import { computed as s, unref as p } from "vue";
+import { noRenderAsFormItemValueList as l } from "../../ap-table/constants.mjs";
 import { getColumnOrder as t, updateFormProps as u, getFieldProps as i, getSearchFormItemRenderNode as m } from "../../ap-table/utils.mjs";
 import "../../config-provider/index.mjs";
 import { useGlobalConfig as f } from "../../config-provider/hooks/use-global-config.mjs";
 const P = (a) => {
   let d = 0;
   const n = f("valueTypeMap");
-  return p(() => (d++, a.columns?.filter(
-    (e) => !e.hideInSearch && (e.field ?? e.dataIndex ?? e.key) && (e.valueType || e.customRenderFormItem) && !s.includes(e.valueType)
+  return s(() => (d++, a.columns?.filter(
+    (e) => !e.hideInSearch && (e.field ?? e.dataIndex ?? e.key) && (e.valueType || e.customRenderFormItem) && !l.includes(e.valueType)
   )?.sort((e, o) => {
     const r = t(e.order);
     return t(o.order) - r;
@@ -29,7 +29,7 @@ const P = (a) => {
     };
     return r.renderNode = m(
       r,
-      l(n)
+      p(n)
     ), r;
   }) || []));
 };

package/es/src/ag-grid/hooks/use-selection-col-def.d.ts

@@ -1,5 +1,5 @@
+import { SelectionColumnDef } from 'ag-grid-community';
 import { Ref, ComputedRef } from 'vue';
 import { AgGridColumnType, AgGridProps } from '../interface';
-import { SelectionColumnDef } from 'ag-grid-community';
 declare const useRowSelectionColumnDef: <RecordType>(props: AgGridProps<RecordType>, shownColumns: Ref<AgGridColumnType<RecordType>[]>) => ComputedRef<SelectionColumnDef | undefined>;
 export default useRowSelectionColumnDef;

package/es/src/ag-grid/hooks/use-selection-col-def.mjs

@@ -1,12 +1,12 @@
-import { computed as s } from "vue";
-import { isFunction as m } from "lodash-unified";
+import { isFunction as s } from "lodash-unified";
+import { computed as m } from "vue";
 import "../../ap-grid/index.mjs";
 import { pxToNumber as a } from "../utils.mjs";
 import { ROW_SELECTION_FIELD as d } from "../../ap-grid/constants.mjs";
 function p(t) {
   return t?.bottom?.length || t?.top?.length;
 }
-const v = (t, c) => s(() => {
+const v = (t, c) => m(() => {
   if (!t.rowSelection)
     return;
   const o = t.rowSelection === !0 ? {} : t.rowSelection, i = {
@@ -32,7 +32,7 @@ const v = (t, c) => s(() => {
       rowIndex: u
     }) => {
       if (!(!r.rowPinned || !e))
-        return m(e) ? e(n, f, r.rowPinned, u) : e;
+        return s(e) ? e(n, f, r.rowPinned, u) : e;
     }, i.cellRenderer = ({ data: r }) => r?.[d];
   }
   return i;

package/es/src/ag-grid/hooks/use-virtual-config.d.ts

@@ -1,5 +1,5 @@
+import { GridOptions } from 'ag-grid-community';
 import { Ref, ComputedRef } from 'vue';
 import { AgGridProps } from '../interface';
-import { GridOptions } from 'ag-grid-community';
 declare const useVirtualConfig: (config: Ref<AgGridProps["virtual"]>) => ComputedRef<GridOptions<any>>;
 export default useVirtualConfig;

package/es/src/ag-grid/hooks/use-virtual-config.mjs

@@ -1,16 +1,16 @@
-import { computed as e, unref as i } from "vue";
-import { merge as n } from "lodash-unified";
+import { merge as e } from "lodash-unified";
+import { computed as i, unref as n } from "vue";
 const a = {
   row: !0,
   col: !0
-}, f = (o) => e(() => {
-  const r = i(o);
+}, f = (o) => i(() => {
+  const r = n(o);
   if (r === !1)
     return {
       suppressRowVirtualisation: !0,
       suppressColumnVirtualisation: !0
     };
-  const { row: t, col: s, rowBuffer: u } = n(
+  const { row: t, col: s, rowBuffer: u } = e(
     a,
     r || {}
   );