x-next 1.3.1 → 1.5.0

package/dist/es/components/menu/MenuSubMenu.js

@@ -1,13 +1,14 @@
-import { defineComponent as x, createVNode as r, mergeProps as y, toRefs as M, computed as a, toRef as h } from "vue";
+import { defineComponent as h, createVNode as s, mergeProps as y, toRefs as x, computed as a, provide as C, toRef as b } from "vue";
 import g from "./sub-menu-inline.vue.js";
-import C from "./sub-menu-pop.vue.js";
-import k from "./hooks/use-menu.js";
-import I from "./hooks/use-level.js";
-import v from "../../icons/_self/menu/down.js";
-import K from "../../icons/_self/dropdown/more.js";
-import P from "./hooks/use-menu-context.js";
-import _ from "./hooks/use-menu-data-collector.js";
-const w = {
+import I from "./sub-menu-pop.vue.js";
+import v from "./hooks/use-menu.js";
+import k from "./hooks/use-level.js";
+import K from "../../icons/_self/menu/down.js";
+import _ from "../../icons/_self/dropdown/more.js";
+import D from "./hooks/use-menu-context.js";
+import P from "./hooks/use-menu-data-collector.js";
+import { DataCollectorInjectionKey as w } from "./context.js";
+const R = {
   /**
    * @zh 子菜单的标题
    * @en The title of the submenu
@@ -51,9 +52,9 @@ const w = {
   _internalSkipCollect: {
     type: Boolean
   }
-}, O = /* @__PURE__ */ x({
+}, q = /* @__PURE__ */ h({
   name: "SubMenu",
-  props: w,
+  props: R,
   slots: Object,
   /**
    * @zh 菜单的图标
@@ -81,47 +82,60 @@ const w = {
   }) {
     const {
       key: n
-    } = k(), {
+    } = v(), {
       level: d
-    } = I(), {
+    } = k(), {
       popup: o
-    } = M(e), t = P(), s = a(() => {
+    } = x(e), t = D(), i = a(() => {
       const {
-        mode: i,
-        collapsed: p,
+        mode: p,
+        collapsed: c,
         inTrigger: m
       } = t;
-      return !!(typeof o.value == "function" ? o.value(d.value) : o.value) || p || m || i !== "vertical";
+      return !!(typeof o.value == "function" ? o.value(d.value) : o.value) || c || m || p !== "vertical";
     }), {
       subMenuKeys: l,
       menuItemKeys: f
     } = e._internalSkipCollect ? {
       subMenuKeys: a(() => []),
       menuItemKeys: a(() => [])
-    } : _({
+    } : P({
       key: n.value,
       type: "subMenu"
-    }), b = a(() => {
-      const i = t.selectedKeys || [], p = (m) => {
-        for (let c = 0; c < i.length; c++) {
-          const S = i[c];
+    });
+    e._internalSkipCollect && C(w, {
+      collectSubMenu: () => {
+      },
+      removeSubMenu: () => {
+      },
+      collectMenuItem: () => {
+      },
+      removeMenuItem: () => {
+      },
+      reportMenuData: () => {
+      }
+    });
+    const M = a(() => {
+      const p = t.selectedKeys || [], c = (m) => {
+        for (let r = 0; r < p.length; r++) {
+          const S = p[r];
           if (m.includes(S))
             return !0;
         }
         return !1;
       };
-      return p(l.value) || p(f.value);
+      return c(l.value) || c(f.value);
     });
     return {
       subMenuKeys: l,
       menuItemKeys: f,
-      isChildrenSelected: b,
+      isChildrenSelected: M,
       props: e,
       attrs: u,
       computedKey: n,
-      computedPopup: s,
-      expandIconDown: h(t, "expandIconDown"),
-      expandIconRight: h(t, "expandIconRight")
+      computedPopup: i,
+      expandIconDown: b(t, "expandIconDown"),
+      expandIconRight: b(t, "expandIconRight")
     };
   },
   render() {
@@ -132,30 +146,30 @@ const w = {
       computedPopup: d,
       expandIconDown: o,
       expandIconRight: t,
-      isChildrenSelected: s
+      isChildrenSelected: i
     } = this, l = {
       ...this.$slots,
-      "expand-icon-down": this.$slots["expand-icon-down"] || o || (() => [r(v, null, null)]),
-      "expand-icon-right": this.$slots["expand-icon-right"] || t || (() => [r(K, null, null)])
+      "expand-icon-down": this.$slots["expand-icon-down"] || o || (() => [s(K, null, null)]),
+      "expand-icon-right": this.$slots["expand-icon-right"] || t || (() => [s(_, null, null)])
     };
-    return d ? r(C, y({
+    return d ? s(I, y({
       key: n,
       title: e.title,
       selectable: e.selectable,
       disabled: e.disabled,
-      isChildrenSelected: s,
+      isChildrenSelected: i,
       popupMaxHeight: e.popupMaxHeight,
       _internalSkipCollect: e._internalSkipCollect
-    }, u), l) : r(g, y({
+    }, u), l) : s(g, y({
       key: n,
       title: e.title,
       disabled: e.disabled,
-      isChildrenSelected: s,
+      isChildrenSelected: i,
       _internalSkipCollect: e._internalSkipCollect
     }, u), l);
   }
 });
 export {
-  O as default,
-  w as menuSubMenuProps
+  q as default,
+  R as menuSubMenuProps
 };

package/dist/es/components/menu/sub-menu-pop.vue2.js

@@ -2,10 +2,10 @@ import { defineComponent as S, toRefs as B, computed as o, ref as P } from "vue"
 import { Trigger as $ } from "../trigger/index.js";
 import H from "./base-menu.vue.js";
 import N from "./hooks/use-menu.js";
-import I from "./hooks/use-level.js";
-import { omit as K } from "../../_utils/omit.js";
-import V from "./indent.vue.js";
-import _ from "./hooks/use-menu-context.js";
+import _ from "./hooks/use-level.js";
+import { omit as I } from "../../_utils/omit.js";
+import K from "./indent.vue.js";
+import V from "./hooks/use-menu-context.js";
 import R from "../../_container/render-function.js";
 import { isNumber as T } from "../../_utils/is.js";
 import { getClassNameMixin as w } from "../../_utils/config.js";
@@ -14,7 +14,7 @@ const Q = S({
   components: {
     Menu: H,
     Trigger: $,
-    MenuIndent: V,
+    MenuIndent: K,
     RenderFunction: R
   },
   inheritAttrs: !1,
@@ -39,57 +39,57 @@ const Q = S({
       type: Boolean
     }
   },
-  setup(g) {
-    const { key: l } = N(), { level: i } = I(), { selectable: a, disabled: u, isChildrenSelected: C, popupMaxHeight: x } = B(g), t = _(), { onSubMenuClick: r, onMenuItemClick: n } = t, p = o(() => t.prefixCls), m = o(() => t.mode), c = o(() => t.selectedKeys || []), s = o(() => `${p.value}-pop`), f = o(
-      () => a.value && c.value.includes(l.value) || C.value
+  setup(s) {
+    const { key: l } = N(), { level: a } = _(), { selectable: u, disabled: p, isChildrenSelected: C, popupMaxHeight: x } = B(s), t = V(), { onSubMenuClick: r, onMenuItemClick: n } = t, m = o(() => t.prefixCls), c = o(() => t.mode), f = o(() => t.selectedKeys || []), i = o(() => `${m.value}-pop`), v = o(
+      () => u.value && f.value.includes(l.value) || C.value
     ), M = o(() => [
-      `${s.value}`,
-      `${s.value}-header`,
+      `${i.value}`,
+      `${i.value}-header`,
       {
-        [`${p.value}-selected`]: f.value
+        [`${m.value}-selected`]: v.value
       }
-    ]), h = o(() => m.value === "horizontal" && !t.inTrigger), v = P(!1), d = (e) => {
-      v.value = e;
-    }, y = w("trigger"), b = o(() => {
+    ]), h = o(() => c.value === "horizontal" && !t.inTrigger), d = P(!1), g = (e) => {
+      d.value = e;
+    }, y = w("trigger"), k = o(() => {
       var e;
       return [
-        `${s.value}-trigger`,
+        `${i.value}-trigger`,
         {
-          [`${s.value}-trigger-dark`]: t.theme === "dark"
+          [`${i.value}-trigger-dark`]: t.theme === "dark"
         },
         // @ts-ignore
         (e = t.triggerProps) == null ? void 0 : e.class
       ];
-    }), k = o(() => K(t.triggerProps || {}, ["class"]));
+    }), b = o(() => I(t.triggerProps || {}, ["class"]));
     return {
-      menuPrefixCls: p,
-      mode: m,
-      level: i,
+      menuPrefixCls: m,
+      mode: c,
+      level: a,
       classNames: M,
-      isSelected: f,
-      disabled: u,
-      selectedKeys: c,
+      isSelected: v,
+      disabled: p,
+      selectedKeys: f,
       needPopOnBottom: h,
-      popVisible: v,
+      popVisible: d,
       className: y,
-      triggerClassNames: b,
-      triggerProps: k,
+      triggerClassNames: k,
+      triggerProps: b,
       menuContext: t,
       popupMenuStyles: o(() => {
         const e = x.value ?? t.popupMaxHeight;
         return T(e) ? { maxHeight: `${e}px` } : e ? {} : { maxHeight: "unset" };
       }),
       onClick: () => {
-        u.value || (r && r(l.value, i.value), a.value && n && n(l.value));
+        p.value || s._internalSkipCollect || (r && r(l.value, a.value), u.value && n && n(l.value));
       },
       onKeydown: (e) => {
-        u.value || (e.key === "Enter" || e.key === " ") && (e.preventDefault(), r && r(l.value, i.value), a.value && n && n(l.value));
+        p.value || s._internalSkipCollect || (e.key === "Enter" || e.key === " ") && (e.preventDefault(), r && r(l.value, a.value), u.value && n && n(l.value));
       },
       onMenuItemClick: (e) => {
-        n && n(e), d(!1);
+        n && n(e), g(!1);
       },
       onVisibleChange: (e) => {
-        d(e);
+        g(e);
       }
     };
   }

package/dist/es/components/pagination/Pagination.js

@@ -1,10 +1,10 @@
-import { defineComponent as F, toRefs as $, ref as w, computed as m, reactive as D, watch as j, createVNode as i, mergeProps as b } from "vue";
+import { defineComponent as F, toRefs as $, ref as M, computed as d, reactive as D, watch as j, createVNode as n, mergeProps as b } from "vue";
 import G from "./page-item.vue.js";
 import O from "./page-item-step.vue.js";
 import H from "./page-item-ellipsis.vue.js";
 import B from "./page-jumper.vue.js";
 import K from "./page-options.vue.js";
-import { isNumber as y } from "../../_utils/is.js";
+import { isNumber as h } from "../../_utils/is.js";
 import { useSize as Q } from "../../_hooks/use-size.js";
 import { getClassNameMixin as U } from "../../_utils/config.js";
 import { useLocale as W } from "../../locale/index.js";
@@ -211,88 +211,88 @@ const ne = /* @__PURE__ */ F({
    * @binding {number} total
    */
   setup(e, {
-    emit: f,
-    slots: s
+    emit: o,
+    slots: f
   }) {
-    const o = U("pagination"), {
+    const g = U("pagination"), {
       t: I
     } = W(), {
-      disabled: z,
+      disabled: P,
       pageItemStyle: A,
       activePageItemStyle: E,
       size: L
     } = $(e), {
-      mergedSize: c
-    } = Q(L), p = w(e.defaultCurrent), P = w(e.defaultPageSize), C = (t) => y(t) && Number.isFinite(t) && t > 0, k = (t, a = 10) => C(t) ? t : a, N = m(() => e.current ?? p.value), h = m(() => k(e.pageSize ?? P.value, k(e.defaultPageSize))), u = m(() => Math.max(Math.ceil(e.total / h.value), 1)), l = m(() => y(N.value) ? Math.min(Math.max(N.value, 1), u.value) : 1), S = (t) => {
-      if (t !== l.value && y(t) && !e.disabled) {
+      mergedSize: m
+    } = Q(L), p = M(e.defaultCurrent), C = M(e.defaultPageSize), k = (t) => h(t) && Number.isFinite(t) && t > 0, N = (t, a = 10) => k(t) ? t : a, S = d(() => e.current ?? p.value), y = d(() => N(e.pageSize ?? C.value, N(e.defaultPageSize))), u = d(() => Math.max(Math.ceil(e.total / y.value), 1)), l = d(() => h(S.value) ? Math.min(Math.max(S.value, 1), u.value) : 1), z = (t) => {
+      if (t !== l.value && h(t) && !e.disabled) {
         const a = Math.min(Math.max(t, 1), u.value);
-        a !== l.value && (p.value = a, f("update:current", a), f("change", a));
+        a !== l.value && (p.value = a, o("update:current", a), o("change", a));
       }
     }, J = (t) => {
-      C(t) && (P.value = t, f("update:pageSize", t), f("pageSizeChange", t));
-    }, n = D({
+      k(t) && (C.value = t, o("update:pageSize", t), o("pageSizeChange", t));
+    }, s = D({
       current: l,
       style: A,
       activeStyle: E,
-      onClick: S
+      onClick: z
     }), V = {
       get current() {
-        return n.current;
+        return s.current;
       },
       get disabled() {
-        return z.value;
+        return P.value;
       },
       get style() {
-        return n.style;
+        return s.style;
       },
       get activeStyle() {
-        return n.activeStyle;
+        return s.activeStyle;
       },
       get onClick() {
-        return n.onClick;
+        return s.onClick;
       }
-    }, x = {
+    }, w = {
       get current() {
-        return n.current;
+        return s.current;
       },
       get disabled() {
-        return z.value;
+        return P.value;
       },
       get style() {
-        return n.style;
+        return s.style;
       },
       get onClick() {
-        return n.onClick;
+        return s.onClick;
       },
       get pages() {
         return u.value;
       }
     }, _ = {
       get current() {
-        return n.current;
+        return s.current;
       },
       get style() {
-        return n.style;
+        return s.style;
       },
       get onClick() {
-        return n.onClick;
+        return s.onClick;
       },
       get pages() {
         return u.value;
       }
-    }, r = (t, a = {}) => t === "more" ? i(H, b(a, _), {
-      default: s["page-item-ellipsis"]
-    }) : t === "previous" ? i(O, b({
+    }, r = (t, a = {}) => t === "more" ? n(H, b(a, _), {
+      default: f["page-item-ellipsis"]
+    }) : t === "previous" ? n(O, b({
       type: "previous"
-    }, a, x), {
-      default: s["page-item-step"]
-    }) : t === "next" ? i(O, b({
+    }, a, w), {
+      default: f["page-item-step"]
+    }) : t === "next" ? n(O, b({
       type: "next"
-    }, a, x), {
-      default: s["page-item-step"]
-    }) : i(G, b(a, V), {
-      default: s["page-item"]
-    }), R = m(() => {
+    }, a, w), {
+      default: f["page-item-step"]
+    }) : n(G, b(a, V), {
+      default: f["page-item"]
+    }), R = d(() => {
       const t = [];
       if (u.value < e.baseSize + e.bufferSize * 2)
         for (let a = 1; a <= u.value; a++)
@@ -301,20 +301,20 @@ const ne = /* @__PURE__ */ F({
             pageNumber: a
           }));
       else {
-        let a = 1, g = u.value, d = !1, M = !1;
-        l.value > 2 + e.bufferSize && (d = !0, a = Math.min(l.value - e.bufferSize, u.value - 2 * e.bufferSize)), l.value < u.value - (e.bufferSize + 1) && (M = !0, g = Math.max(l.value + e.bufferSize, 2 * e.bufferSize + 1)), d && (t.push(r("page", {
+        let a = 1, c = u.value, i = !1, x = !1;
+        l.value > 2 + e.bufferSize && (i = !0, a = Math.min(l.value - e.bufferSize, u.value - 2 * e.bufferSize)), l.value < u.value - (e.bufferSize + 1) && (x = !0, c = Math.max(l.value + e.bufferSize, 2 * e.bufferSize + 1)), i && (t.push(r("page", {
           key: 1,
           pageNumber: 1
         })), t.push(r("more", {
           key: "left-ellipsis-pager",
           step: -(e.bufferSize * 2 + 1)
         })));
-        for (let v = a; v <= g; v++)
+        for (let v = a; v <= c; v++)
           t.push(r("page", {
             key: v,
             pageNumber: v
           }));
-        M && (t.push(r("more", {
+        x && (t.push(r("more", {
           key: "right-ellipsis-pager",
           step: e.bufferSize * 2 + 1
         })), t.push(r("page", {
@@ -323,66 +323,69 @@ const ne = /* @__PURE__ */ F({
         })));
       }
       return t;
-    }), T = () => e.simple ? i("span", {
-      class: o.element("simple")
+    }), T = () => e.simple ? n("span", {
+      class: g.element("simple")
     }, [r("previous", {
       simple: !0
-    }), i(B, {
+    }), n(B, {
       disabled: e.disabled,
       current: l.value,
-      size: c.value,
+      size: m.value,
       pages: u.value,
       simple: !0,
-      onChange: S
+      onChange: z
     }, null), r("next", {
       simple: !0
-    })]) : i("ul", {
-      class: o.element("list")
+    })]) : n("ul", {
+      class: g.element("list")
     }, [r("previous"), R.value, e.showMore && r("more", {
       key: "more",
       step: e.bufferSize * 2 + 1
     }), r("next")]);
-    j(h, (t, a) => {
+    j(y, (t, a) => {
       if (e.autoAdjust && t !== a && l.value > 1) {
-        const g = a * (l.value - 1) + 1, d = Math.ceil(g / t);
-        d !== l.value && (p.value = d, f("update:current", d), f("change", d));
+        const c = a * (l.value - 1) + 1, i = Math.ceil(c / t);
+        i !== l.value && (p.value = i, o("update:current", i), o("change", i));
       }
     }), j(u, (t, a) => {
-      if (e.autoAdjust && t !== a && l.value > 1 && l.value > t) {
-        const g = Math.max(t, 1);
-        p.value = g, f("update:current", g), f("change", g);
-      }
+      if (!e.autoAdjust || t === a)
+        return;
+      const c = S.value;
+      if (!h(c) || c <= t)
+        return;
+      const i = Math.max(t, 1);
+      p.value = i, o("update:current", i), o("change", i);
     });
-    const q = m(() => [o.block, o.modifier(`size-${c.value}`), {
-      [o.modifier("simple")]: e.simple,
-      [o.modifier("disabled")]: e.disabled
+    const q = d(() => [g.block, g.modifier(`size-${m.value}`), {
+      [g.modifier("simple")]: e.simple,
+      [g.modifier("disabled")]: e.disabled
     }]);
     return () => {
       var t;
-      return e.hideOnSinglePage && u.value <= 1 ? null : i("div", {
+      return e.hideOnSinglePage && u.value <= 1 ? null : n("div", {
         class: q.value
-      }, [e.showTotal && i("span", {
-        class: o.element("total")
-      }, [((t = s.total) == null ? void 0 : t.call(s, {
+      }, [e.showTotal && n("span", {
+        class: g.element("total")
+      }, [((t = f.total) == null ? void 0 : t.call(f, {
         total: e.total
       })) ?? I("pagination.total", {
         total: e.total
-      })]), T(), e.showPageSize && i(K, {
+      })]), T(), e.showPageSize && n(K, {
         disabled: e.disabled,
         sizeOptions: e.pageSizeOptions,
-        pageSize: h.value,
-        size: c.value,
+        pageSize: y.value,
+        size: m.value,
         onChange: J,
         selectProps: e.pageSizeProps
-      }, null), !e.simple && e.showJumper && i(B, {
+      }, null), !e.simple && e.showJumper && n(B, {
         disabled: e.disabled,
         current: l.value,
         pages: u.value,
-        size: c.value,
-        onChange: S
+        size: m.value,
+        onChange: z
       }, {
-        "jumper-prepend": s["jumper-prepend"],
-        "jumper-append": s["jumper-append"]
+        "jumper-prepend": f["jumper-prepend"],
+        "jumper-append": f["jumper-append"]
       })]);
     };
   }

package/dist/es/components/popconfirm/src/popup.vue.js

@@ -27,7 +27,7 @@ function C(o, $, B, v, z, T) {
     i("div", {
       class: e([`${o.ns}--footer`])
     }, [
-      n(m, { size: 12 }, {
+      n(m, { size: 8 }, {
         default: a(() => [
           n(r, p({
             size: "mini",

package/dist/es/components/progress/Progress.vue2.js

@@ -94,7 +94,7 @@ const g = (e) => Number.isFinite(e) ? Math.min(1, Math.max(0, e)) : 0, C = c({
     /**
      * @zh 进度条状态
      * @en Progress bar status
-     * @values 'normal', 'success', 'warning', 'danger'
+     * @values 'normal', 'success', 'warning', 'strong', 'danger'
      */
     status: {
       type: String