@aplus-frontend/ui 7.0.0 → 7.1.0

package/es/src/ap-descriptions/style/index.mjs

@@ -44,58 +44,31 @@ const e = (t) => {
       },
       ".ant-descriptions-row": {
         ".ant-descriptions-item-label": {
+          justifyContent: "flex-end",
+          width: "var(--ap-descriptions-item-label-width, auto)",
+          color: t.textColor3,
+          ".ap-descriptions-item-content__help": {
+            fontSize: t.fontSizeLG,
+            marginInlineStart: "4px",
+            color: t.textColor3
+          },
           ".ant-typography": {
             color: "inherit"
           }
-        }
-      },
-      "&--admin": {
-        ".ant-descriptions-row": {
-          ".ant-descriptions-item-label": {
-            justifyContent: "flex-end",
-            width: "var(--ap-descriptions-item-label-width, auto)",
-            color: "#999",
-            ".ap-descriptions-item-content__help": {
-              fontSize: t.fontSizeLG,
-              marginInlineStart: "4px",
-              color: "#999"
-            }
-          },
-          ".ant-descriptions-item-content": {
-            color: "#333",
-            ".ap-descriptions-item-content__link": {
-              color: "#1890ff",
-              cursor: "pointer"
-            }
-          }
-        }
-      },
-      "&--aplus": {
-        ".ant-descriptions-row": {
-          ".ant-descriptions-item-label": {
-            justifyContent: "flex-end",
-            width: "var(--ap-descriptions-item-label-width, auto)",
-            color: "#8896B0",
-            ".ap-descriptions-item-content__help": {
-              fontSize: t.fontSizeLG,
-              marginInlineStart: "4px",
-              color: "#8896B0"
-            }
-          },
-          ".ant-descriptions-item-content": {
-            color: "#182948",
-            ".ap-descriptions-item-content__link": {
-              color: "#0070FF",
-              cursor: "pointer"
-            }
+        },
+        ".ant-descriptions-item-content": {
+          color: t.textColor1,
+          ".ap-descriptions-item-content__link": {
+            color: t.colorLink,
+            cursor: "pointer"
           }
         }
       }
     }
   };
-}, s = n("ApDescriptions", (t) => [
+}, r = n("ApDescriptions", (t) => [
   e(t)
 ]);
 export {
-  s as default
+  r as default
 };

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

@@ -1,20 +1,20 @@
-import { defineComponent as F, ref as A, useSlots as L, computed as s, unref as t, createBlock as S, openBlock as i, mergeProps as x, withCtx as j, createElementVNode as u, normalizeClass as I, createElementBlock as f, createCommentVNode as g, createVNode as M, renderSlot as T, toDisplayString as U } from "vue";
-import { Button as V } from "@aplus-frontend/antdv";
-import { LoadingOutlined as D } from "@ant-design/icons-vue";
+import { defineComponent as O, ref as z, useSlots as A, computed as s, unref as t, createBlock as L, openBlock as i, mergeProps as S, withCtx as x, createElementVNode as m, normalizeClass as j, createElementBlock as f, createCommentVNode as u, createVNode as I, renderSlot as F, toDisplayString as T } from "vue";
+import { Button as U } from "@aplus-frontend/antdv";
+import { LoadingOutlined as V } from "@ant-design/icons-vue";
 import "../config-provider/index.mjs";
-import { useOssInit as E } from "./hooks/index.mjs";
-import { getFileInfo as y } from "./utils/getFileInfo.mjs";
-import { useStyle as P } from "./hooks/useStyle.mjs";
-import { omit as G } from "lodash-unified";
-import { useLocale as R } from "../config-provider/hooks/use-locale.mjs";
-import { useGlobalConfig as r } from "../config-provider/hooks/use-global-config.mjs";
-const W = {
+import { useOssInit as D } from "./hooks/index.mjs";
+import { getFileInfo as g } from "./utils/getFileInfo.mjs";
+import { useStyle as E } from "./hooks/useStyle.mjs";
+import { omit as P } from "lodash-unified";
+import { useLocale as G } from "../config-provider/hooks/use-locale.mjs";
+import { useGlobalConfig as y } from "../config-provider/hooks/use-global-config.mjs";
+const M = {
   key: 0,
   class: "spin"
-}, $ = {
+}, R = {
   key: 1,
   class: "icon"
-}, q = { class: "text" }, ae = /* @__PURE__ */ F({
+}, W = { class: "text" }, oe = /* @__PURE__ */ O({
   name: "ApDownload",
   __name: "ap-download",
   props: {
@@ -45,57 +45,57 @@ const W = {
   },
   emits: ["downloadCallback"],
   setup(C, { emit: N }) {
-    const c = N, l = A(!1), { lang: b } = R(), v = L(), w = s(() => b.value === "zh-cn" ? "zh_CN" : "en_US"), h = r("uiMode"), e = C, n = r("apUpload"), d = r(
+    const r = N, n = z(!1), { lang: b } = G(), w = A(), h = s(() => b.value === "zh-cn" ? "zh_CN" : "en_US"), e = C, l = y("apUpload"), c = y(
       "downloadCenterTriggerConfig"
-    ), p = s(() => e.disabled), _ = s(() => e.color ? e.color : h.value === "aplus" ? "#0070FF" : "#1890FF"), k = s(() => e.size), { getInnerWrapperClass: B } = P(_, k, p), O = s(() => e.getOssAccess || n.value?.getOssAccess), z = async () => {
+    ), d = s(() => e.disabled), v = s(() => e.size), { getInnerWrapperClass: _ } = E(v, d), k = s(() => e.getOssAccess || l.value?.getOssAccess), B = async () => {
       if (!e.disabled) {
-        l.value = !0;
+        n.value = !0;
         try {
-          if (d.value?.trigger) {
-            let a = y(
-              e.needName ?? n?.value?.needName,
+          if (c.value?.trigger) {
+            let a = g(
+              e.needName ?? l?.value?.needName,
               e.fileName
-            ).map((m) => ({
-              objectName: m.path,
-              fileName: m.fileName
+            ).map((p) => ({
+              objectName: p.path,
+              fileName: p.fileName
             }));
-            await d.value?.trigger(a), c("downloadCallback", a);
+            await c.value?.trigger(a), r("downloadCallback", a);
           } else {
-            const a = await (await E(
-              O.value,
-              t(w)
+            const a = await (await D(
+              k.value,
+              t(h)
             )).downloadFile(
-              y(
-                e.needName ?? n?.value?.needName,
+              g(
+                e.needName ?? l?.value?.needName,
                 e.fileName
               )
             );
-            c("downloadCallback", a);
+            r("downloadCallback", a);
           }
         } catch (o) {
           console.error(o);
         } finally {
-          l.value = !1;
+          n.value = !1;
         }
       }
     };
-    return (o, a) => (i(), S(t(V), x(t(G)(e, ["getOssAccess", "fileName", "needName"]), {
+    return (o, a) => (i(), L(t(U), S(t(P)(e, ["getOssAccess", "fileName", "needName"]), {
       type: e.type,
       size: e.size,
-      disabled: p.value,
-      onClick: z
+      disabled: d.value,
+      onClick: B
     }), {
-      default: j(() => [
-        u("div", {
-          class: I(t(B))
+      default: x(() => [
+        m("div", {
+          class: j(t(_))
         }, [
-          l.value ? (i(), f("span", W, [
-            M(t(D), { spin: !0 })
-          ])) : g("", !0),
-          t(v).icon ? (i(), f("span", $, [
-            T(o.$slots, "icon")
-          ])) : g("", !0),
-          u("span", q, U(o.text), 1)
+          n.value ? (i(), f("span", M, [
+            I(t(V), { spin: !0 })
+          ])) : u("", !0),
+          t(w).icon ? (i(), f("span", R, [
+            F(o.$slots, "icon")
+          ])) : u("", !0),
+          m("span", W, T(o.text), 1)
         ], 2)
       ]),
       _: 3
@@ -103,5 +103,5 @@ const W = {
   }
 });
 export {
-  ae as default
+  oe as default
 };

package/es/src/ap-download/hooks/useStyle.d.ts

@@ -1,5 +1,5 @@
 import { ComputedRef } from 'vue';
-export declare function useStyle(color: ComputedRef<string>, size: ComputedRef<string>, disabled: ComputedRef<boolean>): {
+export declare function useStyle(size: ComputedRef<string>, disabled: ComputedRef<boolean>): {
     wrapperStyle: ComputedRef<Record<string, any>>;
     getWrapperClass: ComputedRef<string[]>;
     getInnerWrapperClass: ComputedRef<string[]>;

package/es/src/ap-download/hooks/useStyle.mjs

@@ -1,25 +1,28 @@
 import { computed as o } from "vue";
-import { getHexWithOpacity as m } from "../utils/getFileInfo.mjs";
+import { getHexWithOpacity as c } from "../utils/getFileInfo.mjs";
 import "../../config-provider/index.mjs";
-import c from "../style/index.mjs";
+import m from "../style/index.mjs";
+import { useToken as d } from "../../config-provider/hooks/use-token.mjs";
 import { useNamespace as w } from "../../config-provider/hooks/use-namespace.mjs";
-import { useGlobalConfig as f } from "../../config-provider/hooks/use-global-config.mjs";
-function S(p, n, l) {
-  const { b: r, bm: e } = w("ap-download"), t = c("ap-download"), i = f("uiMode"), s = o(() => ({
-    "--download-main-color": p.value,
-    "--download-main-color-opacity": m(p.value, 0.6)
-  })), u = o(() => [r("wrapper"), e("wrapper", n.value), t.value].filter(
+function g(a, l) {
+  const { b: r, bm: e } = w("ap-download"), n = m("ap-download"), { token: p } = d(), s = o(() => ({
+    "--download-main-color": p.value?.colorLink,
+    "--download-main-color-opacity": c(
+      p.value?.colorLink,
+      0.6
+    )
+  })), i = o(() => [r("wrapper"), e("wrapper", a.value), n.value].filter(
     Boolean
-  )), d = o(() => {
-    const a = [r(), r("inner-wrapper"), e("inner-wrapper", n.value)];
-    return l.value && (i.value === "aplus" ? a.push(e("inner-wrapper", "disabled")) : a.push(e("inner-wrapper", "disabled-admin"))), [...a, t.value];
+  )), u = o(() => {
+    const t = [r(), r("inner-wrapper"), e("inner-wrapper", a.value)];
+    return l.value && t.push(e("inner-wrapper", "disabled")), [...t, n.value];
   });
   return {
     wrapperStyle: s,
-    getWrapperClass: u,
-    getInnerWrapperClass: d
+    getWrapperClass: i,
+    getInnerWrapperClass: u
   };
 }
 export {
-  S as useStyle
+  g as useStyle
 };

package/es/src/ap-download/style/index.mjs

@@ -1,6 +1,6 @@
 import { genComponentStyleHook as l } from "../../utils/cssinjs/index.mjs";
-const i = (o) => {
-  const { componentCls: e } = o, n = `${e}-inner-wrapper`;
+const r = (o) => {
+  const { componentCls: e, textColor3: n } = o, i = `${e}-inner-wrapper`;
   return {
     [e]: {
       "&-wrapper": {
@@ -8,7 +8,7 @@ const i = (o) => {
         display: "inline-block"
       }
     },
-    [n]: {
+    [i]: {
       display: "flex",
       color: "var(--download-main-color)",
       cursor: "pointer",
@@ -40,23 +40,16 @@ const i = (o) => {
         fontSize: o.fontSizeSM
       },
       "&--disabled": {
-        color: "#8896b0",
+        color: n,
         cursor: "not-allowed",
         "&:hover": {
-          color: "#8896b0"
-        }
-      },
-      "&--disabled-admin": {
-        cursor: "not-allowed",
-        color: "#999",
-        "&:hover": {
-          color: "#999"
+          color: n
         }
       }
     }
   };
 }, a = l("ApDownload", (o) => [
-  i(o)
+  r(o)
 ]);
 export {
   a as default

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

@@ -1,20 +1,19 @@
-import { isVNode as z, defineComponent as E, useSlots as $, ref as d, watch as q, cloneVNode as A, computed as D, createVNode as n, mergeProps as m, unref as a, createElementBlock as L, openBlock as b, Fragment as G, createBlock as T, createCommentVNode as K, withCtx as v, createElementVNode as W, normalizeClass as H, normalizeStyle as J, renderSlot as C, resolveDynamicComponent as B, createTextVNode as Q, toDisplayString as X } from "vue";
-import { Button as y, Flex as Y, Space as Z, Modal as ee } from "@aplus-frontend/antdv";
+import { isVNode as O, defineComponent as z, useSlots as E, ref as d, watch as $, cloneVNode as q, computed as A, createVNode as n, mergeProps as m, unref as o, createElementBlock as D, openBlock as p, Fragment as L, createBlock as T, createCommentVNode as K, withCtx as b, createElementVNode as W, normalizeClass as G, normalizeStyle as H, renderSlot as C, resolveDynamicComponent as B, createTextVNode as J, toDisplayString as Q } from "vue";
+import { Button as v, Flex as X, Space as Y, Modal as Z } from "@aplus-frontend/antdv";
 import "../ap-form.vue.mjs";
 import "../../hooks/index.mjs";
-import { getSingleVNode as te } from "../../utils/slot.mjs";
+import { getSingleVNode as ee } from "../../utils/slot.mjs";
 import "../../config-provider/index.mjs";
-import { omit as le } from "lodash-unified";
-import oe from "../style/modal-form.mjs";
+import { omit as te } from "lodash-unified";
+import le from "../style/modal-form.mjs";
 import { useControllableValue as ae } from "../../hooks/useControllableValue.mjs";
-import { useLocale as se } from "../../config-provider/hooks/use-locale.mjs";
-import { useGlobalConfig as ne } from "../../config-provider/hooks/use-global-config.mjs";
-import { useNamespace as re } from "../../config-provider/hooks/use-namespace.mjs";
-import ie from "../ap-form.vue2.mjs";
+import { useLocale as oe } from "../../config-provider/hooks/use-locale.mjs";
+import { useNamespace as se } from "../../config-provider/hooks/use-namespace.mjs";
+import ne from "../ap-form.vue2.mjs";
 function k(r) {
-  return typeof r == "function" || Object.prototype.toString.call(r) === "[object Object]" && !z(r);
+  return typeof r == "function" || Object.prototype.toString.call(r) === "[object Object]" && !O(r);
 }
-const Re = /* @__PURE__ */ E({
+const Ne = /* @__PURE__ */ z({
   name: "ApFormModalForm",
   __name: "index",
   props: {
@@ -97,49 +96,49 @@ const Re = /* @__PURE__ */ E({
     expose: P,
     emit: S
   }) {
-    const t = r, c = $(), w = S, o = d(), F = d(0), i = d(), s = d(!1), {
+    const t = r, c = E(), w = S, a = d(), y = d(0), i = d(), s = d(!1), {
       value: N,
       updateValue: u
     } = ae(t, w, {
       valuePropName: "open",
       defaultValue: !1,
       beforeUpdateValue(e) {
-        return e && (F.value += 1), !0;
+        return e && (y.value += 1), !0;
       }
     }), {
       t: f
-    } = se(), x = ne("uiMode", "aplus"), M = oe("ap-form-modal-form"), {
+    } = oe(), x = le("ap-form-modal-form"), {
       b: R,
-      e: p
-    } = re("ap-form-modal-form");
-    q(() => o.value, (e) => {
+      e: F
+    } = se("ap-form-modal-form");
+    $(() => a.value, (e) => {
       e && i.value && (e.setFieldsValue?.(i.value), i.value = void 0);
     });
-    const h = te(c.trigger), g = h ? A(h, {
+    const h = ee(c.trigger), g = h ? q(h, {
       onClick: () => {
         u(!0);
       }
-    }) : null, _ = D(() => {
+    }) : null, _ = A(() => {
       const e = [];
       if (t.submitter === !1)
         return null;
       if (t.showCancel) {
         let l;
-        e.push(n(y, {
+        e.push(n(v, {
           onClick: V,
           disabled: s.value
         }, k(l = f("ap.common.cancelText")) ? l : {
           default: () => [l]
         }));
       }
-      return t.submitter?.resetButtonProps !== !1 && e.push(n(y, m(t.submitter?.resetButtonProps || {}, {
+      return t.submitter?.resetButtonProps !== !1 && e.push(n(v, m(t.submitter?.resetButtonProps || {}, {
         key: "reset",
         disabled: s.value,
         onClick: I,
         htmlType: "reset"
       }), {
         default: () => [t.submitter?.resetText || f("ap.common.resetText")]
-      })), t.submitter?.submitButtonProps !== !1 && e.push(n(y, m({
+      })), t.submitter?.submitButtonProps !== !1 && e.push(n(v, m({
         type: "primary",
         key: "submit",
         htmlType: "submit"
@@ -147,28 +146,28 @@ const Re = /* @__PURE__ */ E({
         loading: s.value
       }), {
         default: () => [t.submitter?.submitText || f("ap.common.okText")]
-      })), n(Y, {
+      })), n(X, {
         justify: "flex-end",
-        key: a(F),
-        class: [p("footer"), a(x) === "admin" ? p("footer-admin") : null]
+        key: o(y),
+        class: [F("footer")]
       }, {
-        default: () => [c.submitter ? c.submitter(e) : n(Z, null, k(e) ? e : {
+        default: () => [c.submitter ? c.submitter(e) : n(Y, null, k(e) ? e : {
           default: () => [e]
         })]
       });
     });
     function I() {
-      t.submitter !== !1 && (o.value?.resetFields(), t.submitter?.onReset?.());
+      t.submitter !== !1 && (a.value?.resetFields(), t.submitter?.onReset?.());
     }
-    async function U(e) {
+    async function M(e) {
       if (t.submitter !== !1)
         try {
           t.submitter?.onSubmit?.(), s.value = !0;
           const l = t.onFinish?.(e);
           if (t.submitTimeout && l instanceof Promise) {
-            const O = setTimeout(() => s.value = !1, t.submitTimeout);
+            const j = setTimeout(() => s.value = !1, t.submitTimeout);
             l.finally(() => {
-              clearTimeout(O), s.value = !1;
+              clearTimeout(j), s.value = !1;
             });
           }
           await l && u(!1);
@@ -177,71 +176,71 @@ const Re = /* @__PURE__ */ E({
         }
     }
     function V() {
-      a(s) || u(!1);
+      o(s) || u(!1);
     }
-    function j(e) {
-      !e && a(s) || u(e);
+    function U(e) {
+      !e && o(s) || u(e);
     }
     return P({
       resetFields: async () => {
-        o.value?.resetFields();
+        a.value?.resetFields();
       },
       clearValidate: (e) => {
-        o.value?.clearValidate(e);
+        a.value?.clearValidate(e);
       },
-      validateFields: (e, l) => o.value?.validateFields(e, l),
-      getFieldsValue: (e) => o.value?.getFieldsValue(e),
-      validate: (e, l) => o.value?.validate(e, l),
+      validateFields: (e, l) => a.value?.validateFields(e, l),
+      getFieldsValue: (e) => a.value?.getFieldsValue(e),
+      validate: (e, l) => a.value?.validate(e, l),
       scrollToField: (e, l = {}) => {
-        o.value?.scrollToField(e, l);
+        a.value?.scrollToField(e, l);
       },
       setFieldValue: (e, l) => {
-        o.value?.setFieldValue?.(e, l);
+        a.value?.setFieldValue?.(e, l);
       },
       setFieldsValue: (e) => {
-        if (!o.value) {
+        if (!a.value) {
           i.value = e;
           return;
         }
-        o.value?.setFieldsValue?.(e);
+        a.value?.setFieldsValue?.(e);
       },
-      getInternalInstance: (e) => o.value?.getInternalInstance(e),
+      getInternalInstance: (e) => a.value?.getInternalInstance(e),
       getFieldsValueTransformed(e) {
-        return o.value?.getFieldsValueTransformed(e);
+        return a.value?.getFieldsValueTransformed(e);
       },
       validateFieldsReturnTransformed(e, l) {
-        return o.value?.validateFieldsReturnTransformed(e, l);
+        return a.value?.validateFieldsReturnTransformed(e, l);
       }
-    }), (e, l) => (b(), L(G, null, [n(a(ee), m(e.modalProps, {
-      open: a(N),
+    }), (e, l) => (p(), D(L, null, [n(o(Z), m(e.modalProps, {
+      open: o(N),
       footer: null,
       width: e.width,
-      class: [a(R)(), a(M)],
+      class: [o(R)(), o(x)],
       "body-style": {
         padding: "0px !important"
       },
-      "onUpdate:open": j,
+      "onUpdate:open": U,
       onCancel: V
     }), {
-      title: v(() => [C(e.$slots, "title", {}, () => [Q(X(t.title), 1)])]),
-      default: v(() => [n(ie, m({
+      title: b(() => [C(e.$slots, "title", {}, () => [J(Q(t.title), 1)])]),
+      default: b(() => [n(ne, m({
         ref_key: "formRef",
-        ref: o
-      }, a(le)(t, ["modalProps", "open", "onUpdate:open", "title", "width", "onFinish", "submitter"]), {
-        onFinish: U
+        ref: a
+      }, o(te)(t, ["modalProps", "open", "onUpdate:open", "title", "width", "onFinish", "submitter"]), {
+        onFinish: M
       }), {
-        default: v(() => [W("div", {
-          style: J(e.modalProps?.bodyStyle),
-          class: H(a(p)("content"))
-        }, [C(e.$slots, "default")], 6), (b(), T(B(_.value)))]),
+        default: b(() => [W("div", {
+          style: H(e.modalProps?.bodyStyle),
+          class: G(o(F)("content"))
+        }, [C(e.$slots, "default")], 6), (p(), T(B(_.value)))]),
         _: 3
       }, 16)]),
       _: 3
-    }, 16, ["open", "width", "class"]), a(g) ? (b(), T(B(a(g)), {
+    }, 16, ["open", "width", "class"]), o(g) ? (p(), T(B(o(g)), {
       key: 0
     })) : K("", !0)], 64));
   }
 });
 export {
-  Re as default
+  Ne as default
 };

package/es/src/ap-form/style/item.mjs

@@ -1,5 +1,5 @@
 import { genComponentStyleHook as a } from "../../utils/cssinjs/index.mjs";
-const i = (n) => {
+const r = (n) => {
   const { componentCls: e, namespace: t } = n;
   return {
     [e]: {
@@ -42,7 +42,8 @@ const i = (n) => {
         },
         ".ant-select-selector": {
           borderWidth: "0 !important",
-          boxShadow: "none !important"
+          boxShadow: "none !important",
+          background: "unset !important"
         },
         ".ant-select-single .ant-select-selector": {
           height: "30px !important"
@@ -124,8 +125,8 @@ const i = (n) => {
       }
     }
   };
-}, o = a("ApForm", (n) => [i(n)]);
+}, o = a("ApForm", (n) => [r(n)]);
 export {
   o as default,
-  i as genApFormItemStyle
+  r as genApFormItemStyle
 };

package/es/src/ap-form/style/modal-form.mjs

@@ -1,6 +1,6 @@
-import { genComponentStyleHook as d } from "../../utils/cssinjs/index.mjs";
+import { genComponentStyleHook as r } from "../../utils/cssinjs/index.mjs";
 const e = (o) => {
-  const { componentCls: a } = o;
+  const { componentCls: a, apFormModalCloseSize: d } = o;
   return {
     [a]: {
       ".ant-modal-content": {
@@ -16,19 +16,17 @@ const e = (o) => {
         padding: o.apFormModalContentPadding
       },
       [`${a}__footer`]: {
-        padding: o.apFormModalFooterPadding
-      },
-      [`${a}__footer-admin`]: {
-        borderTop: "1px solid #E9EDF3"
+        padding: o.apFormModalFooterPadding,
+        borderTop: o.apFormModalFooterBorderTop
       },
       ".ant-modal-close": {
-        top: `calc(${o.apFormModalHeaderPaddingBlock} - (${o.apFormModalCloseSize} - 22px) / 2)`,
-        width: o.apFormModalCloseSize,
-        height: o.apFormModalCloseSize
+        top: o.calc(o.apFormModalHeaderPaddingBlock).sub(o.calc(d).sub("22px").div(2)).equal(),
+        width: d,
+        height: d
       }
     }
   };
-}, r = d(
+}, n = r(
   "ApForm.Modal",
   (o) => [e(o)],
   {
@@ -36,10 +34,11 @@ const e = (o) => {
     apFormModalHeaderPaddingBlock: 15,
     apFormModalContentPadding: "20px 20px 0px",
     apFormModalFooterPadding: "12px 20px",
-    apFormModalCloseSize: 32
+    apFormModalCloseSize: 32,
+    apFormModalFooterBorderTop: "unset"
   }
 );
 export {
-  r as default,
+  n as default,
   e as genModalFormStyle
 };