@aplus-frontend/ui 7.0.0-beta.0 → 7.0.0-beta.2

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

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

package/es/src/ap-form/search-form/components/popover-filter.vue.d.ts

@@ -143,7 +143,7 @@ declare const _default: DefineComponent<ApFormSearchFormPopoverFilterProps, {},
             delay?: number;
         };
         danger: boolean;
-        htmlType: ButtonHTMLType;
+        htmlType: ** @type { [typeof __VLS_components.Tooltip, typeof __VLS_components.Tooltip, ] } */).ButtonHTMLType;
         ghost: boolean;
         iconPosition: ButtonIconPosition;
     }> | null;

package/es/src/ap-form/search-form/components/popover-filter.vue2.mjs

@@ -1,11 +1,12 @@
-import { defineComponent as h, ref as y, toRef as w, createBlock as u, openBlock as s, unref as e, withCtx as o, createVNode as t, normalizeClass as a, withDirectives as x, createElementVNode as f, toDisplayString as d, vShow as R, createElementBlock as S, Fragment as D, renderList as L, resolveDynamicComponent as N, createTextVNode as b } from "vue";
-import { Popover as P, Tooltip as T, Button as g, Row as V, Col as z, Divider as A, Flex as E } from "@aplus-frontend/antdv";
-import { IconApFilterOutlined as I } from "@aplus-frontend/icon";
+import { defineComponent as S, ref as y, toRef as w, createBlock as f, openBlock as l, unref as e, withCtx as o, createVNode as t, normalizeClass as a, withDirectives as x, createElementVNode as u, toDisplayString as d, vShow as R, createElementBlock as D, Fragment as L, renderList as N, resolveDynamicComponent as I, createTextVNode as b } from "vue";
+import { Popover as P, Tooltip as T, Button as g, Row as V, Col as $, Divider as z, Flex as A } from "@aplus-frontend/antdv";
+import { IconApFilterOutlined as E } from "@aplus-frontend/icon";
 import "../../../config-provider/index.mjs";
 import { useCollapseInputCount as j } from "../hooks/use-collapse-input-count.mjs";
-import { useNamespace as O } from "../../../config-provider/hooks/use-namespace.mjs";
-import { useLocale as U } from "../../../config-provider/hooks/use-locale.mjs";
-const Q = /* @__PURE__ */ h({
+import O from "../../style/search-form.mjs";
+import { useNamespace as U } from "../../../config-provider/hooks/use-namespace.mjs";
+import { useLocale as q } from "../../../config-provider/hooks/use-locale.mjs";
+const Y = /* @__PURE__ */ S({
   name: "ApFormSearchFormPopoverFilter",
   __name: "popover-filter",
   props: {
@@ -14,14 +15,14 @@ const Q = /* @__PURE__ */ h({
     submitLoading: { type: Boolean }
   },
   setup(k) {
-    const C = k, F = y(), { e: i, b: c } = O("ap-form-search-form"), { t: m } = U(), p = y(!1), B = w(() => C.config), { count: v } = j(B);
+    const C = k, F = y(), { e: p, b: c } = U("ap-form-search-form"), h = O("ap-form-search-form"), { t: m } = q(), i = y(!1), B = w(() => C.config), { count: v } = j(B);
     function _(r) {
       return r?.closest(".ant-form") || document.body;
     }
-    return (r, l) => (s(), u(e(P), {
-      open: p.value,
-      "onUpdate:open": l[1] || (l[1] = (n) => p.value = n),
-      "overlay-class-name": e(i)("popover"),
+    return (r, s) => (l(), f(e(P), {
+      open: i.value,
+      "onUpdate:open": s[1] || (s[1] = (n) => i.value = n),
+      "overlay-class-name": `${e(p)("popover")} ${e(h)}`,
       trigger: "click",
       placement: "bottom",
       mask: "",
@@ -30,18 +31,18 @@ const Q = /* @__PURE__ */ h({
       "force-render": !0
     }, {
       content: o(() => [
-        f("div", {
-          class: a([e(i)("popover-content")]),
+        u("div", {
+          class: a([e(p)("popover-content")]),
           style: { paddingBottom: "4px", width: "825px" }
         }, [
           t(e(V), { gutter: 8 }, {
             default: o(() => [
-              (s(!0), S(D, null, L(r.config, (n) => (s(), u(e(z), {
+              (l(!0), D(L, null, N(r.config, (n) => (l(), f(e($), {
                 key: n.key,
                 span: 8
               }, {
                 default: o(() => [
-                  (s(), u(N(n.node)))
+                  (l(), f(I(n.node)))
                 ]),
                 _: 2
               }, 1024))), 128))
@@ -49,14 +50,14 @@ const Q = /* @__PURE__ */ h({
             _: 1
           })
         ], 2),
-        t(e(A), { style: { margin: "0" } }),
-        f("div", {
-          class: a(e(i)("popover-footer"))
+        t(e(z), { style: { margin: "0" } }),
+        u("div", {
+          class: a(e(p)("popover-footer"))
         }, [
-          t(e(E), { justify: "end" }, {
+          t(e(A), { justify: "end" }, {
             default: o(() => [
               t(e(g), {
-                onClick: l[0] || (l[0] = (n) => p.value = !1)
+                onClick: s[0] || (s[0] = (n) => i.value = !1)
               }, {
                 default: o(() => [
                   b(d(e(m)("ap.common.cancelText")), 1)
@@ -64,7 +65,7 @@ const Q = /* @__PURE__ */ h({
                 _: 1
               }),
               t(e(g), {
-                class: a(e(i)("popover-footer-confirm-btn")),
+                class: a(e(p)("popover-footer-confirm-btn")),
                 type: "primary",
                 loading: r.submitLoading,
                 onClick: r.onSubmit
@@ -88,15 +89,15 @@ const Q = /* @__PURE__ */ h({
             t(e(g), {
               ref_key: "triggerBtnRef",
               ref: F,
-              class: a([e(c)("trigger-btn"), { [e(c)("trigger-btn-active")]: p.value }])
+              class: a([e(c)("trigger-btn"), { [e(c)("trigger-btn-active")]: i.value }])
             }, {
               icon: o(() => [
-                x(f("sup", {
+                x(u("sup", {
                   class: a(e(c)("trigger-btn-badge"))
                 }, d(e(v)), 3), [
                   [R, e(v) !== 0]
                 ]),
-                t(e(I), { size: 14 })
+                t(e(E), { size: 14 })
               ]),
               _: 1
             }, 8, ["class"])
@@ -109,5 +110,5 @@ const Q = /* @__PURE__ */ h({
   }
 });
 export {
-  Q as default
+  Y as default
 };

package/es/src/ap-form/search-form/components/popover-sorter/index.vue2.mjs

@@ -1,13 +1,14 @@
-import { defineComponent as D, ref as y, watch as k, unref as e, createBlock as L, openBlock as P, withCtx as r, createVNode as t, normalizeClass as o, createElementVNode as n, toDisplayString as m, createTextVNode as b } from "vue";
-import { Popover as S, Tooltip as V, Button as g, Flex as _, Divider as j } from "@aplus-frontend/antdv";
+import { defineComponent as S, ref as C, watch as k, unref as e, createBlock as D, openBlock as L, withCtx as r, createVNode as t, normalizeClass as o, createElementVNode as n, toDisplayString as m, createTextVNode as b } from "vue";
+import { Popover as P, Tooltip as V, Button as g, Flex as _, Divider as j } from "@aplus-frontend/antdv";
 import { IconApLayoutOutlined as z } from "@aplus-frontend/icon";
 import "../../../../config-provider/index.mjs";
 import A from "vuedraggable";
 import "./sortable-item.vue.mjs";
+import I from "../../../style/search-form-sorter.mjs";
 import { useNamespace as F } from "../../../../config-provider/hooks/use-namespace.mjs";
 import { useLocale as R } from "../../../../config-provider/hooks/use-locale.mjs";
-import $ from "./sortable-item.vue2.mjs";
-const M = /* @__PURE__ */ D({
+import E from "./sortable-item.vue2.mjs";
+const X = /* @__PURE__ */ S({
   name: "ApFormSearchFormPopoverSorter",
   __name: "index",
   props: {
@@ -16,19 +17,19 @@ const M = /* @__PURE__ */ D({
     sorted: { type: Boolean }
   },
   setup(x, { expose: w }) {
-    const l = x, i = y(l.items);
+    const l = x, i = C(l.items);
     let v = [...l.items], h = [...l.items];
     k(
       () => l.items,
-      (a) => {
-        i.value = a, v = a, l.sorted || (h = a);
+      (s) => {
+        i.value = s, v = s, l.sorted || (h = s);
       }
     );
-    const { e: f, b: C } = F("ap-form-search-form"), { b: s } = F("search-form-sorter"), { t: c } = R(), p = y(!1);
-    function B(a) {
-      return a.closest(".ant-form") || document.body;
+    const B = I("search-form-sorter"), { e: f, b: y } = F("ap-form-search-form"), { b: a } = F("search-form-sorter"), { t: c } = R(), p = C(!1);
+    function T(s) {
+      return s.closest(".ant-form") || document.body;
     }
-    function T() {
+    function $() {
       p.value = !1, v = [...e(i)], l.onClickConfirm(e(i));
     }
     function N() {
@@ -36,27 +37,27 @@ const M = /* @__PURE__ */ D({
     }
     return k(
       () => p.value,
-      (a) => {
-        a && (i.value = [...v]);
+      (s) => {
+        s && (i.value = [...v]);
       }
     ), w({
       getCachedList: () => h
-    }), (a, u) => (P(), L(e(S), {
+    }), (s, u) => (L(), D(e(P), {
       open: p.value,
       "onUpdate:open": u[1] || (u[1] = (d) => p.value = d),
-      "overlay-class-name": e(f)("popover"),
+      "overlay-class-name": `${e(a)()} ${e(f)("popover")} ${e(B)}`,
       trigger: "click",
       placement: "bottom",
       mask: "",
       "mask-style": { backgroundColor: "transparent" },
-      "get-popup-container": B
+      "get-popup-container": T
     }, {
       content: r(() => [
         n("div", {
-          class: o(e(s)("header"))
+          class: o(e(a)("header"))
         }, [
           n("span", {
-            class: o(e(s)("header-title"))
+            class: o(e(a)("header-title"))
           }, m(e(c)("ap.apForm.search.sorterTitle")), 3),
           t(e(_), {
             justify: "space-between",
@@ -64,14 +65,14 @@ const M = /* @__PURE__ */ D({
           }, {
             default: r(() => [
               n("span", {
-                class: o(e(s)("header-desc"))
+                class: o(e(a)("header-desc"))
               }, m(e(c)("ap.apForm.search.sorterDesc")), 3),
               n("div", {
-                class: o(e(s)("header-action-wrapper")),
+                class: o(e(a)("header-action-wrapper")),
                 onClick: N
               }, [
                 n("span", {
-                  class: o(e(s)("header-reset-btn"))
+                  class: o(e(a)("header-reset-btn"))
                 }, m(e(c)("ap.apForm.search.sorterReset")), 3)
               ], 2)
             ]),
@@ -79,15 +80,15 @@ const M = /* @__PURE__ */ D({
           })
         ], 2),
         n("div", {
-          class: o([e(f)("popover-content"), e(s)("content")])
+          class: o([e(f)("popover-content"), e(a)("content")])
         }, [
           t(e(A), {
             list: i.value,
-            class: o(e(s)("sorter-wrapper")),
+            class: o(e(a)("sorter-wrapper")),
             "item-key": "name"
           }, {
             item: r(({ element: d }) => [
-              t($, { item: d }, null, 8, ["item"])
+              t(E, { item: d }, null, 8, ["item"])
             ]),
             _: 1
           }, 8, ["list", "class"])
@@ -109,7 +110,7 @@ const M = /* @__PURE__ */ D({
               t(e(g), {
                 class: o(e(f)("popover-footer-confirm-btn")),
                 type: "primary",
-                onClick: T
+                onClick: $
               }, {
                 default: r(() => [
                   b(m(e(c)("ap.apForm.search.sorterConfirmBtn")), 1)
@@ -128,7 +129,7 @@ const M = /* @__PURE__ */ D({
         }, {
           default: r(() => [
             t(e(g), {
-              class: o([e(C)("trigger-btn"), { [e(C)("trigger-btn-active")]: p.value }])
+              class: o([e(y)("trigger-btn"), { [e(y)("trigger-btn-active")]: p.value }])
             }, {
               icon: r(() => [
                 t(e(z), { size: 14 })
@@ -144,5 +145,5 @@ const M = /* @__PURE__ */ D({
   }
 });
 export {
-  M as default
+  X as default
 };