x-next 1.4.0 → 1.6.0

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

@@ -1,14 +1,14 @@
-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 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 { useSize as Q } from "../../_hooks/use-size.js";
-import { getClassNameMixin as U } from "../../_utils/config.js";
-import { useLocale as W } from "../../locale/index.js";
-const ne = /* @__PURE__ */ F({
+import { defineComponent as D, toRefs as G, ref as O, computed as g, reactive as H, watch as B, createVNode as n, mergeProps as b } from "vue";
+import K from "./page-item.vue.js";
+import L from "./page-item-step.vue.js";
+import Q from "./page-item-ellipsis.vue.js";
+import I from "./page-jumper.vue.js";
+import U from "./page-options.vue.js";
+import { isNumber as h } from "../../_utils/is.js";
+import { useSize as W } from "../../_hooks/use-size.js";
+import { getClassNameMixin as X } from "../../_utils/config.js";
+import { useLocale as Y } from "../../locale/index.js";
+const oe = /* @__PURE__ */ D({
   name: "Pagination",
   props: {
     /**
@@ -168,20 +168,20 @@ const ne = /* @__PURE__ */ F({
     }
   },
   emits: {
-    "update:current": (e) => !0,
-    "update:pageSize": (e) => !0,
+    "update:current": (t) => !0,
+    "update:pageSize": (t) => !0,
     /**
      * @zh 页码改变时触发
      * @en Triggered when page number changes
      * @param {number} current
      */
-    change: (e) => !0,
+    change: (t) => !0,
     /**
      * @zh 数据条数改变时触发
      * @en Triggered when the number of data items changes
      * @param {number} pageSize
      */
-    pageSizeChange: (e) => !0
+    pageSizeChange: (t) => !0
   },
   /**
    * @zh 分页按钮
@@ -210,183 +210,195 @@ const ne = /* @__PURE__ */ F({
    * @slot total
    * @binding {number} total
    */
-  setup(e, {
+  setup(t, {
     emit: f,
-    slots: s
+    slots: o
   }) {
-    const o = U("pagination"), {
-      t: I
-    } = W(), {
-      disabled: z,
+    const c = X("pagination"), {
+      t: S
+    } = Y(), {
+      disabled: y,
       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) {
-        const a = Math.min(Math.max(t, 1), u.value);
+      size: T
+    } = G(t), {
+      mergedSize: d
+    } = W(T), p = O(t.defaultCurrent), N = O(t.defaultPageSize), k = (e) => h(e) && Number.isFinite(e) && e > 0, w = (e, a = 10) => k(e) ? e : a, F = g(() => t.current ?? p.value), z = g(() => w(t.pageSize ?? N.value, w(t.defaultPageSize))), P = g(() => {
+      const e = t.total;
+      return h(e) && Number.isFinite(e) && e > 0 ? e : 0;
+    }), x = g(() => {
+      const e = F.value;
+      return h(e) && Number.isFinite(e) ? e : 1;
+    }), u = g(() => Math.max(Math.ceil(P.value / z.value), 1)), l = g(() => Math.min(Math.max(x.value, 1), u.value)), C = (e) => {
+      if (e !== l.value && h(e) && !t.disabled) {
+        const a = Math.min(Math.max(e, 1), u.value);
         a !== l.value && (p.value = a, f("update:current", a), f("change", a));
       }
-    }, J = (t) => {
-      C(t) && (P.value = t, f("update:pageSize", t), f("pageSizeChange", t));
-    }, n = D({
+    }, J = (e) => {
+      k(e) && (N.value = e, f("update:pageSize", e), f("pageSizeChange", e));
+    }, s = H({
       current: l,
       style: A,
       activeStyle: E,
-      onClick: S
+      onClick: C
     }), V = {
       get current() {
-        return n.current;
+        return s.current;
       },
       get disabled() {
-        return z.value;
+        return y.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 = {
+    }, M = {
       get current() {
-        return n.current;
+        return s.current;
       },
       get disabled() {
-        return z.value;
+        return y.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 disabled() {
+        return y.value;
       },
       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 = (e, a = {}) => e === "more" ? n(Q, b(a, _), {
+      default: o["page-item-ellipsis"]
+    }) : e === "previous" ? n(L, b({
       type: "previous"
-    }, a, x), {
-      default: s["page-item-step"]
-    }) : t === "next" ? i(O, b({
+    }, a, M), {
+      default: o["page-item-step"]
+    }) : e === "next" ? n(L, b({
       type: "next"
-    }, a, x), {
-      default: s["page-item-step"]
-    }) : i(G, b(a, V), {
-      default: s["page-item"]
-    }), R = m(() => {
-      const t = [];
-      if (u.value < e.baseSize + e.bufferSize * 2)
+    }, a, M), {
+      default: o["page-item-step"]
+    }) : n(K, b(a, V), {
+      default: o["page-item"]
+    }), R = g(() => {
+      const e = [];
+      if (u.value < t.baseSize + t.bufferSize * 2)
         for (let a = 1; a <= u.value; a++)
-          t.push(r("page", {
+          e.push(r("page", {
             key: a,
             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, m = u.value, i = !1, j = !1;
+        l.value > 2 + t.bufferSize && (i = !0, a = Math.min(l.value - t.bufferSize, u.value - 2 * t.bufferSize)), l.value < u.value - (t.bufferSize + 1) && (j = !0, m = Math.max(l.value + t.bufferSize, 2 * t.bufferSize + 1)), i && (e.push(r("page", {
           key: 1,
           pageNumber: 1
-        })), t.push(r("more", {
+        })), e.push(r("more", {
           key: "left-ellipsis-pager",
-          step: -(e.bufferSize * 2 + 1)
+          step: -(t.bufferSize * 2 + 1)
         })));
-        for (let v = a; v <= g; v++)
-          t.push(r("page", {
+        for (let v = a; v <= m; v++)
+          e.push(r("page", {
             key: v,
             pageNumber: v
           }));
-        M && (t.push(r("more", {
+        j && (e.push(r("more", {
           key: "right-ellipsis-pager",
-          step: e.bufferSize * 2 + 1
-        })), t.push(r("page", {
+          step: t.bufferSize * 2 + 1
+        })), e.push(r("page", {
           key: u.value,
           pageNumber: u.value
         })));
       }
-      return t;
-    }), T = () => e.simple ? i("span", {
-      class: o.element("simple")
+      return e;
+    }), q = () => t.simple ? n("span", {
+      class: c.element("simple")
     }, [r("previous", {
       simple: !0
-    }), i(B, {
-      disabled: e.disabled,
+    }), n(I, {
+      disabled: t.disabled,
       current: l.value,
-      size: c.value,
+      size: d.value,
       pages: u.value,
       simple: !0,
-      onChange: S
+      onChange: C
     }, null), r("next", {
       simple: !0
-    })]) : i("ul", {
-      class: o.element("list")
-    }, [r("previous"), R.value, e.showMore && r("more", {
+    })]) : n("ul", {
+      class: c.element("list")
+    }, [r("previous"), R.value, t.showMore && r("more", {
       key: "more",
-      step: e.bufferSize * 2 + 1
+      step: t.bufferSize * 2 + 1
     }), r("next")]);
-    j(h, (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));
-      }
-    }), 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);
+    B(z, (e, a) => {
+      if (t.autoAdjust && e !== a && l.value > 1) {
+        const m = a * (l.value - 1) + 1, i = Math.ceil(m / e);
+        i !== l.value && (p.value = i, f("update:current", i), f("change", i));
       }
+    }), B(u, (e, a) => {
+      if (!t.autoAdjust || e === a || x.value <= e)
+        return;
+      const i = Math.max(e, 1);
+      p.value = i, f("update:current", i), f("change", i);
     });
-    const q = m(() => [o.block, o.modifier(`size-${c.value}`), {
-      [o.modifier("simple")]: e.simple,
-      [o.modifier("disabled")]: e.disabled
+    const $ = g(() => [c.block, c.modifier(`size-${d.value}`), {
+      [c.modifier("simple")]: t.simple,
+      [c.modifier("disabled")]: t.disabled
     }]);
     return () => {
-      var t;
-      return e.hideOnSinglePage && u.value <= 1 ? null : i("div", {
-        class: q.value
-      }, [e.showTotal && i("span", {
-        class: o.element("total")
-      }, [((t = s.total) == null ? void 0 : t.call(s, {
-        total: e.total
-      })) ?? I("pagination.total", {
-        total: e.total
-      })]), T(), e.showPageSize && i(K, {
-        disabled: e.disabled,
-        sizeOptions: e.pageSizeOptions,
-        pageSize: h.value,
-        size: c.value,
+      var e;
+      return t.hideOnSinglePage && u.value <= 1 ? null : n("div", {
+        class: $.value,
+        role: "navigation",
+        "aria-label": S("pagination.ariaLabel")
+      }, [t.showTotal && n("span", {
+        class: c.element("total")
+      }, [((e = o.total) == null ? void 0 : e.call(o, {
+        total: P.value
+      })) ?? S("pagination.total", {
+        total: P.value
+      })]), q(), t.showPageSize && n(U, {
+        disabled: t.disabled,
+        sizeOptions: t.pageSizeOptions,
+        pageSize: z.value,
+        size: d.value,
         onChange: J,
-        selectProps: e.pageSizeProps
-      }, null), !e.simple && e.showJumper && i(B, {
-        disabled: e.disabled,
+        selectProps: t.pageSizeProps
+      }, null), !t.simple && t.showJumper && n(I, {
+        disabled: t.disabled,
         current: l.value,
         pages: u.value,
-        size: c.value,
-        onChange: S
+        size: d.value,
+        ariaLabel: S("pagination.jumpTo"),
+        onChange: C
       }, {
-        "jumper-prepend": s["jumper-prepend"],
-        "jumper-append": s["jumper-append"]
+        "jumper-prepend": o["jumper-prepend"],
+        "jumper-append": o["jumper-append"]
       })]);
     };
   }
 });
 export {
-  ne as default
+  oe as default
 };

package/dist/es/components/pagination/page-item-ellipsis.vue.js

@@ -1,23 +1,24 @@
-import r from "./page-item-ellipsis.vue2.js";
-import { resolveComponent as a, openBlock as t, createElementBlock as i, normalizeClass as s, renderSlot as p, createVNode as d } from "vue";
+import l from "./page-item-ellipsis.vue2.js";
+import { resolveComponent as i, openBlock as r, createElementBlock as s, normalizeClass as d, renderSlot as t, createVNode as p } from "vue";
 import m from "../../_virtual/_plugin-vue_export-helper.js";
-const f = ["aria-label"];
-function u(e, o, c, g, k, C) {
-  const l = a("icon-more");
-  return t(), i("li", {
-    class: s(e.cls),
+const b = ["tabindex", "aria-label", "aria-disabled"];
+function f(e, o, u, g, k, C) {
+  const a = i("icon-more");
+  return r(), s("li", {
+    class: d(e.cls),
     role: "button",
-    tabindex: "0",
+    tabindex: e.disabled ? -1 : 0,
     "aria-label": e.t("pagination.jumpToPage", { page: e.nextPage }),
+    "aria-disabled": e.disabled || void 0,
     onClick: o[0] || (o[0] = (...n) => e.handleClick && e.handleClick(...n)),
     onKeydown: o[1] || (o[1] = (...n) => e.handleKeyDown && e.handleKeyDown(...n))
   }, [
-    p(e.$slots, "default", {}, () => [
-      d(l)
+    t(e.$slots, "default", {}, () => [
+      p(a)
     ])
-  ], 42, f);
+  ], 42, b);
 }
-const y = /* @__PURE__ */ m(r, [["render", u]]);
+const y = /* @__PURE__ */ m(l, [["render", f]]);
 export {
   y as default
 };

package/dist/es/components/pagination/page-item-ellipsis.vue2.js

@@ -1,9 +1,9 @@
-import { defineComponent as l, computed as i } from "vue";
+import { defineComponent as c, computed as i } from "vue";
 import p from "../../icons/_self/more-dot.js";
 import { getLegalPage as u } from "./utils.js";
 import { getClassNameMixin as f } from "../../_utils/config.js";
 import { useLocale as d } from "../../locale/index.js";
-const x = l({
+const x = c({
   name: "EllipsisPager",
   components: {
     IconMore: p
@@ -20,28 +20,32 @@ const x = l({
     pages: {
       type: Number,
       required: !0
+    },
+    disabled: {
+      type: Boolean,
+      default: !1
     }
   },
   emits: ["click"],
-  setup(t, { emit: m }) {
-    const o = f("pagination--item"), { t: s } = d(), r = i(
-      () => u(t.current + t.step, {
+  setup(e, { emit: a }) {
+    const o = f("pagination--item"), { t: s } = d(), n = i(
+      () => u(e.current + e.step, {
         min: 1,
-        max: t.pages
+        max: e.pages
       })
-    ), n = (e) => {
-      m("click", r.value);
-    }, a = (e) => {
-      (e.key === "Enter" || e.key === " ") && (e.preventDefault(), n());
-    }, c = i(() => [o.block, o.modifier("ellipsis")]);
+    ), r = (t) => {
+      e.disabled || a("click", n.value);
+    }, m = (t) => {
+      (t.key === "Enter" || t.key === " ") && (t.preventDefault(), r());
+    }, l = i(() => [o.block, o.modifier("ellipsis")]);
     return {
       t: s,
       className: o,
-      cls: c,
+      cls: l,
       // 模板的 aria-label 需要它（点击后真正跳转到的页码）
-      nextPage: r,
-      handleClick: n,
-      handleKeyDown: a
+      nextPage: n,
+      handleClick: r,
+      handleKeyDown: m
     };
   }
 });

package/dist/es/components/pagination/page-jumper.vue.js

@@ -1,7 +1,7 @@
-import i from "./page-jumper.vue2.js";
-import { resolveComponent as u, openBlock as s, createElementBlock as n, normalizeClass as a, renderSlot as p, createTextVNode as f, toDisplayString as r, createCommentVNode as l, createVNode as g, Fragment as N, createElementVNode as m } from "vue";
-import V from "../../_virtual/_plugin-vue_export-helper.js";
-function $(e, o, b, c, C, h) {
+import d from "./page-jumper.vue2.js";
+import { resolveComponent as u, openBlock as s, createElementBlock as n, normalizeClass as a, renderSlot as r, createTextVNode as g, toDisplayString as p, createCommentVNode as l, createVNode as f, Fragment as N, createElementVNode as m } from "vue";
+import b from "../../_virtual/_plugin-vue_export-helper.js";
+function V(e, o, $, C, h, j) {
   const t = u("input-number");
   return s(), n("span", {
     class: a(e.cls)
@@ -10,13 +10,13 @@ function $(e, o, b, c, C, h) {
       key: 0,
       class: a([e.className.element("prepend"), e.className.modifier("text-goto")])
     }, [
-      p(e.$slots, "jumper-prepend", {}, () => [
-        f(r(e.t("pagination.jumpTo")), 1)
+      r(e.$slots, "jumper-prepend", {}, () => [
+        g(p(e.t("pagination.jumpTo")), 1)
       ])
     ], 2)),
-    g(t, {
+    f(t, {
       modelValue: e.inputValue,
-      "onUpdate:modelValue": o[0] || (o[0] = (d) => e.inputValue = d),
+      "onUpdate:modelValue": o[0] || (o[0] = (i) => e.inputValue = i),
       class: a(e.className.element("input")),
       min: 1,
       max: e.pages,
@@ -24,13 +24,14 @@ function $(e, o, b, c, C, h) {
       disabled: e.disabled,
       "hide-button": "",
       formatter: e.handleFormatter,
+      "aria-label": e.ariaLabel || e.t("pagination.jumpTo"),
       onChange: e.handleChange
-    }, null, 8, ["modelValue", "class", "max", "size", "disabled", "formatter", "onChange"]),
+    }, null, 8, ["modelValue", "class", "max", "size", "disabled", "formatter", "aria-label", "onChange"]),
     e.$slots["jumper-append"] ? (s(), n("span", {
       key: 1,
       class: a(e.className.element("append"))
     }, [
-      p(e.$slots, "jumper-append")
+      r(e.$slots, "jumper-append")
     ], 2)) : l("", !0),
     e.simple ? (s(), n(N, { key: 2 }, [
       m("span", {
@@ -38,11 +39,11 @@ function $(e, o, b, c, C, h) {
       }, "/", 2),
       m("span", {
         class: a(e.className.element("total-page"))
-      }, r(e.pages), 3)
+      }, p(e.pages), 3)
     ], 64)) : l("", !0)
   ], 2);
 }
-const z = /* @__PURE__ */ V(i, [["render", $]]);
+const z = /* @__PURE__ */ b(d, [["render", V]]);
 export {
   z as default
 };

package/dist/es/components/pagination/page-jumper.vue2.js

@@ -1,8 +1,8 @@
 import { defineComponent as l, ref as c, watch as p, computed as d, nextTick as f } from "vue";
 import { InputNumber as g } from "../form-input-number/index.js";
 import { getClassNameMixin as N } from "../../_utils/config.js";
-import { useLocale as h } from "../../locale/index.js";
-const x = l({
+import { useLocale as b } from "../../locale/index.js";
+const S = l({
   name: "PageJumper",
   components: {
     InputNumber: g
@@ -27,13 +27,16 @@ const x = l({
     size: {
       type: String
     },
+    ariaLabel: {
+      type: String
+    },
     onChange: {
       type: Function
     }
   },
   emits: ["change"],
   setup(e, { emit: i }) {
-    const a = N("pagination--jumper"), { t: o } = h(), t = c(e.simple ? e.current : void 0), m = (n) => {
+    const a = N("pagination--jumper"), { t: o } = b(), t = c(e.simple ? e.current : void 0), m = (n) => {
       const r = parseInt(n.toString(), 10);
       return Number.isNaN(r) ? void 0 : String(r);
     }, s = (n) => {
@@ -64,5 +67,5 @@ const x = l({
   }
 });
 export {
-  x as default
+  S as default
 };

package/dist/es/components/pagination/page-options.vue.js

@@ -6,12 +6,13 @@ function m(e, d, c, f, u, g) {
   return a(), l("span", {
     class: r(e.className.block)
   }, [
-    p(o, t({
+    p(o, t(e.selectProps, {
       "model-value": e.pageSize,
       options: e.options,
       size: e.size,
-      disabled: e.disabled
-    }, e.selectProps, { onChange: e.handleChange }), null, 16, ["model-value", "options", "size", "disabled", "onChange"])
+      disabled: e.disabled,
+      onChange: e.handleChange
+    }), null, 16, ["model-value", "options", "size", "disabled", "onChange"])
   ], 2);
 }
 const b = /* @__PURE__ */ i(s, [["render", m]]);

package/dist/es/components/pagination/page-options.vue2.js

@@ -1,11 +1,12 @@
-import { defineComponent as p, computed as a } from "vue";
-import { Select as r } from "../form-select/index.js";
-import { getClassNameMixin as m } from "../../_utils/config.js";
-import { useLocale as c } from "../../locale/index.js";
-const u = p({
+import { defineComponent as r, computed as m } from "vue";
+import { Select as c } from "../form-select/index.js";
+import { getClassNameMixin as g } from "../../_utils/config.js";
+import { useLocale as f } from "../../locale/index.js";
+import { isNumber as u } from "../../_utils/is.js";
+const y = r({
   name: "PageOptions",
   components: {
-    Select: r
+    Select: c
   },
   props: {
     sizeOptions: {
@@ -25,16 +26,17 @@ const u = p({
     }
   },
   emits: ["change"],
-  setup(t, { emit: n }) {
-    const o = m("pagination--options"), { t: i } = c(), s = a(
-      () => t.sizeOptions.map((e) => ({
-        value: e,
-        label: i("pagination.pageSizeOption", { size: e })
-      }))
-    );
+  setup(i, { emit: n }) {
+    const o = g("pagination--options"), { t: s } = f(), a = m(() => {
+      const e = i.sizeOptions.slice();
+      return u(i.pageSize) && i.pageSize > 0 && !e.includes(i.pageSize) && (e.push(i.pageSize), e.sort((t, p) => t - p)), e.map((t) => ({
+        value: t,
+        label: s("pagination.pageSizeOption", { size: t })
+      }));
+    });
     return {
       className: o,
-      options: s,
+      options: a,
       handleChange: (e) => {
         typeof e == "number" && Number.isFinite(e) && e > 0 && n("change", e);
       }
@@ -42,5 +44,5 @@ const u = p({
   }
 });
 export {
-  u as default
+  y as default
 };

package/dist/es/components/skeleton/Skeleton.vue.js

@@ -1,14 +1,16 @@
 import r from "./Skeleton.vue2.js";
-import { openBlock as t, createElementBlock as s, normalizeClass as n, renderSlot as o } from "vue";
-import l from "../../_virtual/_plugin-vue_export-helper.js";
-function a(e, c, p, f, i, m) {
-  return t(), s("div", {
-    class: n(e.cls)
+import { openBlock as s, createElementBlock as t, normalizeClass as n, renderSlot as e } from "vue";
+import a from "../../_virtual/_plugin-vue_export-helper.js";
+const l = ["aria-busy"];
+function i(o, d, c, p, f, m) {
+  return s(), t("div", {
+    class: n(o.cls),
+    "aria-busy": o.loading ? "true" : void 0
   }, [
-    e.loading ? o(e.$slots, "default", { key: 0 }) : o(e.$slots, "content", { key: 1 })
-  ], 2);
+    o.loading ? e(o.$slots, "default", { key: 0 }) : e(o.$slots, "content", { key: 1 })
+  ], 10, l);
 }
-const u = /* @__PURE__ */ l(r, [["render", a]]);
+const k = /* @__PURE__ */ a(r, [["render", i]]);
 export {
-  u as default
+  k as default
 };