@aplus-frontend/ui 0.0.32 → 0.0.33

package/es/src/ap-form/ap-form-item-group/helper.d.ts

@@ -1,4 +1,5 @@
 import { VNode, RendererNode, RendererElement } from 'vue';
+import { ApFormItemProps } from '../interface';
 
 export declare const buildColSpan: (count: number, times?: number) => {
     xs: number;
@@ -16,3 +17,9 @@ export declare const buildColSpan: (count: number, times?: number) => {
 export declare const genRealChildren: (nodes: VNode[]) => VNode< RendererNode, RendererElement, {
     [key: string]: any;
 }>[];
+/**
+ * 获取FormItem 字符串化的name，如果未获取到name，返回当前的时间戳
+ * @param name
+ * @returns
+ */
+export declare function getStringName(name?: ApFormItemProps['name']): string | number;

package/es/src/ap-form/ap-form-item-group/helper.mjs

@@ -1,33 +1,38 @@
 import { isArray as f } from "lodash-unified";
-const l = (e) => e <= 1 ? 1 : e, n = (e, r = 1) => {
-  const o = Math.floor(24 / e), t = o * r;
-  return t > 24 ? o : t;
-}, p = (e, r = 1) => ({
-  xs: n(l(e - 3), r),
-  sm: n(l(e - 2), r),
-  md: n(l(e - 1), r),
-  lg: n(l(e - 1), r),
-  xl: n(e, r),
-  xxl: n(e, r)
+import { isDef as i } from "../../utils/index.mjs";
+const s = (r) => r <= 1 ? 1 : r, n = (r, e = 1) => {
+  const t = Math.floor(24 / r), o = t * e;
+  return o > 24 ? t : o;
+}, p = (r, e = 1) => ({
+  xs: n(s(r - 3), e),
+  sm: n(s(r - 2), e),
+  md: n(s(r - 1), e),
+  lg: n(s(r - 1), e),
+  xl: n(r, e),
+  xxl: n(r, e)
 });
-function s(e) {
-  const r = [];
-  for (const o of e.filter(Boolean).filter((t) => t.type !== Symbol.for("v-cmt")))
-    if (o.type === Symbol.for("v-fgt")) {
-      const t = s(o.children);
-      r.push(...t);
-    } else if (f(o)) {
-      const t = s(o);
-      r.push(...t);
+function l(r) {
+  const e = [];
+  for (const t of r.filter(Boolean).filter((o) => o.type !== Symbol.for("v-cmt")))
+    if (t.type === Symbol.for("v-fgt")) {
+      const o = l(t.children);
+      e.push(...o);
+    } else if (f(t)) {
+      const o = l(t);
+      e.push(...o);
     } else
-      r.push(o);
-  return r;
+      e.push(t);
+  return e;
 }
-const c = (e) => {
-  const r = [];
-  return r.push(...s(e)), r;
+const a = (r) => {
+  const e = [];
+  return e.push(...l(r)), e;
 };
+function h(r) {
+  return i(r) ? (f(r) ? r : [r]).join("") : Date.now();
+}
 export {
   p as buildColSpan,
-  c as genRealChildren
+  a as genRealChildren,
+  h as getStringName
 };

package/es/src/ap-form/ap-form-item-group/index.vue.mjs

@@ -1,15 +1,15 @@
-import { isVNode as g, defineComponent as _, useSlots as k, watch as b, onBeforeUpdate as h, shallowRef as x, computed as B, unref as p, createVNode as R, mergeProps as m, openBlock as s, createBlock as i, withCtx as S, createElementBlock as j, Fragment as v, renderList as N, resolveDynamicComponent as P } from "vue";
-import { Col as $, Row as D } from "ant-design-vue";
+import { isVNode as C, defineComponent as _, useSlots as k, watch as S, shallowRef as b, computed as h, unref as n, createVNode as x, mergeProps as m, openBlock as a, createBlock as u, withCtx as N, createElementBlock as R, Fragment as j, renderList as B, resolveDynamicComponent as P } from "vue";
+import { Col as $, Row as v } from "ant-design-vue";
 import { pick as F } from "lodash-unified";
-import { apFormItemColPropKeys as I } from "../constant.mjs";
-import { genRealChildren as l, buildColSpan as O } from "./helper.mjs";
+import { apFormItemColPropKeys as D } from "../constant.mjs";
+import { genRealChildren as i, buildColSpan as I, getStringName as O } from "./helper.mjs";
 import "../../config-provider/index.mjs";
 import "../style/ap-form-item-group.css";
 import { useNamespace as V } from "../../config-provider/hooks/use-namespace.mjs";
 function A(r) {
-  return typeof r == "function" || Object.prototype.toString.call(r) === "[object Object]" && !g(r);
+  return typeof r == "function" || Object.prototype.toString.call(r) === "[object Object]" && !C(r);
 }
-const J = /* @__PURE__ */ _({
+const M = /* @__PURE__ */ _({
   name: "ApFormItemGroup",
   __name: "index",
   props: {
@@ -29,30 +29,28 @@ const J = /* @__PURE__ */ _({
   },
   setup(r) {
     const {
-      b: c
+      b: s
     } = V("ap-form-item-group"), {
       countPerRow: f,
       ...d
-    } = r, n = k();
-    b(() => n.default(), (e) => {
-      a.value = l(e);
-    }), h(() => {
-      a.value = l(n.default());
+    } = r, p = k();
+    S(() => p.default(), (e) => {
+      c.value = i(e);
     });
-    const a = x(l(n.default())), w = B(() => p(a).map((e, u) => {
-      const t = e.props, o = F(t, I), y = o != null && o.span ? {} : O(f), C = !!(t != null && t.hidden);
-      return R($, m({
-        key: `${u}-${Date.now()}`
-      }, y, o, {
-        class: C ? c("col-hidden") : ""
+    const c = b(i(p.default())), g = h(() => n(c).map((e, l) => {
+      const t = e.props, o = F(t, D), w = o != null && o.span ? {} : I(f), y = !!(t != null && t.hidden);
+      return x($, m({
+        key: `${l}-${O(t.name)}`
+      }, w, o, {
+        class: y ? s("col-hidden") : ""
       }), A(e) ? e : {
         default: () => [e]
       });
     }));
-    return (e, u) => (s(), i(p(D), m({
-      class: p(c)()
+    return (e, l) => (a(), u(n(v), m({
+      class: n(s)()
     }, d), {
-      default: S(() => [(s(!0), j(v, null, N(w.value, (t, o) => (s(), i(P(t), {
+      default: N(() => [(a(!0), R(j, null, B(g.value, (t, o) => (a(), u(P(t), {
         key: `${o}-${Date.now()}`
       }))), 128))]),
       _: 1
@@ -60,5 +58,5 @@ const J = /* @__PURE__ */ _({
   }
 });
 export {
-  J as default
+  M as default
 };

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

@@ -1,4 +1,4 @@
-import { ApFormModalFormProps, ApFormSubmitterConfig } from '../interface';
+import { ApFormModalFormProps, ApFormInternalInstance, ApFormSubmitterConfig } from '../interface';
 import { VNode, DefineComponent, ComponentOptionsMixin, PublicProps, ExtractPropTypes, PropType, CSSProperties } from 'vue';
 import { InternalNamePath, NamePath, ValidateOptions, FormLabelAlign } from 'ant-design-vue/es/form/interface';
 import { VueTypeValidableDef } from '../../../node_modules/vue-types';
@@ -36,6 +36,7 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefau
     scrollToField: (name: NamePath, options?: {}) => void;
     setFieldValue: (key: string, newValue: any) => void;
     setFieldsValue: (values: Record<string, any>) => void;
+    getInternalInstance: (mark: string) => ApFormInternalInstance | undefined;
 }, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
     "update:open": (...args: any[]) => void;
 }, string, PublicProps, Readonly< ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<ApFormModalFormProps>, {

package/es/src/ap-form/modal-form/index.vue.mjs

@@ -1,5 +1,5 @@
-import { isVNode as $, defineComponent as q, useSlots as D, ref as F, watch as L, cloneVNode as A, computed as G, createVNode as u, mergeProps as p, unref as i, openBlock as g, createElementBlock as W, Fragment as H, withCtx as y, renderSlot as x, createTextVNode as J, toDisplayString as K, createElementVNode as Q, normalizeClass as X, createBlock as T, resolveDynamicComponent as N, createCommentVNode as Y } from "vue";
-import { Button as V, Flex as Z, Space as I, Modal as ee } from "ant-design-vue";
+import { isVNode as $, defineComponent as q, useSlots as D, ref as h, watch as L, cloneVNode as A, computed as G, createVNode as u, mergeProps as p, unref as n, openBlock as F, createElementBlock as I, Fragment as W, withCtx as y, renderSlot as x, createTextVNode as H, toDisplayString as J, createElementVNode as K, normalizeClass as Q, createBlock as T, resolveDynamicComponent as N, createCommentVNode as X } from "vue";
+import { Button as V, Flex as Y, Space as Z, Modal as ee } from "ant-design-vue";
 import "../ap-form.vue.mjs";
 import "../../hooks/index.mjs";
 import { getSingleVNode as te } from "../../utils/slot.mjs";
@@ -8,14 +8,14 @@ import { omit as le } from "lodash-unified";
 import "../style/modal-form.css";
 import { convertReactiveToRaw as ae } from "../../utils/index.mjs";
 import { useControllableValue as oe } from "../../hooks/useControllableValue.mjs";
-import { useLocale as ie } from "../../config-provider/hooks/use-locale.mjs";
-import { useGlobalConfig as se } from "../../config-provider/hooks/use-global-config.mjs";
-import { useNamespace as ne } from "../../config-provider/hooks/use-namespace.mjs";
+import { useLocale as ne } from "../../config-provider/hooks/use-locale.mjs";
+import { useGlobalConfig as ie } from "../../config-provider/hooks/use-global-config.mjs";
+import { useNamespace as se } from "../../config-provider/hooks/use-namespace.mjs";
 import re from "../ap-form.vue2.mjs";
 function P(d) {
   return typeof d == "function" || Object.prototype.toString.call(d) === "[object Object]" && !$(d);
 }
-const _e = /* @__PURE__ */ q({
+const Re = /* @__PURE__ */ q({
   __name: "index",
   props: {
     layout: {
@@ -89,7 +89,7 @@ const _e = /* @__PURE__ */ q({
     expose: S,
     emit: _
   }) {
-    const a = d, b = D(), R = _, o = F(), c = F(), r = F(!1), {
+    const a = d, b = D(), R = _, o = h(), c = h(), r = h(!1), {
       value: M,
       updateValue: m
     } = oe(a, R, {
@@ -97,10 +97,10 @@ const _e = /* @__PURE__ */ q({
       defaultValue: !1
     }), {
       t: v
-    } = ie(), h = se("uiMode", "aplus"), {
+    } = ne(), g = ie("uiMode", "aplus"), {
       b: j,
       e: C
-    } = ne("ap-form-modal-form");
+    } = se("ap-form-modal-form");
     L(() => o.value, (e) => {
       var t;
       e && c.value && ((t = e.setFieldsValue) == null || t.call(e, c.value), c.value = void 0);
@@ -110,17 +110,17 @@ const _e = /* @__PURE__ */ q({
         m(!0);
       }
     }) : null, O = G(() => {
-      var t, l, n, f;
+      var t, l, s, f;
       const e = [];
       if (a.submitter === !1)
         return null;
       if (a.showCancel) {
-        let s;
+        let i;
         e.push(u(V, {
           onClick: w,
           disabled: r.value
-        }, P(s = v("ap.common.cancelText")) ? s : {
-          default: () => [s]
+        }, P(i = v("ap.common.cancelText")) ? i : {
+          default: () => [i]
         }));
       }
       return ((t = a.submitter) == null ? void 0 : t.resetButtonProps) !== !1 && e.push(u(V, p(((l = a.submitter) == null ? void 0 : l.resetButtonProps) || {}, {
@@ -129,10 +129,10 @@ const _e = /* @__PURE__ */ q({
         onClick: z
       }), {
         default: () => {
-          var s;
-          return [((s = a.submitter) == null ? void 0 : s.resetText) || v("ap.common.resetText")];
+          var i;
+          return [((i = a.submitter) == null ? void 0 : i.resetText) || v("ap.common.resetText")];
         }
-      })), ((n = a.submitter) == null ? void 0 : n.submitButtonProps) !== !1 && e.push(u(V, p({
+      })), ((s = a.submitter) == null ? void 0 : s.submitButtonProps) !== !1 && e.push(u(V, p({
         type: "primary",
         key: "submit"
       }, ((f = a.submitter) == null ? void 0 : f.submitButtonProps) || {}, {
@@ -140,14 +140,14 @@ const _e = /* @__PURE__ */ q({
         onClick: E
       }), {
         default: () => {
-          var s;
-          return [((s = a.submitter) == null ? void 0 : s.submitText) || v("ap.common.okText")];
+          var i;
+          return [((i = a.submitter) == null ? void 0 : i.submitText) || v("ap.common.okText")];
         }
-      })), u(Z, {
+      })), u(Y, {
         justify: "flex-end",
-        class: C(i(h) === "admin" ? "footer-admin" : "footer")
+        class: C(n(g) === "admin" ? "footer-admin" : "footer")
       }, {
-        default: () => [b.submitter ? b.submitter(e) : u(I, null, P(e) ? e : {
+        default: () => [b.submitter ? b.submitter(e) : u(Z, null, P(e) ? e : {
           default: () => [e]
         })]
       });
@@ -157,20 +157,20 @@ const _e = /* @__PURE__ */ q({
       a.submitter !== !1 && ((e = o.value) == null || e.resetFields(), (l = (t = a.submitter) == null ? void 0 : t.onReset) == null || l.call(t));
     }
     async function E() {
-      var e, t, l, n;
+      var e, t, l, s;
       if (a.submitter !== !1)
         try {
           const f = await ((e = o.value) == null ? void 0 : e.validateFields());
-          (l = (t = a.submitter) == null ? void 0 : t.onSubmit) == null || l.call(t), r.value = !0, await ((n = a.onFinish) == null ? void 0 : n.call(a, ae(f))) && m(!1);
+          (l = (t = a.submitter) == null ? void 0 : t.onSubmit) == null || l.call(t), r.value = !0, await ((s = a.onFinish) == null ? void 0 : s.call(a, ae(f))) && m(!1);
         } finally {
           r.value = !1;
         }
     }
     function w() {
-      i(r) || m(!1);
+      n(r) || m(!1);
     }
     function U(e) {
-      !e && i(r) || m(e);
+      !e && n(r) || m(e);
     }
     return S({
       resetFields: () => {
@@ -198,8 +198,8 @@ const _e = /* @__PURE__ */ q({
         (l = o.value) == null || l.scrollToField(e, t);
       },
       setFieldValue: (e, t) => {
-        var l, n;
-        (n = (l = o.value) == null ? void 0 : l.setFieldValue) == null || n.call(l, e, t);
+        var l, s;
+        (s = (l = o.value) == null ? void 0 : l.setFieldValue) == null || s.call(l, e, t);
       },
       setFieldsValue: (e) => {
         var t, l;
@@ -208,36 +208,40 @@ const _e = /* @__PURE__ */ q({
           return;
         }
         (l = (t = o.value) == null ? void 0 : t.setFieldsValue) == null || l.call(t, e);
+      },
+      getInternalInstance: (e) => {
+        var t;
+        return (t = o.value) == null ? void 0 : t.getInternalInstance(e);
       }
-    }), (e, t) => (g(), W(H, null, [u(i(ee), p(e.modalProps, {
-      open: i(M),
+    }), (e, t) => (F(), I(W, null, [u(n(ee), p(e.modalProps, {
+      open: n(M),
       "onUpdate:open": U,
       onCancel: w,
       footer: null,
       width: e.width,
-      class: i(j)(),
+      class: n(j)(),
       "body-style": {
-        padding: i(h) === "admin" ? "0px !important" : "20px !important"
+        padding: n(g) === "admin" ? "0px !important" : "20px !important"
         // 这里使用内联样式目的是为了使用最高优先级覆盖设置的全局样式
         // 使用ModalForm你可能无法再自定义body的样式
       }
     }), {
-      title: y(() => [x(e.$slots, "title", {}, () => [J(K(a.title), 1)])]),
-      default: y(() => [Q("div", {
-        class: X(i(C)(i(h) === "admin" ? "content-admin" : "content"))
+      title: y(() => [x(e.$slots, "title", {}, () => [H(J(a.title), 1)])]),
+      default: y(() => [K("div", {
+        class: Q(n(C)(n(g) === "admin" ? "content-admin" : "content"))
       }, [u(re, p({
         ref_key: "formRef",
         ref: o
-      }, i(le)(a, ["modalProps", "open", "onUpdate:open", "title", "width", "onFinish", "submitter"])), {
+      }, n(le)(a, ["modalProps", "open", "onUpdate:open", "title", "width", "onFinish", "submitter"])), {
         default: y(() => [x(e.$slots, "default")]),
         _: 3
-      }, 16)], 2), (g(), T(N(O.value)))]),
+      }, 16)], 2), (F(), T(N(O.value)))]),
       _: 3
-    }, 16, ["open", "width", "class", "body-style"]), i(k) ? (g(), T(N(i(k)), {
+    }, 16, ["open", "width", "class", "body-style"]), n(k) ? (F(), T(N(n(k)), {
       key: 0
-    })) : Y("", !0)], 64));
+    })) : X("", !0)], 64));
   }
 });
 export {
-  _e as default
+  Re as default
 };

package/es/src/ap-tag/ap-tag-group.vue.d.ts

@@ -1,19 +1,24 @@
-import { ApTagGroupProps, ApTagProps } from './interface';
+import { ApTagGroupProps, ApTagProps, EllipsisProps } from './interface';
 import { DefineComponent, ComponentOptionsMixin, PublicProps, ExtractPropTypes, PropType } from 'vue';
 
-declare const _default: DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<ApTagGroupProps>, {
+type ApTagGroupSlots = {
+    tooltip?: (props: {
+        tags: ApTagProps[];
+    }) => void;
+};
+declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<ApTagGroupProps>, {
     list: () => ApTagProps[];
     space: number;
-    ellipsisColor: string;
+    ellipsis: () => {};
 }>, {}, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly< ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<ApTagGroupProps>, {
     list: () => ApTagProps[];
     space: number;
-    ellipsisColor: string;
+    ellipsis: () => {};
 }>>>, {
+    ellipsis: EllipsisProps;
     space: number;
     list: ApTagProps[];
-    ellipsisColor: string;
-}, {}>;
+}, {}>, Readonly<ApTagGroupSlots> & ApTagGroupSlots>;
 export default _default;
 type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
 type __VLS_TypePropsToRuntimeProps<T> = {
@@ -32,3 +37,8 @@ type __VLS_WithDefaults<P, D> = {
 type __VLS_Prettify<T> = {
     [K in keyof T]: T[K];
 } & {};
+type __VLS_WithTemplateSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

package/es/src/ap-tag/ap-tag-group.vue.mjs

@@ -1,12 +1,15 @@
-import { createElementVNode as e, defineComponent as z, ref as p, computed as m, unref as l, nextTick as g, watch as L, onMounted as W, onUnmounted as b, openBlock as f, createBlock as v, withCtx as y, normalizeClass as F, normalizeStyle as w, createElementBlock as N, Fragment as T, renderList as q, mergeProps as A, createCommentVNode as M } from "vue";
-import { Tooltip as P } from "ant-design-vue";
-import V from "@ant-design/icons-vue";
+import { createElementVNode as t, defineComponent as N, ref as v, computed as s, unref as o, nextTick as g, watch as P, onMounted as S, onUnmounted as j, openBlock as u, createBlock as h, mergeProps as _, withCtx as y, renderSlot as q, createTextVNode as G, toDisplayString as k, normalizeClass as b, normalizeStyle as E, createElementBlock as B, Fragment as R, renderList as I, createCommentVNode as U } from "vue";
+import { Tooltip as H } from "ant-design-vue";
+import J from "@ant-design/icons-vue";
 import "./ap-tag.vue2.mjs";
 import "../config-provider/index.mjs";
+import { omit as K } from "lodash-unified";
 import "./style/ap-tag-group.css";
-import { useNamespace as $ } from "../config-provider/hooks/use-namespace.mjs";
-import j from "./ap-tag.vue.mjs";
-const I = /* @__PURE__ */ e("svg", {
+import { useLocale as O } from "../config-provider/hooks/use-locale.mjs";
+import { useGlobalConfig as Q } from "../config-provider/hooks/use-global-config.mjs";
+import { useNamespace as X } from "../config-provider/hooks/use-namespace.mjs";
+import Y from "./ap-tag.vue.mjs";
+const Z = /* @__PURE__ */ t("svg", {
   xmlns: "http://www.w3.org/2000/svg",
   "xmlns:xlink": "http://www.w3.org/1999/xlink",
   fill: "none",
@@ -15,9 +18,9 @@ const I = /* @__PURE__ */ e("svg", {
   height: "16",
   viewBox: "0 0 16 16"
 }, [
-  /* @__PURE__ */ e("defs", null, [
-    /* @__PURE__ */ e("clipPath", { id: "master_svg0_1133_24991" }, [
-      /* @__PURE__ */ e("rect", {
+  /* @__PURE__ */ t("defs", null, [
+    /* @__PURE__ */ t("clipPath", { id: "master_svg0_1133_24991" }, [
+      /* @__PURE__ */ t("rect", {
         x: "0",
         y: "0",
         width: "16",
@@ -26,9 +29,9 @@ const I = /* @__PURE__ */ e("svg", {
       })
     ])
   ]),
-  /* @__PURE__ */ e("g", { "clip-path": "url(#master_svg0_1133_24991)" }, [
-    /* @__PURE__ */ e("g", null, [
-      /* @__PURE__ */ e("ellipse", {
+  /* @__PURE__ */ t("g", { "clip-path": "url(#master_svg0_1133_24991)" }, [
+    /* @__PURE__ */ t("g", null, [
+      /* @__PURE__ */ t("ellipse", {
         cx: "8",
         cy: "8",
         rx: "1",
@@ -37,8 +40,8 @@ const I = /* @__PURE__ */ e("svg", {
         "fill-opacity": "1"
       })
     ]),
-    /* @__PURE__ */ e("g", null, [
-      /* @__PURE__ */ e("ellipse", {
+    /* @__PURE__ */ t("g", null, [
+      /* @__PURE__ */ t("ellipse", {
         cx: "3.25",
         cy: "8",
         rx: "1",
@@ -47,8 +50,8 @@ const I = /* @__PURE__ */ e("svg", {
         "fill-opacity": "1"
       })
     ]),
-    /* @__PURE__ */ e("g", null, [
-      /* @__PURE__ */ e("ellipse", {
+    /* @__PURE__ */ t("g", null, [
+      /* @__PURE__ */ t("ellipse", {
         cx: "12.75",
         cy: "8",
         rx: "1",
@@ -58,80 +61,97 @@ const I = /* @__PURE__ */ e("svg", {
       })
     ])
   ])
-], -1), O = /* @__PURE__ */ z({
+], -1), pe = /* @__PURE__ */ N({
   __name: "ap-tag-group",
   props: {
     list: { default: () => [] },
     space: { default: 4 },
-    ellipsisColor: { default: "#34B77C" }
+    ellipsisColor: {},
+    ellipsis: { default: () => ({}) }
   },
-  setup(_) {
-    const r = _, { b: x } = $("tag-group"), a = p(), h = m(() => l(o) < r.list.length), C = m(() => r.list.slice(0, l(o))), o = p(0), c = p(0), u = p(r.list.length), k = m(() => r.list.map((t) => t.text).join("、")), B = m(() => [x()].filter(Boolean)), i = () => {
-      if (!a.value)
+  setup(T) {
+    const { t: V } = O(), l = T, z = Q("uiMode"), { b: L, bm: x } = X("tag-group"), c = v(), r = s(() => ({
+      ...{
+        iconColor: "#34B77C",
+        symbol: "icon",
+        text: V("ap.common.more")
+      },
+      ...l.ellipsis
+    })), M = s(() => r.value.tooltip && typeof r.value.tooltip == "object" ? K(r.value.tooltip, ["trigger", "title"]) : {}), d = s(() => o(n) < l.list.length), $ = s(() => l.list.slice(0, o(n))), n = v(0), p = v(0), m = v(l.list.length), W = s(() => l.list.map((e) => e.text).join("、")), A = s(() => [L()].filter(Boolean)), D = s(() => z.value === "aplus" ? [x("ellipsis-text", "aplus")] : [x("ellipsis-text", "admin")]), f = () => {
+      if (!c.value)
         return;
-      const t = a.value.scrollWidth, n = a.value.clientWidth;
-      if (l(c) <= l(u)) {
-        const s = Math.floor((l(c) + l(u)) / 2);
-        t <= n ? (o.value = s, c.value = s + 1) : u.value = s - 1, g(() => {
-          requestAnimationFrame(i);
+      const e = c.value.scrollWidth, i = c.value.clientWidth;
+      if (o(p) <= o(m)) {
+        const a = Math.floor((o(p) + o(m)) / 2);
+        e <= i ? (n.value = a, p.value = a + 1) : m.value = a - 1, g(() => {
+          requestAnimationFrame(f);
         });
       } else
-        t > n && (o.value = o.value - 1, g(() => {
-          requestAnimationFrame(i);
+        e > i && (n.value = n.value - 1, g(() => {
+          requestAnimationFrame(f);
         }));
-    }, d = () => {
-      c.value = 0, u.value = r.list.length, o.value = 0;
+    }, w = () => {
+      p.value = 0, m.value = l.list.length, n.value = 0;
     };
-    return L(
-      () => r.list,
-      (t, n) => {
-        t !== n && (d(), g(() => i()));
+    P(
+      () => l.list,
+      (e, i) => {
+        e !== i && (w(), g(() => f()));
       },
       {
         immediate: !0
       }
-    ), W(() => {
-      window.addEventListener("resize", () => {
-        d(), i();
-      });
-    }), b(() => {
-      window.removeEventListener("resize", () => {
-        d(), i();
-      });
-    }), (t, n) => (f(), v(l(P), {
-      title: k.value,
-      trigger: "hover"
-    }, {
+    );
+    const C = () => {
+      w(), f();
+    };
+    return S(() => {
+      [["ellipsisColor", "ellipse.color"]].forEach(([e, i]) => {
+        l[e] && console.error(
+          `[ApTagGroup]: \`${e}\` is deprecated, please use \`${i}\` instead.`
+        );
+      }), window.addEventListener("resize", C);
+    }), j(() => {
+      window.removeEventListener("resize", C);
+    }), (e, i) => (u(), h(o(H), _({ trigger: "hover" }, M.value), {
+      title: y(() => [
+        q(e.$slots, "tooltip", { tags: e.list }, () => [
+          G(k(W.value), 1)
+        ])
+      ]),
       default: y(() => [
-        e("div", {
-          class: F(B.value),
+        t("div", {
+          class: b(A.value),
           ref_key: "container",
-          ref: a,
-          style: w({
-            pointerEvents: h.value ? "auto" : "none"
+          ref: c,
+          style: E({
+            pointerEvents: d.value ? "auto" : "none"
           })
         }, [
-          (f(!0), N(T, null, q(C.value, (s, E) => (f(), v(j, A({ ref_for: !0 }, s, {
-            key: E,
+          (u(!0), B(R, null, I($.value, (a, F) => (u(), h(Y, _({ ref_for: !0 }, a, {
+            key: F,
             style: {
-              marginRight: `${t.space}px`
+              marginRight: `${e.space}px`
             }
           }), null, 16, ["style"]))), 128)),
-          h.value ? (f(), v(l(V), {
+          d.value && r.value.symbol === "icon" ? (u(), h(o(J), {
             key: 0,
-            style: w({ color: t.ellipsisColor })
+            style: E({ color: e.ellipsisColor || r.value.iconColor })
           }, {
             component: y(() => [
-              I
+              Z
             ]),
             _: 1
-          }, 8, ["style"])) : M("", !0)
+          }, 8, ["style"])) : d.value && r.value.symbol === "text" ? (u(), B("span", {
+            key: 1,
+            class: b(D.value)
+          }, k(r.value.text), 3)) : U("", !0)
         ], 6)
       ]),
-      _: 1
-    }, 8, ["title"]));
+      _: 3
+    }, 16));
   }
 });
 export {
-  O as default
+  pe as default
 };

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

@@ -1,3 +1,5 @@
+import { TooltipProps } from 'ant-design-vue/es/tooltip';
+
 export interface ApTagProps {
     /**
      * 标签内容
@@ -17,6 +19,27 @@ export interface ApTagProps {
      */
     disabled?: boolean;
 }
+export type EllipsisProps = {
+    /**
+     * 省略号标志
+     * @default 'icon' - 内置图标不能自定义
+     * @type 'icon' | 'text'
+     */
+    symbol?: 'icon' | 'text';
+    /**
+     * 省略号文本 - symbol为text时生效
+     */
+    text?: string;
+    /**
+     * 省略号颜色 - symbol为icon时生效
+     * @default #34B77C
+     */
+    iconColor?: string;
+    /**
+     * 省略号气泡内容
+     */
+    tooltip?: Omit<TooltipProps, 'trigger' | 'title'>;
+};
 export interface ApTagGroupProps {
     /**
      * 标签组内容
@@ -32,4 +55,5 @@ export interface ApTagGroupProps {
      * @default #34B77C
      */
     ellipsisColor?: string;
+    ellipsis?: EllipsisProps;
 }

package/es/src/ap-tag/style/ap-tag-group.css

@@ -5,3 +5,11 @@
   white-space: nowrap;
   align-items: center;
 }
+.aplus-tag-group-ellipsis-text--admin {
+  font-size: 12px;
+  color: #1890FF;
+}
+.aplus-tag-group-ellipsis-text--aplus {
+  font-size: 12px;
+  color: #0070FF;
+}

package/es/src/design-token/index.mjs

@@ -28,7 +28,9 @@ const o = {
   colorBgContainerDisabled: "#F9F9FA",
   wireframe: !1,
   colorBgLayout: "#F2F6F9",
-  colorBgSpotlight: "#000000cc"
+  colorBgSpotlight: "#000000cc",
+  controlItemBgActive: "#E9EDF3",
+  controlItemBgActiveHover: "#EAF2FF"
 }, c = {
   ...o,
   // 主色
@@ -57,7 +59,9 @@ const o = {
   colorLink: "#1890FF",
   wireframe: !1,
   colorBgLayout: "#FAFAFA",
-  colorBgSpotlight: "#000000cc"
+  colorBgSpotlight: "#000000cc",
+  controlItemBgActive: "#f3fbf7",
+  controlItemBgActiveHover: "#e6f6ef"
 };
 export {
   c as adminToken,

package/es/src/theme/ap-tag/ap-tag-group.css

@@ -5,3 +5,11 @@
   white-space: nowrap;
   align-items: center;
 }
+.aplus-tag-group-ellipsis-text--admin {
+  font-size: 12px;
+  color: #1890FF;
+}
+.aplus-tag-group-ellipsis-text--aplus {
+  font-size: 12px;
+  color: #0070FF;
+}

package/lib/src/ap-form/ap-form-item-group/helper.d.ts

@@ -1,4 +1,5 @@
 import { VNode, RendererNode, RendererElement } from 'vue';
+import { ApFormItemProps } from '../interface';
 
 export declare const buildColSpan: (count: number, times?: number) => {
     xs: number;
@@ -16,3 +17,9 @@ export declare const buildColSpan: (count: number, times?: number) => {
 export declare const genRealChildren: (nodes: VNode[]) => VNode< RendererNode, RendererElement, {
     [key: string]: any;
 }>[];
+/**
+ * 获取FormItem 字符串化的name，如果未获取到name，返回当前的时间戳
+ * @param name
+ * @returns
+ */
+export declare function getStringName(name?: ApFormItemProps['name']): string | number;

package/lib/src/ap-form/ap-form-item-group/helper.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("lodash-unified"),o=r=>r<=1?1:r,t=(r,e=1)=>{const l=Math.floor(24/r),n=l*e;return n>24?l:n},f=(r,e=1)=>({xs:t(o(r-3),e),sm:t(o(r-2),e),md:t(o(r-1),e),lg:t(o(r-1),e),xl:t(r,e),xxl:t(r,e)});function s(r){const e=[];for(const l of r.filter(Boolean).filter(n=>n.type!==Symbol.for("v-cmt")))if(l.type===Symbol.for("v-fgt")){const n=s(l.children);e.push(...n)}else if(u.isArray(l)){const n=s(l);e.push(...n)}else e.push(l);return e}const i=r=>{const e=[];return e.push(...s(r)),e};exports.buildColSpan=f;exports.genRealChildren=i;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("lodash-unified"),u=require("../../utils/index.js"),l=r=>r<=1?1:r,o=(r,e=1)=>{const t=Math.floor(24/r),n=t*e;return n>24?t:n},f=(r,e=1)=>({xs:o(l(r-3),e),sm:o(l(r-2),e),md:o(l(r-1),e),lg:o(l(r-1),e),xl:o(r,e),xxl:o(r,e)});function s(r){const e=[];for(const t of r.filter(Boolean).filter(n=>n.type!==Symbol.for("v-cmt")))if(t.type===Symbol.for("v-fgt")){const n=s(t.children);e.push(...n)}else if(i.isArray(t)){const n=s(t);e.push(...n)}else e.push(t);return e}const a=r=>{const e=[];return e.push(...s(r)),e};function c(r){return u.isDef(r)?(i.isArray(r)?r:[r]).join(""):Date.now()}exports.buildColSpan=f;exports.genRealChildren=a;exports.getStringName=c;

package/lib/src/ap-form/ap-form-item-group/index.vue.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),i=require("ant-design-vue"),C=require("lodash-unified"),h=require("../constant.js"),u=require("./helper.js");require("../../config-provider/index.js");require("../style/ap-form-item-group.css");const k=require("../../config-provider/hooks/use-namespace.js");function w(r){return typeof r=="function"||Object.prototype.toString.call(r)==="[object Object]"&&!e.isVNode(r)}const y=e.defineComponent({name:"ApFormItemGroup",__name:"index",props:{align:{},justify:{},prefixCls:{},gutter:{default:16},wrap:{type:Boolean,default:void 0},countPerRow:{default:3}},setup(r){const{b:l}=k.useNamespace("ap-form-item-group"),{countPerRow:p,...d}=r,a=e.useSlots();e.watch(()=>a.default(),t=>{s.value=u.genRealChildren(t)}),e.onBeforeUpdate(()=>{s.value=u.genRealChildren(a.default())});const s=e.shallowRef(u.genRealChildren(a.default())),f=e.computed(()=>e.unref(s).map((t,c)=>{const o=t.props,n=C.pick(o,h.apFormItemColPropKeys),m=n!=null&&n.span?{}:u.buildColSpan(p),g=!!(o!=null&&o.hidden);return e.createVNode(i.Col,e.mergeProps({key:`${c}-${Date.now()}`},m,n,{class:g?l("col-hidden"):""}),w(t)?t:{default:()=>[t]})}));return(t,c)=>(e.openBlock(),e.createBlock(e.unref(i.Row),e.mergeProps({class:e.unref(l)()},d),{default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(f.value,(o,n)=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(o),{key:`${n}-${Date.now()}`}))),128))]),_:1},16,["class"]))}});exports.default=y;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),i=require("ant-design-vue"),k=require("lodash-unified"),y=require("../constant.js"),s=require("./helper.js");require("../../config-provider/index.js");require("../style/ap-form-item-group.css");const C=require("../../config-provider/hooks/use-namespace.js");function _(r){return typeof r=="function"||Object.prototype.toString.call(r)==="[object Object]"&&!e.isVNode(r)}const h=e.defineComponent({name:"ApFormItemGroup",__name:"index",props:{align:{},justify:{},prefixCls:{},gutter:{default:16},wrap:{type:Boolean,default:void 0},countPerRow:{default:3}},setup(r){const{b:u}=C.useNamespace("ap-form-item-group"),{countPerRow:p,...d}=r,a=e.useSlots();e.watch(()=>a.default(),t=>{c.value=s.genRealChildren(t)});const c=e.shallowRef(s.genRealChildren(a.default())),f=e.computed(()=>e.unref(c).map((t,l)=>{const n=t.props,o=k.pick(n,y.apFormItemColPropKeys),m=o!=null&&o.span?{}:s.buildColSpan(p),g=!!(n!=null&&n.hidden);return e.createVNode(i.Col,e.mergeProps({key:`${l}-${s.getStringName(n.name)}`},m,o,{class:g?u("col-hidden"):""}),_(t)?t:{default:()=>[t]})}));return(t,l)=>(e.openBlock(),e.createBlock(e.unref(i.Row),e.mergeProps({class:e.unref(u)()},d),{default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(f.value,(n,o)=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(n),{key:`${o}-${Date.now()}`}))),128))]),_:1},16,["class"]))}});exports.default=h;

package/lib/src/ap-form/modal-form/index.vue.d.ts

@@ -1,4 +1,4 @@
-import { ApFormModalFormProps, ApFormSubmitterConfig } from '../interface';
+import { ApFormModalFormProps, ApFormInternalInstance, ApFormSubmitterConfig } from '../interface';
 import { VNode, DefineComponent, ComponentOptionsMixin, PublicProps, ExtractPropTypes, PropType, CSSProperties } from 'vue';
 import { InternalNamePath, NamePath, ValidateOptions, FormLabelAlign } from 'ant-design-vue/es/form/interface';
 import { VueTypeValidableDef } from '../../../node_modules/vue-types';
@@ -36,6 +36,7 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefau
     scrollToField: (name: NamePath, options?: {}) => void;
     setFieldValue: (key: string, newValue: any) => void;
     setFieldsValue: (values: Record<string, any>) => void;
+    getInternalInstance: (mark: string) => ApFormInternalInstance | undefined;
 }, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
     "update:open": (...args: any[]) => void;
 }, string, PublicProps, Readonly< ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<ApFormModalFormProps>, {

package/lib/src/ap-form/modal-form/index.vue.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),i=require("ant-design-vue");require("../ap-form.vue.js");require("../../hooks/index.js");const S=require("../../utils/slot.js");require("../../config-provider/index.js");const T=require("lodash-unified");require("../style/modal-form.css");const M=require("../../utils/index.js"),R=require("../../hooks/useControllableValue.js"),j=require("../../config-provider/hooks/use-locale.js"),O=require("../../config-provider/hooks/use-global-config.js"),D=require("../../config-provider/hooks/use-namespace.js"),U=require("../ap-form.vue2.js");function y(d){return typeof d=="function"||Object.prototype.toString.call(d)==="[object Object]"&&!e.isVNode(d)}const z=e.defineComponent({__name:"index",props:{layout:{default:"horizontal"},labelCol:{},wrapperCol:{},colon:{type:Boolean,default:!0},labelAlign:{default:"right"},labelWrap:{type:Boolean},prefixCls:{},requiredMark:{},hideRequiredMark:{type:Boolean,default:!1},rules:{},validateMessages:{},validateOnRuleChange:{type:Boolean,default:!0},scrollToFirstError:{},onSubmit:{},name:{},validateTrigger:{default:"change"},size:{},disabled:{type:Boolean},onValuesChange:{},onFieldsChange:{},onFinishFailed:{},onValidate:{},initialValues:{},open:{type:Boolean,default:void 0},"onUpdate:open":{},modalProps:{default:()=>({})},title:{},width:{default:800},onFinish:{},submitter:{type:[Boolean,Object],default:()=>({resetButtonProps:!1})},showCancel:{type:Boolean,default:!0}},emits:["update:open"],setup(d,{expose:C,emit:B}){const o=d,m=e.useSlots(),k=B,n=e.ref(),c=e.ref(),u=e.ref(!1),{value:N,updateValue:f}=R.useControllableValue(o,k,{valuePropName:"open",defaultValue:!1}),{t:b}=j.useLocale(),v=O.useGlobalConfig("uiMode","aplus"),{b:q,e:g}=D.useNamespace("ap-form-modal-form");e.watch(()=>n.value,t=>{var l;t&&c.value&&((l=t.setFieldsValue)==null||l.call(t,c.value),c.value=void 0)});const V=S.getSingleVNode(m.trigger),h=V?e.cloneVNode(V,{onClick:()=>{f(!0)}}):null,_=e.computed(()=>{var l,a,r,p;const t=[];if(o.submitter===!1)return null;if(o.showCancel){let s;t.push(e.createVNode(i.Button,{onClick:F,disabled:u.value},y(s=b("ap.common.cancelText"))?s:{default:()=>[s]}))}return((l=o.submitter)==null?void 0:l.resetButtonProps)!==!1&&t.push(e.createVNode(i.Button,e.mergeProps(((a=o.submitter)==null?void 0:a.resetButtonProps)||{},{key:"submit",disabled:u.value,onClick:w}),{default:()=>{var s;return[((s=o.submitter)==null?void 0:s.resetText)||b("ap.common.resetText")]}})),((r=o.submitter)==null?void 0:r.submitButtonProps)!==!1&&t.push(e.createVNode(i.Button,e.mergeProps({type:"primary",key:"submit"},((p=o.submitter)==null?void 0:p.submitButtonProps)||{},{loading:u.value,onClick:x}),{default:()=>{var s;return[((s=o.submitter)==null?void 0:s.submitText)||b("ap.common.okText")]}})),e.createVNode(i.Flex,{justify:"flex-end",class:g(e.unref(v)==="admin"?"footer-admin":"footer")},{default:()=>[m.submitter?m.submitter(t):e.createVNode(i.Space,null,y(t)?t:{default:()=>[t]})]})});function w(){var t,l,a;o.submitter!==!1&&((t=n.value)==null||t.resetFields(),(a=(l=o.submitter)==null?void 0:l.onReset)==null||a.call(l))}async function x(){var t,l,a,r;if(o.submitter!==!1)try{const p=await((t=n.value)==null?void 0:t.validateFields());(a=(l=o.submitter)==null?void 0:l.onSubmit)==null||a.call(l),u.value=!0,await((r=o.onFinish)==null?void 0:r.call(o,M.convertReactiveToRaw(p)))&&f(!1)}finally{u.value=!1}}function F(){e.unref(u)||f(!1)}function P(t){!t&&e.unref(u)||f(t)}return C({resetFields:()=>{var t;(t=n.value)==null||t.resetFields()},clearValidate:t=>{var l;(l=n.value)==null||l.clearValidate(t)},validateFields:(t,l)=>{var a;return(a=n.value)==null?void 0:a.validateFields(t,l)},getFieldsValue:t=>{var l;return(l=n.value)==null?void 0:l.getFieldsValue(t)},validate:(t,l)=>{var a;return(a=n.value)==null?void 0:a.validate(t,l)},scrollToField:(t,l={})=>{var a;(a=n.value)==null||a.scrollToField(t,l)},setFieldValue:(t,l)=>{var a,r;(r=(a=n.value)==null?void 0:a.setFieldValue)==null||r.call(a,t,l)},setFieldsValue:t=>{var l,a;if(!n.value){c.value=t;return}(a=(l=n.value)==null?void 0:l.setFieldsValue)==null||a.call(l,t)}}),(t,l)=>(e.openBlock(),e.createElementBlock(e.Fragment,null,[e.createVNode(e.unref(i.Modal),e.mergeProps(t.modalProps,{open:e.unref(N),"onUpdate:open":P,onCancel:F,footer:null,width:t.width,class:e.unref(q)(),"body-style":{padding:e.unref(v)==="admin"?"0px !important":"20px !important"}}),{title:e.withCtx(()=>[e.renderSlot(t.$slots,"title",{},()=>[e.createTextVNode(e.toDisplayString(o.title),1)])]),default:e.withCtx(()=>[e.createElementVNode("div",{class:e.normalizeClass(e.unref(g)(e.unref(v)==="admin"?"content-admin":"content"))},[e.createVNode(U.default,e.mergeProps({ref_key:"formRef",ref:n},e.unref(T.omit)(o,["modalProps","open","onUpdate:open","title","width","onFinish","submitter"])),{default:e.withCtx(()=>[e.renderSlot(t.$slots,"default")]),_:3},16)],2),(e.openBlock(),e.createBlock(e.resolveDynamicComponent(_.value)))]),_:3},16,["open","width","class","body-style"]),e.unref(h)?(e.openBlock(),e.createBlock(e.resolveDynamicComponent(e.unref(h)),{key:0})):e.createCommentVNode("",!0)],64))}});exports.default=z;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),i=require("ant-design-vue");require("../ap-form.vue.js");require("../../hooks/index.js");const S=require("../../utils/slot.js");require("../../config-provider/index.js");const T=require("lodash-unified");require("../style/modal-form.css");const M=require("../../utils/index.js"),R=require("../../hooks/useControllableValue.js"),j=require("../../config-provider/hooks/use-locale.js"),O=require("../../config-provider/hooks/use-global-config.js"),D=require("../../config-provider/hooks/use-namespace.js"),U=require("../ap-form.vue2.js");function y(d){return typeof d=="function"||Object.prototype.toString.call(d)==="[object Object]"&&!e.isVNode(d)}const z=e.defineComponent({__name:"index",props:{layout:{default:"horizontal"},labelCol:{},wrapperCol:{},colon:{type:Boolean,default:!0},labelAlign:{default:"right"},labelWrap:{type:Boolean},prefixCls:{},requiredMark:{},hideRequiredMark:{type:Boolean,default:!1},rules:{},validateMessages:{},validateOnRuleChange:{type:Boolean,default:!0},scrollToFirstError:{},onSubmit:{},name:{},validateTrigger:{default:"change"},size:{},disabled:{type:Boolean},onValuesChange:{},onFieldsChange:{},onFinishFailed:{},onValidate:{},initialValues:{},open:{type:Boolean,default:void 0},"onUpdate:open":{},modalProps:{default:()=>({})},title:{},width:{default:800},onFinish:{},submitter:{type:[Boolean,Object],default:()=>({resetButtonProps:!1})},showCancel:{type:Boolean,default:!0}},emits:["update:open"],setup(d,{expose:C,emit:B}){const o=d,m=e.useSlots(),k=B,n=e.ref(),c=e.ref(),u=e.ref(!1),{value:N,updateValue:f}=R.useControllableValue(o,k,{valuePropName:"open",defaultValue:!1}),{t:v}=j.useLocale(),b=O.useGlobalConfig("uiMode","aplus"),{b:q,e:g}=D.useNamespace("ap-form-modal-form");e.watch(()=>n.value,t=>{var l;t&&c.value&&((l=t.setFieldsValue)==null||l.call(t,c.value),c.value=void 0)});const V=S.getSingleVNode(m.trigger),h=V?e.cloneVNode(V,{onClick:()=>{f(!0)}}):null,_=e.computed(()=>{var l,a,r,p;const t=[];if(o.submitter===!1)return null;if(o.showCancel){let s;t.push(e.createVNode(i.Button,{onClick:F,disabled:u.value},y(s=v("ap.common.cancelText"))?s:{default:()=>[s]}))}return((l=o.submitter)==null?void 0:l.resetButtonProps)!==!1&&t.push(e.createVNode(i.Button,e.mergeProps(((a=o.submitter)==null?void 0:a.resetButtonProps)||{},{key:"submit",disabled:u.value,onClick:w}),{default:()=>{var s;return[((s=o.submitter)==null?void 0:s.resetText)||v("ap.common.resetText")]}})),((r=o.submitter)==null?void 0:r.submitButtonProps)!==!1&&t.push(e.createVNode(i.Button,e.mergeProps({type:"primary",key:"submit"},((p=o.submitter)==null?void 0:p.submitButtonProps)||{},{loading:u.value,onClick:x}),{default:()=>{var s;return[((s=o.submitter)==null?void 0:s.submitText)||v("ap.common.okText")]}})),e.createVNode(i.Flex,{justify:"flex-end",class:g(e.unref(b)==="admin"?"footer-admin":"footer")},{default:()=>[m.submitter?m.submitter(t):e.createVNode(i.Space,null,y(t)?t:{default:()=>[t]})]})});function w(){var t,l,a;o.submitter!==!1&&((t=n.value)==null||t.resetFields(),(a=(l=o.submitter)==null?void 0:l.onReset)==null||a.call(l))}async function x(){var t,l,a,r;if(o.submitter!==!1)try{const p=await((t=n.value)==null?void 0:t.validateFields());(a=(l=o.submitter)==null?void 0:l.onSubmit)==null||a.call(l),u.value=!0,await((r=o.onFinish)==null?void 0:r.call(o,M.convertReactiveToRaw(p)))&&f(!1)}finally{u.value=!1}}function F(){e.unref(u)||f(!1)}function P(t){!t&&e.unref(u)||f(t)}return C({resetFields:()=>{var t;(t=n.value)==null||t.resetFields()},clearValidate:t=>{var l;(l=n.value)==null||l.clearValidate(t)},validateFields:(t,l)=>{var a;return(a=n.value)==null?void 0:a.validateFields(t,l)},getFieldsValue:t=>{var l;return(l=n.value)==null?void 0:l.getFieldsValue(t)},validate:(t,l)=>{var a;return(a=n.value)==null?void 0:a.validate(t,l)},scrollToField:(t,l={})=>{var a;(a=n.value)==null||a.scrollToField(t,l)},setFieldValue:(t,l)=>{var a,r;(r=(a=n.value)==null?void 0:a.setFieldValue)==null||r.call(a,t,l)},setFieldsValue:t=>{var l,a;if(!n.value){c.value=t;return}(a=(l=n.value)==null?void 0:l.setFieldsValue)==null||a.call(l,t)},getInternalInstance:t=>{var l;return(l=n.value)==null?void 0:l.getInternalInstance(t)}}),(t,l)=>(e.openBlock(),e.createElementBlock(e.Fragment,null,[e.createVNode(e.unref(i.Modal),e.mergeProps(t.modalProps,{open:e.unref(N),"onUpdate:open":P,onCancel:F,footer:null,width:t.width,class:e.unref(q)(),"body-style":{padding:e.unref(b)==="admin"?"0px !important":"20px !important"}}),{title:e.withCtx(()=>[e.renderSlot(t.$slots,"title",{},()=>[e.createTextVNode(e.toDisplayString(o.title),1)])]),default:e.withCtx(()=>[e.createElementVNode("div",{class:e.normalizeClass(e.unref(g)(e.unref(b)==="admin"?"content-admin":"content"))},[e.createVNode(U.default,e.mergeProps({ref_key:"formRef",ref:n},e.unref(T.omit)(o,["modalProps","open","onUpdate:open","title","width","onFinish","submitter"])),{default:e.withCtx(()=>[e.renderSlot(t.$slots,"default")]),_:3},16)],2),(e.openBlock(),e.createBlock(e.resolveDynamicComponent(_.value)))]),_:3},16,["open","width","class","body-style"]),e.unref(h)?(e.openBlock(),e.createBlock(e.resolveDynamicComponent(e.unref(h)),{key:0})):e.createCommentVNode("",!0)],64))}});exports.default=z;

package/lib/src/ap-tag/ap-tag-group.vue.d.ts

@@ -1,19 +1,24 @@
-import { ApTagGroupProps, ApTagProps } from './interface';
+import { ApTagGroupProps, ApTagProps, EllipsisProps } from './interface';
 import { DefineComponent, ComponentOptionsMixin, PublicProps, ExtractPropTypes, PropType } from 'vue';
 
-declare const _default: DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<ApTagGroupProps>, {
+type ApTagGroupSlots = {
+    tooltip?: (props: {
+        tags: ApTagProps[];
+    }) => void;
+};
+declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<ApTagGroupProps>, {
     list: () => ApTagProps[];
     space: number;
-    ellipsisColor: string;
+    ellipsis: () => {};
 }>, {}, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly< ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<ApTagGroupProps>, {
     list: () => ApTagProps[];
     space: number;
-    ellipsisColor: string;
+    ellipsis: () => {};
 }>>>, {
+    ellipsis: EllipsisProps;
     space: number;
     list: ApTagProps[];
-    ellipsisColor: string;
-}, {}>;
+}, {}>, Readonly<ApTagGroupSlots> & ApTagGroupSlots>;
 export default _default;
 type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
 type __VLS_TypePropsToRuntimeProps<T> = {
@@ -32,3 +37,8 @@ type __VLS_WithDefaults<P, D> = {
 type __VLS_Prettify<T> = {
     [K in keyof T]: T[K];
 } & {};
+type __VLS_WithTemplateSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

package/lib/src/ap-tag/ap-tag-group.vue.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),_=require("ant-design-vue"),y=require("@ant-design/icons-vue");require("./ap-tag.vue2.js");require("../config-provider/index.js");require("./style/ap-tag-group.css");const w=require("../config-provider/hooks/use-namespace.js"),x=require("./ap-tag.vue.js"),E=e.createElementVNode("svg",{xmlns:"http://www.w3.org/2000/svg","xmlns:xlink":"http://www.w3.org/1999/xlink",fill:"none",version:"1.1",width:"16",height:"16",viewBox:"0 0 16 16"},[e.createElementVNode("defs",null,[e.createElementVNode("clipPath",{id:"master_svg0_1133_24991"},[e.createElementVNode("rect",{x:"0",y:"0",width:"16",height:"16",rx:"0"})])]),e.createElementVNode("g",{"clip-path":"url(#master_svg0_1133_24991)"},[e.createElementVNode("g",null,[e.createElementVNode("ellipse",{cx:"8",cy:"8",rx:"1",ry:"1",fill:"currentColor","fill-opacity":"1"})]),e.createElementVNode("g",null,[e.createElementVNode("ellipse",{cx:"3.25",cy:"8",rx:"1",ry:"1",fill:"currentColor","fill-opacity":"1"})]),e.createElementVNode("g",null,[e.createElementVNode("ellipse",{cx:"12.75",cy:"8",rx:"1",ry:"1",fill:"currentColor","fill-opacity":"1"})])])],-1),k=e.defineComponent({__name:"ap-tag-group",props:{list:{default:()=>[]},space:{default:4},ellipsisColor:{default:"#34B77C"}},setup(p){const l=p,{b:m}=w.useNamespace("tag-group"),s=e.ref(),d=e.computed(()=>e.unref(r)<l.list.length),f=e.computed(()=>l.list.slice(0,e.unref(r))),r=e.ref(0),c=e.ref(0),a=e.ref(l.list.length),g=e.computed(()=>l.list.map(t=>t.text).join("、")),v=e.computed(()=>[m()].filter(Boolean)),n=()=>{if(!s.value)return;const t=s.value.scrollWidth,o=s.value.clientWidth;if(e.unref(c)<=e.unref(a)){const i=Math.floor((e.unref(c)+e.unref(a))/2);t<=o?(r.value=i,c.value=i+1):a.value=i-1,e.nextTick(()=>{requestAnimationFrame(n)})}else t>o&&(r.value=r.value-1,e.nextTick(()=>{requestAnimationFrame(n)}))},u=()=>{c.value=0,a.value=l.list.length,r.value=0};return e.watch(()=>l.list,(t,o)=>{t!==o&&(u(),e.nextTick(()=>n()))},{immediate:!0}),e.onMounted(()=>{window.addEventListener("resize",()=>{u(),n()})}),e.onUnmounted(()=>{window.removeEventListener("resize",()=>{u(),n()})}),(t,o)=>(e.openBlock(),e.createBlock(e.unref(_.Tooltip),{title:g.value,trigger:"hover"},{default:e.withCtx(()=>[e.createElementVNode("div",{class:e.normalizeClass(v.value),ref_key:"container",ref:s,style:e.normalizeStyle({pointerEvents:d.value?"auto":"none"})},[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(f.value,(i,h)=>(e.openBlock(),e.createBlock(x.default,e.mergeProps({ref_for:!0},i,{key:h,style:{marginRight:`${t.space}px`}}),null,16,["style"]))),128)),d.value?(e.openBlock(),e.createBlock(e.unref(y),{key:0,style:e.normalizeStyle({color:t.ellipsisColor})},{component:e.withCtx(()=>[E]),_:1},8,["style"])):e.createCommentVNode("",!0)],6)]),_:1},8,["title"]))}});exports.default=k;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),V=require("ant-design-vue"),N=require("@ant-design/icons-vue");require("./ap-tag.vue2.js");require("../config-provider/index.js");const q=require("lodash-unified");require("./style/ap-tag-group.css");const B=require("../config-provider/hooks/use-locale.js"),b=require("../config-provider/hooks/use-global-config.js"),T=require("../config-provider/hooks/use-namespace.js"),z=require("./ap-tag.vue.js"),M=e.createElementVNode("svg",{xmlns:"http://www.w3.org/2000/svg","xmlns:xlink":"http://www.w3.org/1999/xlink",fill:"none",version:"1.1",width:"16",height:"16",viewBox:"0 0 16 16"},[e.createElementVNode("defs",null,[e.createElementVNode("clipPath",{id:"master_svg0_1133_24991"},[e.createElementVNode("rect",{x:"0",y:"0",width:"16",height:"16",rx:"0"})])]),e.createElementVNode("g",{"clip-path":"url(#master_svg0_1133_24991)"},[e.createElementVNode("g",null,[e.createElementVNode("ellipse",{cx:"8",cy:"8",rx:"1",ry:"1",fill:"currentColor","fill-opacity":"1"})]),e.createElementVNode("g",null,[e.createElementVNode("ellipse",{cx:"3.25",cy:"8",rx:"1",ry:"1",fill:"currentColor","fill-opacity":"1"})]),e.createElementVNode("g",null,[e.createElementVNode("ellipse",{cx:"12.75",cy:"8",rx:"1",ry:"1",fill:"currentColor","fill-opacity":"1"})])])],-1),S=e.defineComponent({__name:"ap-tag-group",props:{list:{default:()=>[]},space:{default:4},ellipsisColor:{},ellipsis:{default:()=>({})}},setup(v){const{t:g}=B.useLocale(),l=v,h=b.useGlobalConfig("uiMode"),{b:y,bm:m}=T.useNamespace("tag-group"),i=e.ref(),o=e.computed(()=>({...{iconColor:"#34B77C",symbol:"icon",text:g("ap.common.more")},...l.ellipsis})),x=e.computed(()=>o.value.tooltip&&typeof o.value.tooltip=="object"?q.omit(o.value.tooltip,["trigger","title"]):{}),p=e.computed(()=>e.unref(n)<l.list.length),_=e.computed(()=>l.list.slice(0,e.unref(n))),n=e.ref(0),a=e.ref(0),u=e.ref(l.list.length),C=e.computed(()=>l.list.map(t=>t.text).join("、")),w=e.computed(()=>[y()].filter(Boolean)),k=e.computed(()=>h.value==="aplus"?[m("ellipsis-text","aplus")]:[m("ellipsis-text","admin")]),c=()=>{if(!i.value)return;const t=i.value.scrollWidth,r=i.value.clientWidth;if(e.unref(a)<=e.unref(u)){const s=Math.floor((e.unref(a)+e.unref(u))/2);t<=r?(n.value=s,a.value=s+1):u.value=s-1,e.nextTick(()=>{requestAnimationFrame(c)})}else t>r&&(n.value=n.value-1,e.nextTick(()=>{requestAnimationFrame(c)}))},d=()=>{a.value=0,u.value=l.list.length,n.value=0};e.watch(()=>l.list,(t,r)=>{t!==r&&(d(),e.nextTick(()=>c()))},{immediate:!0});const f=()=>{d(),c()};return e.onMounted(()=>{[["ellipsisColor","ellipse.color"]].forEach(([t,r])=>{l[t]&&console.error(`[ApTagGroup]: \`${t}\` is deprecated, please use \`${r}\` instead.`)}),window.addEventListener("resize",f)}),e.onUnmounted(()=>{window.removeEventListener("resize",f)}),(t,r)=>(e.openBlock(),e.createBlock(e.unref(V.Tooltip),e.mergeProps({trigger:"hover"},x.value),{title:e.withCtx(()=>[e.renderSlot(t.$slots,"tooltip",{tags:t.list},()=>[e.createTextVNode(e.toDisplayString(C.value),1)])]),default:e.withCtx(()=>[e.createElementVNode("div",{class:e.normalizeClass(w.value),ref_key:"container",ref:i,style:e.normalizeStyle({pointerEvents:p.value?"auto":"none"})},[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(_.value,(s,E)=>(e.openBlock(),e.createBlock(z.default,e.mergeProps({ref_for:!0},s,{key:E,style:{marginRight:`${t.space}px`}}),null,16,["style"]))),128)),p.value&&o.value.symbol==="icon"?(e.openBlock(),e.createBlock(e.unref(N),{key:0,style:e.normalizeStyle({color:t.ellipsisColor||o.value.iconColor})},{component:e.withCtx(()=>[M]),_:1},8,["style"])):p.value&&o.value.symbol==="text"?(e.openBlock(),e.createElementBlock("span",{key:1,class:e.normalizeClass(k.value)},e.toDisplayString(o.value.text),3)):e.createCommentVNode("",!0)],6)]),_:3},16))}});exports.default=S;

package/lib/src/ap-tag/interface.d.ts

@@ -1,3 +1,5 @@
+import { TooltipProps } from 'ant-design-vue/es/tooltip';
+
 export interface ApTagProps {
     /**
      * 标签内容
@@ -17,6 +19,27 @@ export interface ApTagProps {
      */
     disabled?: boolean;
 }
+export type EllipsisProps = {
+    /**
+     * 省略号标志
+     * @default 'icon' - 内置图标不能自定义
+     * @type 'icon' | 'text'
+     */
+    symbol?: 'icon' | 'text';
+    /**
+     * 省略号文本 - symbol为text时生效
+     */
+    text?: string;
+    /**
+     * 省略号颜色 - symbol为icon时生效
+     * @default #34B77C
+     */
+    iconColor?: string;
+    /**
+     * 省略号气泡内容
+     */
+    tooltip?: Omit<TooltipProps, 'trigger' | 'title'>;
+};
 export interface ApTagGroupProps {
     /**
      * 标签组内容
@@ -32,4 +55,5 @@ export interface ApTagGroupProps {
      * @default #34B77C
      */
     ellipsisColor?: string;
+    ellipsis?: EllipsisProps;
 }

package/lib/src/ap-tag/style/ap-tag-group.css

@@ -5,3 +5,11 @@
   white-space: nowrap;
   align-items: center;
 }
+.aplus-tag-group-ellipsis-text--admin {
+  font-size: 12px;
+  color: #1890FF;
+}
+.aplus-tag-group-ellipsis-text--aplus {
+  font-size: 12px;
+  color: #0070FF;
+}

package/lib/src/design-token/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o={borderRadius:4},r={...o,colorPrimary:"#0070FF",colorPrimaryHover:"#66A9FF",colorPrimaryActive:"#338CFF",colorTextBase:"#182948",colorText:"#182948",colorTextSecondary:"#526A90",colorTextTertiary:"#8896B0",colorTextPlaceholder:"#BFBFBF",colorBorder:"#DEE4ED",colorSplit:"#E9EDF3",colorInfo:"#0070FF",colorSuccess:"#2ED1A3",colorError:"#FF4D4F",colorWarning:"#FFA940",colorBgContainerDisabled:"#F9F9FA",wireframe:!1,colorBgLayout:"#F2F6F9",colorBgSpotlight:"#000000cc"},c={...o,colorPrimary:"#34B77C",colorPrimaryHover:"#85D4B0",colorPrimaryActive:"#5DC596",colorBgContainerDisabled:"#f5f5f5",colorText:"#333333",colorTextSecondary:"#666666",colorTextTertiary:"#999999",colorTextPlaceholder:"#ABB7CC",colorBorder:"#D9D9D9",colorSplit:"#E9E9E9",colorInfo:"#1890FF",colorSuccess:"#52C41A",colorError:"#FF4D4F",colorWarning:"#FAAD14",colorLink:"#1890FF",wireframe:!1,colorBgLayout:"#FAFAFA",colorBgSpotlight:"#000000cc"};exports.adminToken=c;exports.aplusToken=r;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o={borderRadius:4},r={...o,colorPrimary:"#0070FF",colorPrimaryHover:"#66A9FF",colorPrimaryActive:"#338CFF",colorTextBase:"#182948",colorText:"#182948",colorTextSecondary:"#526A90",colorTextTertiary:"#8896B0",colorTextPlaceholder:"#BFBFBF",colorBorder:"#DEE4ED",colorSplit:"#E9EDF3",colorInfo:"#0070FF",colorSuccess:"#2ED1A3",colorError:"#FF4D4F",colorWarning:"#FFA940",colorBgContainerDisabled:"#F9F9FA",wireframe:!1,colorBgLayout:"#F2F6F9",colorBgSpotlight:"#000000cc",controlItemBgActive:"#E9EDF3",controlItemBgActiveHover:"#EAF2FF"},c={...o,colorPrimary:"#34B77C",colorPrimaryHover:"#85D4B0",colorPrimaryActive:"#5DC596",colorBgContainerDisabled:"#f5f5f5",colorText:"#333333",colorTextSecondary:"#666666",colorTextTertiary:"#999999",colorTextPlaceholder:"#ABB7CC",colorBorder:"#D9D9D9",colorSplit:"#E9E9E9",colorInfo:"#1890FF",colorSuccess:"#52C41A",colorError:"#FF4D4F",colorWarning:"#FAAD14",colorLink:"#1890FF",wireframe:!1,colorBgLayout:"#FAFAFA",colorBgSpotlight:"#000000cc",controlItemBgActive:"#f3fbf7",controlItemBgActiveHover:"#e6f6ef"};exports.adminToken=c;exports.aplusToken=r;

package/lib/src/theme/ap-tag/ap-tag-group.css

@@ -5,3 +5,11 @@
   white-space: nowrap;
   align-items: center;
 }
+.aplus-tag-group-ellipsis-text--admin {
+  font-size: 12px;
+  color: #1890FF;
+}
+.aplus-tag-group-ellipsis-text--aplus {
+  font-size: 12px;
+  color: #0070FF;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aplus-frontend/ui",
-  "version": "0.0.32",
+  "version": "0.0.33",
   "main": "lib/index.js",
   "module": "es/index.mjs",
   "files": [