@aplus-frontend/ui 6.34.0 → 6.35.0

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

@@ -9,7 +9,7 @@ const w = /* @__PURE__ */ p({
   setup(l) {
     const n = l, e = m(!1), { e: s } = x("ag-grid");
     return u(() => {
-      const { rowIndex: o, column: t, gridWrapperRef: c, lineClamp: i } = n.params, r = c.value.querySelector(
+      const { rowIndex: o, column: t, gridWrapperRef: c, lineClamp: i } = n.params, r = c.value?.querySelector(
         `div.ag-row[row-index="${o}"] .ag-cell[col-id="${t.colId}"] span.ag-cell-value`
       );
       if (!r) {

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

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

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

@@ -1,9 +1,9 @@
-import { defineComponent as oo, useSlots as to, ref as I, toRef as T, unref as t, computed as l, nextTick as ro, watch as z, createElementBlock as A, openBlock as b, normalizeStyle as V, normalizeClass as m, createCommentVNode as re, createElementVNode as B, createVNode as M, mergeProps as O, createSlots as ao, withCtx as ae, Fragment as no, renderList as lo, createBlock as ne, resolveDynamicComponent as so, renderSlot as le, withDirectives as io, vShow as uo } from "vue";
+import { defineComponent as oo, useSlots as to, ref as I, toRef as T, unref as t, computed as l, nextTick as ro, watch as z, createElementBlock as A, openBlock as b, normalizeStyle as V, normalizeClass as m, createCommentVNode as ae, createElementVNode as B, createVNode as M, mergeProps as O, createSlots as ao, withCtx as ne, Fragment as no, renderList as lo, createBlock as le, resolveDynamicComponent as so, renderSlot as se, withDirectives as io, vShow as uo } from "vue";
 import { AgGridVue as co } from "ag-grid-vue3";
 import { ModuleRegistry as mo, AllCommunityModule as po } from "ag-grid-community";
 import { mergeProps as fo } from "./utils.mjs";
 import { Spin as go, Pagination as wo } from "@aplus-frontend/antdv";
-import { isUndefined as F, isFunction as se } from "lodash-unified";
+import { isUndefined as F, isFunction as G } from "lodash-unified";
 import "../config-provider/index.mjs";
 import { ApForm as So } from "../ap-form/index.mjs";
 import { recursionApColumns as yo } from "../ap-table/utils.mjs";
@@ -101,11 +101,11 @@ const mt = /* @__PURE__ */ oo({
   },
   setup(de, { expose: ue }) {
     mo.registerModules([po]);
-    const o = de, W = to(), { e: k, b: u, be: ce } = zo("ag-grid"), y = I(o.size), me = ko(y, T(o, "rowHeight")), pe = Eo(T(o, "virtual")), { rowPinnedGridConfig: G, getRowPinnedCellClass: fe } = Ko(
+    const o = de, W = to(), { e: k, b: u, be: ce } = zo("ag-grid"), C = I(o.size), me = ko(C, T(o, "rowHeight")), pe = Eo(T(o, "virtual")), { rowPinnedGridConfig: H, getRowPinnedCellClass: fe } = Ko(
       T(o, "summary")
     ), ge = Ao("apGrid"), s = I(), [, we] = Fo();
     let p = !!o.dataSource;
-    const H = Do(o), { shownColumns: f, columns: L, columnKeys: Se, getTargetColumnByKey: ye } = xo(o), { defaultColDef: Ce, columnDefs: he, gridWrapperRef: ve } = Io(L, o, fe), x = I({});
+    const L = Do(o), { shownColumns: f, columns: U, columnKeys: Se, getTargetColumnByKey: ye } = xo(o), { defaultColDef: Ce, columnDefs: he, gridWrapperRef: ve } = Io(U, o, fe), x = I({});
     vo({
       sorter: x,
       setSorter(e) {
@@ -126,11 +126,11 @@ const mt = /* @__PURE__ */ oo({
       }
       if (!a)
         return;
-      const i = a.getColDef(), S = a.getSort(), v = ye(i.colId);
-      j(void 0, void 0, {
+      const i = a.getColDef(), y = a.getSort(), v = ye(i.colId);
+      $(void 0, void 0, {
         column: i,
         field: v?.field ?? i.field ?? i.colId,
-        order: S ? Re[S] : null
+        order: y ? Re[y] : null
       });
     }
     const Be = l(() => yo(t(f), (e) => {
@@ -148,16 +148,16 @@ const mt = /* @__PURE__ */ oo({
       submit: N,
       reset: D,
       data: w,
-      tableProps: U,
-      handleTableChangeOptional: j,
-      submitWith: $,
-      refresh: q,
+      tableProps: j,
+      handleTableChangeOptional: $,
+      submitWith: q,
+      refresh: J,
       getPaging: xe,
       setPaging: Ie,
       setDataSource: Te
     } = Co({
       async request(e) {
-        if (p = !1, C.value && !C.value.preserveSelectedRowKeys && F(o.dataSource) && P(), !F(o.dataSource)) {
+        if (p = !1, S.value && !S.value.preserveSelectedRowKeys && F(o.dataSource) && P(), !F(o.dataSource)) {
           const a = e.pageSize * (e.current - 1);
           return {
             data: (o.pagination === !1 ? o.dataSource : o.dataSource.slice(a, a + e.pageSize)) || [],
@@ -179,7 +179,7 @@ const mt = /* @__PURE__ */ oo({
       pagination: o.pagination,
       sortFields: Be,
       onClickReset: Fe
-    }), C = l(() => {
+    }), S = l(() => {
       const e = o.rowSelection || ge.value?.rowSelection;
       if (e)
         return e === !0 ? ie : {
@@ -196,14 +196,14 @@ const mt = /* @__PURE__ */ oo({
       clearAll: ze,
       selectMultiByKeys: Ae
     } = ho({
-      ...C,
+      ...S,
       dataSource: De,
       rowKey: o.rowKey
     }), Ve = {
       checkbox: "multiRow",
       radio: "singleRow"
     }, Me = l(() => {
-      const e = C.value;
+      const e = S.value;
       if (!e)
         return;
       const { type: r = "checkbox", disabled: a } = e;
@@ -213,12 +213,12 @@ const mt = /* @__PURE__ */ oo({
       };
     });
     function K(e) {
-      return se(o.rowKey) ? o.rowKey(e) : e[o.rowKey];
+      return G(o.rowKey) ? o.rowKey(e) : e[o.rowKey];
     }
-    const J = ({
+    const Q = ({
       api: e = s.value
     }) => {
-      if (o.onUpdate?.(), !C.value)
+      if (o.onUpdate?.(), !S.value)
         return;
       const r = E.value;
       if (!r.length) {
@@ -231,39 +231,44 @@ const mt = /* @__PURE__ */ oo({
       const a = [];
       e.forEachNode((d) => {
         const h = d.data, i = K(h);
-        r.find((S) => K(S) === i) && a.push(d);
+        r.find((y) => K(y) === i) && a.push(d);
       }), e.setNodesSelected({ nodes: a, newValue: !0 }), setTimeout(() => {
         p = !0;
       }, 0);
     }, Oe = (e) => {
-      p && (e.node.isSelected() ? Ee(e.data) : Ke(e.data));
-    }, We = () => {
+      p && (e.node.isSelected() ? Ee(e.data) : Ke(e.data), G(S.value?.tooltip) && e.api.refreshCells({
+        rowNodes: [e.node],
+        // todo: 取消硬编码
+        columns: ["ag-Grid-SelectionColumn"],
+        force: !0
+      }));
+    }, Ge = () => {
       p = !0;
     }, P = () => {
       ze(), s.value?.deselectAll();
     };
-    function Ge(e) {
+    function We(e) {
       Ae(e), ro(() => {
-        J({});
+        Q({});
       });
     }
-    function Q(e = !1) {
+    function X(e = !1) {
       const r = e ? "getFieldsValueTransformed" : "getFieldsValue";
       return g.value?.apForm?.[r]?.(!0);
     }
-    function X(e) {
+    function Y(e) {
       g.value?.apForm?.setFieldsValue?.(e);
     }
-    function Y() {
+    function Z() {
       return g.value?.getSorterItems() || [];
     }
-    function Z(e) {
+    function _(e) {
       g.value?.setSorterItems(e);
     }
-    function _() {
+    function ee() {
       g.value?.resetSorterItems();
     }
-    function ee(e) {
+    function oe(e) {
       return e && String(e);
     }
     function He(e) {
@@ -273,21 +278,21 @@ const mt = /* @__PURE__ */ oo({
       const a = r.getColumnState() || [], d = e.map((n) => n.key ? String(n.key) : n.key).filter(Boolean), h = a.map((n) => {
         if (!Se.value.includes(n.colId))
           return n;
-        const R = !d.includes(n.colId), oe = {
+        const R = !d.includes(n.colId), te = {
           ...n,
           hide: R
-        }, te = e.find(
-          (eo) => ee(eo.key) === n.colId
+        }, re = e.find(
+          (eo) => oe(eo.key) === n.colId
         );
-        return te && (oe.pinned = te.fixed || null), oe;
+        return re && (te.pinned = re.fixed || null), te;
       }), i = new Map(
-        e.map((n, R) => [ee(n.key), R])
-      ), S = h.filter((n) => i.has(n.colId)).sort(
+        e.map((n, R) => [oe(n.key), R])
+      ), y = h.filter((n) => i.has(n.colId)).sort(
         (n, R) => i.get(n.colId) - i.get(R.colId)
       ), v = [];
       let c = 0;
       for (const n of h)
-        i.has(n.colId) ? v.push(S[c++]) : v.push(n);
+        i.has(n.colId) ? v.push(y[c++]) : v.push(n);
       r.applyColumnState({
         state: v,
         applyOrder: !0
@@ -295,28 +300,28 @@ const mt = /* @__PURE__ */ oo({
     }
     Ro({
       columns: l(() => f.value),
-      columnsBackup: l(() => L.value),
-      size: l(() => Bo[y.value]),
+      columnsBackup: l(() => U.value),
+      size: l(() => Bo[C.value]),
       updateColumns(e) {
         f.value = e, o.onShownColumnsChange?.(e), He(e);
       },
       updateSize(e) {
-        y.value = bo[e];
+        C.value = bo[e];
       },
       renderConfig: l(() => ({
         className: ce("table-header", "title"),
         color: we.value.colorTextTertiary
       })),
       dataSource: l(() => t(w).records),
-      getSearchFormValues: Q,
-      setSearchFormValues: X,
+      getSearchFormValues: X,
+      setSearchFormValues: Y,
       submit: N,
-      submitWith: $,
+      submitWith: q,
       reset: D,
-      refresh: q,
-      getSearchFormSorterItems: Y,
-      setSearchFormSorterItems: Z,
-      resetSearchFormSorterItems: _
+      refresh: J,
+      getSearchFormSorterItems: Z,
+      setSearchFormSorterItems: _,
+      resetSearchFormSorterItems: ee
     });
     const Le = l(
       () => F(o.loading) ? w.loading : o.loading
@@ -324,12 +329,12 @@ const mt = /* @__PURE__ */ oo({
       u(),
       o.card ? null : u("wrapper"),
       u("adaptive"),
-      u(`size-${y.value}`)
+      u(`size-${C.value}`)
     ].filter(Boolean)), je = l(() => ({
       height: "100%",
       ...o.tableStyle || {}
     })), $e = (e, r) => {
-      j({ current: e, pageSize: r });
+      $({ current: e, pageSize: r });
     };
     function qe(e) {
       const r = e.data;
@@ -352,10 +357,10 @@ const mt = /* @__PURE__ */ oo({
     }
     const _e = (e) => {
       const r = [
-        G.value.getRowClass?.(e)
+        H.value.getRowClass?.(e)
       ];
       if (!e.node.rowPinned) {
-        const a = se(o.rowClassName) ? o.rowClassName(e.data, e.rowIndex) : o.rowClassName;
+        const a = G(o.rowClassName) ? o.rowClassName(e.data, e.rowIndex) : o.rowClassName;
         r.push(a);
       }
       return r.flat().filter(Boolean);
@@ -369,7 +374,7 @@ const mt = /* @__PURE__ */ oo({
     ), z(
       () => o.size,
       (e) => {
-        y.value = e;
+        C.value = e;
       }
     ), z(
       () => t(w).loading,
@@ -379,23 +384,23 @@ const mt = /* @__PURE__ */ oo({
     ), ue({
       submit: N,
       reset: D,
-      refresh: q,
-      submitWith: $,
-      setSearchFormValues: X,
-      getSearchFormValues: Q,
+      refresh: J,
+      submitWith: q,
+      setSearchFormValues: Y,
+      getSearchFormValues: X,
       getShowColumns: () => t(f),
       rowSelection: {
         selectedRows: l(() => E.value),
-        setSelectedRowKeys: Ge,
+        setSelectedRowKeys: We,
         clearAll: P
       },
       scrollToRow: Je,
       getDataSource: () => t(w.records),
       getPaging: xe,
       setPaging: Ie,
-      getSearchFormSorterItems: Y,
-      setSearchFormSorterItems: Z,
-      resetSearchFormSorterItems: _,
+      getSearchFormSorterItems: Z,
+      setSearchFormSorterItems: _,
+      resetSearchFormSorterItems: ee,
       refreshCells: Ye,
       redrawRows: Ze,
       _internalGridApi: l(() => s.value)
@@ -403,7 +408,7 @@ const mt = /* @__PURE__ */ oo({
       class: m(Ue.value),
       style: V(e.wrapperStyle)
     }, [
-      t(F)(e.dataSource) && e.searchForm !== !1 && t(H).length > 0 ? (b(), A("div", {
+      t(F)(e.dataSource) && e.searchForm !== !1 && t(L).length > 0 ? (b(), A("div", {
         key: 0,
         class: m(e.card ? t(k)("search-wrapper") : null),
         style: V(e.searchFormWrapperStyle)
@@ -412,12 +417,12 @@ const mt = /* @__PURE__ */ oo({
           ref_key: "formRef",
           ref: g,
           "custom-reset": "",
-          "submit-loading": t(U).loading,
+          "submit-loading": t(j).loading,
           onSubmit: t(N),
           onReset: t(D)
         }), ao({
-          default: ae(() => [
-            (b(!0), A(no, null, lo(t(H), (a) => (b(), ne(so(a.renderNode), {
+          default: ne(() => [
+            (b(!0), A(no, null, lo(t(L), (a) => (b(), le(so(a.renderNode), {
               key: a.dataIndex
             }))), 128))
           ]),
@@ -425,13 +430,13 @@ const mt = /* @__PURE__ */ oo({
         }, [
           W.searchFormExtra ? {
             name: "extra",
-            fn: ae(() => [
-              le(e.$slots, "searchFormExtra")
+            fn: ne(() => [
+              se(e.$slots, "searchFormExtra")
             ]),
             key: "0"
           } : void 0
         ]), 1040, ["submit-loading", "onSubmit", "onReset"])
-      ], 6)) : re("", !0),
+      ], 6)) : ae("", !0),
       B("div", {
         class: m([t(k)("table-wrapper"), e.card ? t(k)("table-wrapper-card") : null]),
         style: V(e.tableWrapperStyle)
@@ -439,7 +444,7 @@ const mt = /* @__PURE__ */ oo({
         B("div", {
           class: m(t(u)("header-wrapper"))
         }, [
-          le(e.$slots, "title", {
+          se(e.$slots, "title", {
             selectedRows: t(E),
             selectedRowKeys: t(Pe),
             shownColumns: t(f),
@@ -451,7 +456,7 @@ const mt = /* @__PURE__ */ oo({
           ref: ve,
           class: m(t(u)("grid-wrapper"))
         }, [
-          M(t(co), O(t(fo)(t(pe), t(G)), {
+          M(t(co), O(t(fo)(t(pe), t(H)), {
             "get-row-class": _e,
             style: je.value,
             "row-data": t(w).records,
@@ -471,9 +476,9 @@ const mt = /* @__PURE__ */ oo({
             "dom-layout": e.autoHeight ? "autoHeight" : "normal",
             onSortChanged: be,
             onGridReady: r[0] || (r[0] = (a) => s.value = a.api),
-            onRowDataUpdated: J,
+            onRowDataUpdated: Q,
             onRowSelected: Oe,
-            onFirstDataRendered: We,
+            onFirstDataRendered: Ge,
             onRowClicked: Qe,
             onBodyScrollEnd: Xe
           }), null, 16, ["style", "row-data", "column-defs", "default-col-def", "row-selection", "selection-column-def", "theme", "enable-browser-tooltips", "row-class-rules", "dom-layout"]),
@@ -488,10 +493,10 @@ const mt = /* @__PURE__ */ oo({
         B("div", {
           class: m(t(u)("pagination-wrapper"))
         }, [
-          e.pagination !== !1 ? (b(), ne(t(wo), O({
+          e.pagination !== !1 ? (b(), le(t(wo), O({
             key: 0,
             class: t(u)("pagination")
-          }, t(U).pagination, { onChange: $e }), null, 16, ["class"])) : re("", !0)
+          }, t(j).pagination, { onChange: $e }), null, 16, ["class"])) : ae("", !0)
         ], 2)
       ], 6)
     ], 6));

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

@@ -106,7 +106,7 @@ export type AgGridColumnType<RecordType = any, ExtraValueType = 'text', ValueTyp
 } : null;
 export type AgGridRowSelection<RecordType> = Pick<TableRowSelection<RecordType>, 'type' | 'fixed' | 'columnWidth' | 'defaultSelectedRowKeys'> & {
     /**
-     * 设置禁用的列
+     * 设置禁用的行
      * @param row
      * @returns
      */
@@ -115,6 +115,10 @@ export type AgGridRowSelection<RecordType> = Pick<TableRowSelection<RecordType>,
      * 在后端分页下，是否在网络请求后仍然保留上一次的选中（即使不在当前数据中）
      */
     preserveSelectedRowKeys?: boolean;
+    /**
+     * 行选择列自定义tooltip
+     */
+    tooltip?: string | ((checked: boolean, disabled: boolean, rowNode: IRowNode) => string | any);
 };
 export type AgGridVirtualConfig = {
     row?: boolean;

package/es/src/ap-form/ap-form.vue.d.ts

@@ -370,9 +370,7 @@ declare function __VLS_template(): {
                         default: string | number | ColSize;
                     };
                     xxl: {
-                        type: **
-                         * 执行Watch回调
-                         */).PropType<string | number | ColSize>;
+                        type: PropType<string | number | ColSize>;
                         default: string | number | ColSize;
                     };
                     prefixCls: StringConstructor;
@@ -1042,9 +1040,7 @@ declare const __VLS_component: DefineComponent<ApFormProps, {
                     default: string | number | ColSize;
                 };
                 xxl: {
-                    type: **
-                     * 执行Watch回调
-                     */).PropType<string | number | ColSize>;
+                    type: PropType<string | number | ColSize>;
                     default: string | number | ColSize;
                 };
                 prefixCls: StringConstructor;