@aplus-frontend/ui 0.6.0-beta.13 → 0.6.0-beta.15

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

@@ -239,6 +239,10 @@ export type ApGridProps<RecordType = any, ParamsType = any> = Omit<TableProps<Re
      * 作为表单项时内部传递，请勿使用
      */
     value?: any;
+    /**
+     * 行是否可以被高亮（传入函数可以获取当前被选中的行）
+     */
+    rowHighlightable?: boolean | ((current: RecordType) => void);
 };
 export type ApGridVirtualConfig = {
     x?: false | number;
@@ -289,6 +293,12 @@ export type ApGridExpose<SearchParamsType = Recordable, RecordType = any> = {
      */
     rowSelection: {
         selectedRows: ComputedRef<RecordType[]>;
+        /**
+         * 通过API调用设置行选中
+         * @param keys
+         * @returns
+         */
+        setSelectedRowKeys: (keys: (string | number)[]) => void;
         clearAll: () => void;
     };
     /**
@@ -303,4 +313,10 @@ export type ApGridExpose<SearchParamsType = Recordable, RecordType = any> = {
      * @returns
      */
     getDataSource: () => RecordType[];
+    /**
+     * 设置某一行被选中
+     * @param nextRow
+     * @returns
+     */
+    setCurrentRow: (nextRow: Partial<RecordType>) => void;
 };

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

@@ -1,10 +1,10 @@
-import { omit as u, isUndefined as l, isFunction as h, isNumber as m } from "lodash-unified";
+import { omit as l, isUndefined as s, isFunction as h, isNumber as m } from "lodash-unified";
 import { isDef as w } from "../../utils/index.mjs";
-const y = 20, C = 50, b = (e) => e.some((t) => !!t.html);
+const C = 20, b = 50, y = (e) => e.some((t) => !!t.html);
 function v(e) {
   var i;
   const t = {
-    ...u(e, [
+    ...l(e, [
       "columns",
       "request",
       "searchForm",
@@ -16,8 +16,9 @@ function v(e) {
   };
   if (t.rowConfig = {
     isHover: !0,
-    keyField: e.rowKey
-  }, t.columnConfig = {}, b(e.columns || []) && (t.rowConfig.useKey = !0, t.columnConfig.useKey = !0), e.adaptive && (t.autoResize = !0, t.height = "100%"), e.columnResizable && (t.columnConfig.resizable = !0), e.rowSelection) {
+    keyField: e.rowKey,
+    isCurrent: !!e.rowHighlightable
+  }, t.columnConfig = {}, y(e.columns || []) && (t.rowConfig.useKey = !0, t.columnConfig.useKey = !0), e.adaptive && (t.autoResize = !0, t.height = "100%"), e.columnResizable && (t.columnConfig.resizable = !0), e.rowSelection) {
     const o = e.rowSelection === !0 ? {} : e.rowSelection;
     o.type === "radio" ? t.radioConfig = {
       highlight: !0,
@@ -28,7 +29,7 @@ function v(e) {
         return o.shown ? o.shown(r) : !0;
       },
       checkRowKey: (i = o.defaultSelectedRowKeys) == null ? void 0 : i[0],
-      reserve: l(o.preserveSelectedRowKeys) ? !0 : o.preserveSelectedRowKeys
+      reserve: s(o.preserveSelectedRowKeys) ? !0 : o.preserveSelectedRowKeys
     } : t.checkboxConfig = {
       highlight: !0,
       checkMethod({ row: r }) {
@@ -37,12 +38,11 @@ function v(e) {
       visibleMethod({ row: r }) {
         return o.shown ? o.shown(r) : !0;
       },
-      checkRowKeys: o.defaultSelectedRowKeys,
-      reserve: l(o.preserveSelectedRowKeys) ? !0 : o.preserveSelectedRowKeys,
+      reserve: s(o.preserveSelectedRowKeys) ? !0 : o.preserveSelectedRowKeys,
       range: o.range || !1
     };
   }
-  return t.border = e.bordered === !1 ? "inner" : !0, e.expandable && (t.expandConfig = u(e.expandable, [
+  return t.border = e.bordered === !1 ? "inner" : !0, e.expandable && (t.expandConfig = l(e.expandable, [
     "renderContent",
     "width",
     "title"
@@ -50,22 +50,22 @@ function v(e) {
     enabled: !1
   }, t.virtualYConfig = {
     enabled: !1
-  }) : (f(t, "X", e.virtual), f(t, "Y", e.virtual)), t.round = w(e.round) ? e.round : !e.card, t;
+  }) : (a(t, "X", e.virtual), a(t, "Y", e.virtual)), t.round = w(e.round) ? e.round : !e.card, t;
 }
-function f(e, t, n) {
-  const i = t === "X", o = i ? "x" : "y", r = i ? "virtualXConfig" : "virtualYConfig", d = n == null ? void 0 : n[o], a = d !== !1, s = i ? y : C, c = m(d) && d >= 0 ? d : s;
+function a(e, t, n) {
+  const i = t === "X", o = i ? "x" : "y", r = i ? "virtualXConfig" : "virtualYConfig", u = n == null ? void 0 : n[o], f = u !== !1, d = i ? C : b, c = m(u) && u >= 0 ? u : d;
   e[r] = {
-    enabled: a,
+    enabled: f,
     gt: c,
     oSize: (n == null ? void 0 : n.oSize) || 0
   };
 }
-function x(e) {
+function g(e) {
   return e === !0 ? "left" : e;
 }
 function K(e, t) {
   const n = e === !0 || !e.type ? "checkbox" : e.type, i = e === !0 ? 60 : e.columnWidth || 60;
-  let o = e === !0 ? void 0 : x(e.fixed);
+  let o = e === !0 ? void 0 : g(e.fixed);
   return o || (o === !1 ? o = void 0 : o = t.some(
     (r) => r.fixed === "left" || r.fixed === !0
   ) ? "left" : void 0), {

package/es/src/ap-table/hooks/use-table-paging-ng.d.ts

@@ -58,6 +58,11 @@ export type UseTablePagingParams<DataType, ParamsType> = {
      * @returns
      */
     onClickReset?: () => void;
+    /**
+     * 当请求结束后触发的事件
+     * @returns
+     */
+    onAfterRequest?: () => void;
 };
 type InternalDataType<DataType = Recordable> = {
     total: number;
@@ -67,7 +72,7 @@ type InternalDataType<DataType = Recordable> = {
 export declare const DEFAULT_CURRENT = 1;
 export declare const DEFAULT_PAGE_SIZE = 20;
 export type OptionalOnTableChange<T extends (...args: any[]) => any> = (...args: Partial<Parameters<T>>) => ReturnType<T>;
-export declare const useTablePaging: <DataType = any, ParamsType = Record<string, any>>({ manual, request, defaultParams, defaultData, formatParams, paramsValueTypeMap, resetFieldsIgnores, filterFields, sortFields, namespace, pagination, onClickReset }: UseTablePagingParams<DataType, ParamsType>) => {
+export declare const useTablePaging: <DataType = any, ParamsType = Record<string, any>>({ manual, request, defaultParams, defaultData, formatParams, paramsValueTypeMap, resetFieldsIgnores, filterFields, sortFields, namespace, pagination, onClickReset, onAfterRequest }: UseTablePagingParams<DataType, ParamsType>) => {
     formRef: Ref<ApFormSearchFormExpose | undefined, ApFormSearchFormExpose | undefined>;
     submit: () => void;
     reset: () => void;

package/es/src/ap-table/hooks/use-table-paging-ng.mjs

@@ -1,98 +1,101 @@
-import { ref as ie, reactive as J, unref as m, nextTick as ce, onMounted as ue, watch as le, computed as A, createVNode as C } from "vue";
-import { useTableSortedAndFiltered as fe } from "./use-sorted-filtered.mjs";
+import { ref as ce, reactive as M, unref as m, nextTick as ue, onMounted as le, watch as fe, computed as O, createVNode as C } from "vue";
+import { useTableSortedAndFiltered as ge } from "./use-sorted-filtered.mjs";
 import "../../config-provider/index.mjs";
-import { parseFieldValue as ge, dataIndexToStr as de, isEqualCustom as pe } from "../utils.mjs";
-import { isArray as K, isEqualWith as me, isUndefined as Se } from "lodash-unified";
-import { isDef as M } from "../../utils/index.mjs";
-import { useLocale as he } from "../../config-provider/hooks/use-locale.mjs";
-import { useNamespace as ze } from "../../config-provider/hooks/use-namespace.mjs";
-const S = 1, L = 20, Q = {
+import { parseFieldValue as de, dataIndexToStr as pe, isEqualCustom as me } from "../utils.mjs";
+import { isArray as Q, isEqualWith as Se, isUndefined as he } from "lodash-unified";
+import { isDef as $ } from "../../utils/index.mjs";
+import { useLocale as ze } from "../../config-provider/hooks/use-locale.mjs";
+import { useNamespace as Te } from "../../config-provider/hooks/use-namespace.mjs";
+const S = 1, y = 20, G = {
   defaultCurrent: S,
-  defaultPageSize: L,
+  defaultPageSize: y,
   showLessItems: !1,
   showTotal: !0
 };
-function Te(i) {
-  return i === !1 ? {} : i == null || i === !0 ? Q : {
-    ...Q,
+function Pe(i) {
+  return i === !1 ? {} : i == null || i === !0 ? G : {
+    ...G,
     ...i
   };
 }
-function Pe(i) {
+function we(i) {
   const f = {};
-  return i === !1 || (i === !0 || i == null ? (f.current = S, f.pageSize = L) : (f.current = i.defaultCurrent || S, f.pageSize = i.defaultPageSize || L)), f;
+  return i === !1 || (i === !0 || i == null ? (f.current = S, f.pageSize = y) : (f.current = i.defaultCurrent || S, f.pageSize = i.defaultPageSize || y)), f;
 }
-const Ae = ({
+const Oe = ({
   manual: i = !1,
   request: f,
-  defaultParams: O = {},
-  defaultData: y = [],
-  formatParams: I,
-  paramsValueTypeMap: V,
-  resetFieldsIgnores: U,
-  filterFields: R,
-  sortFields: $,
-  namespace: G = "ap-table",
+  defaultParams: I = {},
+  defaultData: V = [],
+  formatParams: U,
+  paramsValueTypeMap: _,
+  resetFieldsIgnores: j,
+  filterFields: W,
+  sortFields: Z,
+  namespace: H = "ap-table",
   pagination: h,
-  onClickReset: b
+  onClickReset: b,
+  onAfterRequest: E
 }) => {
-  let E = 0, c = {};
-  const W = Te(h), Z = (e) => I ? I(e) : e, z = ie(), s = J(Pe(h)), {
-    getColumnSFConfig: H,
-    setSF: X,
-    clearAll: Y,
-    sortedInfo: _,
-    filteredInfo: j
-  } = fe(), {
+  let v = 0, c = {};
+  const X = Pe(h), Y = (e) => U ? U(e) : e, z = ce(), s = M(we(h)), {
+    getColumnSFConfig: q,
+    setSF: R,
+    clearAll: k,
+    sortedInfo: A,
+    filteredInfo: N
+  } = ge(), {
     t: T
-  } = he(), {
+  } = ze(), {
     b: P
-  } = ze(G), o = J({
-    total: y.length,
-    records: y,
+  } = Te(H), o = M({
+    total: V.length,
+    records: V,
     loading: !1
   }), w = () => {
     var e, t;
     return ((t = (e = z.value) == null ? void 0 : e.apForm) == null ? void 0 : t.getFieldsValueTransformed(!0)) || {};
-  }, q = async (e) => {
+  }, B = async (e) => {
     var n;
-    const t = Z(e), r = Date.now();
-    E = r, o.loading = !0;
+    const t = Y(e), r = Date.now();
+    v = r, o.loading = !0;
     try {
       const a = await f({
-        ...m(O),
+        ...m(I),
         ...t
       });
-      E === r && (o.total = a.total || ((n = a.data) == null ? void 0 : n.length) || 0, o.records = [...a.data || []], o.loading = !1);
+      v === r && (o.total = a.total || ((n = a.data) == null ? void 0 : n.length) || 0, o.records = [...a.data || []], o.loading = !1);
     } catch {
-      E === r && (o.records = [], o.total = 0, o.loading = !1);
+      v === r && (o.records = [], o.total = 0, o.loading = !1);
+    } finally {
+      E == null || E();
     }
-  }, N = (e) => {
+  }, J = (e) => {
     const t = {};
     return Object.entries(e).forEach(([r, n]) => {
-      if (t[r] = n, V && n) {
-        const a = V[r];
-        a && (t[r] = ge(a, n));
+      if (t[r] = n, _ && n) {
+        const a = _[r];
+        a && (t[r] = de(a, n));
       }
     }), t;
-  }, k = async (e) => {
+  }, ee = async (e) => {
     var n, a, l, g, d;
     const t = w(), r = {};
     Object.entries(t).forEach(([p, F]) => {
-      U && U.indexOf(p) > -1 && (r[p] = F);
-    }), await ((a = (n = z.value) == null ? void 0 : n.apForm) == null ? void 0 : a.resetFields()), (d = (g = (l = z.value) == null ? void 0 : l.apForm) == null ? void 0 : g.setFieldsValue) == null || d.call(g, r), ce(() => {
+      j && j.indexOf(p) > -1 && (r[p] = F);
+    }), await ((a = (n = z.value) == null ? void 0 : n.apForm) == null ? void 0 : a.resetFields()), (d = (g = (l = z.value) == null ? void 0 : l.apForm) == null ? void 0 : g.setFieldsValue) == null || d.call(g, r), ue(() => {
       e == null || e();
     });
   }, x = (e) => {
     c = e;
-    const t = N(e);
-    q(t);
-  }, ee = (e) => {
+    const t = J(e);
+    B(t);
+  }, te = (e) => {
     x({
       ...c,
       ...e
     });
-  }, v = () => {
+  }, D = () => {
     const e = w(), t = h !== !1;
     t && (s.current = S), x({
       ...e,
@@ -101,32 +104,32 @@ const Ae = ({
       current: t ? S : void 0,
       pageSize: t ? c.pageSize || s.pageSize : void 0
     });
-  }, te = () => {
-    Y(), c.sort = {}, c.filter = {}, b == null || b(), k(v);
-  }, B = () => {
+  }, re = () => {
+    k(), c.sort = {}, c.filter = {}, b == null || b(), ee(D);
+  }, K = () => {
     x(c);
-  }, re = (e) => {
+  }, ne = (e) => {
     if (h === !1)
-      B();
+      K();
     else {
       const {
         current: t,
         pageSize: r
       } = s, n = o.total - e, a = Math.ceil(n / r), l = t > a ? a : t;
-      ee({
+      te({
         current: l > 0 ? l : 1
       });
     }
-  }, D = (e, t, r) => {
+  }, L = (e, t, r) => {
     var p, F;
     const n = w();
-    s.current = e.current, s.pageSize = e.pageSize, X(t, r);
-    const a = K(r) ? [...r] : [r], l = {};
+    s.current = e.current, s.pageSize = e.pageSize, R(t, r);
+    const a = Q(r) ? [...r] : [r], l = {};
     for (const u of a)
-      (p = m($)) != null && p.includes(u.columnKey || u.field) && u.order && (l[de(u.columnKey || u.field)] = u.order);
+      (p = m(Z)) != null && p.includes(u.columnKey || u.field) && u.order && (l[pe(u.columnKey || u.field)] = u.order);
     const g = {};
     for (const u of Object.keys(t))
-      (F = m(R)) != null && F.includes(u) && t[u] && (g[u] = t[u]);
+      (F = m(W)) != null && F.includes(u) && t[u] && (g[u] = t[u]);
     const d = {
       ...n,
       filter: g,
@@ -134,10 +137,10 @@ const Ae = ({
       current: e.current,
       pageSize: e.pageSize
     };
-    me(c, d, pe) || x(d);
-  }, ne = (e, t = j.value || {}, r = _.value || {}) => {
+    Se(c, d, me) || x(d);
+  }, ae = (e, t = N.value || {}, r = A.value || {}) => {
     const n = (e == null ? void 0 : e.current) ?? s.current, a = (e == null ? void 0 : e.pageSize) ?? s.pageSize;
-    D(
+    L(
       {
         current: n,
         pageSize: a
@@ -151,7 +154,7 @@ const Ae = ({
       }
     );
   };
-  ue(() => {
+  le(() => {
     const e = w(), {
       current: t,
       pageSize: r
@@ -163,15 +166,15 @@ const Ae = ({
       sort: {},
       ...e
     }, !i) {
-      const n = N(c);
-      q(n);
+      const n = J(c);
+      B(n);
     }
-  }), le(() => m(O), () => {
-    v();
+  }), fe(() => m(I), () => {
+    D();
   }, {
     deep: !0
   });
-  const ae = A(() => {
+  const oe = O(() => {
     if (o.total === 0)
       return "-";
     const {
@@ -180,28 +183,28 @@ const Ae = ({
     } = s;
     return `${e}/${Math.ceil(o.total / t)}`;
   });
-  function oe(e) {
-    K(e) && (o.records = e, o.total = e.length);
+  function se(e) {
+    Q(e) && (o.records = e, o.total = e.length);
   }
-  const se = A(() => {
+  const ie = O(() => {
     const {
       showLessItems: e,
       showTotal: t,
       showQuickJumper: r,
       showSizeChanger: n,
       pageSizeOptions: a
-    } = W;
+    } = X;
     return {
       loading: o.loading,
       pagination: {
         current: s.current,
         pageSize: s.pageSize,
         total: o.total,
-        showSizeChanger: M(n) ? n : !e,
-        showQuickJumper: M(r) ? r : !e,
+        showSizeChanger: $(n) ? n : !e,
+        showQuickJumper: $(r) ? r : !e,
         showLessItems: e,
         size: "default",
-        pageSizeOptions: Se(a) ? ["10", "20", "50", "100"] : a,
+        pageSizeOptions: he(a) ? ["10", "20", "50", "100"] : a,
         showTotal: t ? (l) => C("span", {
           class: P("pagination-total-wrapper")
         }, [T("ap.apTable.pagination.totalLeftPrefix"), " ", C("span", {
@@ -210,33 +213,33 @@ const Ae = ({
           class: P("pagination--total-right")
         }, [T("ap.apTable.pagination.totalRightPrefix"), " ", C("span", {
           class: P("pagination-count-text")
-        }, [m(ae)]), " ", T("ap.apTable.pagination.totalRightSuffix")])]) : void 0
+        }, [m(oe)]), " ", T("ap.apTable.pagination.totalRightSuffix")])]) : void 0
       },
-      onChange: D,
+      onChange: L,
       dataSource: o.records
     };
   });
   return {
     formRef: z,
-    submit: v,
-    reset: te,
-    refresh: B,
-    refreshByDelete: re,
+    submit: D,
+    reset: re,
+    refresh: K,
+    refreshByDelete: ne,
     data: o,
     current: s.current,
     pageSize: s.pageSize,
-    handleTableChange: D,
-    handleTableChangeOptional: ne,
-    tableProps: se,
-    dataSource: A(() => o.records),
-    setDataSource: oe,
-    getColumnSFConfig: H,
-    sortedInfo: _,
-    filteredInfo: j
+    handleTableChange: L,
+    handleTableChangeOptional: ae,
+    tableProps: ie,
+    dataSource: O(() => o.records),
+    setDataSource: se,
+    getColumnSFConfig: q,
+    sortedInfo: A,
+    filteredInfo: N
   };
 };
 export {
   S as DEFAULT_CURRENT,
-  L as DEFAULT_PAGE_SIZE,
-  Ae as useTablePaging
+  y as DEFAULT_PAGE_SIZE,
+  Oe as useTablePaging
 };

package/es/src/business/ap-copy/ApCopy.mjs

@@ -1,47 +1,47 @@
-import { defineComponent as T, Text as y, isVNode as p, computed as b, createVNode as r, Fragment as h } from "vue";
-import { ApCopyProps as v } from "./constans.mjs";
+import { defineComponent as T, Text as p, isVNode as y, computed as m, createVNode as n, Fragment as b } from "vue";
+import { ApCopyProps as h } from "./constans.mjs";
 import { IconApAdLineCopy as k } from "@aplus-frontend/icon";
 import "../../config-provider/index.mjs";
-import { message as m } from "@aplus-frontend/antdv";
-import { isNull as j, isUndefined as A } from "lodash-unified";
-import { useNamespace as N } from "../../config-provider/hooks/use-namespace.mjs";
-import { useLocale as P } from "../../config-provider/hooks/use-locale.mjs";
-const I = /* @__PURE__ */ T({
+import { message as d } from "@aplus-frontend/antdv";
+import { isNull as P, isUndefined as j } from "lodash-unified";
+import { useNamespace as A } from "../../config-provider/hooks/use-namespace.mjs";
+import { useLocale as N } from "../../config-provider/hooks/use-locale.mjs";
+const D = /* @__PURE__ */ T({
   name: "CopyBtn",
-  props: v(),
-  setup(n, {
-    slots: l
+  props: h(),
+  setup(r, {
+    slots: a
   }) {
     const {
-      b: d,
-      e: a,
-      m: x
-    } = N("ap-copy"), {
-      t: c
-    } = P(), g = () => {
-      navigator.clipboard.writeText(n.text || u() || "").then(() => {
-        m.success(c("ap.apCopy.copySuccess"));
+      b: x,
+      e: l,
+      m: g
+    } = A("ap-copy"), {
+      t: u
+    } = N(), v = (t) => {
+      t.stopPropagation(), t.preventDefault(), t.stopImmediatePropagation(), navigator.clipboard.writeText(r.text || c() || "").then(() => {
+        d.success(u("ap.apCopy.copySuccess"));
       }).catch(() => {
-        m.error(c("ap.apCopy.copyError"));
+        d.error(u("ap.apCopy.copyError"));
       });
     }, S = (t) => {
       if (t.length === 1) {
         const e = t[0];
-        if (e.type === y || e.type.toString() === "Symbol(Text)" || p(e) && typeof e.children == "string")
+        if (e.type === p || e.type.toString() === "Symbol(Text)" || y(e) && typeof e.children == "string")
           return !0;
       }
       return !1;
     }, C = (t) => {
       if (!t.length) return "";
       const e = t[0];
-      return e.type === y || e.type.toString() === "Symbol(Text)" ? String(e.children) : p(e) && typeof e.children == "string" ? e.children : "";
-    }, u = () => {
+      return e.type === p || e.type.toString() === "Symbol(Text)" ? String(e.children) : y(e) && typeof e.children == "string" ? e.children : "";
+    }, c = () => {
       var f;
-      const t = (f = l.default) == null ? void 0 : f.call(l);
+      const t = (f = a.default) == null ? void 0 : f.call(a);
       return t && S(t) ? C(t) : null;
-    }, s = (t) => !(j(t) || A(t) || typeof t == "string" && t === ""), i = b(() => {
-      if (typeof n.textStyle == "string")
-        switch (n.textStyle) {
+    }, s = (t) => !(P(t) || j(t) || typeof t == "string" && t === ""), o = m(() => {
+      if (typeof r.textStyle == "string")
+        switch (r.textStyle) {
           case "link":
             return "text-link";
           case "minor":
@@ -51,29 +51,29 @@ const I = /* @__PURE__ */ T({
           default:
             return "text-major";
         }
-      else if (typeof n.textStyle == "object")
+      else if (typeof r.textStyle == "object")
         return {
-          ...n.textStyle
+          ...r.textStyle
         };
       return {};
-    }), o = u() || n.text || "";
-    return () => r(h, null, [r("div", {
-      class: [d()],
-      onClick: n.disableCopy ? void 0 : g
-    }, [r("div", {
-      class: [a("text"), typeof i.value == "string" && x(i.value)],
-      style: typeof i.value != "string" && i.value,
-      title: typeof i.value == "string" ? o : ""
-    }, [s(o) ? n.link ? r("a", {
-      href: n.link,
+    }), i = m(() => c() || r.text || "");
+    return () => n(b, null, [n("div", {
+      class: [x()]
+    }, [n("div", {
+      class: [l("text"), typeof o.value == "string" && g(o.value)],
+      style: typeof o.value != "string" && o.value,
+      title: typeof o.value == "string" ? i.value : ""
+    }, [s(i.value) ? r.link ? n("a", {
+      href: r.link,
       target: "_blank"
-    }, [o]) : o : "--"]), s(o) && !n.disableCopy && r("div", {
-      class: [a("copy-btn"), "copy-btn"]
-    }, [r(k, {
-      size: n.size
+    }, [i.value]) : i.value : "--"]), s(i.value) && !r.disableCopy && n("div", {
+      class: [l("copy-btn"), "copy-btn"],
+      onClick: r.disableCopy ? void 0 : v
+    }, [n(k, {
+      size: r.size
     }, null)])])]);
   }
 });
 export {
-  I as default
+  D as default
 };

package/es/src/business/ap-label/group/ApLabelGroup.mjs

@@ -1,29 +1,28 @@
-import { defineComponent as n, createVNode as o, mergeProps as l, createTextVNode as m } from "vue";
+import { defineComponent as n, createVNode as o, mergeProps as a, createTextVNode as l } from "vue";
 import "../../../config-provider/index.mjs";
-import f from "../ApLabel.mjs";
-import { omit as t } from "lodash-unified";
-import { ApLabelGroupProps as s } from "../constans.mjs";
-import { Tag as c } from "@aplus-frontend/antdv";
-import { useNamespace as g } from "../../../config-provider/hooks/use-namespace.mjs";
+import m from "../ApLabel.mjs";
+import { omit as s } from "lodash-unified";
+import { ApLabelGroupProps as c } from "../constans.mjs";
+import "../../../ap-tag/index.mjs";
+import { useNamespace as f } from "../../../config-provider/hooks/use-namespace.mjs";
+import i from "../../../ap-tag/ap-tag.vue.mjs";
 const {
   b: p
-} = g("ap-label-group"), x = /* @__PURE__ */ n({
+} = f("ap-label-group"), _ = /* @__PURE__ */ n({
   name: "ApLabelGroup",
-  props: s(),
+  props: c(),
   setup(r) {
-    const a = (e) => (r.tagValue || r.tagValue === 0) && e.tagConfig && e.tagConfig.length > 0 ? () => e.tagConfig.filter((u) => r.tagValue === u.value).map((u) => o(c, t(u, ["text"]), {
-      default: () => [u.text]
-    })) : e.customRender ? () => o("div", null, [e.customRender(r.record)]) : null;
+    const t = (e) => (r.tagValue || r.tagValue === 0) && e.tagConfig && e.tagConfig.length > 0 ? () => e.tagConfig.filter((u) => r.tagValue === u.value).map((u) => o(i, u, null)) : e.customRender ? () => o("div", null, [e.customRender(r.record)]) : null;
     return () => o("div", {
       class: p()
-    }, [r.columns ? r.columns.map((e, u) => o(f, l({
+    }, [r.columns ? r.columns.map((e, u) => o(m, a({
       key: u,
       show: r.value === e.value
-    }, t(e, ["value", "tagConfig", "customRender"])), {
-      custom: a(e)
-    })) : o("div", null, [m("columns数组不能为空")])]);
+    }, s(e, ["value", "tagConfig", "customRender"])), {
+      custom: t(e)
+    })) : o("div", null, [l("columns数组不能为空")])]);
   }
 });
 export {
-  x as default
+  _ as default
 };

package/es/src/business/ap-label/interface.d.ts

@@ -1,6 +1,6 @@
 import { BadgeProps } from '@aplus-frontend/antdv';
 import { TooltipPlacement } from '@aplus-frontend/antdv/es/tooltip/Tooltip';
-import { TagProps } from '@aplus-frontend/antdv/es/tag';
+import { ApTagProps } from '../../ap-tag';
 import { VNode, VNodeChild } from 'vue';
 type Recordable = Record<string, any>;
 export type ApLabelProps = BadgeProps & Partial<{
@@ -12,9 +12,8 @@ export type ApLabelProps = BadgeProps & Partial<{
     show: boolean;
     toolTipBgColor: string;
 }>;
-export type tagConfigKey = TagProps & {
+export type tagConfigKey = ApTagProps & {
     value: number | string | undefined | null;
-    text: string;
 };
 export type ApLabelGroupItemProps<T extends Recordable = Recordable> = ApLabelProps & {
     value?: string | number | null | undefined;