@aplus-frontend/ui 7.0.1 → 7.1.0

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/modal-form.mjs

@@ -1,8 +1,8 @@
-import { genComponentStyleHook as n } from "../../utils/cssinjs/index.mjs";
+import { genComponentStyleHook as r } from "../../utils/cssinjs/index.mjs";
 const e = (o) => {
-  const { componentCls: d, apFormModalCloseSize: a } = o;
+  const { componentCls: a, apFormModalCloseSize: d } = o;
   return {
-    [d]: {
+    [a]: {
       ".ant-modal-content": {
         padding: 0
       },
@@ -12,23 +12,21 @@ const e = (o) => {
         borderBottom: "1px solid #E9EDF3",
         marginBottom: 0
       },
-      [`${d}__content`]: {
+      [`${a}__content`]: {
         padding: o.apFormModalContentPadding
       },
-      [`${d}__footer`]: {
-        padding: o.apFormModalFooterPadding
-      },
-      [`${d}__footer-admin`]: {
-        borderTop: "1px solid #E9EDF3"
+      [`${a}__footer`]: {
+        padding: o.apFormModalFooterPadding,
+        borderTop: o.apFormModalFooterBorderTop
       },
       ".ant-modal-close": {
-        top: `calc(${o.apFormModalHeaderPaddingBlock} - (${a} - 22px) / 2)`,
-        width: a,
-        height: a
+        top: o.calc(o.apFormModalHeaderPaddingBlock).sub(o.calc(d).sub("22px").div(2)).equal(),
+        width: d,
+        height: d
       }
     }
   };
-}, l = n(
+}, 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 {
-  l as default,
+  n as default,
   e as genModalFormStyle
 };

package/es/src/ap-form/style/search-form-sorter.mjs

@@ -1,48 +1,48 @@
-import { resetComponent as e } from "../../style/index.mjs";
-import { genComponentStyleHook as t } from "../../utils/cssinjs/index.mjs";
-import { genPopoverStyle as i } from "./search-form.mjs";
-const c = (r) => {
-  const { componentCls: o } = r, a = `calc(100% / ${r.searchFormSorterCountPerRow})`;
+import { resetComponent as o } from "../../style/index.mjs";
+import { genComponentStyleHook as i } from "../../utils/cssinjs/index.mjs";
+import { genPopoverStyle as t } from "./search-form.mjs";
+const l = (r) => {
+  const { componentCls: e } = r, a = r.calc("100%").div(r.searchFormSorterCountPerRow).equal();
   return {
-    [o]: {
-      [`${o}-content`]: {
+    [e]: {
+      [`${e}-content`]: {
         width: r.searchFormSorterWidth
       },
-      [`${o}-header`]: {
+      [`${e}-header`]: {
         padding: `${r.spaceXL} ${r.spaceXL} 0px`,
         "&-title": {
-          ...e(r),
-          color: r.textColor2,
+          ...o(r),
+          color: r.textColor1,
           fontWeight: 700,
           display: "inline-block",
           paddingBottom: r.spaceXS
         },
         "&-desc": {
-          ...e(r),
+          ...o(r),
           color: r.textColor3
         },
         "&-action-wrapper": {
           padding: r.space,
-          margin: `calc(-1 * ${r.space})`,
+          margin: r.calc(-1).mul(r.space).equal(),
           cursor: "pointer"
         },
         "&-reset-btn": {
-          ...e(r),
+          ...o(r),
           color: r.colorLink
         }
       },
-      [`${o}-sorter-wrapper`]: {
+      [`${e}-sorter-wrapper`]: {
         display: "flex",
         flexDirection: "row",
         flexWrap: "wrap",
-        marginInlineStart: `calc(${r.searchFormSorterItemGap} / -2)`,
-        marginInlineEnd: `calc(${r.searchFormSorterItemGap} / -2)`,
+        marginInlineStart: r.calc(r.searchFormSorterItemGap).div(-2).equal(),
+        marginInlineEnd: r.calc(r.searchFormSorterItemGap).div(-2).equal(),
         rowGap: r.searchFormSorterItemGap
       },
-      [`${o}-sorter-item`]: {
+      [`${e}-sorter-item`]: {
         flex: `0 0 ${a}`,
         maxWidth: a,
-        paddingInline: `calc(${r.searchFormSorterItemGap} / 2)`,
+        paddingInline: r.calc(r.searchFormSorterItemGap).div(2).equal(),
         "> div": {
           border: `1px solid ${r.colorBg1}`,
           borderRadius: r.borderRadius,
@@ -62,21 +62,21 @@ const c = (r) => {
           display: "none"
         }
       },
-      [`${o}-sorter-item-text`]: {
-        ...e(r),
+      [`${e}-sorter-item-text`]: {
+        ...o(r),
         paddingInlineStart: r.spaceXS,
-        color: r.textColor2,
+        color: r.textColor1,
         maxWidth: "100%",
         whiteSpace: "nowrap",
         overflow: "hidden",
         textOverflow: "ellipsis"
       }
     },
-    ...i(r)
+    ...t(r)
   };
-}, m = t(
+}, d = i(
   "ApForm.SearchFormSorter",
-  (r) => [c(r)],
+  (r) => [l(r)],
   {
     searchFormSorterWidth: 560,
     searchFormSorterItemGap: 8,
@@ -87,6 +87,6 @@ const c = (r) => {
   }
 );
 export {
-  m as default,
-  c as genSearchFormSorter
+  d as default,
+  l as genSearchFormSorter
 };

package/es/src/ap-form/style/token.d.ts

@@ -12,6 +12,10 @@ export type ApFormToken = {
      * 对话框表单底部Footer区域边距
      */
     apFormModalFooterPadding: string | number;
+    /**
+     * 对话框表单底部Footer上边框
+     */
+    apFormModalFooterBorderTop: string;
     /**
      * 关闭按钮的尺寸
      */

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

@@ -139,13 +139,13 @@ const g = (e) => {
           backgroundColor: "var(--vxe-ui-loading-background-color)"
         },
         [`${i}-pagination-count-text`]: {
-          color: e.textColor2
+          color: e.textColor1
         },
         [`${i}-pagination--total-right`]: {
           paddingInlineStart: "12px"
         },
         [`${i}-pagination-total-wrapper`]: {
-          color: e.textColor1
+          color: e.textColor2
         },
         // ApGrid中表格表头的样式
         [`${i}-table-header`]: {
@@ -203,7 +203,7 @@ const g = (e) => {
         },
         "div.vxe-cell--tree-btn > i": {
           fontSize: e.fontSizeSM,
-          color: e.textColor2
+          color: e.textColor1
         }
       }
     }

package/es/src/ap-pro-card/style/statistic.mjs

@@ -51,7 +51,7 @@ const o = (t) => {
         marginTop: "4px"
       },
       ".ant-statistic-title": {
-        color: t.textColor1,
+        color: t.textColor2,
         fontSize: t.fontSize,
         lineHeight: t.lineHeight,
         marginBlockEnd: "8px"
@@ -94,7 +94,7 @@ const o = (t) => {
           fontWeight: "500"
         },
         ".ant-statistic-content": {
-          color: t.textColor2,
+          color: t.textColor1,
           fontSize: t.fontSize,
           lineHeight: t.lineHeight,
           fontWeight: "500"
@@ -111,7 +111,7 @@ const o = (t) => {
           fontWeight: "500"
         },
         ".ant-statistic-content": {
-          color: t.textColor2,
+          color: t.textColor1,
           fontSize: t.fontSize,
           lineHeight: t.lineHeight,
           fontWeight: "500"

package/es/src/ap-pro-card/style/token.mjs

@@ -12,7 +12,7 @@ const r = {
   apProCardTooltipColor: "#8896b0",
   apProCardHeaderTitleFontSize: "12px",
   apProCardHeaderTitleFontColor: "#182948",
-  apProCardAreaColor: "#f1f7ff",
+  apProCardAreaColor: "#f7f8fa",
   apProCardSplitLineHeight: "100%",
   apProCardDividerLineHeight: "60%"
 };

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

@@ -126,13 +126,13 @@ const r = (t) => ({
         marginBlockEnd: 0
       },
       "&-pagination-count-text": {
-        color: t.textColor2
+        color: t.textColor1
       },
       "&-pagination--total-right": {
         paddingLeft: "12px"
       },
       "&-pagination-total-wrapper": {
-        color: t.textColor1
+        color: t.textColor2
       },
       // ApTable的header区域
       [`${a}-header`]: {

package/es/src/ap-table/style/setting.mjs

@@ -16,7 +16,7 @@ const r = (e) => {
         [`.${l}-ap-grid-table-header__title`]: {
           ...n(e),
           fontWeight: "normal",
-          color: e.textColor2
+          color: e.textColor1
         },
         [`.${l}-ag-grid-table-header__title`]: {
           ...n(e)
@@ -169,7 +169,7 @@ const r = (e) => {
           "&-title": {
             ...i(e),
             fontWeight: "bold",
-            color: e.textColor2
+            color: e.textColor1
           }
         },
         "&-content": {