@aplus-frontend/ui 6.28.4 → 6.29.1

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

@@ -1,25 +1,25 @@
 import { noRenderAsFormItemValueList as s } from "../../ap-table/constants.mjs";
 import { computed as p, unref as l } from "vue";
-import { getColumnOrder as d, updateFormProps as m, getFieldProps as u, getSearchFormItemRenderNode as i } from "../../ap-table/utils.mjs";
+import { getColumnOrder as d, updateFormProps as u, getFieldProps as m, getSearchFormItemRenderNode as i } from "../../ap-table/utils.mjs";
 import "../../config-provider/index.mjs";
 import { useGlobalConfig as c } from "../../config-provider/hooks/use-global-config.mjs";
-const h = (n) => {
+const P = (n) => {
   let t = 0;
   const a = c("valueTypeMap");
   return p(() => (t++, n.columns?.filter(
-    (e) => !e.hideInSearch && e.dataIndex && (e.valueType || e.customRenderFormItem) && !s.includes(e.valueType)
+    (e) => !e.hideInSearch && (e.dataIndex || e.key) && (e.valueType || e.customRenderFormItem) && !s.includes(e.valueType)
   )?.sort((e, o) => {
     const r = d(e.order);
     return d(o.order) - r;
   })?.map((e) => {
-    const o = m(
+    const o = u(
       e,
-      u(e.fieldProps, {})
+      m(e.fieldProps, {})
     ), r = {
       ...e,
       fieldProps: {
         label: e.title,
-        name: e.dataIndex,
+        name: e.dataIndex || e.key,
         // tips: 在表格中的查询表单项默认是带边框的
         bordered: !0,
         ...o || {},
@@ -34,5 +34,5 @@ const h = (n) => {
   }) || []));
 };
 export {
-  h as useSearchForm
+  P as useSearchForm
 };

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

@@ -1,35 +1,36 @@
-import { computed as m } from "vue";
+import { computed as u } from "vue";
 import { isFunction as s } from "lodash-unified";
 import "../../ap-grid/index.mjs";
-import { ROW_SELECTION_FIELD as a } from "../../ap-grid/constants.mjs";
-function d(e) {
+import { pxToNumber as a } from "../utils.mjs";
+import { ROW_SELECTION_FIELD as d } from "../../ap-grid/constants.mjs";
+function w(e) {
   return e?.bottom?.length || e?.top?.length;
 }
-const C = (e, l) => m(() => {
+const D = (e, l) => u(() => {
   if (!e.rowSelection)
     return;
-  const i = e.rowSelection === !0 ? {} : e.rowSelection, o = {
+  const n = e.rowSelection === !0 ? {} : e.rowSelection, o = {
     sortable: !1,
     resizable: !1,
-    width: i.columnWidth || 60
+    width: a(n.columnWidth, 60)
   };
-  let n = i.fixed;
-  if (n === void 0 && (n = l.value.some(
+  let i = n.fixed;
+  if (i === void 0 && (i = l.value.some(
     (t) => t.fixed === "left" || t.fixed === !0
-  ) ? "left" : void 0), o.pinned = n, d(e.summary)) {
+  ) ? "left" : void 0), o.pinned = i, w(e.summary)) {
     const { cellClassName: t } = e.summary;
     o.cellClass = ({
       node: r,
       data: f,
       colDef: c,
-      rowIndex: u
+      rowIndex: m
     }) => {
       if (!(!r.rowPinned || !t))
-        return s(t) ? t(f, c, r.rowPinned, u) : t;
-    }, o.cellRenderer = ({ data: r }) => r?.[a];
+        return s(t) ? t(f, c, r.rowPinned, m) : t;
+    }, o.cellRenderer = ({ data: r }) => r?.[d];
   }
   return o;
 });
 export {
-  C as default
+  D as default
 };

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

@@ -1,31 +1,31 @@
-import { defineComponent as Je, useSlots as Qe, ref as F, toRef as k, unref as t, computed as l, nextTick as Xe, watch as P, createElementBlock as z, openBlock as v, normalizeStyle as E, normalizeClass as m, createCommentVNode as oe, createElementVNode as R, createVNode as V, mergeProps as A, createSlots as Ye, withCtx as te, Fragment as Ze, renderList as _e, createBlock as re, resolveDynamicComponent as eo, renderSlot as ae, withDirectives as oo, vShow as to } from "vue";
-import { AgGridVue as ro } from "ag-grid-vue3";
-import { ModuleRegistry as ao, AllCommunityModule as no } from "ag-grid-community";
-import { mergeProps as lo } from "./utils.mjs";
-import { Spin as so, Pagination as io } from "@aplus-frontend/antdv";
+import { defineComponent as Xe, useSlots as Ye, ref as F, toRef as k, unref as t, computed as l, nextTick as Ze, watch as P, createElementBlock as z, openBlock as v, normalizeStyle as E, normalizeClass as m, createCommentVNode as oe, createElementVNode as R, createVNode as V, mergeProps as A, createSlots as _e, withCtx as te, Fragment as eo, renderList as oo, createBlock as re, resolveDynamicComponent as to, renderSlot as ae, withDirectives as ro, vShow as ao } from "vue";
+import { AgGridVue as no } from "ag-grid-vue3";
+import { ModuleRegistry as lo, AllCommunityModule as so } from "ag-grid-community";
+import { mergeProps as io } from "./utils.mjs";
+import { Spin as co, Pagination as uo } from "@aplus-frontend/antdv";
 import { isUndefined as b, isFunction as ne } from "lodash-unified";
 import "../config-provider/index.mjs";
-import { ApForm as co } from "../ap-form/index.mjs";
-import { recursionApColumns as uo } from "../ap-table/utils.mjs";
-import { useTablePaging as mo } from "../ap-table/hooks/use-table-paging-ng.mjs";
-import po from "./hooks/use-row-selection.mjs";
-import { useProvideSorter as fo } from "./context.mjs";
-import { useProvideApTable as go } from "../ap-table/context.mjs";
-import { sizeReverseMap as So, sizeMap as wo } from "../ap-grid/constants.mjs";
-import { useToken as yo } from "@aplus-frontend/antdv/es/theme/internal";
-import { useTheme as ho } from "./theme.mjs";
-import { useColumns as Co } from "./hooks/use-columns.mjs";
-import { useColumnsDef as vo } from "./hooks/use-columns-def.mjs";
-import { isDef as Ro } from "../utils/index.mjs";
-import { getValidVNodeList as bo } from "../utils/slot.mjs";
-import { useSearchForm as Bo } from "./hooks/use-search-form.mjs";
+import { ApForm as mo } from "../ap-form/index.mjs";
+import { recursionApColumns as po } from "../ap-table/utils.mjs";
+import { useTablePaging as fo } from "../ap-table/hooks/use-table-paging-ng.mjs";
+import wo from "./hooks/use-row-selection.mjs";
+import { useProvideSorter as go } from "./context.mjs";
+import { useProvideApTable as So } from "../ap-table/context.mjs";
+import { sizeReverseMap as yo, sizeMap as ho } from "../ap-grid/constants.mjs";
+import { useToken as Co } from "@aplus-frontend/antdv/es/theme/internal";
+import { useTheme as vo } from "./theme.mjs";
+import { useColumns as Ro } from "./hooks/use-columns.mjs";
+import { useColumnsDef as bo } from "./hooks/use-columns-def.mjs";
+import { isDef as Bo } from "../utils/index.mjs";
+import { getValidVNodeList as Fo } from "../utils/slot.mjs";
+import { useSearchForm as ko } from "./hooks/use-search-form.mjs";
 import "./components/empty/index.vue.mjs";
-import Fo from "./hooks/use-virtual-config.mjs";
-import { usePinnedRow as ko } from "./hooks/use-pinned-row.mjs";
-import xo from "./hooks/use-selection-col-def.mjs";
-import { useNamespace as Io } from "../config-provider/hooks/use-namespace.mjs";
-import To from "./components/empty/index.vue2.mjs";
-const rt = /* @__PURE__ */ Je({
+import xo from "./hooks/use-virtual-config.mjs";
+import { usePinnedRow as Io } from "./hooks/use-pinned-row.mjs";
+import To from "./hooks/use-selection-col-def.mjs";
+import { useNamespace as No } from "../config-provider/hooks/use-namespace.mjs";
+import Do from "./components/empty/index.vue2.mjs";
+const nt = /* @__PURE__ */ Xe({
   name: "AgGrid",
   __name: "index",
   props: {
@@ -93,54 +93,55 @@ const rt = /* @__PURE__ */ Je({
     virtual: { type: [Boolean, Object], default: void 0 },
     onRowClicked: {},
     onScrollEnd: {},
-    rowClassName: {}
+    rowClassName: {},
+    rowClassRules: {}
   },
   setup(le, { expose: se }) {
-    ao.registerModules([no]);
-    const o = le, M = Qe(), { e: B, b: d, be: ie } = Io("ag-grid"), y = F(o.size), de = ho(y, k(o, "rowHeight")), ce = Fo(k(o, "virtual")), { rowPinnedGridConfig: O, getRowPinnedCellClass: ue } = ko(
+    lo.registerModules([so]);
+    const o = le, M = Ye(), { e: B, b: d, be: ie } = No("ag-grid"), y = F(o.size), ce = vo(y, k(o, "rowHeight")), de = xo(k(o, "virtual")), { rowPinnedGridConfig: O, getRowPinnedCellClass: ue } = Io(
       k(o, "summary")
-    ), c = F(), [, me] = yo();
+    ), c = F(), [, me] = Co();
     let p = !!o.dataSource;
-    const W = Bo(o), { shownColumns: f, columns: j, columnKeys: pe } = Co(o), { defaultColDef: fe, columnDefs: ge } = vo(
+    const W = ko(o), { shownColumns: f, columns: j, columnKeys: pe } = Ro(o), { defaultColDef: fe, columnDefs: we } = bo(
       j,
       o,
       ue
     ), x = F({});
-    fo({
+    go({
       sorter: x,
       setSorter(e) {
         x.value = e;
       }
     });
-    const Se = {
+    const ge = {
       asc: "ascend",
       desc: "descend"
     };
-    function we() {
-      const e = c.value.getColumns()?.filter((s) => s.getSort() !== void 0), r = t(x) || {};
+    function Se() {
+      const e = c.value.getColumns()?.filter((i) => i.getSort() !== void 0), r = t(x) || {};
       let a = e?.[0];
       const u = Object.keys(r);
-      if (u.length && u.every((s) => r[s] === null)) {
-        const s = Object.keys(r)[0];
-        s && (a = c.value?.getColumn(s));
+      if (u.length && u.every((i) => r[i] === null)) {
+        const i = Object.keys(r)[0];
+        i && (a = c.value?.getColumn(i));
       }
       if (!a)
         return;
-      const i = a.getColDef(), w = a.getSort();
+      const s = a.getColDef(), S = a.getSort();
       G(void 0, void 0, {
-        column: i,
-        field: i.field,
-        order: w ? Se[w] : null
+        column: s,
+        field: s.field || s.colId,
+        order: S ? ge[S] : null
       });
     }
-    const ye = l(() => uo(t(f), (e) => {
+    const ye = l(() => po(t(f), (e) => {
       if (e.sorter === !0)
         return e.key || e.dataIndex;
-    }).filter(Boolean)), he = l(() => Ro(o.manual) ? o.manual : bo(M.searchFormExtra?.() || []).some((r) => r.type?.name === "ApView")), {
-      formRef: g,
+    }).filter(Boolean)), he = l(() => Bo(o.manual) ? o.manual : Fo(M.searchFormExtra?.() || []).some((r) => r.type?.name === "ApView")), {
+      formRef: w,
       submit: I,
       reset: T,
-      data: S,
+      data: g,
       tableProps: L,
       handleTableChangeOptional: G,
       submitWith: H,
@@ -148,7 +149,7 @@ const rt = /* @__PURE__ */ Je({
       getPaging: Ce,
       setPaging: ve,
       setDataSource: Re
-    } = mo({
+    } = fo({
       async request(e) {
         if (p = !1, !Fe.value && b(o.dataSource) && K(), !b(o.dataSource)) {
           const a = e.pageSize * (e.current - 1);
@@ -171,8 +172,8 @@ const rt = /* @__PURE__ */ Je({
       formatParams: o.beforeSearchSubmit,
       pagination: o.pagination,
       sortFields: ye
-    }), be = xo(o, f), Be = l(
-      () => b(o.dataSource) ? S.records : o.dataSource
+    }), be = To(o, f), Be = l(
+      () => b(o.dataSource) ? g.records : o.dataSource
     ), Fe = l(() => {
       const e = o.rowSelection === !0 ? {} : o.rowSelection;
       return e ? e.preserveSelectedRowKeys !== !1 : !1;
@@ -183,7 +184,7 @@ const rt = /* @__PURE__ */ Je({
       selectedRowKeys: Ie,
       clearAll: Te,
       selectMultiByKeys: Ne
-    } = po({
+    } = wo({
       ...o.rowSelection === !0 ? {} : o.rowSelection,
       dataSource: Be,
       rowKey: o.rowKey
@@ -217,8 +218,8 @@ const rt = /* @__PURE__ */ Je({
       p = !1;
       const a = [];
       e.forEachNode((u) => {
-        const h = u.data, i = D(h);
-        r.find((w) => D(w) === i) && a.push(u);
+        const h = u.data, s = D(h);
+        r.find((S) => D(S) === s) && a.push(u);
       }), e.setNodesSelected({ nodes: a, newValue: !0 }), setTimeout(() => {
         p = !0;
       }, 0);
@@ -230,25 +231,25 @@ const rt = /* @__PURE__ */ Je({
       Te(), c.value?.deselectAll();
     };
     function Ee(e) {
-      Ne(e), Xe(() => {
+      Ne(e), Ze(() => {
         $({});
       });
     }
     function q(e = !1) {
       const r = e ? "getFieldsValueTransformed" : "getFieldsValue";
-      return g.value?.apForm?.[r]?.(!0);
+      return w.value?.apForm?.[r]?.(!0);
     }
     function J(e) {
-      g.value?.apForm?.setFieldsValue?.(e);
+      w.value?.apForm?.setFieldsValue?.(e);
     }
     function Q() {
-      return g.value?.getSorterItems() || [];
+      return w.value?.getSorterItems() || [];
     }
     function X(e) {
-      g.value?.setSorterItems(e);
+      w.value?.setSorterItems(e);
     }
     function Y() {
-      g.value?.resetSorterItems();
+      w.value?.resetSorterItems();
     }
     function Z(e) {
       return e && String(e);
@@ -264,37 +265,37 @@ const rt = /* @__PURE__ */ Je({
           ...n,
           hide: C
         }, ee = e.find(
-          (qe) => Z(qe.key) === n.colId
+          (Qe) => Z(Qe.key) === n.colId
         );
         return ee && (_.pinned = ee.fixed || null), _;
-      }), i = new Map(
+      }), s = new Map(
         e.map((n, C) => [Z(n.key), C])
-      ), w = h.filter((n) => i.has(n.colId)).sort(
-        (n, C) => i.get(n.colId) - i.get(C.colId)
-      ), s = [];
-      let $e = 0;
+      ), S = h.filter((n) => s.has(n.colId)).sort(
+        (n, C) => s.get(n.colId) - s.get(C.colId)
+      ), i = [];
+      let Je = 0;
       for (const n of h)
-        i.has(n.colId) ? s.push(w[$e++]) : s.push(n);
+        s.has(n.colId) ? i.push(S[Je++]) : i.push(n);
       r.applyColumnState({
-        state: s,
+        state: i,
         applyOrder: !0
       });
     }
-    go({
+    So({
       columns: l(() => f.value),
       columnsBackup: l(() => j.value),
-      size: l(() => wo[y.value]),
+      size: l(() => ho[y.value]),
       updateColumns(e) {
-        console.log("run reset", e), f.value = e, o.onShownColumnsChange?.(e), Ve(e);
+        f.value = e, o.onShownColumnsChange?.(e), Ve(e);
       },
       updateSize(e) {
-        y.value = So[e];
+        y.value = yo[e];
       },
       renderConfig: l(() => ({
         className: ie("table-header", "title"),
         color: me.value.colorTextTertiary
       })),
-      dataSource: l(() => t(S).records),
+      dataSource: l(() => t(g).records),
       getSearchFormValues: q,
       setSearchFormValues: J,
       submit: I,
@@ -306,7 +307,7 @@ const rt = /* @__PURE__ */ Je({
       resetSearchFormSorterItems: Y
     });
     const Ae = l(
-      () => b(o.loading) ? S.loading : o.loading
+      () => b(o.loading) ? g.loading : o.loading
     ), Me = l(() => [
       d(),
       o.card ? null : d("wrapper"),
@@ -331,7 +332,13 @@ const rt = /* @__PURE__ */ Je({
     function He(e) {
       o.onScrollEnd?.(e.direction);
     }
-    const Ue = (e) => {
+    function Ue(e) {
+      return c.value?.refreshCells(e);
+    }
+    function $e(e) {
+      return c.value?.redrawRows(e);
+    }
+    const qe = (e) => {
       const r = [
         O.value.getRowClass?.(e)
       ];
@@ -353,7 +360,7 @@ const rt = /* @__PURE__ */ Je({
         y.value = e;
       }
     ), P(
-      () => t(S).loading,
+      () => t(g).loading,
       (e) => {
         o.onLoadingChange?.(e);
       }
@@ -371,12 +378,14 @@ const rt = /* @__PURE__ */ Je({
         clearAll: K
       },
       scrollToRow: Le,
-      getDataSource: () => t(S.records),
+      getDataSource: () => t(g.records),
       getPaging: Ce,
       setPaging: ve,
       getSearchFormSorterItems: Q,
       setSearchFormSorterItems: X,
-      resetSearchFormSorterItems: Y
+      resetSearchFormSorterItems: Y,
+      refreshCells: Ue,
+      redrawRows: $e
     }), (e, r) => (v(), z("div", {
       class: m(Me.value),
       style: E(e.wrapperStyle)
@@ -386,16 +395,16 @@ const rt = /* @__PURE__ */ Je({
         class: m(e.card ? t(B)("search-wrapper") : null),
         style: E(e.searchFormWrapperStyle)
       }, [
-        V(t(co).SearchForm, A(e.searchForm || {}, {
+        V(t(mo).SearchForm, A(e.searchForm || {}, {
           ref_key: "formRef",
-          ref: g,
+          ref: w,
           "custom-reset": "",
           "submit-loading": t(L).loading,
           onSubmit: t(I),
           onReset: t(T)
-        }), Ye({
+        }), _e({
           default: te(() => [
-            (v(!0), z(Ze, null, _e(t(W), (a) => (v(), re(eo(a.renderNode), {
+            (v(!0), z(eo, null, oo(t(W), (a) => (v(), re(to(a.renderNode), {
               key: a.dataIndex
             }))), 128))
           ]),
@@ -427,41 +436,43 @@ const rt = /* @__PURE__ */ Je({
         R("div", {
           class: m(t(d)("grid-wrapper"))
         }, [
-          V(t(ro), A(t(lo)(t(ce), t(O)), {
-            "get-row-class": Ue,
+          V(t(no), A(t(io)(t(de), t(O)), {
+            "get-row-class": qe,
             style: Oe.value,
-            "row-data": t(S).records,
-            "column-defs": t(ge),
+            "row-data": t(g).records,
+            "column-defs": t(we),
             "default-col-def": t(fe),
             "suppress-loading-overlay": "",
             "row-selection": Ke.value,
             "selection-column-def": t(be),
             "get-row-id": je,
-            theme: t(de),
+            theme: t(ce),
             "tooltip-show-delay": 500,
             "enable-browser-tooltips": e.browserTooltips,
             "tooltip-interaction": "",
-            "no-rows-overlay-component": To,
-            onSortChanged: we,
+            "row-class-rules": e.rowClassRules,
+            "no-rows-overlay-component": Do,
+            "suppress-cell-focus": "",
+            onSortChanged: Se,
             onGridReady: r[0] || (r[0] = (a) => c.value = a.api),
             onRowDataUpdated: $,
             onRowSelected: Pe,
             onFirstDataRendered: ze,
             onRowClicked: Ge,
             onBodyScrollEnd: He
-          }), null, 16, ["style", "row-data", "column-defs", "default-col-def", "row-selection", "selection-column-def", "theme", "enable-browser-tooltips"]),
-          oo(R("div", {
+          }), null, 16, ["style", "row-data", "column-defs", "default-col-def", "row-selection", "selection-column-def", "theme", "enable-browser-tooltips", "row-class-rules"]),
+          ro(R("div", {
             class: m(t(B)("table-loading-wrapper"))
           }, [
-            V(t(so), { delay: 300 })
+            V(t(co), { delay: 300 })
           ], 2), [
-            [to, Ae.value]
+            [ao, Ae.value]
           ])
         ], 2),
         R("div", {
           class: m(t(d)("pagination-wrapper"))
         }, [
-          e.pagination !== !1 ? (v(), re(t(io), A({
+          e.pagination !== !1 ? (v(), re(t(uo), A({
             key: 0,
             class: t(d)("pagination")
           }, t(L).pagination, { onChange: We }), null, 16, ["class"])) : oe("", !0)
@@ -471,5 +482,5 @@ const rt = /* @__PURE__ */ Je({
   }
 });
 export {
-  rt as default
+  nt as default
 };

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

@@ -4,7 +4,7 @@ import { TableProps } from '@aplus-frontend/antdv';
 import { ApFormSearchFormPopoverSorterItem, ApFormSearchFormProps } from '../ap-form/interface';
 import { Recordable } from '../type';
 import { SortOrder, TableRowSelection } from '@aplus-frontend/antdv/es/table/interface';
-import { ColDef, IRowNode, RowPinnedType, ScrollDirection } from 'ag-grid-community';
+import { ColDef, IRowNode, RedrawRowsParams, RefreshCellsParams, RowClassRules, RowPinnedType, ScrollDirection } from 'ag-grid-community';
 import { InternalPagingType } from '../ap-table/hooks/use-table-paging-ng';
 export type AgGridColumnType<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' | 'width' | 'maxWidth' | 'className' | 'class' | 'colSpan'> & {
     children?: AgGridColumnType<RecordType, ExtraValueType, ValueType>[];
@@ -251,6 +251,10 @@ export type AgGridProps<RecordType = any, ParamsType = any> = Omit<TableProps<Re
      * @description 固定行自定义样式类请使用`summary.rowClassName`
      */
     rowClassName?: string | string[] | ((data: RecordType, rowIndex: number) => string | string[]);
+    /**
+     * 表格行自定义样式规则集
+     */
+    rowClassRules?: RowClassRules<RecordType>;
 };
 export type AgGridExpose<SearchParamsType = Recordable, RecordType = any> = {
     /**
@@ -344,4 +348,16 @@ export type AgGridExpose<SearchParamsType = Recordable, RecordType = any> = {
      * @returns
      */
     resetSearchFormSorterItems: () => void;
+    /**
+     * 刷新单元格
+     * @param params
+     * @returns
+     */
+    refreshCells: (params?: RefreshCellsParams<RecordType>) => void;
+    /**
+     * 重新绘制行
+     * @param params
+     * @returns
+     */
+    redrawRows: (params?: RedrawRowsParams<RecordType>) => void;
 };

package/es/src/ag-grid/utils.d.ts

@@ -1,2 +1,9 @@
 import { GridOptions } from 'ag-grid-community';
 export declare function mergeProps(...options: GridOptions[]): GridOptions<any>;
+/**
+ * 将尺寸单位px去掉
+ * @param value
+ * @param defaultValue
+ * @returns
+ */
+export declare function pxToNumber(value?: string | number, defaultValue?: number): number;

package/es/src/ag-grid/utils.mjs

@@ -1,6 +1,18 @@
-function o(...e) {
-  return e.reduce((r, n) => ({ ...r, ...n }), {});
+function e(...r) {
+  return r.reduce((n, t) => ({ ...n, ...t }), {});
+}
+function c(r, n = 0) {
+  if (!r)
+    return n;
+  if (typeof r == "number")
+    return r;
+  const t = r.match(/^(-?\d+(?:\.\d+)?)px$/);
+  if (!t)
+    return n;
+  const o = parseFloat(t[1]);
+  return o > 0 ? o : n;
 }
 export {
-  o as mergeProps
+  e as mergeProps,
+  c as pxToNumber
 };

package/es/src/business/ap-table-modal/interface.d.ts

@@ -26,6 +26,8 @@ export interface ApTableModalProps<TableRowType = any> extends Omit<ModalProps,
     tableLayoutConfig?: TableLayoutConfig;
     /** 渲染头部信息 */
     renderHeader?: () => VNodeChild;
+    /** 弹框ok事件回调 */
+    onOk?: (data: OpenReturnType<TableRowType>) => Promise<boolean> | void;
 }
 /** useCreateTableModal参数类型 */
 export interface UseCreateTableModalProps extends ApTableModalProps {

package/es/src/business/ap-table-modal/table-modal.vue2.mjs

@@ -1,4 +1,4 @@
-import { defineComponent as E, ref as d, unref as r, computed as G, h as H, createBlock as g, openBlock as w, mergeProps as m, withCtx as k, createCommentVNode as U, createVNode as R, resolveDynamicComponent as q } from "vue";
+import { defineComponent as E, ref as d, unref as r, computed as G, h as H, createBlock as w, openBlock as g, mergeProps as m, withCtx as k, createCommentVNode as U, createVNode as R, resolveDynamicComponent as q } from "vue";
 import { message as h, Modal as V } from "@aplus-frontend/antdv";
 import "../../config-provider/index.mjs";
 import { ApTable as $ } from "../../ap-table/index.mjs";
@@ -10,7 +10,7 @@ import "./table-layout/index.vue.mjs";
 import { useLocale as W } from "../../config-provider/hooks/use-locale.mjs";
 import J from "./modal-title.vue2.mjs";
 import Q from "./table-layout/index.vue2.mjs";
-const ie = /* @__PURE__ */ E({
+const ue = /* @__PURE__ */ E({
   __name: "table-modal",
   props: {
     columns: {},
@@ -24,6 +24,7 @@ const ie = /* @__PURE__ */ E({
     rowSelection: {},
     tableLayoutConfig: {},
     renderHeader: {},
+    onOk: {},
     prefixCls: {},
     confirmLoading: { type: Boolean, default: void 0 },
     title: {},
@@ -62,24 +63,24 @@ const ie = /* @__PURE__ */ E({
   },
   emits: ["finish"],
   setup(S, { expose: B, emit: P }) {
-    const e = S, M = P, s = d(!1), v = d({}), u = d(null), a = d([]), b = d();
-    let f = null, i = null;
-    const { t: x } = W(), K = async (t = [], o = {}) => {
-      switch (a.value = [...t], s.value = !0, v.value = o?.extraParams, b.value = o.apTableDataSources || e.apTableProps?.dataSource, o.refreshMode || "reset") {
+    const e = S, M = P, s = d(!1), v = d({}), i = d(null), a = d([]), C = d();
+    let f = null, u = null;
+    const { t: b } = W(), K = async (t = [], o = {}) => {
+      switch (a.value = [...t], s.value = !0, v.value = o?.extraParams, C.value = o.apTableDataSources || e.apTableProps?.dataSource, o.refreshMode || "reset") {
         case "reset":
-          u.value?.reset();
+          i.value?.reset();
           break;
         case "submit":
-          u.value?.submit();
+          i.value?.submit();
           break;
         case "none":
           break;
       }
       return new Promise((n, l) => {
-        f = n, i = l;
+        f = n, u = l;
       });
-    }, C = () => {
-      s.value = !1, f = null, i?.(y.ModalCancel), i = null;
+    }, x = () => {
+      s.value = !1, f = null, u?.(y.ModalCancel), u = null;
     }, _ = async (t) => {
       t = z({
         ...t,
@@ -90,20 +91,24 @@ const ie = /* @__PURE__ */ E({
         data: n,
         total: l
       };
-    }, I = () => {
+    }, I = async () => {
       if (a.value.length > e.maxCount) {
-        i?.(y.ExceedMaxCount);
+        u?.(y.ExceedMaxCount);
         return;
       }
       if (e.getRowKey) {
         const t = j(r(a)), o = t.map(e.getRowKey);
-        M("finish", o, t), f?.({ keys: o, rows: t });
+        if (M("finish", o, t), f?.({ keys: o, rows: t }), e.onOk && await e.onOk({
+          keys: o,
+          rows: t
+        }) === !1)
+          return;
       } else {
-        i?.(y.NotFineGetRowKey);
+        u?.(y.NotFineGetRowKey);
         return;
       }
       s.value = !1;
-    }, D = G(() => {
+    }, O = G(() => {
       if (!e.getRowKey) return;
       const t = e.getRowKey;
       return {
@@ -114,15 +119,15 @@ const ie = /* @__PURE__ */ E({
         onSelectAll(o, n) {
           if (n.length > e.maxCount) {
             h.warning(
-              x("ap.apTableModal.messageMaxCount", {
+              b("ap.apTableModal.messageMaxCount", {
                 maxCount: e.maxCount
               })
             );
             return;
           }
-          const l = u.value?.dataSource;
+          const l = i.value?.dataSource;
           if (o) {
-            const c = r(l).filter((p) => !a.value.some((O) => t(O) === t(p)));
+            const c = r(l).filter((p) => !a.value.some((F) => t(F) === t(p)));
             a.value = a.value.concat(c);
           } else
             a.value = a.value?.filter((c) => !l.some((p) => t(p) === t(c)));
@@ -131,7 +136,7 @@ const ie = /* @__PURE__ */ E({
           if (n) {
             if (a.value.length >= e.maxCount) {
               h.warning(
-                x("ap.apTableModal.messageMaxCount", {
+                b("ap.apTableModal.messageMaxCount", {
                   maxCount: e.maxCount
                 })
               );
@@ -151,7 +156,7 @@ const ie = /* @__PURE__ */ E({
         }),
         ...e.rowSelection || {}
       };
-    }), L = () => e.isRenderModalTitleSuffix ? H(
+    }), D = () => e.isRenderModalTitleSuffix ? H(
       J,
       {
         title: e.title,
@@ -161,9 +166,9 @@ const ie = /* @__PURE__ */ E({
       {
         default: e.renderModalTitleSuffix ?? void 0
       }
-    ) : e.title, N = () => u.value, A = () => {
+    ) : e.title, L = () => i.value, N = () => {
       a.value = [];
-    }, F = (t) => {
+    }, A = (t) => {
       const o = e.getRowKey;
       if (!o) return;
       const n = a.value.findIndex(
@@ -173,9 +178,9 @@ const ie = /* @__PURE__ */ E({
     };
     return B({
       open: K,
-      close: C,
-      getApTableInstance: N
-    }), (t, o) => (w(), g(r(V), m(
+      close: x,
+      getApTableInstance: L
+    }), (t, o) => (g(), w(r(V), m(
       {
         open: s.value,
         "onUpdate:open": o[0] || (o[0] = (n) => s.value = n)
@@ -195,30 +200,30 @@ const ie = /* @__PURE__ */ E({
         "tableLayoutConfig"
       ]),
       {
-        title: L(),
+        title: D(),
         centered: e.centered ?? !0,
         onOk: I,
-        onCancel: C
+        onCancel: x
       }
     ), {
       default: k(() => [
-        e.renderHeader ? (w(), g(q(e.renderHeader), { key: 0 })) : U("", !0),
+        e.renderHeader ? (g(), w(q(e.renderHeader), { key: 0 })) : U("", !0),
         R(Q, m(e.tableLayoutConfig || {}, {
           "selected-list": a.value,
-          onClear: A,
-          onDeleteItem: F
+          onClear: N,
+          onDeleteItem: A
         }), {
           default: k(() => [
             R(r($), m({
               ref_key: "apTableRef",
-              ref: u,
+              ref: i,
               scroll: { y: 450 },
               style: { padding: "0px" },
               columns: t.columns,
               request: _,
               "row-key": t.getRowKey,
-              "row-selection": D.value,
-              "data-source": b.value,
+              "row-selection": O.value,
+              "data-source": C.value,
               "search-form": {
                 sortable: !1,
                 countPerRow: 2
@@ -233,5 +238,5 @@ const ie = /* @__PURE__ */ E({
   }
 });
 export {
-  ie as default
+  ue as default
 };

package/es/src/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "6.28.4";
+declare const _default: "6.29.1";
 export default _default;

package/es/src/version.mjs

@@ -1,4 +1,4 @@
-const e = "6.28.4";
+const e = "6.29.1";
 export {
   e as default
 };

package/lib/src/ag-grid/hooks/use-search-form.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("../../ap-table/constants.js"),n=require("vue"),o=require("../../ap-table/utils.js");require("../../config-provider/index.js");const l=require("../../config-provider/hooks/use-global-config.js"),c=s=>{let d=0;const u=l.useGlobalConfig("valueTypeMap");return n.computed(()=>(d++,s.columns?.filter(e=>!e.hideInSearch&&e.dataIndex&&(e.valueType||e.customRenderFormItem)&&!a.noRenderAsFormItemValueList.includes(e.valueType))?.sort((e,t)=>{const r=o.getColumnOrder(e.order);return o.getColumnOrder(t.order)-r})?.map(e=>{const t=o.updateFormProps(e,o.getFieldProps(e.fieldProps,{})),r={...e,fieldProps:{label:e.title,name:e.dataIndex,bordered:!0,...t||{},_signal:d},renderNode:void 0};return r.renderNode=o.getSearchFormItemRenderNode(r,n.unref(u)),r})||[]))};exports.useSearchForm=c;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("../../ap-table/constants.js"),n=require("vue"),o=require("../../ap-table/utils.js");require("../../config-provider/index.js");const l=require("../../config-provider/hooks/use-global-config.js"),c=s=>{let d=0;const u=l.useGlobalConfig("valueTypeMap");return n.computed(()=>(d++,s.columns?.filter(e=>!e.hideInSearch&&(e.dataIndex||e.key)&&(e.valueType||e.customRenderFormItem)&&!a.noRenderAsFormItemValueList.includes(e.valueType))?.sort((e,t)=>{const r=o.getColumnOrder(e.order);return o.getColumnOrder(t.order)-r})?.map(e=>{const t=o.updateFormProps(e,o.getFieldProps(e.fieldProps,{})),r={...e,fieldProps:{label:e.title,name:e.dataIndex||e.key,bordered:!0,...t||{},_signal:d},renderNode:void 0};return r.renderNode=o.getSearchFormItemRenderNode(r,n.unref(u)),r})||[]))};exports.useSearchForm=c;

package/lib/src/ag-grid/hooks/use-selection-col-def.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const f=require("vue"),d=require("lodash-unified");require("../../ap-grid/index.js");const a=require("../../ap-grid/constants.js");function m(e){return e?.bottom?.length||e?.top?.length}const S=(e,l)=>f.computed(()=>{if(!e.rowSelection)return;const o=e.rowSelection===!0?{}:e.rowSelection,n={sortable:!1,resizable:!1,width:o.columnWidth||60};let i=o.fixed;if(i===void 0&&(i=l.value.some(t=>t.fixed==="left"||t.fixed===!0)?"left":void 0),n.pinned=i,m(e.summary)){const{cellClassName:t}=e.summary;n.cellClass=({node:r,data:u,colDef:c,rowIndex:s})=>{if(!(!r.rowPinned||!t))return d.isFunction(t)?t(u,c,r.rowPinned,s):t},n.cellRenderer=({data:r})=>r?.[a.ROW_SELECTION_FIELD]}return n});exports.default=S;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const f=require("vue"),d=require("lodash-unified");require("../../ap-grid/index.js");const a=require("../utils.js"),m=require("../../ap-grid/constants.js");function S(e){return e?.bottom?.length||e?.top?.length}const w=(e,l)=>f.computed(()=>{if(!e.rowSelection)return;const o=e.rowSelection===!0?{}:e.rowSelection,r={sortable:!1,resizable:!1,width:a.pxToNumber(o.columnWidth,60)};let i=o.fixed;if(i===void 0&&(i=l.value.some(t=>t.fixed==="left"||t.fixed===!0)?"left":void 0),r.pinned=i,S(e.summary)){const{cellClassName:t}=e.summary;r.cellClass=({node:n,data:u,colDef:c,rowIndex:s})=>{if(!(!n.rowPinned||!t))return d.isFunction(t)?t(u,c,n.rowPinned,s):t},r.cellRenderer=({data:n})=>n?.[m.ROW_SELECTION_FIELD]}return r});exports.default=w;

package/lib/src/ag-grid/index.vue.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),Ee=require("ag-grid-vue3"),$=require("ag-grid-community"),De=require("./utils.js"),G=require("@aplus-frontend/antdv"),d=require("lodash-unified");require("../config-provider/index.js");const Ke=require("../ap-form/index.js"),Ae=require("../ap-table/utils.js"),Me=require("../ap-table/hooks/use-table-paging-ng.js"),Oe=require("./hooks/use-row-selection.js"),Ue=require("./context.js"),je=require("../ap-table/context.js"),L=require("../ap-grid/constants.js"),We=require("@aplus-frontend/antdv/es/theme/internal"),$e=require("./theme.js"),Ge=require("./hooks/use-columns.js"),Le=require("./hooks/use-columns-def.js"),He=require("../utils/index.js"),_e=require("../utils/slot.js"),Je=require("./hooks/use-search-form.js");require("./components/empty/index.vue.js");const Qe=require("./hooks/use-virtual-config.js"),Xe=require("./hooks/use-pinned-row.js"),Ye=require("./hooks/use-selection-col-def.js"),Ze=require("../config-provider/hooks/use-namespace.js"),eo=require("./components/empty/index.vue2.js"),oo=e.defineComponent({name:"AgGrid",__name:"index",props:{dropdownPrefixCls:{},bordered:{type:Boolean},locale:{},onChange:{},onResizeColumn:{},getPopupContainer:{},scroll:{},sortDirections:{},showSorterTooltip:{type:[Boolean,Object]},prefixCls:{},rowKey:{type:[String,Function],default:"key"},tableLayout:{},title:{},id:{},showHeader:{type:Boolean},components:{},customRow:{},customHeaderRow:{},direction:{},expandFixed:{type:[String,Boolean]},expandColumnWidth:{},expandedRowKeys:{},defaultExpandedRowKeys:{},expandedRowRender:{},expandRowByClick:{type:Boolean},expandIcon:{},onExpand:{},onExpandedRowsChange:{},defaultExpandAllRows:{type:Boolean},indentSize:{},expandIconColumnIndex:{},showExpandColumn:{type:Boolean},expandedRowClassName:{},childrenColumnName:{},rowExpandable:{},transformCellText:{},columns:{},rowSelection:{type:Boolean},card:{type:Boolean},params:{},request:{},defaultData:{},dataSource:{},onLoadingChange:{},onShownColumnsChange:{},searchForm:{type:[Boolean,Object],default:void 0},beforeSearchSubmit:{},pagination:{type:[Boolean,Object],default:void 0},searchFormWrapperStyle:{},tableWrapperStyle:{},wrapperStyle:{},tableStyle:{},manual:{type:Boolean,default:void 0},size:{default:"mini"},adaptive:{type:Boolean},columnResizable:{type:Boolean,default:!1},loading:{type:Boolean,default:void 0},summary:{},rowHeight:{},advanceRenderer:{type:Boolean},browserTooltips:{type:Boolean},virtual:{type:[Boolean,Object],default:void 0},onRowClicked:{},onScrollEnd:{},rowClassName:{}},setup(H,{expose:_}){$.ModuleRegistry.registerModules([$.AllCommunityModule]);const t=H,F=e.useSlots(),{e:C,b:u,be:J}=Ze.useNamespace("ag-grid"),w=e.ref(t.size),Q=$e.useTheme(w,e.toRef(t,"rowHeight")),X=Qe.default(e.toRef(t,"virtual")),{rowPinnedGridConfig:q,getRowPinnedCellClass:Y}=Xe.usePinnedRow(e.toRef(t,"summary")),i=e.ref(),[,Z]=We.useToken();let f=!!t.dataSource;const N=Je.useSearchForm(t),{shownColumns:m,columns:z,columnKeys:ee}=Ge.useColumns(t),{defaultColDef:oe,columnDefs:te}=Le.useColumnsDef(z,t,Y),v=e.ref({});Ue.useProvideSorter({sorter:v,setSorter(o){v.value=o}});const re={asc:"ascend",desc:"descend"};function ne(){const o=i.value.getColumns()?.filter(l=>l.getSort()!==void 0),r=e.unref(v)||{};let n=o?.[0];const c=Object.keys(r);if(c.length&&c.every(l=>r[l]===null)){const l=Object.keys(r)[0];l&&(n=i.value?.getColumn(l))}if(!n)return;const s=n.getColDef(),S=n.getSort();P(void 0,void 0,{column:s,field:s.field,order:S?re[S]:null})}const ae=e.computed(()=>Ae.recursionApColumns(e.unref(m),o=>{if(o.sorter===!0)return o.key||o.dataIndex}).filter(Boolean)),le=e.computed(()=>He.isDef(t.manual)?t.manual:_e.getValidVNodeList(F.searchFormExtra?.()||[]).some(r=>r.type?.name==="ApView")),{formRef:p,submit:R,reset:b,data:g,tableProps:I,handleTableChangeOptional:P,submitWith:T,refresh:V,getPaging:se,setPaging:ue,setDataSource:ie}=Me.useTablePaging({async request(o){if(f=!1,!fe.value&&d.isUndefined(t.dataSource)&&x(),!d.isUndefined(t.dataSource)){const n=o.pageSize*(o.current-1);return{data:(t.pagination===!1?t.dataSource:t.dataSource.slice(n,n+o.pageSize))||[],total:t.dataSource.length||0}}const r=await t.request?.(o);return{data:r?.data||[],total:r?.total||0}},namespace:"ap-grid",filterFields:e.ref([]),params:e.toRef(t,"params"),defaultData:t.defaultData,manual:e.unref(le),formatParams:t.beforeSearchSubmit,pagination:t.pagination,sortFields:ae}),ce=Ye.default(t,m),de=e.computed(()=>d.isUndefined(t.dataSource)?g.records:t.dataSource),fe=e.computed(()=>{const o=t.rowSelection===!0?{}:t.rowSelection;return o?o.preserveSelectedRowKeys!==!1:!1}),{select:me,unSelect:pe,selectedRows:B,selectedRowKeys:ge,clearAll:Se,selectMultiByKeys:we}=Oe.default({...t.rowSelection===!0?{}:t.rowSelection,dataSource:de,rowKey:t.rowKey}),ye={checkbox:"multiRow",radio:"singleRow"},he=e.computed(()=>{if(!t.rowSelection)return;const{type:o="checkbox",disabled:r}=t.rowSelection===!0?{}:t.rowSelection;return{mode:ye[o],isRowSelectable:n=>r?!r(n.data):!0}});function k(o){return d.isFunction(t.rowKey)?t.rowKey(o):o[t.rowKey]}const E=({api:o=i.value})=>{if(!t.rowSelection)return;const r=B.value;if(!r.length){setTimeout(()=>{f=!0},0);return}f=!1;const n=[];o.forEachNode(c=>{const y=c.data,s=k(y);r.find(S=>k(S)===s)&&n.push(c)}),o.setNodesSelected({nodes:n,newValue:!0}),setTimeout(()=>{f=!0},0)},Ce=o=>{f&&(o.node.isSelected()?me(o.data):pe(o.data))},ve=()=>{f=!0},x=()=>{Se(),i.value?.deselectAll()};function Re(o){we(o),e.nextTick(()=>{E({})})}function D(o=!1){const r=o?"getFieldsValueTransformed":"getFieldsValue";return p.value?.apForm?.[r]?.(!0)}function K(o){p.value?.apForm?.setFieldsValue?.(o)}function A(){return p.value?.getSorterItems()||[]}function M(o){p.value?.setSorterItems(o)}function O(){p.value?.resetSorterItems()}function U(o){return o&&String(o)}function be(o){const r=i.value;if(!r)return;const n=r.getColumnState()||[],c=o.map(a=>a.key?String(a.key):a.key).filter(Boolean),y=n.map(a=>{if(!ee.value.includes(a.colId))return a;const h=!c.includes(a.colId),j={...a,hide:h},W=o.find(Ve=>U(Ve.key)===a.colId);return W&&(j.pinned=W.fixed||null),j}),s=new Map(o.map((a,h)=>[U(a.key),h])),S=y.filter(a=>s.has(a.colId)).sort((a,h)=>s.get(a.colId)-s.get(h.colId)),l=[];let Te=0;for(const a of y)s.has(a.colId)?l.push(S[Te++]):l.push(a);r.applyColumnState({state:l,applyOrder:!0})}je.useProvideApTable({columns:e.computed(()=>m.value),columnsBackup:e.computed(()=>z.value),size:e.computed(()=>L.sizeMap[w.value]),updateColumns(o){console.log("run reset",o),m.value=o,t.onShownColumnsChange?.(o),be(o)},updateSize(o){w.value=L.sizeReverseMap[o]},renderConfig:e.computed(()=>({className:J("table-header","title"),color:Z.value.colorTextTertiary})),dataSource:e.computed(()=>e.unref(g).records),getSearchFormValues:D,setSearchFormValues:K,submit:R,submitWith:T,reset:b,refresh:V,getSearchFormSorterItems:A,setSearchFormSorterItems:M,resetSearchFormSorterItems:O});const Be=e.computed(()=>d.isUndefined(t.loading)?g.loading:t.loading),ke=e.computed(()=>[u(),t.card?null:u("wrapper"),u("adaptive"),u(`size-${w.value}`)].filter(Boolean)),xe=e.computed(()=>({height:"100%",...t.tableStyle||{}})),Fe=(o,r)=>{P({current:o,pageSize:r})};function qe(o){const r=o.data;return k(r)}function Ne(o,r){i.value?.ensureIndexVisible(o,r)}function ze(o){t.onRowClicked?.(o.data,o.event)}function Ie(o){t.onScrollEnd?.(o.direction)}const Pe=o=>{const r=[q.value.getRowClass?.(o)];if(!o.node.rowPinned){const n=d.isFunction(t.rowClassName)?t.rowClassName(o.data,o.rowIndex):t.rowClassName;r.push(n)}return r.flat().filter(Boolean)};return e.watch(()=>t.dataSource,o=>{ie(o)},{immediate:!0,deep:!0}),e.watch(()=>t.size,o=>{w.value=o}),e.watch(()=>e.unref(g).loading,o=>{t.onLoadingChange?.(o)}),_({submit:R,reset:b,refresh:V,submitWith:T,setSearchFormValues:K,getSearchFormValues:D,getShowColumns:()=>e.unref(m),rowSelection:{selectedRows:e.computed(()=>B.value),setSelectedRowKeys:Re,clearAll:x},scrollToRow:Ne,getDataSource:()=>e.unref(g.records),getPaging:se,setPaging:ue,getSearchFormSorterItems:A,setSearchFormSorterItems:M,resetSearchFormSorterItems:O}),(o,r)=>(e.openBlock(),e.createElementBlock("div",{class:e.normalizeClass(ke.value),style:e.normalizeStyle(o.wrapperStyle)},[e.unref(d.isUndefined)(o.dataSource)&&o.searchForm!==!1&&e.unref(N).length>0?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(o.card?e.unref(C)("search-wrapper"):null),style:e.normalizeStyle(o.searchFormWrapperStyle)},[e.createVNode(e.unref(Ke.ApForm).SearchForm,e.mergeProps(o.searchForm||{},{ref_key:"formRef",ref:p,"custom-reset":"","submit-loading":e.unref(I).loading,onSubmit:e.unref(R),onReset:e.unref(b)}),e.createSlots({default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(e.unref(N),n=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(n.renderNode),{key:n.dataIndex}))),128))]),_:2},[F.searchFormExtra?{name:"extra",fn:e.withCtx(()=>[e.renderSlot(o.$slots,"searchFormExtra")]),key:"0"}:void 0]),1040,["submit-loading","onSubmit","onReset"])],6)):e.createCommentVNode("",!0),e.createElementVNode("div",{class:e.normalizeClass([e.unref(C)("table-wrapper"),o.card?e.unref(C)("table-wrapper-card"):null]),style:e.normalizeStyle(o.tableWrapperStyle)},[e.createElementVNode("div",{class:e.normalizeClass(e.unref(u)("header-wrapper"))},[e.renderSlot(o.$slots,"title",{selectedRows:e.unref(B),selectedRowKeys:e.unref(ge),shownColumns:e.unref(m),clearAll:x})],2),e.createElementVNode("div",{class:e.normalizeClass(e.unref(u)("grid-wrapper"))},[e.createVNode(e.unref(Ee.AgGridVue),e.mergeProps(e.unref(De.mergeProps)(e.unref(X),e.unref(q)),{"get-row-class":Pe,style:xe.value,"row-data":e.unref(g).records,"column-defs":e.unref(te),"default-col-def":e.unref(oe),"suppress-loading-overlay":"","row-selection":he.value,"selection-column-def":e.unref(ce),"get-row-id":qe,theme:e.unref(Q),"tooltip-show-delay":500,"enable-browser-tooltips":o.browserTooltips,"tooltip-interaction":"","no-rows-overlay-component":eo.default,onSortChanged:ne,onGridReady:r[0]||(r[0]=n=>i.value=n.api),onRowDataUpdated:E,onRowSelected:Ce,onFirstDataRendered:ve,onRowClicked:ze,onBodyScrollEnd:Ie}),null,16,["style","row-data","column-defs","default-col-def","row-selection","selection-column-def","theme","enable-browser-tooltips"]),e.withDirectives(e.createElementVNode("div",{class:e.normalizeClass(e.unref(C)("table-loading-wrapper"))},[e.createVNode(e.unref(G.Spin),{delay:300})],2),[[e.vShow,Be.value]])],2),e.createElementVNode("div",{class:e.normalizeClass(e.unref(u)("pagination-wrapper"))},[o.pagination!==!1?(e.openBlock(),e.createBlock(e.unref(G.Pagination),e.mergeProps({key:0,class:e.unref(u)("pagination")},e.unref(I).pagination,{onChange:Fe}),null,16,["class"])):e.createCommentVNode("",!0)],2)],6)],6))}});exports.default=oo;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),Ke=require("ag-grid-vue3"),$=require("ag-grid-community"),Ae=require("./utils.js"),G=require("@aplus-frontend/antdv"),d=require("lodash-unified");require("../config-provider/index.js");const Me=require("../ap-form/index.js"),Oe=require("../ap-table/utils.js"),Ue=require("../ap-table/hooks/use-table-paging-ng.js"),je=require("./hooks/use-row-selection.js"),We=require("./context.js"),$e=require("../ap-table/context.js"),L=require("../ap-grid/constants.js"),Ge=require("@aplus-frontend/antdv/es/theme/internal"),Le=require("./theme.js"),He=require("./hooks/use-columns.js"),_e=require("./hooks/use-columns-def.js"),Je=require("../utils/index.js"),Qe=require("../utils/slot.js"),Xe=require("./hooks/use-search-form.js");require("./components/empty/index.vue.js");const Ye=require("./hooks/use-virtual-config.js"),Ze=require("./hooks/use-pinned-row.js"),eo=require("./hooks/use-selection-col-def.js"),oo=require("../config-provider/hooks/use-namespace.js"),to=require("./components/empty/index.vue2.js"),ro=e.defineComponent({name:"AgGrid",__name:"index",props:{dropdownPrefixCls:{},bordered:{type:Boolean},locale:{},onChange:{},onResizeColumn:{},getPopupContainer:{},scroll:{},sortDirections:{},showSorterTooltip:{type:[Boolean,Object]},prefixCls:{},rowKey:{type:[String,Function],default:"key"},tableLayout:{},title:{},id:{},showHeader:{type:Boolean},components:{},customRow:{},customHeaderRow:{},direction:{},expandFixed:{type:[String,Boolean]},expandColumnWidth:{},expandedRowKeys:{},defaultExpandedRowKeys:{},expandedRowRender:{},expandRowByClick:{type:Boolean},expandIcon:{},onExpand:{},onExpandedRowsChange:{},defaultExpandAllRows:{type:Boolean},indentSize:{},expandIconColumnIndex:{},showExpandColumn:{type:Boolean},expandedRowClassName:{},childrenColumnName:{},rowExpandable:{},transformCellText:{},columns:{},rowSelection:{type:Boolean},card:{type:Boolean},params:{},request:{},defaultData:{},dataSource:{},onLoadingChange:{},onShownColumnsChange:{},searchForm:{type:[Boolean,Object],default:void 0},beforeSearchSubmit:{},pagination:{type:[Boolean,Object],default:void 0},searchFormWrapperStyle:{},tableWrapperStyle:{},wrapperStyle:{},tableStyle:{},manual:{type:Boolean,default:void 0},size:{default:"mini"},adaptive:{type:Boolean},columnResizable:{type:Boolean,default:!1},loading:{type:Boolean,default:void 0},summary:{},rowHeight:{},advanceRenderer:{type:Boolean},browserTooltips:{type:Boolean},virtual:{type:[Boolean,Object],default:void 0},onRowClicked:{},onScrollEnd:{},rowClassName:{},rowClassRules:{}},setup(H,{expose:_}){$.ModuleRegistry.registerModules([$.AllCommunityModule]);const t=H,F=e.useSlots(),{e:h,b:i,be:J}=oo.useNamespace("ag-grid"),S=e.ref(t.size),Q=Le.useTheme(S,e.toRef(t,"rowHeight")),X=Ye.default(e.toRef(t,"virtual")),{rowPinnedGridConfig:q,getRowPinnedCellClass:Y}=Ze.usePinnedRow(e.toRef(t,"summary")),u=e.ref(),[,Z]=Ge.useToken();let f=!!t.dataSource;const N=Xe.useSearchForm(t),{shownColumns:m,columns:I,columnKeys:ee}=He.useColumns(t),{defaultColDef:oe,columnDefs:te}=_e.useColumnsDef(I,t,Y),v=e.ref({});We.useProvideSorter({sorter:v,setSorter(o){v.value=o}});const re={asc:"ascend",desc:"descend"};function ne(){const o=u.value.getColumns()?.filter(s=>s.getSort()!==void 0),r=e.unref(v)||{};let n=o?.[0];const c=Object.keys(r);if(c.length&&c.every(s=>r[s]===null)){const s=Object.keys(r)[0];s&&(n=u.value?.getColumn(s))}if(!n)return;const l=n.getColDef(),w=n.getSort();P(void 0,void 0,{column:l,field:l.field||l.colId,order:w?re[w]:null})}const ae=e.computed(()=>Oe.recursionApColumns(e.unref(m),o=>{if(o.sorter===!0)return o.key||o.dataIndex}).filter(Boolean)),le=e.computed(()=>Je.isDef(t.manual)?t.manual:Qe.getValidVNodeList(F.searchFormExtra?.()||[]).some(r=>r.type?.name==="ApView")),{formRef:p,submit:R,reset:b,data:g,tableProps:z,handleTableChangeOptional:P,submitWith:T,refresh:V,getPaging:se,setPaging:ue,setDataSource:ie}=Ue.useTablePaging({async request(o){if(f=!1,!fe.value&&d.isUndefined(t.dataSource)&&x(),!d.isUndefined(t.dataSource)){const n=o.pageSize*(o.current-1);return{data:(t.pagination===!1?t.dataSource:t.dataSource.slice(n,n+o.pageSize))||[],total:t.dataSource.length||0}}const r=await t.request?.(o);return{data:r?.data||[],total:r?.total||0}},namespace:"ap-grid",filterFields:e.ref([]),params:e.toRef(t,"params"),defaultData:t.defaultData,manual:e.unref(le),formatParams:t.beforeSearchSubmit,pagination:t.pagination,sortFields:ae}),ce=eo.default(t,m),de=e.computed(()=>d.isUndefined(t.dataSource)?g.records:t.dataSource),fe=e.computed(()=>{const o=t.rowSelection===!0?{}:t.rowSelection;return o?o.preserveSelectedRowKeys!==!1:!1}),{select:me,unSelect:pe,selectedRows:B,selectedRowKeys:ge,clearAll:we,selectMultiByKeys:Se}=je.default({...t.rowSelection===!0?{}:t.rowSelection,dataSource:de,rowKey:t.rowKey}),ye={checkbox:"multiRow",radio:"singleRow"},Ce=e.computed(()=>{if(!t.rowSelection)return;const{type:o="checkbox",disabled:r}=t.rowSelection===!0?{}:t.rowSelection;return{mode:ye[o],isRowSelectable:n=>r?!r(n.data):!0}});function k(o){return d.isFunction(t.rowKey)?t.rowKey(o):o[t.rowKey]}const E=({api:o=u.value})=>{if(!t.rowSelection)return;const r=B.value;if(!r.length){setTimeout(()=>{f=!0},0);return}f=!1;const n=[];o.forEachNode(c=>{const y=c.data,l=k(y);r.find(w=>k(w)===l)&&n.push(c)}),o.setNodesSelected({nodes:n,newValue:!0}),setTimeout(()=>{f=!0},0)},he=o=>{f&&(o.node.isSelected()?me(o.data):pe(o.data))},ve=()=>{f=!0},x=()=>{we(),u.value?.deselectAll()};function Re(o){Se(o),e.nextTick(()=>{E({})})}function D(o=!1){const r=o?"getFieldsValueTransformed":"getFieldsValue";return p.value?.apForm?.[r]?.(!0)}function K(o){p.value?.apForm?.setFieldsValue?.(o)}function A(){return p.value?.getSorterItems()||[]}function M(o){p.value?.setSorterItems(o)}function O(){p.value?.resetSorterItems()}function U(o){return o&&String(o)}function be(o){const r=u.value;if(!r)return;const n=r.getColumnState()||[],c=o.map(a=>a.key?String(a.key):a.key).filter(Boolean),y=n.map(a=>{if(!ee.value.includes(a.colId))return a;const C=!c.includes(a.colId),j={...a,hide:C},W=o.find(De=>U(De.key)===a.colId);return W&&(j.pinned=W.fixed||null),j}),l=new Map(o.map((a,C)=>[U(a.key),C])),w=y.filter(a=>l.has(a.colId)).sort((a,C)=>l.get(a.colId)-l.get(C.colId)),s=[];let Ee=0;for(const a of y)l.has(a.colId)?s.push(w[Ee++]):s.push(a);r.applyColumnState({state:s,applyOrder:!0})}$e.useProvideApTable({columns:e.computed(()=>m.value),columnsBackup:e.computed(()=>I.value),size:e.computed(()=>L.sizeMap[S.value]),updateColumns(o){m.value=o,t.onShownColumnsChange?.(o),be(o)},updateSize(o){S.value=L.sizeReverseMap[o]},renderConfig:e.computed(()=>({className:J("table-header","title"),color:Z.value.colorTextTertiary})),dataSource:e.computed(()=>e.unref(g).records),getSearchFormValues:D,setSearchFormValues:K,submit:R,submitWith:T,reset:b,refresh:V,getSearchFormSorterItems:A,setSearchFormSorterItems:M,resetSearchFormSorterItems:O});const Be=e.computed(()=>d.isUndefined(t.loading)?g.loading:t.loading),ke=e.computed(()=>[i(),t.card?null:i("wrapper"),i("adaptive"),i(`size-${S.value}`)].filter(Boolean)),xe=e.computed(()=>({height:"100%",...t.tableStyle||{}})),Fe=(o,r)=>{P({current:o,pageSize:r})};function qe(o){const r=o.data;return k(r)}function Ne(o,r){u.value?.ensureIndexVisible(o,r)}function Ie(o){t.onRowClicked?.(o.data,o.event)}function ze(o){t.onScrollEnd?.(o.direction)}function Pe(o){return u.value?.refreshCells(o)}function Te(o){return u.value?.redrawRows(o)}const Ve=o=>{const r=[q.value.getRowClass?.(o)];if(!o.node.rowPinned){const n=d.isFunction(t.rowClassName)?t.rowClassName(o.data,o.rowIndex):t.rowClassName;r.push(n)}return r.flat().filter(Boolean)};return e.watch(()=>t.dataSource,o=>{ie(o)},{immediate:!0,deep:!0}),e.watch(()=>t.size,o=>{S.value=o}),e.watch(()=>e.unref(g).loading,o=>{t.onLoadingChange?.(o)}),_({submit:R,reset:b,refresh:V,submitWith:T,setSearchFormValues:K,getSearchFormValues:D,getShowColumns:()=>e.unref(m),rowSelection:{selectedRows:e.computed(()=>B.value),setSelectedRowKeys:Re,clearAll:x},scrollToRow:Ne,getDataSource:()=>e.unref(g.records),getPaging:se,setPaging:ue,getSearchFormSorterItems:A,setSearchFormSorterItems:M,resetSearchFormSorterItems:O,refreshCells:Pe,redrawRows:Te}),(o,r)=>(e.openBlock(),e.createElementBlock("div",{class:e.normalizeClass(ke.value),style:e.normalizeStyle(o.wrapperStyle)},[e.unref(d.isUndefined)(o.dataSource)&&o.searchForm!==!1&&e.unref(N).length>0?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(o.card?e.unref(h)("search-wrapper"):null),style:e.normalizeStyle(o.searchFormWrapperStyle)},[e.createVNode(e.unref(Me.ApForm).SearchForm,e.mergeProps(o.searchForm||{},{ref_key:"formRef",ref:p,"custom-reset":"","submit-loading":e.unref(z).loading,onSubmit:e.unref(R),onReset:e.unref(b)}),e.createSlots({default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(e.unref(N),n=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(n.renderNode),{key:n.dataIndex}))),128))]),_:2},[F.searchFormExtra?{name:"extra",fn:e.withCtx(()=>[e.renderSlot(o.$slots,"searchFormExtra")]),key:"0"}:void 0]),1040,["submit-loading","onSubmit","onReset"])],6)):e.createCommentVNode("",!0),e.createElementVNode("div",{class:e.normalizeClass([e.unref(h)("table-wrapper"),o.card?e.unref(h)("table-wrapper-card"):null]),style:e.normalizeStyle(o.tableWrapperStyle)},[e.createElementVNode("div",{class:e.normalizeClass(e.unref(i)("header-wrapper"))},[e.renderSlot(o.$slots,"title",{selectedRows:e.unref(B),selectedRowKeys:e.unref(ge),shownColumns:e.unref(m),clearAll:x})],2),e.createElementVNode("div",{class:e.normalizeClass(e.unref(i)("grid-wrapper"))},[e.createVNode(e.unref(Ke.AgGridVue),e.mergeProps(e.unref(Ae.mergeProps)(e.unref(X),e.unref(q)),{"get-row-class":Ve,style:xe.value,"row-data":e.unref(g).records,"column-defs":e.unref(te),"default-col-def":e.unref(oe),"suppress-loading-overlay":"","row-selection":Ce.value,"selection-column-def":e.unref(ce),"get-row-id":qe,theme:e.unref(Q),"tooltip-show-delay":500,"enable-browser-tooltips":o.browserTooltips,"tooltip-interaction":"","row-class-rules":o.rowClassRules,"no-rows-overlay-component":to.default,"suppress-cell-focus":"",onSortChanged:ne,onGridReady:r[0]||(r[0]=n=>u.value=n.api),onRowDataUpdated:E,onRowSelected:he,onFirstDataRendered:ve,onRowClicked:Ie,onBodyScrollEnd:ze}),null,16,["style","row-data","column-defs","default-col-def","row-selection","selection-column-def","theme","enable-browser-tooltips","row-class-rules"]),e.withDirectives(e.createElementVNode("div",{class:e.normalizeClass(e.unref(h)("table-loading-wrapper"))},[e.createVNode(e.unref(G.Spin),{delay:300})],2),[[e.vShow,Be.value]])],2),e.createElementVNode("div",{class:e.normalizeClass(e.unref(i)("pagination-wrapper"))},[o.pagination!==!1?(e.openBlock(),e.createBlock(e.unref(G.Pagination),e.mergeProps({key:0,class:e.unref(i)("pagination")},e.unref(z).pagination,{onChange:Fe}),null,16,["class"])):e.createCommentVNode("",!0)],2)],6)],6))}});exports.default=ro;

package/lib/src/ag-grid/interface.d.ts

@@ -4,7 +4,7 @@ import { TableProps } from '@aplus-frontend/antdv';
 import { ApFormSearchFormPopoverSorterItem, ApFormSearchFormProps } from '../ap-form/interface';
 import { Recordable } from '../type';
 import { SortOrder, TableRowSelection } from '@aplus-frontend/antdv/es/table/interface';
-import { ColDef, IRowNode, RowPinnedType, ScrollDirection } from 'ag-grid-community';
+import { ColDef, IRowNode, RedrawRowsParams, RefreshCellsParams, RowClassRules, RowPinnedType, ScrollDirection } from 'ag-grid-community';
 import { InternalPagingType } from '../ap-table/hooks/use-table-paging-ng';
 export type AgGridColumnType<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' | 'width' | 'maxWidth' | 'className' | 'class' | 'colSpan'> & {
     children?: AgGridColumnType<RecordType, ExtraValueType, ValueType>[];
@@ -251,6 +251,10 @@ export type AgGridProps<RecordType = any, ParamsType = any> = Omit<TableProps<Re
      * @description 固定行自定义样式类请使用`summary.rowClassName`
      */
     rowClassName?: string | string[] | ((data: RecordType, rowIndex: number) => string | string[]);
+    /**
+     * 表格行自定义样式规则集
+     */
+    rowClassRules?: RowClassRules<RecordType>;
 };
 export type AgGridExpose<SearchParamsType = Recordable, RecordType = any> = {
     /**
@@ -344,4 +348,16 @@ export type AgGridExpose<SearchParamsType = Recordable, RecordType = any> = {
      * @returns
      */
     resetSearchFormSorterItems: () => void;
+    /**
+     * 刷新单元格
+     * @param params
+     * @returns
+     */
+    refreshCells: (params?: RefreshCellsParams<RecordType>) => void;
+    /**
+     * 重新绘制行
+     * @param params
+     * @returns
+     */
+    redrawRows: (params?: RedrawRowsParams<RecordType>) => void;
 };

package/lib/src/ag-grid/utils.d.ts

@@ -1,2 +1,9 @@
 import { GridOptions } from 'ag-grid-community';
 export declare function mergeProps(...options: GridOptions[]): GridOptions<any>;
+/**
+ * 将尺寸单位px去掉
+ * @param value
+ * @param defaultValue
+ * @returns
+ */
+export declare function pxToNumber(value?: string | number, defaultValue?: number): number;

package/lib/src/ag-grid/utils.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});function o(...e){return e.reduce((r,t)=>({...r,...t}),{})}exports.mergeProps=o;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});function o(...r){return r.reduce((e,t)=>({...e,...t}),{})}function c(r,e=0){if(!r)return e;if(typeof r=="number")return r;const t=r.match(/^(-?\d+(?:\.\d+)?)px$/);if(!t)return e;const n=parseFloat(t[1]);return n>0?n:e}exports.mergeProps=o;exports.pxToNumber=c;

package/lib/src/business/ap-table-modal/interface.d.ts

@@ -26,6 +26,8 @@ export interface ApTableModalProps<TableRowType = any> extends Omit<ModalProps,
     tableLayoutConfig?: TableLayoutConfig;
     /** 渲染头部信息 */
     renderHeader?: () => VNodeChild;
+    /** 弹框ok事件回调 */
+    onOk?: (data: OpenReturnType<TableRowType>) => Promise<boolean> | void;
 }
 /** useCreateTableModal参数类型 */
 export interface UseCreateTableModalProps extends ApTableModalProps {

package/lib/src/business/ap-table-modal/table-modal.vue2.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const t=require("vue"),p=require("@aplus-frontend/antdv");require("../../config-provider/index.js");const I=require("../../ap-table/index.js"),m=require("lodash-unified"),O=require("@aplus-frontend/utils");require("./modal-title.vue.js");const v=require("./interface.js");require("./table-layout/index.vue.js");const A=require("../../config-provider/hooks/use-locale.js"),L=require("./modal-title.vue2.js"),N=require("./table-layout/index.vue2.js"),D=t.defineComponent({__name:"table-modal",props:{columns:{},getRowKey:{},api:{type:Function,default:async()=>({records:[],total:0})},apTableProps:{},maxCount:{default:1/0},isRenderModalTitleSuffix:{type:Boolean,default:!0},renderModalTitleSuffix:{},disabledCheckbox:{type:[Boolean,Function]},rowSelection:{},tableLayoutConfig:{},renderHeader:{},prefixCls:{},confirmLoading:{type:Boolean,default:void 0},title:{},closable:{type:Boolean,default:void 0},closeIcon:{},onCancel:{},"onUpdate:visible":{},"onUpdate:open":{},onChange:{},afterClose:{},centered:{type:Boolean,default:void 0},width:{},footer:{},okText:{},okType:{},cancelText:{},icon:{},maskClosable:{type:Boolean,default:void 0},forceRender:{type:Boolean,default:void 0},okButtonProps:{},cancelButtonProps:{},destroyOnClose:{type:Boolean,default:void 0},wrapClassName:{},maskTransitionName:{},transitionName:{},getContainer:{type:[String,Boolean,Function],default:void 0},zIndex:{},bodyStyle:{},maskStyle:{},mask:{type:Boolean,default:void 0},keyboard:{type:Boolean,default:void 0},wrapProps:{},focusTriggerAfterClose:{type:Boolean,default:void 0},modalRender:{},mousePosition:{}},emits:["finish"],setup(g,{expose:w,emit:k}){const e=g,R=k,s=t.ref(!1),y=t.ref({}),u=t.ref(null),n=t.ref([]),b=t.ref();let d=null,i=null;const{t:x}=A.useLocale(),h=async(o=[],a={})=>{switch(n.value=[...o],s.value=!0,y.value=a?.extraParams,b.value=a.apTableDataSources||e.apTableProps?.dataSource,a.refreshMode||"reset"){case"reset":u.value?.reset();break;case"submit":u.value?.submit();break;case"none":break}return new Promise((l,r)=>{d=l,i=r})},C=()=>{s.value=!1,d=null,i?.(v.AsyncOpenResultError.ModalCancel),i=null},T=async o=>{o=O.transformTableParams({...o,...y.value});const a=e.api,{records:l,total:r}=await a(o);return{data:l,total:r}},S=()=>{if(n.value.length>e.maxCount){i?.(v.AsyncOpenResultError.ExceedMaxCount);return}if(e.getRowKey){const o=m.cloneDeep(t.unref(n)),a=o.map(e.getRowKey);R("finish",a,o),d?.({keys:a,rows:o})}else{i?.(v.AsyncOpenResultError.NotFineGetRowKey);return}s.value=!1},_=t.computed(()=>{if(!e.getRowKey)return;const o=e.getRowKey;return{fixed:!0,selectedRowKeys:n.value.map(o),columnWidth:50,preserveSelectedRowKeys:!0,onSelectAll(a,l){if(l.length>e.maxCount){p.message.warning(x("ap.apTableModal.messageMaxCount",{maxCount:e.maxCount}));return}const r=u.value?.dataSource;if(a){const c=t.unref(r).filter(f=>!n.value.some(K=>o(K)===o(f)));n.value=n.value.concat(c)}else n.value=n.value?.filter(c=>!r.some(f=>o(f)===o(c)))},onSelect(a,l){if(l){if(n.value.length>=e.maxCount){p.message.warning(x("ap.apTableModal.messageMaxCount",{maxCount:e.maxCount}));return}n.value.push(a)}else{const r=n.value.findIndex(c=>o(a)===o(c));n.value.splice(r,1)}},getCheckboxProps:a=>({disabled:typeof e.disabledCheckbox=="function"?e.disabledCheckbox(a,n.value):e.disabledCheckbox}),...e.rowSelection||{}}}),B=()=>e.isRenderModalTitleSuffix?t.h(L.default,{title:e.title,count:n.value.length||0,maxCount:e.maxCount},{default:e.renderModalTitleSuffix??void 0}):e.title,P=()=>u.value,M=()=>{n.value=[]},q=o=>{const a=e.getRowKey;if(!a)return;const l=n.value.findIndex(r=>a(o)===a(r));n.value.splice(l,1)};return w({open:h,close:C,getApTableInstance:P}),(o,a)=>(t.openBlock(),t.createBlock(t.unref(p.Modal),t.mergeProps({open:s.value,"onUpdate:open":a[0]||(a[0]=l=>s.value=l)},t.unref(m.omit)(e,["api","getRowKey","centered","apTableProps","onOk","maxCount","title","renderModalTitleSuffix","isRenderModalTitleSuffix","rowSelection","disabledCheckbox","tableLayoutConfig"]),{title:B(),centered:e.centered??!0,onOk:S,onCancel:C}),{default:t.withCtx(()=>[e.renderHeader?(t.openBlock(),t.createBlock(t.resolveDynamicComponent(e.renderHeader),{key:0})):t.createCommentVNode("",!0),t.createVNode(N.default,t.mergeProps(e.tableLayoutConfig||{},{"selected-list":n.value,onClear:M,onDeleteItem:q}),{default:t.withCtx(()=>[t.createVNode(t.unref(I.ApTable),t.mergeProps({ref_key:"apTableRef",ref:u,scroll:{y:450},style:{padding:"0px"},columns:o.columns,request:T,"row-key":o.getRowKey,"row-selection":_.value,"data-source":b.value,"search-form":{sortable:!1,countPerRow:2}},t.unref(m.omit)(e.apTableProps,"dataSource")),null,16,["columns","row-key","row-selection","data-source"])]),_:1},16,["selected-list"])]),_:1},16,["open","title","centered"]))}});exports.default=D;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const t=require("vue"),p=require("@aplus-frontend/antdv");require("../../config-provider/index.js");const O=require("../../ap-table/index.js"),m=require("lodash-unified"),I=require("@aplus-frontend/utils");require("./modal-title.vue.js");const y=require("./interface.js");require("./table-layout/index.vue.js");const A=require("../../config-provider/hooks/use-locale.js"),L=require("./modal-title.vue2.js"),N=require("./table-layout/index.vue2.js"),D=t.defineComponent({__name:"table-modal",props:{columns:{},getRowKey:{},api:{type:Function,default:async()=>({records:[],total:0})},apTableProps:{},maxCount:{default:1/0},isRenderModalTitleSuffix:{type:Boolean,default:!0},renderModalTitleSuffix:{},disabledCheckbox:{type:[Boolean,Function]},rowSelection:{},tableLayoutConfig:{},renderHeader:{},onOk:{},prefixCls:{},confirmLoading:{type:Boolean,default:void 0},title:{},closable:{type:Boolean,default:void 0},closeIcon:{},onCancel:{},"onUpdate:visible":{},"onUpdate:open":{},onChange:{},afterClose:{},centered:{type:Boolean,default:void 0},width:{},footer:{},okText:{},okType:{},cancelText:{},icon:{},maskClosable:{type:Boolean,default:void 0},forceRender:{type:Boolean,default:void 0},okButtonProps:{},cancelButtonProps:{},destroyOnClose:{type:Boolean,default:void 0},wrapClassName:{},maskTransitionName:{},transitionName:{},getContainer:{type:[String,Boolean,Function],default:void 0},zIndex:{},bodyStyle:{},maskStyle:{},mask:{type:Boolean,default:void 0},keyboard:{type:Boolean,default:void 0},wrapProps:{},focusTriggerAfterClose:{type:Boolean,default:void 0},modalRender:{},mousePosition:{}},emits:["finish"],setup(g,{expose:w,emit:k}){const e=g,R=k,s=t.ref(!1),v=t.ref({}),u=t.ref(null),a=t.ref([]),b=t.ref();let d=null,i=null;const{t:x}=A.useLocale(),h=async(o=[],n={})=>{switch(a.value=[...o],s.value=!0,v.value=n?.extraParams,b.value=n.apTableDataSources||e.apTableProps?.dataSource,n.refreshMode||"reset"){case"reset":u.value?.reset();break;case"submit":u.value?.submit();break;case"none":break}return new Promise((l,r)=>{d=l,i=r})},C=()=>{s.value=!1,d=null,i?.(y.AsyncOpenResultError.ModalCancel),i=null},T=async o=>{o=I.transformTableParams({...o,...v.value});const n=e.api,{records:l,total:r}=await n(o);return{data:l,total:r}},S=async()=>{if(a.value.length>e.maxCount){i?.(y.AsyncOpenResultError.ExceedMaxCount);return}if(e.getRowKey){const o=m.cloneDeep(t.unref(a)),n=o.map(e.getRowKey);if(R("finish",n,o),d?.({keys:n,rows:o}),e.onOk&&await e.onOk({keys:n,rows:o})===!1)return}else{i?.(y.AsyncOpenResultError.NotFineGetRowKey);return}s.value=!1},_=t.computed(()=>{if(!e.getRowKey)return;const o=e.getRowKey;return{fixed:!0,selectedRowKeys:a.value.map(o),columnWidth:50,preserveSelectedRowKeys:!0,onSelectAll(n,l){if(l.length>e.maxCount){p.message.warning(x("ap.apTableModal.messageMaxCount",{maxCount:e.maxCount}));return}const r=u.value?.dataSource;if(n){const c=t.unref(r).filter(f=>!a.value.some(K=>o(K)===o(f)));a.value=a.value.concat(c)}else a.value=a.value?.filter(c=>!r.some(f=>o(f)===o(c)))},onSelect(n,l){if(l){if(a.value.length>=e.maxCount){p.message.warning(x("ap.apTableModal.messageMaxCount",{maxCount:e.maxCount}));return}a.value.push(n)}else{const r=a.value.findIndex(c=>o(n)===o(c));a.value.splice(r,1)}},getCheckboxProps:n=>({disabled:typeof e.disabledCheckbox=="function"?e.disabledCheckbox(n,a.value):e.disabledCheckbox}),...e.rowSelection||{}}}),B=()=>e.isRenderModalTitleSuffix?t.h(L.default,{title:e.title,count:a.value.length||0,maxCount:e.maxCount},{default:e.renderModalTitleSuffix??void 0}):e.title,P=()=>u.value,M=()=>{a.value=[]},q=o=>{const n=e.getRowKey;if(!n)return;const l=a.value.findIndex(r=>n(o)===n(r));a.value.splice(l,1)};return w({open:h,close:C,getApTableInstance:P}),(o,n)=>(t.openBlock(),t.createBlock(t.unref(p.Modal),t.mergeProps({open:s.value,"onUpdate:open":n[0]||(n[0]=l=>s.value=l)},t.unref(m.omit)(e,["api","getRowKey","centered","apTableProps","onOk","maxCount","title","renderModalTitleSuffix","isRenderModalTitleSuffix","rowSelection","disabledCheckbox","tableLayoutConfig"]),{title:B(),centered:e.centered??!0,onOk:S,onCancel:C}),{default:t.withCtx(()=>[e.renderHeader?(t.openBlock(),t.createBlock(t.resolveDynamicComponent(e.renderHeader),{key:0})):t.createCommentVNode("",!0),t.createVNode(N.default,t.mergeProps(e.tableLayoutConfig||{},{"selected-list":a.value,onClear:M,onDeleteItem:q}),{default:t.withCtx(()=>[t.createVNode(t.unref(O.ApTable),t.mergeProps({ref_key:"apTableRef",ref:u,scroll:{y:450},style:{padding:"0px"},columns:o.columns,request:T,"row-key":o.getRowKey,"row-selection":_.value,"data-source":b.value,"search-form":{sortable:!1,countPerRow:2}},t.unref(m.omit)(e.apTableProps,"dataSource")),null,16,["columns","row-key","row-selection","data-source"])]),_:1},16,["selected-list"])]),_:1},16,["open","title","centered"]))}});exports.default=D;

package/lib/src/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "6.28.4";
+declare const _default: "6.29.1";
 export default _default;

package/lib/src/version.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e="6.28.4";exports.default=e;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e="6.29.1";exports.default=e;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aplus-frontend/ui",
-  "version": "6.28.4",
+  "version": "6.29.1",
   "main": "./lib/index.js",
   "type": "module",
   "files": [
@@ -37,8 +37,8 @@
     "scroll-into-view-if-needed": "^3.1.0",
     "vue-virtual-scroller": "2.0.0-beta.8",
     "vuedraggable": "^4.1.0",
-    "@aplus-frontend/utils": "1.0.61",
-    "@aplus-frontend/hooks": "1.0.7"
+    "@aplus-frontend/hooks": "1.0.7",
+    "@aplus-frontend/utils": "1.0.61"
   },
   "peerDependencies": {
     "@aplus-frontend/antdv": "^1.2.6",

package/theme/ag-grid/index.css

@@ -690,6 +690,3 @@
        user-select: text;
   -webkit-user-select: text;
 }
-.aplus-ag-grid .ag-cell-focus:not(.ag-cell-range-selected):focus-within {
-  border-color: transparent;
-}

package/theme/ag-grid/index.less

@@ -158,8 +158,4 @@
     user-select: text;
     -webkit-user-select: text;
   }
-  // avoid cell selectable style
-  .ag-cell-focus:not(.ag-cell-range-selected):focus-within {
-    border-color: transparent;
-  }
 });

package/theme/index.css

@@ -4389,9 +4389,6 @@ div.aplus-ap-info-layout-admin__header-shadow.aplus-ap-info-layout-admin__sticky
        user-select: text;
   -webkit-user-select: text;
 }
-.aplus-ag-grid .ag-cell-focus:not(.ag-cell-range-selected):focus-within {
-  border-color: transparent;
-}
 .aplus-ap-value-select-card {
   position: relative;
   margin-top: 8px;