@aplus-frontend/ui 6.39.2 → 6.41.0

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

@@ -1,16 +1,14 @@
-import { useToken as d } from "@aplus-frontend/antdv/es/theme/internal";
-import { themeQuartz as n } from "ag-grid-community";
-import { computed as c } from "vue";
-const h = (o, r) => {
-  const [, a] = d();
-  return c(() => {
-    const t = o.value === "mini", e = a.value;
-    return n.withParams({
+import { useToken as n } from "@aplus-frontend/antdv/es/theme/internal";
+import { themeQuartz as c } from "ag-grid-community";
+import { computed as l } from "vue";
+const h = (o, r, a) => {
+  const [, t] = n();
+  return l(() => {
+    const d = o.value === "mini", e = t.value;
+    return c.withParams({
       headerHeight: "36px",
       headerFontSize: "12px",
       dataFontSize: "12px",
-      rowHeight: r.value,
-      spacing: t ? "5px" : "6.5px",
       foregroundColor: e.colorTextBase,
       wrapperBorder: !1,
       rowBorder: { color: e.colorBorderSecondary },
@@ -21,7 +19,10 @@ const h = (o, r) => {
       headerBackgroundColor: "var(--ap-table-header-bg)",
       headerColumnResizeHandleHeight: "50%",
       headerColumnResizeHandleWidth: "1px",
-      wrapperBorderRadius: "4px"
+      wrapperBorderRadius: "4px",
+      ...a.value || {},
+      rowHeight: r.value,
+      spacing: d ? "5px" : "6.5px"
     });
   });
 };

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

@@ -1,4 +1,4 @@
-import { DropdownProps, ModalFuncProps, PopconfirmProps } from '@aplus-frontend/antdv';
+import { DropdownProps, ModalFuncProps, PopconfirmProps, TooltipProps } from '@aplus-frontend/antdv';
 import { VNode } from 'vue';
 export type ActionColor = 'primary' | 'success' | 'error' | 'warn';
 export type ApActionItemProps = {
@@ -43,6 +43,10 @@ export type ApActionItemProps = {
      * 是否优先显示图标
      */
     iconFirst?: boolean;
+    /**
+     * 优先显示图标时，对弹出的tooltip进行设置
+     */
+    tooltip?: Partial<Omit<TooltipProps, 'title'>>;
 };
 export type MixedActionTypes = ApActionItemProps | ApActionItemModalProps | ApActionItemPopconfirmProps;
 export type GroupActionTypes = MixedActionTypes | ApActionItemDropdownProps;

package/es/src/ap-action/item/index.vue2.mjs

@@ -1,9 +1,9 @@
-import { defineComponent as C, useSlots as B, createPropsRestProxy as h, ref as A, computed as u, unref as n, renderSlot as y, createElementBlock as f, createCommentVNode as a, openBlock as t, mergeProps as F, createBlock as m, normalizeClass as N, createVNode as L, withCtx as P, resolveDynamicComponent as g, isVNode as S, toDisplayString as V } from "vue";
+import { defineComponent as B, useSlots as h, createPropsRestProxy as A, ref as F, computed as u, unref as n, renderSlot as y, createElementBlock as f, createCommentVNode as a, openBlock as t, mergeProps as g, createBlock as m, normalizeClass as N, createVNode as L, withCtx as P, resolveDynamicComponent as k, isVNode as S, toDisplayString as V } from "vue";
 import "../../config-provider/index.mjs";
 import $ from "@aplus-frontend/antdv/es/button/LoadingIcon";
 import { Tooltip as w } from "@aplus-frontend/antdv";
-import { useNamespace as x } from "../../config-provider/hooks/use-namespace.mjs";
-const D = { key: 1 }, q = /* @__PURE__ */ C({
+import { useNamespace as D } from "../../config-provider/hooks/use-namespace.mjs";
+const I = { key: 1 }, q = /* @__PURE__ */ B({
   name: "ApActionItem",
   __name: "index",
   props: {
@@ -15,27 +15,28 @@ const D = { key: 1 }, q = /* @__PURE__ */ C({
     onClick: { type: Function },
     loading: { type: Boolean, default: !1 },
     icon: {},
-    iconFirst: { type: Boolean, default: !1 }
+    iconFirst: { type: Boolean, default: !1 },
+    tooltip: { default: () => ({}) }
   },
   setup(o) {
-    const s = B(), r = h(o, ["color", "disabled", "visible", "loading", "iconFirst", "icon"]), { b: k, m: l, e: v } = x("action-item"), c = A(!1), d = u(() => o.iconFirst && (o.icon || s.icon));
+    const s = h(), r = A(o, ["color", "disabled", "visible", "loading", "iconFirst", "icon", "tooltip"]), { b: v, m: l, e: b } = D("action-item"), c = F(!1), d = u(() => o.iconFirst && (o.icon || s.icon));
     function p(e) {
       n(i) || o.disabled || (r.onClick?.(e), r.onAction && (c.value = !0, r.onAction(e).finally(() => c.value = !1)));
     }
-    const i = u(() => o.loading || n(c)), b = u(() => [
-      k(),
+    const i = u(() => o.loading || n(c)), C = u(() => [
+      v(),
       l(o.color),
       d.value ? l("icon-first") : null,
       o.disabled ? l("disabled") : null,
       i.value ? l("loading") : null
     ].filter(Boolean));
-    return (e, I) => y(e.$slots, "trigger", {
+    return (e, T) => y(e.$slots, "trigger", {
       loading: i.value,
       disabled: e.disabled,
       onClick: p
     }, () => [
-      e.visible ? (t(), f("span", F({ key: 0 }, e.$attrs, {
-        class: b.value,
+      e.visible ? (t(), f("span", g({ key: 0 }, e.$attrs, {
+        class: C.value,
         onClick: p
       }), [
         i.value ? (t(), m(n($), {
@@ -46,19 +47,19 @@ const D = { key: 1 }, q = /* @__PURE__ */ C({
         })) : a("", !0),
         e.icon || s.icon ? (t(), f("span", {
           key: 1,
-          class: N(n(v)("icon-wrapper"))
+          class: N(n(b)("icon-wrapper"))
         }, [
-          L(n(w), {
+          L(n(w), g({
             title: d.value ? e.text : null
-          }, {
+          }, e.tooltip), {
             default: P(() => [
-              (t(), m(g(e.icon || s.icon)))
+              (t(), m(k(e.icon || s.icon)))
             ]),
             _: 1
-          }, 8, ["title"])
+          }, 16, ["title"])
         ], 2)) : a("", !0),
         d.value ? a("", !0) : y(e.$slots, "default", { key: 2 }, () => [
-          S(e.text) ? (t(), m(g(e.text), { key: 0 })) : (t(), f("span", D, V(e.text || ""), 1))
+          S(e.text) ? (t(), m(k(e.text), { key: 0 })) : (t(), f("span", I, V(e.text || ""), 1))
         ])
       ], 16)) : a("", !0)
     ]);

package/es/src/ap-action/item-dropdown/index.vue.mjs

@@ -25,7 +25,8 @@ const T = /* @__PURE__ */ _({
     onClick: {},
     loading: { type: Boolean, default: !1 },
     icon: {},
-    iconFirst: { type: Boolean }
+    iconFirst: { type: Boolean },
+    tooltip: {}
   },
   setup(d) {
     const f = d, i = v(!1), { e: p } = E("action-item-dropdown"), g = k(() => f.actions.filter((e) => e.visible || V(e.visible)).map((e) => ({

package/es/src/ap-action/item-modal/index.vue.mjs

@@ -1,4 +1,4 @@
-import { defineComponent as i, useSlots as s, createBlock as c, openBlock as p, mergeProps as m, unref as d, createSlots as f, renderList as u, withCtx as _, renderSlot as y, normalizeProps as A, guardReactiveProps as P } from "vue";
+import { defineComponent as i, useSlots as s, createBlock as p, openBlock as c, mergeProps as m, unref as d, createSlots as f, renderList as u, withCtx as _, renderSlot as y, normalizeProps as A, guardReactiveProps as P } from "vue";
 import { Modal as B } from "@aplus-frontend/antdv";
 import "../item/index.vue.mjs";
 import { omit as k } from "lodash-unified";
@@ -16,10 +16,11 @@ const z = /* @__PURE__ */ i({
     loading: { type: Boolean, default: !1 },
     icon: {},
     iconFirst: { type: Boolean },
+    tooltip: {},
     modalProps: { default: () => ({}) }
   },
-  setup(t) {
-    const r = s(), o = t;
+  setup(n) {
+    const r = s(), o = n;
     async function a(e) {
       B.confirm({
         ...o.modalProps,
@@ -29,11 +30,11 @@ const z = /* @__PURE__ */ i({
         }
       });
     }
-    return (e, g) => (p(), c(x, m(d(k)(o, ["modalProps", "onAction"]), { onAction: a }), f({ _: 2 }, [
-      u(r, (h, n) => ({
-        name: n,
+    return (e, g) => (c(), p(x, m(d(k)(o, ["modalProps", "onAction"]), { onAction: a }), f({ _: 2 }, [
+      u(r, (h, t) => ({
+        name: t,
         fn: _((l) => [
-          y(e.$slots, n, A(P(l || {})))
+          y(e.$slots, t, A(P(l || {})))
         ])
       }))
     ]), 1040));

package/es/src/ap-action/item-popconfirm/index.vue.mjs

@@ -16,6 +16,7 @@ const I = /* @__PURE__ */ f({
     loading: { type: Boolean, default: !1 },
     icon: {},
     iconFirst: { type: Boolean },
+    tooltip: {},
     popconfirmProps: { default: () => ({}) }
   },
   setup(a) {

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

@@ -1,23 +1,23 @@
-import { createVNode as o, Fragment as p } from "vue";
-import { isArray as c, isUndefined as N, isString as b, isBoolean as F, isNumber as E, pick as x } from "lodash-unified";
-import { valueEnumToArray as O, objectToString as $, getTableTitle as v, getTableRenderType as w, getTableRenderProps as S, getTableCellRenderNode as V } from "../../ap-table/utils.mjs";
-import { noRenderAsFormItemValueList as B } from "../../ap-table/constants.mjs";
+import { createVNode as u, Fragment as h } from "vue";
+import { isArray as b, isUndefined as E, isString as o, isBoolean as x, isNumber as O, pick as F } from "lodash-unified";
+import { valueEnumToArray as S, objectToString as $, getTableTitle as R, getTableRenderType as V, getTableRenderProps as B, getTableCellRenderNode as M } from "../../ap-table/utils.mjs";
+import { noRenderAsFormItemValueList as _ } from "../../ap-table/constants.mjs";
 import "../../ap-table/components/paragraph-ellipsis/index.vue.mjs";
-import M from "../../ap-table/components/paragraph-ellipsis/index.vue2.mjs";
-function h(e, r) {
-  if (r)
-    return c(r) ? r.reduce((t, l) => t?.[l], e) : e?.[r];
+import j from "../../ap-table/components/paragraph-ellipsis/index.vue2.mjs";
+function T(e, t) {
+  if (t)
+    return b(t) ? t.reduce((r, n) => r?.[n], e) : e?.[t];
 }
-function A(e) {
-  if (!N(e))
-    return c(e) ? e.reduce((r, t) => b(t) ? `${r}${r ? "." : ""}${t}` : `${r}[${t}]`, "") : String(e);
+function v(e) {
+  if (!E(e))
+    return b(e) ? e.reduce((t, r) => o(r) ? `${t}${t ? "." : ""}${r}` : `${t}[${r}]`, "") : String(e);
 }
-function R(e) {
+function A(e) {
   if (e)
     return e === !0 ? "left" : e;
 }
-function j(e) {
-  return F(e) ? {
+function q(e) {
+  return x(e) ? {
     sortable: e
   } : e ? {
     sortable: !0,
@@ -27,117 +27,126 @@ function j(e) {
     sortable: !1
   };
 }
-function q(e) {
-  let r;
-  return F(e.filters) && e.valueEnum ? r = O(e.valueEnum) : r = e.filters, r?.map((t) => ({
-    label: b(t.text) ? t.text : "",
-    value: t.value
+function I(e) {
+  let t;
+  return x(e.filters) && e.valueEnum ? t = S(e.valueEnum) : t = e.filters, t?.map((r) => ({
+    label: o(r.text) ? r.text : "",
+    value: r.value
   }));
 }
 function W(e) {
   if (e)
-    return (r) => e(r.value, r.row);
+    return (t) => e(t.value, t.row);
 }
-function _(e, r) {
-  return e ? E(e) ? {
-    tooltip: r,
+function k(e, t) {
+  return e ? O(e) ? {
+    tooltip: t,
     rows: e
   } : e === !0 || e === "tooltip" ? {
-    tooltip: r,
+    tooltip: t,
     rows: 1
   } : {
     tooltip: null,
     rows: 1,
-    htmlTitle: e === "title" ? r : ""
+    htmlTitle: e === "title" ? t : ""
   } : !1;
 }
-function k(e, r, t) {
-  if (B.includes(e.valueType))
-    return t;
+function z(e, t, r) {
+  if (_.includes(e.valueType))
+    return r;
   if (e.copyable || e.ellipsis) {
-    const l = _(e.ellipsis, r), i = $(r);
-    return o(M, {
+    const n = k(e.ellipsis, t), i = $(t);
+    return u(j, {
       rawValue: i,
       copyable: e.copyable,
-      ellipsis: l,
-      content: t
+      ellipsis: n,
+      content: r
     }, null);
   }
-  return t;
+  return r;
+}
+function c(e, t, r) {
+  const n = F(e, ["width", "minWidth", "align"]);
+  return n.field = v(e.dataIndex), n.fixed = A(e.fixed), n.slots = {
+    header: () => R(e, r, void 0, t)
+  }, n.headerAlign = e.align, n.showOverflow = !1, n.showFooterOverflow = !1, n;
 }
-function T(e, r, t) {
-  const l = x(e, ["width", "minWidth", "align"]);
-  return l.field = A(e.dataIndex), l.fixed = R(e.fixed), l.slots = {
-    header: () => v(e, t, void 0, r)
-  }, l.headerAlign = e.align, l.showOverflow = !1, l.showFooterOverflow = !1, l;
+function D(e, t, r) {
+  if (r)
+    return o(r) ? e[r] : r(e, t);
 }
-const z = ({
+const G = ({
   value: e,
-  ...r
-}, t, l, i = !0) => {
-  const s = w(t), d = S({
-    ...t,
+  ...t
+}, r, n, i = !0) => {
+  const s = V(r), d = B({
+    ...r,
     valueType: s
   }, {
     value: e,
-    ...r
-  }), n = V(s, d, r.record, l), a = t.renderText?.({
-    value: e,
-    ...r
-  }) || e, u = t.renderText ? o(p, null, [t.renderText?.({
+    ...t
+  }), l = M(s, d, t.record, n), a = r.renderText?.({
     value: e,
-    ...r
-  })]) : n;
-  let f = i ? k(t, a, u) : u;
-  return t.customRender && (f = t.customRender({
+    ...t
+  }) || e, p = r.renderText ? u(h, null, [r.renderText?.({
     value: e,
-    ...r,
-    column: t,
-    originalNode: f,
-    originalText: a
-  })), o(p, null, [f]);
+    ...t
+  })]) : l;
+  let f = i ? z(r, a, p) : p;
+  if (r.customRender) {
+    const N = r._path || [], w = D(t.record, t.rowIndex, t.params.rowKey);
+    f = r.customRender({
+      value: e,
+      ...t,
+      column: r,
+      originalNode: f,
+      originalText: a,
+      path: [...N, String(w)]
+    });
+  }
+  return u(h, null, [f]);
 };
-function y(e, r, t, l) {
-  const i = x(e, ["width", "minWidth", "align", "resizable", "className", "headerClassName", "footerClassName", "treeNode"]);
-  i.field = A(e.dataIndex), i.fixed = R(e.fixed), i.headerAlign = e.align, i.footerAlign = e.align, i.showOverflow = !1, i.showFooterOverflow = !1, Object.assign(i, j(e.sorter)), i.filters = q(e), i.filterMultiple = e.filterMultiple, i.filterMethod = W(e.onFilter);
+function y(e, t, r, n) {
+  const i = F(e, ["width", "minWidth", "align", "resizable", "className", "headerClassName", "footerClassName", "treeNode"]);
+  i.field = v(e.dataIndex), i.fixed = A(e.fixed), i.headerAlign = e.align, i.footerAlign = e.align, i.showOverflow = !1, i.showFooterOverflow = !1, Object.assign(i, q(e.sorter)), i.filters = I(e), i.filterMultiple = e.filterMultiple, i.filterMethod = W(e.onFilter);
   const s = ({
     row: d,
-    rowIndex: n
-  }) => z({
-    value: h(d, e.dataIndex),
-    text: h(d, e.dataIndex),
+    rowIndex: l
+  }) => G({
+    value: T(d, e.dataIndex),
+    text: T(d, e.dataIndex),
     record: d,
-    index: n,
-    renderIndex: n,
+    index: l,
+    renderIndex: l,
     column: e
-  }, e, l);
+  }, e, n);
   return i.slots = {
-    header: () => v(e, t, void 0, r),
+    header: () => R(e, r, void 0, t),
     default: s,
     footer: s
   }, e.html && (delete i.slots.default, delete i.slots.footer, i.type = "html"), e.seq && (i.type = "seq", i.slots = {}), i;
 }
-function J(e, r, t, l) {
+function X(e, t, r, n) {
   if (!e.children?.length)
-    return y(e, r, t, l);
+    return y(e, t, r, n);
   function i(d) {
-    return d.map((n) => {
-      if (n.children?.length) {
-        const a = T(n, r, t);
-        return a.children = i(n.children), a;
+    return d.map((l) => {
+      if (l.children?.length) {
+        const a = c(l, t, r);
+        return a.children = i(l.children), a;
       }
-      return y(n, r, t, l);
+      return y(l, t, r, n);
     });
   }
-  const s = T(e, r, t);
+  const s = c(e, t, r);
   return s.children = i(e.children), s;
 }
 export {
-  z as contentCustom,
-  A as dataIndexToField,
-  h as getValueByDataIndex,
-  J as transformCol,
-  R as transformFixed,
-  T as transformToColGroup,
+  G as contentCustom,
+  v as dataIndexToField,
+  T as getValueByDataIndex,
+  X as transformCol,
+  A as transformFixed,
+  c as transformToColGroup,
   y as transformToColumn
 };

package/es/src/business/ag-grid-modal/hooks/use-ag-grid-instance.mjs

@@ -36,7 +36,7 @@ function L(n) {
         dataSourceLength: a(
           () => l.value
         )
-      }), m.default;
+      }), () => m.default?.();
     }
   });
   return [s, p];

package/es/src/business/ag-grid-modal/hooks/use-ag-grid-modal.d.ts

@@ -1,3 +1,4 @@
 import { AgGridPreviewModalProps, PreviewModalReturnType } from '../interface';
+import { Recordable } from '../../../type';
 /** ag-grid弹框 */
-export declare function useAgGridModal<T = any>(props: AgGridPreviewModalProps<T>): PreviewModalReturnType<T>;
+export declare function useAgGridModal<T extends Recordable = any>(props: AgGridPreviewModalProps<T>): PreviewModalReturnType<T>;

package/es/src/business/ag-grid-modal/hooks/use-ag-grid-modal.mjs

@@ -1,29 +1,29 @@
-import { defineComponent as v, ref as w, createVNode as n } from "vue";
-import { ApModal as P } from "../../../ap-modal/index.mjs";
+import { defineComponent as P, ref as v, createVNode as n, mergeProps as w } from "vue";
+import { ApModal as y } from "../../../ap-modal/index.mjs";
 import "../../../ag-grid/index.mjs";
-import { genRequest as y } from "../utils.mjs";
-import { useAgGridInstance as I } from "./use-ag-grid-instance.mjs";
-import { isFunction as A, isEmpty as f, omitBy as M, isUndefined as _, omit as q } from "lodash-unified";
+import { genRequest as I } from "../utils.mjs";
+import { useAgGridInstance as A } from "./use-ag-grid-instance.mjs";
+import { isFunction as M, isEmpty as f, omitBy as _, isUndefined as q, omit as G } from "lodash-unified";
 import "../wrapper/index.vue.mjs";
-import G from "../wrapper/index.vue2.mjs";
-import H from "../../../ag-grid/index.vue.mjs";
-function L(o) {
+import H from "../wrapper/index.vue2.mjs";
+import x from "../../../ag-grid/index.vue.mjs";
+function j(r) {
   let a = null, s = null;
-  const [r, c] = I(), l = y(o.api, o.getRowKey, r.setDataSourceLength), u = (t) => {
+  const [o, c] = A(), l = I(r.api, r.getRowKey, o.setDataSourceLength), u = (t) => {
     const {
       title: e,
       width: i,
       modalProps: C,
       ...d
-    } = A(t) ? t(o) : t;
+    } = M(t) ? t(r) : t;
     f(d) || s?.(d);
-    const m = M({
+    const m = _({
       title: e,
       width: i,
       modalProps: C
-    }, _);
+    }, q);
     f(m) || a?.update(m);
-  }, g = /* @__PURE__ */ v({
+  }, g = /* @__PURE__ */ P({
     name: "AgGridModalPreviewContent",
     props: {
       modalConfig: {
@@ -32,20 +32,20 @@ function L(o) {
       }
     },
     setup(t) {
-      const e = w(t.modalConfig);
+      const e = v(t.modalConfig);
       return s = (i) => {
         e.value = {
           ...e.value,
           ...i
         };
       }, () => n(c, null, {
-        default: () => [n(G, {
+        default: () => [n(H, {
           rowHeight: e.value.rowHeight
         }, {
-          default: () => [e.value.renderHeader?.(q(r, "setInstance"), {
+          default: () => [e.value.renderHeader?.(G(o, "setInstance"), {
             updateProps: u
-          }), n(H, {
-            ref: r.setInstance,
+          }), n(x, w({
+            ref: o.setInstance,
             searchForm: {
               sortable: !1,
               resize: {
@@ -59,25 +59,25 @@ function L(o) {
             },
             rowHeight: e.value.rowHeight,
             columns: e.value.columns
-          }, e.value.gridSlots)]
+          }, r.gridProps), e.value.gridSlots)]
         })]
       });
     }
   });
   function p() {
-    a = P.createModal({
-      title: o.title,
-      width: o.width,
+    a = y.createModal({
+      title: r.title,
+      width: r.width,
       destroyOnClose: !0,
       maskClosable: !1,
       footer: null,
       afterOpenChange(t) {
-        t === !1 && (r.setInstance(void 0), r.setDataSourceLength(0), a = null);
+        t === !1 && (o.setInstance(void 0), o.setDataSourceLength(0), a = null);
       },
       content: n(g, {
-        modalConfig: o
+        modalConfig: r
       }, null),
-      ...o.modalProps || {}
+      ...r.modalProps || {}
     });
   }
   function h(t) {
@@ -85,11 +85,11 @@ function L(o) {
   }
   return {
     open: h,
-    refresh: r.refresh,
-    getAgGridInstance: r.getInstance,
+    refresh: o.refresh,
+    getAgGridInstance: o.getInstance,
     updateProps: u
   };
 }
 export {
-  L as useAgGridModal
+  j as useAgGridModal
 };

package/es/src/business/ag-grid-modal/hooks/use-ag-grid-select-modal.d.ts

@@ -1,2 +1,3 @@
 import { AgGridSelectModalProps, SelectModalReturnType } from '../interface';
-export declare function useAgGridSelectModal<T = any>(props: AgGridSelectModalProps<T>): SelectModalReturnType<T>;
+import { Recordable } from '../../../type';
+export declare function useAgGridSelectModal<T extends Recordable = any>(props: AgGridSelectModalProps<T>): SelectModalReturnType<T>;