x-next 1.1.0 → 1.3.0

package/dist/es/components/form-slider/Slider.vue2.js

@@ -1,24 +1,25 @@
-import { defineComponent as ne, toRefs as le, toRef as ie, ref as M, watch as ue, computed as B } from "vue";
-import z from "../../node_modules/.pnpm/number-precision@1.6.0/node_modules/number-precision/build/index.es.js";
-import me from "./slider-button.vue.js";
-import oe from "./slider-dots.vue.js";
-import re from "./slider-marks.vue.js";
-import de from "./slider-ticks.vue.js";
-import ce from "./slider-input.vue.js";
-import { isUndefined as C, isArray as s } from "../../_utils/is.js";
-import { TRIGGER_POSITIONS as fe, SIZES as ve } from "../../_utils/constant.js";
-import { getLegalValue as se, getOffsetPercent as h, getPositionStyle as he } from "./utils.js";
-import { useFormItem as ge } from "../../_hooks/use-form-item.js";
-import { useSize as ye } from "../../_hooks/use-size.js";
-import { getClassNameMixin as Ve } from "../../_utils/config.js";
-const Ie = ne({
+import { defineComponent as re, computed as c, toRefs as oe, toRef as me, ref as B, watch as ce } from "vue";
+import C from "../../node_modules/.pnpm/number-precision@1.6.0/node_modules/number-precision/build/index.es.js";
+import de from "./slider-button.vue.js";
+import fe from "./slider-dots.vue.js";
+import se from "./slider-marks.vue.js";
+import ve from "./slider-ticks.vue.js";
+import he from "./slider-input.vue.js";
+import { isUndefined as z, isArray as h } from "../../_utils/is.js";
+import { TRIGGER_POSITIONS as ge, SIZES as ye } from "../../_utils/constant.js";
+import { getLegalValue as Ve, getOffsetPercent as g, getPositionStyle as Se } from "./utils.js";
+import { useFormItem as be } from "../../_hooks/use-form-item.js";
+import { useSize as ke } from "../../_hooks/use-size.js";
+import { getClassNameMixin as xe } from "../../_utils/config.js";
+const Te = re({
   name: "Slider",
+  inheritAttrs: !1,
   components: {
-    SliderButton: me,
-    SliderDots: oe,
-    SliderMarks: re,
-    SliderTicks: de,
-    SliderInput: ce
+    SliderButton: de,
+    SliderDots: fe,
+    SliderMarks: se,
+    SliderTicks: ve,
+    SliderInput: he
   },
   props: {
     /**
@@ -92,7 +93,7 @@ const Ie = ne({
      */
     size: {
       type: String,
-      validator: (e) => ve.includes(e)
+      validator: (e) => ye.includes(e)
     },
     /**
      * @zh 是否显示刻度线
@@ -136,7 +137,7 @@ const Ie = ne({
      */
     tooltipPosition: {
       type: String,
-      validator: (e) => fe.includes(e)
+      validator: (e) => ge.includes(e)
     }
   },
   emits: {
@@ -163,154 +164,160 @@ const Ie = ne({
      */
     blur: (e) => !0
   },
-  setup(e, { emit: d }) {
-    const { modelValue: D, size: T } = le(e), o = Ve("slider"), {
-      mergedDisabled: g,
-      mergedSize: L,
-      eventHandlers: w
-    } = ge({
-      disabled: ie(e, "disabled"),
-      size: T
-    }), { mergedSize: R } = ye(L), c = M(null), y = M(), O = C(e.modelValue) ? e.defaultValue : e.modelValue, i = (t) => se(t, e.min, e.max, e.step), V = (t) => {
-      const a = s(t) ? i(t[0] ?? e.min) : e.min, n = s(t) ? i(t[1] ?? e.min) : i(t ?? e.min);
-      return a <= n ? [a, n] : [n, a];
-    }, [F, K] = V(O), u = M(F), l = M(K);
-    ue(D, (t) => {
-      s(t) ? [u.value, l.value] = V(t) : l.value = i(t ?? e.min);
+  setup(e, { emit: d, attrs: A }) {
+    const R = (t) => t === "id" || t.startsWith("aria-"), D = c(
+      () => Object.fromEntries(Object.entries(A).filter(([t]) => !R(t)))
+    ), T = c(
+      () => Object.fromEntries(Object.entries(A).filter(([t]) => R(t)))
+    ), { modelValue: L, size: F } = oe(e), o = xe("slider"), {
+      mergedDisabled: y,
+      mergedSize: K,
+      eventHandlers: E
+    } = be({
+      disabled: me(e, "disabled"),
+      size: F
+    }), { mergedSize: N } = ke(K), f = B(null), V = B(), P = z(e.modelValue) ? e.defaultValue : e.modelValue, i = (t) => Ve(t, e.min, e.max, e.step), S = (t) => {
+      const n = h(t) ? i(t[0] ?? e.min) : e.min, a = h(t) ? i(t[1] ?? e.min) : i(t ?? e.min);
+      return n <= a ? [n, a] : [a, n];
+    }, [_, H] = S(P), u = B(_), l = B(H);
+    ce(L, (t) => {
+      h(t) ? [u.value, l.value] = S(t) : l.value = i(t ?? e.min);
     });
-    const N = () => e.range ? u.value <= l.value ? [u.value, l.value] : [l.value, u.value] : l.value, P = (t) => {
-      var a, n;
-      d("focus", t), (n = (a = w.value) == null ? void 0 : a.onFocus) == null || n.call(a, t);
-    }, _ = (t) => {
-      var a, n;
-      d("blur", t), (n = (a = w.value) == null ? void 0 : a.onBlur) == null || n.call(a, t);
-    }, r = () => {
-      var a, n;
-      const t = N();
-      d("update:modelValue", t), d("change", t), (n = (a = w.value) == null ? void 0 : a.onChange) == null || n.call(a);
-    }, f = () => {
-      d("changeEnd", N());
-    }, H = (t) => {
-      u.value = Math.min(i(t ?? e.min), l.value), r(), f();
-    }, $ = (t) => {
-      l.value = Math.max(i(t ?? e.min), u.value), r(), f();
-    }, S = B(() => e.range ? s(e.modelValue) ? V(e.modelValue) : V([u.value, e.modelValue ?? l.value]) : C(e.modelValue) ? [e.min, i(l.value)] : s(e.modelValue) ? [e.min, i(e.modelValue[1] ?? e.min)] : [e.min, i(e.modelValue)]), j = B(
+    const O = () => e.range ? u.value <= l.value ? [u.value, l.value] : [l.value, u.value] : l.value, $ = (t) => {
+      var n, a;
+      d("focus", t), (a = (n = E.value) == null ? void 0 : n.onFocus) == null || a.call(n, t);
+    }, G = (t) => {
+      var n, a;
+      d("blur", t), (a = (n = E.value) == null ? void 0 : n.onBlur) == null || a.call(n, t);
+    }, m = () => {
+      var n, a;
+      const t = O();
+      d("update:modelValue", t), d("change", t), (a = (n = E.value) == null ? void 0 : n.onChange) == null || a.call(n);
+    }, s = () => {
+      d("changeEnd", O());
+    }, U = (t) => {
+      u.value = Math.min(i(t ?? e.min), l.value), m(), s();
+    }, W = (t) => {
+      l.value = Math.max(i(t ?? e.min), u.value), m(), s();
+    }, b = c(() => e.range ? h(e.modelValue) ? S(e.modelValue) : S([u.value, e.modelValue ?? l.value]) : z(e.modelValue) ? [e.min, i(l.value)] : h(e.modelValue) ? [e.min, i(e.modelValue[1] ?? e.min)] : [e.min, i(e.modelValue)]), X = c(
       () => Object.keys(e.marks || {}).map((t) => {
-        var n;
-        const a = Number(t);
+        var a;
+        const n = Number(t);
         return {
-          key: a,
-          content: (n = e.marks) == null ? void 0 : n[a],
-          isActive: a >= S.value[0] && a <= S.value[1]
+          key: n,
+          content: (a = e.marks) == null ? void 0 : a[n],
+          isActive: n >= b.value[0] && n <= b.value[1]
         };
       })
-    ), G = (t) => he(h(t, [e.min, e.max]), e.direction), U = () => {
-      c.value && (y.value = c.value.getBoundingClientRect());
+    ), Y = (t) => Se(g(t, [e.min, e.max]), e.direction), Z = () => {
+      f.value && (V.value = f.value.getBoundingClientRect());
     };
-    function k(t, a) {
-      if (!y.value)
+    function k(t, n) {
+      if (!V.value)
         return 0;
-      const { left: n, top: m, width: E, height: b } = y.value, x = e.direction === "horizontal" ? E : b;
-      if (x <= 0 || e.max <= e.min)
+      const { left: a, top: r, width: w, height: x } = V.value, M = e.direction === "horizontal" ? w : x;
+      if (M <= 0 || e.max <= e.min)
         return e.min;
-      const I = x * e.step / (e.max - e.min);
-      if (I <= 0)
+      const j = M * e.step / (e.max - e.min);
+      if (j <= 0)
         return e.min;
-      let v = e.direction === "horizontal" ? t - n : m + b - a;
-      v < 0 && (v = 0), v > x && (v = x);
-      const ae = Math.round(v / I);
-      return i(z.plus(e.min, z.times(ae, e.step)));
+      let v = e.direction === "horizontal" ? t - a : r + x - n;
+      v < 0 && (v = 0), v > M && (v = M);
+      const ue = Math.round(v / j);
+      return i(C.plus(e.min, C.times(ue, e.step)));
     }
-    const X = (t, a) => {
-      l.value = e.range ? Math.max(k(t, a), u.value) : k(t, a), r();
-    }, Y = (t) => {
-      if (g.value)
+    const q = (t, n) => {
+      l.value = e.range ? Math.max(k(t, n), u.value) : k(t, n), m();
+    }, J = (t) => {
+      if (y.value)
         return;
-      const { clientX: a, clientY: n } = t;
-      c.value && (y.value = c.value.getBoundingClientRect());
-      const m = k(a, n);
+      const { clientX: n, clientY: a } = t;
+      f.value && (V.value = f.value.getBoundingClientRect());
+      const r = k(n, a);
       if (e.range) {
-        const [E, b] = S.value;
-        Math.abs(m - E) <= Math.abs(m - b) ? u.value = Math.min(m, l.value) : l.value = Math.max(m, u.value);
+        const [w, x] = b.value;
+        Math.abs(r - w) <= Math.abs(r - x) ? u.value = Math.min(r, l.value) : l.value = Math.max(r, u.value);
       } else
-        l.value = m;
-      r(), f();
+        l.value = r;
+      m(), s();
     };
-    function Z([t, a]) {
-      return t > a && ([t, a] = [a, t]), e.direction === "vertical" ? {
-        bottom: h(t, [e.min, e.max]),
-        top: h(e.max + e.min - a, [e.min, e.max])
+    function Q([t, n]) {
+      return t > n && ([t, n] = [n, t]), e.direction === "vertical" ? {
+        bottom: g(t, [e.min, e.max]),
+        top: g(e.max + e.min - n, [e.min, e.max])
       } : {
-        left: h(t, [e.min, e.max]),
-        right: h(e.max + e.min - a, [e.min, e.max])
+        left: g(t, [e.min, e.max]),
+        right: g(e.max + e.min - n, [e.min, e.max])
       };
     }
-    const q = (t, a) => {
-      u.value = Math.min(k(t, a), l.value), r();
-    }, J = () => {
-      f();
-    }, Q = (t) => {
-      const a = t.key;
-      if (a === "Home")
+    const p = (t, n) => {
+      u.value = Math.min(k(t, n), l.value), m();
+    }, ee = () => {
+      s();
+    }, te = (t) => {
+      const n = t.key;
+      if (n === "Home")
         return e.min;
-      if (a === "End")
+      if (n === "End")
         return e.max;
-      if (a === "ArrowRight" || a === "ArrowUp")
+      if (n === "ArrowRight" || n === "ArrowUp")
         return e.step;
-      if (a === "ArrowLeft" || a === "ArrowDown")
+      if (n === "ArrowLeft" || n === "ArrowDown")
         return -e.step;
-    }, A = (t, a) => {
-      if (g.value)
+    }, I = (t, n) => {
+      if (y.value)
         return;
-      const n = Q(a);
-      if (C(n))
+      const a = te(n);
+      if (z(a))
         return;
-      a.preventDefault();
-      const m = a.key === "Home" || a.key === "End" ? n : z.plus(t === "start" ? u.value : l.value, n);
-      t === "start" ? u.value = e.range ? Math.min(i(m), l.value) : i(m) : l.value = e.range ? Math.max(i(m), u.value) : i(m), r(), f();
-    }, W = (t) => {
-      A("start", t);
-    }, p = (t) => {
-      A("end", t);
-    }, ee = B(() => [
+      n.preventDefault();
+      const r = n.key === "Home" || n.key === "End" ? a : C.plus(t === "start" ? u.value : l.value, a);
+      t === "start" ? u.value = e.range ? Math.min(i(r), l.value) : i(r) : l.value = e.range ? Math.max(i(r), u.value) : i(r), m(), s();
+    }, ne = (t) => {
+      I("start", t);
+    }, ae = (t) => {
+      I("end", t);
+    }, le = c(() => [
       o.block,
-      o.modifier(`size-${R.value}`),
+      o.modifier(`size-${N.value}`),
       {
         [o.modifier("vertical")]: e.direction === "vertical",
         [o.modifier("with-marks")]: !!e.marks
       }
-    ]), te = B(() => [
+    ]), ie = c(() => [
       o.element("track"),
       {
-        [`${o.element("track")}-disabled`]: g.value,
+        [`${o.element("track")}-disabled`]: y.value,
         [`${o.element("track")}-vertical`]: e.direction === "vertical"
       }
     ]);
     return {
+      wrapperAttrs: D,
+      controlAttrs: T,
       className: o,
-      cls: ee,
-      trackCls: te,
-      trackRef: c,
-      computedValue: S,
-      mergedDisabled: g,
-      mergedSize: R,
-      markList: j,
-      getBtnStyle: G,
-      getBarStyle: Z,
-      handleClick: Y,
-      handleMoveStart: U,
-      handleEndMoving: X,
-      handleMoveEnd: J,
-      handleStartMoving: q,
-      handleStartChange: H,
-      handleEndChange: $,
-      handleStartKeyDown: W,
-      handleEndKeyDown: p,
-      handleFocus: P,
-      handleBlur: _
+      cls: le,
+      trackCls: ie,
+      trackRef: f,
+      computedValue: b,
+      mergedDisabled: y,
+      mergedSize: N,
+      markList: X,
+      getBtnStyle: Y,
+      getBarStyle: Q,
+      handleClick: J,
+      handleMoveStart: Z,
+      handleEndMoving: q,
+      handleMoveEnd: ee,
+      handleStartMoving: p,
+      handleStartChange: U,
+      handleEndChange: W,
+      handleStartKeyDown: ne,
+      handleEndKeyDown: ae,
+      handleFocus: $,
+      handleBlur: G
     };
   }
 });
 export {
-  Ie as default
+  Te as default
 };

package/dist/es/components/form-slider/slider-button.vue.js

@@ -1,17 +1,17 @@
 import a from "./slider-button.vue2.js";
-import { resolveComponent as r, openBlock as t, createBlock as s, withCtx as u, createElementVNode as d, mergeProps as p, withModifiers as i } from "vue";
+import { resolveComponent as r, openBlock as t, createBlock as s, withCtx as d, createElementVNode as u, mergeProps as p, withModifiers as i } from "vue";
 import m from "../../_virtual/_plugin-vue_export-helper.js";
-const v = ["aria-disabled", "aria-valuemax", "aria-valuemin", "aria-valuenow", "aria-valuetext"];
-function w(o, n, f, b, B, C) {
+const v = ["tabindex", "aria-disabled", "aria-valuemax", "aria-valuemin", "aria-valuenow", "aria-valuetext"];
+function w(o, n, f, b, C, B) {
   const l = r("tooltip");
   return t(), s(l, {
     "popup-visible": o.popupVisible,
     position: o.mergedTooltipPosition,
     content: o.tooltipContent
   }, {
-    default: u(() => [
-      d("div", p(o.$attrs, {
-        tabindex: "0",
+    default: d(() => [
+      u("div", p(o.formControlAttrs, {
+        tabindex: o.disabled ? -1 : 0,
         role: "slider",
         "aria-disabled": o.disabled,
         "aria-valuemax": o.max,

package/dist/es/components/form-slider/slider-button.vue2.js

@@ -1,11 +1,12 @@
-import { defineComponent as x, ref as B, computed as s, onBeforeUnmount as M } from "vue";
-import { Tooltip as N } from "../tooltip/index.js";
+import { defineComponent as M, ref as N, computed as s, onBeforeUnmount as D } from "vue";
+import { Tooltip as F } from "../tooltip/index.js";
 import { off as i, on as l } from "../../_utils/dom.js";
-import { getClassNameMixin as D } from "../../_utils/config.js";
-const X = x({
+import { getClassNameMixin as S } from "../../_utils/config.js";
+import { useFormItem as k, useFormItemControl as q } from "../../_hooks/use-form-item.js";
+const U = M({
   name: "SliderButton",
   components: {
-    Tooltip: N
+    Tooltip: F
   },
   inheritAttrs: !1,
   props: {
@@ -38,50 +39,54 @@ const X = x({
     }
   },
   emits: ["movestart", "moving", "moveend", "keydown", "focus", "blur"],
-  setup(e, { emit: n }) {
-    const m = D("slider--btn"), c = B(!1), w = () => {
+  setup(e, { emit: n, attrs: w }) {
+    const d = S("slider--btn"), { formItemCtx: h } = k(), v = q(h, () => w, {
+      labelable: !1,
+      required: !1
+    }), r = N(!1), f = () => {
       i(window, "mousemove", u), i(window, "touchmove", u), i(window, "mouseup", t), i(window, "contextmenu", t), i(window, "touchend", t), i(window, "touchcancel", t);
-    }, f = (o) => {
-      e.disabled || (o.preventDefault(), c.value = !0, l(window, "mousemove", u), l(window, "touchmove", u), l(window, "mouseup", t), l(window, "contextmenu", t), l(window, "touchend", t), l(window, "touchcancel", t), n("movestart"));
+    }, p = (o) => {
+      e.disabled || (o.preventDefault(), r.value = !0, l(window, "mousemove", u), l(window, "touchmove", u), l(window, "mouseup", t), l(window, "contextmenu", t), l(window, "touchend", t), l(window, "touchcancel", t), n("movestart"));
     }, u = (o) => {
-      let a, d;
+      let c, a;
       if (o.type.startsWith("touch")) {
-        const r = o.touches[0];
-        if (!r)
+        const m = o.touches[0];
+        if (!m)
           return;
-        d = r.clientY, a = r.clientX;
+        a = m.clientY, c = m.clientX;
       } else
-        d = o.clientY, a = o.clientX;
-      n("moving", a, d);
+        a = o.clientY, c = o.clientX;
+      n("moving", c, a);
     }, t = () => {
-      c.value = !1, w(), n("moveend");
-    }, h = (o) => {
+      r.value = !1, f(), n("moveend");
+    }, b = (o) => {
       n("focus", o);
-    }, v = (o) => {
+    }, g = (o) => {
       n("blur", o);
-    }, p = (o) => {
+    }, y = (o) => {
       e.disabled || n("keydown", o);
-    }, b = s(() => [m.block]), g = s(
+    }, x = s(() => [d.block]), C = s(
       () => e.tooltipPosition ?? (e.direction === "vertical" ? "right" : "top")
-    ), y = s(() => {
+    ), T = s(() => {
       var o;
       return ((o = e.formatTooltip) == null ? void 0 : o.call(e, e.value)) ?? `${e.value}`;
-    }), T = s(
-      () => e.showTooltip ? c.value ? !0 : void 0 : !1
+    }), B = s(
+      () => e.showTooltip ? r.value ? !0 : void 0 : !1
     );
-    return M(w), {
-      className: m,
-      cls: b,
-      tooltipContent: y,
-      mergedTooltipPosition: g,
-      popupVisible: T,
-      handleMouseDown: f,
-      handleKeyDown: p,
-      handleFocus: h,
-      handleBlur: v
+    return D(f), {
+      formControlAttrs: v,
+      className: d,
+      cls: x,
+      tooltipContent: T,
+      mergedTooltipPosition: C,
+      popupVisible: B,
+      handleMouseDown: p,
+      handleKeyDown: y,
+      handleFocus: b,
+      handleBlur: g
     };
   }
 });
 export {
-  X as default
+  U as default
 };

package/dist/es/components/form-switch/Switch.vue.js

@@ -1,10 +1,10 @@
 import c from "./Switch.vue2.js";
-import { resolveComponent as h, openBlock as l, createElementBlock as k, mergeProps as p, createElementVNode as d, normalizeClass as a, createBlock as u, Fragment as m, renderSlot as s, createTextVNode as r, toDisplayString as t, createCommentVNode as y } from "vue";
-import $ from "../../_virtual/_plugin-vue_export-helper.js";
-const f = ["aria-checked", "disabled"];
-function C(e, o, g, w, N, b) {
+import { resolveComponent as h, openBlock as l, createElementBlock as m, mergeProps as p, createElementVNode as d, normalizeClass as a, createBlock as u, Fragment as k, renderSlot as s, createTextVNode as r, toDisplayString as t, createCommentVNode as y } from "vue";
+import f from "../../_virtual/_plugin-vue_export-helper.js";
+const C = ["aria-checked", "disabled"];
+function $(e, o, g, w, N, b) {
   const i = h("icon-loading");
-  return l(), k("button", p(e.$attrs, {
+  return l(), m("button", p(e.formControlAttrs, {
     type: "button",
     role: "switch",
     "aria-checked": e.computedCheck,
@@ -23,12 +23,12 @@ function C(e, o, g, w, N, b) {
       d("span", {
         class: a(e.className.element("handle-icon"))
       }, [
-        e.computedLoading ? (l(), u(i, { key: 0 })) : (l(), k(m, { key: 1 }, [
+        e.computedLoading ? (l(), u(i, { key: 0 })) : (l(), m(k, { key: 1 }, [
           e.computedCheck ? s(e.$slots, "checked-icon", { key: 0 }) : s(e.$slots, "unchecked-icon", { key: 1 })
         ], 64))
       ], 2)
     ], 2),
-    e.showText ? (l(), k(m, { key: 0 }, [
+    e.showText ? (l(), m(k, { key: 0 }, [
       d("span", {
         class: a(e.className.element("text-holder"))
       }, [
@@ -48,9 +48,9 @@ function C(e, o, g, w, N, b) {
         ])
       ], 2)
     ], 64)) : y("", !0)
-  ], 16, f);
+  ], 16, C);
 }
-const S = /* @__PURE__ */ $(c, [["render", C]]);
+const S = /* @__PURE__ */ f(c, [["render", $]]);
 export {
   S as default
 };