@aplus-frontend/ui 0.6.0-beta.1 → 0.6.0-beta.2

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

@@ -1,4 +1,4 @@
-import { defineComponent as $, computed as n, createElementBlock as b, openBlock as y, normalizeClass as p, normalizeStyle as w, createVNode as z, unref as B } from "vue";
+import { defineComponent as $, computed as n, createElementBlock as S, openBlock as b, normalizeClass as i, normalizeStyle as w, createVNode as z, unref as B } from "vue";
 import "../config-provider/index.mjs";
 import { TypographyText as v } from "@aplus-frontend/antdv";
 import { useGlobalConfig as I } from "../config-provider/hooks/use-global-config.mjs";
@@ -7,31 +7,37 @@ const A = /* @__PURE__ */ $({
   name: "ApTag",
   __name: "ap-tag",
   props: {
+    type: { default: "purely" },
     text: {},
     color: { default: "#34B77C" },
     size: { default: "middle" },
     disabled: { type: Boolean, default: !1 }
   },
-  setup(i) {
-    const e = i, o = I("uiMode"), { b: r, bm: a } = _("tag");
-    function l(t, s) {
+  setup(o) {
+    const e = o, l = I("uiMode"), { b: r, bm: a } = _("tag");
+    function p(t, s) {
       t.length === 4 && (t = `#${t[1]}${t[1]}${t[2]}${t[2]}${t[3]}${t[3]}`);
-      const m = parseInt(t.slice(1, 3), 16), f = parseInt(t.slice(3, 5), 16), g = parseInt(t.slice(5, 7), 16), S = Math.round(s * 255).toString(16).padStart(2, "0");
-      return `#${m.toString(16).padStart(2, "0")}${f.toString(16).padStart(2, "0")}${g.toString(16).padStart(2, "0")}${S}`;
+      const m = parseInt(t.slice(1, 3), 16), f = parseInt(t.slice(3, 5), 16), g = parseInt(t.slice(5, 7), 16), y = Math.round(s * 255).toString(16).padStart(2, "0");
+      return `#${m.toString(16).padStart(2, "0")}${f.toString(16).padStart(2, "0")}${g.toString(16).padStart(2, "0")}${y}`;
     }
     const c = n(() => ({
       "--tag-main-color": e.color,
-      "--tag-main-color-opacity": l(e.color, 0.06)
-    })), u = n(() => [r("wrapper"), a("wrapper", e.size)].filter(Boolean)), d = n(() => {
+      "--tag-main-color-opacity": p(e.color, 0.06),
+      "--tag-main-color-background": p(e.color, 0.15)
+    })), u = n(() => [
+      r("wrapper"),
+      r(`wrapper-${e.type}`),
+      a("wrapper", e.size)
+    ].filter(Boolean)), d = n(() => {
       const t = [r("inner-wrapper"), a("inner-wrapper", e.size)];
-      return e.disabled && (o.value === "aplus" ? t.push(a("inner-wrapper", "disabled")) : t.push(a("inner-wrapper", "disabled-admin"))), t;
+      return e.disabled && (l.value === "aplus" ? t.push(a("inner-wrapper", "disabled")) : t.push(a("inner-wrapper", "disabled-admin"))), t;
     });
-    return (t, s) => (y(), b("span", {
+    return (t, s) => (b(), S("span", {
       style: w(c.value),
-      class: p(u.value)
+      class: i(u.value)
     }, [
       z(B(v), {
-        class: p(d.value),
+        class: i(d.value),
         ellipsis: { tooltip: t.text },
         content: t.text
       }, null, 8, ["class", "ellipsis", "content"])

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

@@ -1,5 +1,9 @@
 import { TooltipProps } from '@aplus-frontend/antdv/es/tooltip';
 export interface ApTagProps {
+    /**
+     * 标签类型
+     */
+    type?: 'purely' | 'border';
     /**
      * 标签内容
      */

package/es/src/business/ap-expand-alert/ApExpandAlert.vue2.mjs

@@ -1,4 +1,4 @@
-import { defineComponent as W, computed as f, ref as h, watch as T, nextTick as w, createElementBlock as n, openBlock as a, normalizeClass as s, unref as t, createVNode as x, withCtx as m, createElementVNode as g, normalizeStyle as c, renderSlot as A, createBlock as b, toDisplayString as p, resolveDynamicComponent as N, Fragment as C, renderList as j, createCommentVNode as I, createTextVNode as q } from "vue";
+import { defineComponent as W, computed as f, ref as h, watch as T, nextTick as w, createElementBlock as n, openBlock as a, normalizeClass as s, unref as t, createVNode as x, withCtx as m, createElementVNode as b, normalizeStyle as c, renderSlot as A, createBlock as g, toDisplayString as p, resolveDynamicComponent as N, Fragment as C, renderList as j, createCommentVNode as I, createTextVNode as q } from "vue";
 import { DownOutlined as J } from "@ant-design/icons-vue";
 import { Alert as K, Tooltip as P } from "@aplus-frontend/antdv";
 import { ApActionItem as Q } from "../../ap-action/index.mjs";
@@ -24,8 +24,8 @@ const Z = ["onClick"], pe = /* @__PURE__ */ W({
     showIcon: { type: Boolean, default: !0 }
   },
   emits: ["choose", "expand"],
-  setup(L, { expose: $, emit: H }) {
-    const z = H, r = L, { t: S } = U(), V = f(() => {
+  setup(L, { expose: $, emit: z }) {
+    const H = z, r = L, { t: S } = U(), V = f(() => {
       if (r.type != "card")
         return r.type;
     }), l = h(""), u = h(null), D = f(() => ({
@@ -34,11 +34,10 @@ const Z = ["onClick"], pe = /* @__PURE__ */ W({
       overflow: "hidden",
       display: "-webkit-box",
       webkitLineClamp: l.value,
-      webkitBoxOrient: "vertical",
-      lineHeight: "22px"
+      webkitBoxOrient: "vertical"
     }));
     function R() {
-      l.value === "1" ? l.value = "" : l.value = "1", z("expand");
+      l.value === "1" ? l.value = "" : l.value = "1", H("expand");
     }
     const M = f(() => l.value === "1" ? S("ap.apExpandAlert.expand") : S("ap.apExpandAlert.collapse")), y = h(!0), B = f(() => l.value !== "1");
     function v(e) {
@@ -82,14 +81,14 @@ const Z = ["onClick"], pe = /* @__PURE__ */ W({
         class: s([t(o)("antAlert"), e.type == "card" ? "card-alert" : ""])
       }, {
         action: m(() => [
-          y.value ? (a(), b(t(Q), {
+          y.value ? (a(), g(t(Q), {
             key: 0,
             size: "small",
             style: { "font-size": "12px", "padding-left": "16px" },
             onClick: d[0] || (d[0] = (i) => R())
           }, {
             default: m(() => [
-              g("span", {
+              b("span", {
                 class: s(t(o)("expandText"))
               }, p(M.value), 3),
               x(t(J), {
@@ -100,7 +99,7 @@ const Z = ["onClick"], pe = /* @__PURE__ */ W({
           })) : I("", !0)
         ]),
         message: m(() => [
-          g("div", {
+          b("div", {
             ref_key: "ellipsisBoxRef",
             ref: u,
             style: c({ ...D.value, ...e.contentStyle }),
@@ -111,7 +110,7 @@ const Z = ["onClick"], pe = /* @__PURE__ */ W({
                 key: 0,
                 class: s(t(o)("prefix")),
                 style: c(e.prefixStyle)
-              }, p(e.prefix), 7)) : (a(), b(N(e.prefix), {
+              }, p(e.prefix), 7)) : (a(), g(N(e.prefix), {
                 key: 1,
                 style: c(e.prefixStyle)
               }, null, 8, ["style"])),
@@ -127,7 +126,7 @@ const Z = ["onClick"], pe = /* @__PURE__ */ W({
                       record: i,
                       index: k
                     }, () => [
-                      g("span", {
+                      b("span", {
                         class: s(t(o)("showItem")),
                         onClick: (_) => e.$emit("choose", i)
                       }, p(e.mapLabel ? i[e.mapLabel] : i), 11, Z)
@@ -142,7 +141,7 @@ const Z = ["onClick"], pe = /* @__PURE__ */ W({
                 }, [
                   t(E)(e.separator) ? (a(), n(C, { key: 0 }, [
                     q(p(e.separator), 1)
-                  ], 64)) : (a(), b(N(e.separator), { key: 1 }))
+                  ], 64)) : (a(), g(N(e.separator), { key: 1 }))
                 ], 6)) : I("", !0)
               ], 64))), 128))
             ])

package/es/src/business/ap-export-group/ApExportGroup.vue.d.ts

@@ -1,6 +1,7 @@
 import { ApExportGroupProps } from './interface';
 import { DefineComponent, ComponentOptionsMixin, PublicProps, ComponentProvideOptions } from 'vue';
 declare const _default: DefineComponent<ApExportGroupProps, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<ApExportGroupProps> & Readonly<{}>, {
+    type: "button" | "dropdown";
     exportField: boolean | {
         key?: string;
         convertField?: {

package/es/src/business/ap-export-group/ApExportGroup.vue2.mjs

@@ -1,18 +1,21 @@
-import { defineComponent as N, ref as L, computed as s, watch as O, createBlock as g, createCommentVNode as V, openBlock as p, unref as o, normalizeClass as q, withCtx as n, createVNode as b, mergeProps as z, createTextVNode as w, toDisplayString as h } from "vue";
+import { defineComponent as O, ref as A, computed as s, watch as V, createElementBlock as $, openBlock as d, Fragment as q, createBlock as y, createCommentVNode as M, unref as a, mergeProps as B, withCtx as n, createTextVNode as x, toDisplayString as g, normalizeClass as z, createVNode as h } from "vue";
 import { DownOutlined as U } from "@ant-design/icons-vue";
-import { message as $, Dropdown as H, Button as J, Menu as Q, MenuItem as S } from "@aplus-frontend/antdv";
+import { message as H, Dropdown as J, Menu as Q, MenuItem as G } from "@aplus-frontend/antdv";
 import "../../config-provider/index.mjs";
-import { ApExportGroupActionType as m } from "./interface.mjs";
+import { ApExportGroupActionType as r } from "./interface.mjs";
 import { usePermission as W } from "@aplus-frontend/hooks";
 import { handleExportDownload as X } from "./handleExportDownload.mjs";
 import { useInjectApTable as Y } from "../../ap-table/context.mjs";
 import { convertExportField as Z } from "./convertExportField.mjs";
+import "../../ap-button/index.mjs";
 import { useNamespace as ee } from "../../config-provider/hooks/use-namespace.mjs";
 import { useLocale as te } from "../../config-provider/hooks/use-locale.mjs";
-import { useGlobalConfig as A } from "../../config-provider/hooks/use-global-config.mjs";
-const ve = /* @__PURE__ */ N({
+import { useGlobalConfig as ae } from "../../config-provider/hooks/use-global-config.mjs";
+import P from "../../ap-button/ap-button.vue.mjs";
+const ge = /* @__PURE__ */ O({
   __name: "ApExportGroup",
   props: {
+    type: { default: "button" },
     selectedRowKeys: {},
     disabled: { type: Boolean },
     auth: {},
@@ -26,124 +29,130 @@ const ve = /* @__PURE__ */ N({
     successMessage: { type: [Boolean, String], default: !1 },
     exportField: { type: [Boolean, Object], default: void 0 }
   },
-  setup(_) {
-    const { hasPermission: B } = W(), e = _, { columns: u, dataSource: r } = Y(), { b: G } = ee("ap-export-group"), { t: i } = te(), P = A("uiMode"), E = A("exportField"), c = L(!1), v = L(!1), K = s(() => {
-      const t = {
-        aplus: "#0070FF",
-        admin: "#34b77c"
-      };
-      return d.value ? "" : t[P.value] || t.aplus;
-    }), d = s(
+  setup(K) {
+    const { hasPermission: T } = W(), e = K, { columns: c, dataSource: f } = Y(), { b: D } = ee("ap-export-group"), { t: u } = te(), C = ae("exportField"), i = A(!1), p = A(!1), m = s(
       () => {
         var t;
-        return !!(e != null && e.disabled) || (r !== void 0 ? !((t = r == null ? void 0 : r.value) != null && t.length) : !1) || c.value;
+        return !!(e != null && e.disabled) || (f !== void 0 ? !((t = f == null ? void 0 : f.value) != null && t.length) : !1) || i.value;
       }
     );
-    O(
-      () => d.value,
+    V(
+      () => m.value,
       () => {
-        d.value && (v.value = !1);
+        m.value && (p.value = !1);
       },
       {
         immediate: !0
       }
     );
-    const D = s(() => (e == null ? void 0 : e.successMessage) === !0 ? i("ap.apExportGroup.exportSuccess") : e != null && e.successMessage ? e.successMessage : ""), y = s(() => {
-      const t = "exportFieldList", a = (e == null ? void 0 : e.exportField) ?? (E.value === "" ? !0 : E.value) ?? !1;
-      return a === !0 ? {
+    const R = s(() => (e == null ? void 0 : e.successMessage) === !0 ? u("ap.apExportGroup.exportSuccess") : e != null && e.successMessage ? e.successMessage : ""), b = s(() => {
+      const t = "exportFieldList", l = (e == null ? void 0 : e.exportField) ?? (C.value === "" ? !0 : C.value) ?? !1;
+      return l === !0 ? {
         key: t
-      } : typeof a == "object" ? {
-        ...a,
-        key: a.key ?? t
-      } : a;
-    }), R = {
+      } : typeof l == "object" ? {
+        ...l,
+        key: l.key ?? t
+      } : l;
+    }), j = {
       textAlign: "center"
-    }, F = s(() => (e == null ? void 0 : e.selectedRowKeys) || []), T = s(() => {
+    }, k = s(() => (e == null ? void 0 : e.selectedRowKeys) || []), L = s(() => {
       let t = e == null ? void 0 : e.ifShow;
-      return !(e != null && e.ifShow) && (e != null && e.auth) && (t = () => B(e.auth)), (t == null ? void 0 : t()) ?? !0;
+      return !(e != null && e.ifShow) && (e != null && e.auth) && (t = () => T(e.auth)), (t == null ? void 0 : t()) ?? !0;
     });
-    async function j({ key: t }) {
-      var M, k, C;
-      const { getRequestParams: a, request: l } = e || {};
-      let x = {};
-      t === m.SELECT ? x = {
-        [(e == null ? void 0 : e.idKey) || "ids"]: F.value
-      } : t === m.ALL && (x = (a == null ? void 0 : a()) || {});
-      const I = ((M = e == null ? void 0 : e.getInitialParams) == null ? void 0 : M.call(e)) || {};
+    async function I() {
+      k.value.length > 0 ? w({ key: r.SELECT }) : w({ key: r.ALL });
+    }
+    async function w({ key: t }) {
+      var F, S, _;
+      const { getRequestParams: l, request: o } = e || {};
+      let E = {};
+      t === r.SELECT ? E = {
+        [(e == null ? void 0 : e.idKey) || "ids"]: k.value
+      } : t === r.ALL && (E = (l == null ? void 0 : l()) || {});
+      const N = ((F = e == null ? void 0 : e.getInitialParams) == null ? void 0 : F.call(e)) || {};
       try {
-        c.value = !0;
-        let f = Object.assign(
+        i.value = !0;
+        let v = Object.assign(
           {
-            ...x,
-            ...I
+            ...E,
+            ...N
           },
-          y.value && (u != null && u.value) ? {
-            [y.value.key]: Z(
-              u.value,
-              (k = y.value) == null ? void 0 : k.convertField
+          b.value && (c != null && c.value) ? {
+            [b.value.key]: Z(
+              c.value,
+              (S = b.value) == null ? void 0 : S.convertField
             )
           } : {}
         );
-        f = ((C = e == null ? void 0 : e.beforeRequest) == null ? void 0 : C.call(e, f)) || f, await X(async () => await (l == null ? void 0 : l(f))), e != null && e.successMessage && $.success(D.value);
+        v = ((_ = e == null ? void 0 : e.beforeRequest) == null ? void 0 : _.call(e, v)) || v, await X(async () => await (o == null ? void 0 : o(v))), e != null && e.successMessage && H.success(R.value);
       } finally {
-        c.value = !1;
+        i.value = !1;
       }
     }
-    return (t, a) => T.value ? (p(), g(o(H), {
-      key: 0,
-      open: v.value,
-      "onUpdate:open": a[0] || (a[0] = (l) => v.value = l),
-      class: q([o(G)()]),
-      "overlay-style": R,
-      disabled: d.value
-    }, {
-      overlay: n(() => [
-        b(o(Q), { onClick: j }, {
-          default: n(() => {
-            var l;
-            return [
-              (p(), g(o(S), {
-                key: o(m).SELECT,
-                disabled: ((l = F.value) == null ? void 0 : l.length) === 0
-              }, {
-                default: n(() => [
-                  w(h(o(i)("ap.apExportGroup.exportSelected")), 1)
-                ]),
-                _: 1
-              }, 8, ["disabled"])),
-              (p(), g(o(S), {
-                key: o(m).ALL
-              }, {
-                default: n(() => [
-                  w(h(o(i)("ap.apExportGroup.exportAll")), 1)
-                ]),
-                _: 1
-              }))
-            ];
-          }),
-          _: 1
-        })
-      ]),
-      default: n(() => [
-        b(o(J), z({
-          ...t.$attrs
-        }, {
-          style: {
-            color: K.value
-          },
-          loading: c.value
-        }), {
-          default: n(() => [
-            w(h((e == null ? void 0 : e.text) ?? o(i)("ap.apExportGroup.export")) + " ", 1),
-            b(o(U))
-          ]),
-          _: 1
-        }, 16, ["style", "loading"])
-      ]),
-      _: 1
-    }, 8, ["open", "class", "disabled"])) : V("", !0);
+    return (t, l) => (d(), $(q, null, [
+      L.value && e.type === "button" ? (d(), y(a(P), B({ key: 0 }, {
+        ...t.$attrs
+      }, {
+        disabled: m.value,
+        loading: i.value,
+        onClick: I
+      }), {
+        default: n(() => [
+          x(g((e == null ? void 0 : e.text) ?? a(u)("ap.apExportGroup.export")), 1)
+        ]),
+        _: 1
+      }, 16, ["disabled", "loading"])) : M("", !0),
+      L.value && e.type === "dropdown" ? (d(), y(a(J), {
+        key: 1,
+        open: p.value,
+        "onUpdate:open": l[0] || (l[0] = (o) => p.value = o),
+        class: z([a(D)()]),
+        "overlay-style": j,
+        disabled: m.value
+      }, {
+        overlay: n(() => [
+          h(a(Q), { onClick: w }, {
+            default: n(() => {
+              var o;
+              return [
+                (d(), y(a(G), {
+                  key: a(r).SELECT,
+                  disabled: ((o = k.value) == null ? void 0 : o.length) === 0
+                }, {
+                  default: n(() => [
+                    x(g(a(u)("ap.apExportGroup.exportSelected")), 1)
+                  ]),
+                  _: 1
+                }, 8, ["disabled"])),
+                (d(), y(a(G), {
+                  key: a(r).ALL
+                }, {
+                  default: n(() => [
+                    x(g(a(u)("ap.apExportGroup.exportAll")), 1)
+                  ]),
+                  _: 1
+                }))
+              ];
+            }),
+            _: 1
+          })
+        ]),
+        default: n(() => [
+          h(a(P), B({
+            ...t.$attrs
+          }, { loading: i.value }), {
+            default: n(() => [
+              x(g((e == null ? void 0 : e.text) ?? a(u)("ap.apExportGroup.export")) + " ", 1),
+              h(a(U))
+            ]),
+            _: 1
+          }, 16, ["loading"])
+        ]),
+        _: 1
+      }, 8, ["open", "class", "disabled"])) : M("", !0)
+    ], 64));
   }
 });
 export {
-  ve as default
+  ge as default
 };

package/es/src/business/ap-export-group/index.d.ts

@@ -5,6 +5,7 @@ import { ApExportGroupProps } from './interface';
 export * from './interface';
 declare const ApExportGroup: {
     new (...args: any[]): CreateComponentPublicInstanceWithMixins<Readonly< ApExportGroupProps> & Readonly<{}>, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, PublicProps, {
+        type: "button" | "dropdown";
         exportField: boolean | {
             key?: string;
             convertField?: {
@@ -20,6 +21,7 @@ declare const ApExportGroup: {
         M: {};
         Defaults: {};
     }, Readonly< ApExportGroupProps> & Readonly<{}>, {}, {}, {}, {}, {
+        type: "button" | "dropdown";
         exportField: boolean | {
             key?: string;
             convertField?: {
@@ -32,6 +34,7 @@ declare const ApExportGroup: {
     __isTeleport?: never;
     __isSuspense?: never;
 } & ComponentOptionsBase<Readonly< ApExportGroupProps> & Readonly<{}>, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, {
+    type: "button" | "dropdown";
     exportField: boolean | {
         key?: string;
         convertField?: {

package/es/src/business/ap-export-group/interface.d.ts

@@ -1,5 +1,8 @@
-import { MenuProps } from '@aplus-frontend/antdv';
 export interface ApExportGroupProps {
+    /**
+     * 类型
+     */
+    type?: 'button' | 'dropdown';
     /**
      * 选中行的Key列表
      */
@@ -52,5 +55,7 @@ export declare enum ApExportGroupActionType {
     ALL = "ALL",
     SELECT = "SELECT"
 }
-export type ApExportGroupAntMenuInfo = Parameters<Exclude<MenuProps['onClick'], undefined>>[0];
+export type ApExportGroupAntMenuInfo = {
+    key: string | number;
+};
 export type ApExportGroupMixedParams<ParamsType> = Partial<ParamsType>;

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

@@ -29,9 +29,9 @@ const T = /* @__PURE__ */ m({
         r("span", {
           style: u({
             color: o(l) === "admin" ? "#999999" : "#8896b0",
-            fontSize: "14px",
+            fontSize: "12px",
             fontWeight: "normal",
-            marginLeft: "16px"
+            marginLeft: "12px"
           }),
           class: "product-number"
         }, [