x-next 1.6.0 → 1.7.0

package/dist/es/components/image/ImagePreviewGroup.vue2.js

@@ -1,12 +1,13 @@
-import { defineComponent as T, toRefs as q, reactive as b, computed as r, ref as D, watch as E, provide as F } from "vue";
+import { defineComponent as q, toRefs as D, reactive as b, computed as r, ref as E, watch as F, provide as H } from "vue";
 import C from "../../_hooks/use-merge-state.js";
-import H from "./ImagePreview.vue.js";
-import { PreviewGroupInjectionKey as J } from "./context.js";
+import J from "./ImagePreview.vue.js";
+import { PreviewGroupInjectionKey as Q } from "./context.js";
 import { isArray as A, isUndefined as s } from "../../_utils/is.js";
-const $ = /* @__PURE__ */ T({
+import { useLocale as W } from "../../locale/index.js";
+const re = /* @__PURE__ */ q({
   name: "ImagePreviewGroup",
   components: {
-    ImagePreview: H
+    ImagePreview: J
   },
   inheritAttrs: !1,
   props: {
@@ -120,21 +121,23 @@ const $ = /* @__PURE__ */ T({
     emit: m
   }) {
     const {
+      t: U
+    } = W(), {
       srcList: n,
-      visible: U,
-      defaultVisible: M,
-      current: S,
+      visible: M,
+      defaultVisible: S,
+      current: L,
       defaultCurrent: N,
       infinite: w
-    } = q(B), [h, O] = C(M.value, b({
-      value: U
+    } = D(B), [h, O] = C(S.value, b({
+      value: M
     })), g = (e) => {
       e !== h.value && (m("visible-change", e), m("update:visible", e), O(e));
     }, k = r(() => new Map(A(n == null ? void 0 : n.value) ? n == null ? void 0 : n.value.map((e, t) => [t, {
       url: e,
       canPreview: !0
-    }]) : [])), x = r(() => A(n == null ? void 0 : n.value)), c = D(/* @__PURE__ */ new Map()), f = r(() => x.value ? k.value : c.value), z = r(() => Array.from(c.value.keys())), d = r(() => Array.from(f.value.keys())), i = r(() => d.value.length);
-    function L(e, t, u) {
+    }]) : [])), x = r(() => A(n == null ? void 0 : n.value)), c = E(/* @__PURE__ */ new Map()), f = r(() => x.value ? k.value : c.value), z = r(() => Array.from(c.value.keys())), d = r(() => Array.from(f.value.keys())), o = r(() => d.value.length);
+    function R(e, t, u) {
       return c.value.set(e, {
         url: t,
         canPreview: u
@@ -142,21 +145,21 @@ const $ = /* @__PURE__ */ T({
         c.value.delete(e);
       };
     }
-    const [a, R] = C(N.value, b({
-      value: S
+    const [a, _] = C(N.value, b({
+      value: L
     })), v = (e) => {
-      e !== a.value && (m("change", e), m("update:current", e), R(e));
-    }, _ = r(() => d.value[a.value]), j = (e) => {
+      e !== a.value && (m("change", e), m("update:current", e), _(e));
+    }, j = r(() => d.value[a.value]), G = (e) => {
       const t = d.value.indexOf(e);
       t >= 0 && t !== a.value && v(t);
-    }, G = r(() => {
+    }, V = r(() => {
       var e;
-      return (e = f.value.get(_.value)) == null ? void 0 : e.url;
+      return (e = f.value.get(j.value)) == null ? void 0 : e.url;
     });
-    E(
-      [i, a],
+    F(
+      [o, a],
       () => {
-        if (i.value === 0) {
+        if (o.value === 0) {
           g(!1);
           return;
         }
@@ -164,64 +167,67 @@ const $ = /* @__PURE__ */ T({
           v(0);
           return;
         }
-        a.value >= i.value && v(i.value - 1);
+        a.value >= o.value && v(o.value - 1);
       },
       // 自动收集模式须等子图片注册；显式列表在 setup 时即可检查边界。
       {
         immediate: x.value
       }
-    ), F(J, b({
-      registerImageUrl: L,
+    ), H(Q, b({
+      registerImageUrl: R,
       preview: (e) => {
         if (x.value) {
-          const u = c.value.get(e), o = u != null && u.canPreview ? z.value.indexOf(e) : -1;
-          o >= 0 && o < i.value && (v(o), g(!0));
+          const u = c.value.get(e), i = u != null && u.canPreview ? z.value.indexOf(e) : -1;
+          i >= 0 && i < o.value && (v(i), g(!0));
           return;
         }
         const t = f.value.get(e);
-        t != null && t.canPreview && (j(e), g(!0));
+        t != null && t.canPreview && (G(e), g(!0));
       }
     }));
     const y = r(() => {
-      const e = (u, o) => {
+      const e = (u, i) => {
         var p;
-        for (let l = u; l <= o; l++) {
+        for (let l = u; l <= i; l++) {
           const P = d.value[l];
           if ((p = f.value.get(P)) != null && p.canPreview)
             return l;
         }
-      }, t = e(a.value + 1, i.value - 1);
+      }, t = e(a.value + 1, o.value - 1);
       return s(t) && w.value ? e(0, a.value - 1) : t;
     }), I = r(() => {
-      const e = (u, o) => {
+      const e = (u, i) => {
         var p;
-        for (let l = u; l >= o; l--) {
+        for (let l = u; l >= i; l--) {
           const P = d.value[l];
           if ((p = f.value.get(P)) != null && p.canPreview)
             return l;
         }
       }, t = e(a.value - 1, 0);
-      return s(t) && w.value ? e(i.value - 1, a.value + 1) : t;
-    }), V = r(() => s(I.value) ? void 0 : () => {
+      return s(t) && w.value ? e(o.value - 1, a.value + 1) : t;
+    }), K = r(() => s(I.value) ? void 0 : () => {
       !s(I.value) && v(I.value);
-    }), K = r(() => s(y.value) ? void 0 : () => {
+    }), T = r(() => s(y.value) ? void 0 : () => {
       !s(y.value) && v(y.value);
     });
     return {
+      t: U,
+      currentIndex: a,
+      imageCount: o,
       mergedVisible: h,
-      currentUrl: G,
+      currentUrl: V,
       prevIndex: I,
       nextIndex: y,
       onClose() {
         g(!1);
       },
       groupArrowProps: b({
-        onPrev: V,
-        onNext: K
+        onPrev: K,
+        onNext: T
       })
     };
   }
 });
 export {
-  $ as default
+  re as default
 };

package/dist/es/components/image/hooks/use-image-drag.js

@@ -2,39 +2,41 @@ import { toRefs as E, ref as x, watchEffect as R, watch as X, nextTick as Y } fr
 import { on as s, off as f } from "../../../_utils/dom.js";
 import h from "../utils/get-fix-translate.js";
 function B(D) {
-  const { wrapperEl: v, imageEl: a, scale: n } = E(D), t = x([0, 0]), u = x(!1);
-  let i = 0, c = 0, l = [0, 0];
+  const { wrapperEl: v, imageEl: l, scale: n } = E(D), t = x([0, 0]), o = x(!1);
+  let i = 0, c = 0, r = [0, 0];
   const T = () => {
-    if (!v.value || !a.value) return;
-    const e = v.value.getBoundingClientRect(), r = a.value.getBoundingClientRect(), [o, d] = h(
+    if (!v.value || !l.value) return;
+    const e = v.value.getBoundingClientRect(), a = l.value.getBoundingClientRect(), [u, d] = h(
       e,
-      r,
+      a,
       t.value[0],
       t.value[1],
       n.value
     );
-    (o !== t.value[0] || d !== t.value[1]) && (t.value = [o, d]);
+    (u !== t.value[0] || d !== t.value[1]) && (t.value = [u, d]);
   }, p = (e) => {
     e.preventDefault && e.preventDefault();
-    const r = l[0] + (e.pageX - i) / n.value, o = l[1] + (e.pageY - c) / n.value;
-    t.value = [r, o];
+    const a = r[0] + (e.pageX - i) / n.value, u = r[1] + (e.pageY - c) / n.value;
+    t.value = [a, u];
   }, g = (e) => {
-    e.preventDefault && e.preventDefault(), u.value = !1, w();
+    e.preventDefault && e.preventDefault(), o.value = !1, w();
   }, m = (e) => {
-    e.target === e.currentTarget && (e.preventDefault && e.preventDefault(), u.value = !0, i = e.pageX, c = e.pageY, l = [...t.value], s(window, "mousemove", p, !1), s(window, "mouseup", g, !1));
+    e.target === e.currentTarget && (e.preventDefault && e.preventDefault(), o.value = !0, i = e.pageX, c = e.pageY, r = [...t.value], s(window, "mousemove", p, !1), s(window, "mouseup", g, !1));
   };
   function w() {
     typeof window > "u" || (f(window, "mousemove", p, !1), f(window, "mouseup", g, !1));
   }
   return R((e) => {
-    typeof window > "u" || (a.value && s(a.value, "mousedown", m), e(() => {
-      a.value && f(a.value, "mousedown", m), w();
-    }));
+    if (typeof window > "u") return;
+    const a = l.value;
+    a && s(a, "mousedown", m), e(() => {
+      a && f(a, "mousedown", m), o.value = !1, w();
+    });
   }), X([n], () => {
     Y(() => T());
   }), {
     translate: t,
-    moving: u,
+    moving: o,
     resetTranslate() {
       t.value = [0, 0];
     }

package/dist/es/components/index.js

@@ -11,8 +11,8 @@ import { Checkbox as M, CheckboxGroup as R } from "./form-checkbox/index.js";
 import { Input as B, InputGroup as E, InputPassword as _, InputSearch as N } from "./form-input/index.js";
 import { InputNumber as j } from "./form-input-number/index.js";
 import { InputTag as H } from "./form-input-tag/index.js";
-import { Radio as W, RadioGroup as z } from "./form-radio/index.js";
-import { Select as U, SelectDropdown as Y, SelectOption as Z, SelectOptionGroup as q } from "./form-select/index.js";
+import { Radio as W, RadioGroup as U } from "./form-radio/index.js";
+import { Select as Q, SelectDropdown as Y, SelectOption as Z, SelectOptionGroup as q } from "./form-select/index.js";
 import { Slider as V } from "./form-slider/index.js";
 import { Switch as $ } from "./form-switch/index.js";
 import { Textarea as ro } from "./form-textarea/index.js";
@@ -30,7 +30,7 @@ import { Notification as No } from "./notification/index.js";
 import { Pagination as jo } from "./pagination/index.js";
 import { Popconfirm as Ho } from "./popconfirm/index.js";
 import { Popover as Wo } from "./popover/index.js";
-import { Popup as Qo } from "./popup/index.js";
+import { Popup as zo } from "./popup/index.js";
 import { Progress as Yo } from "./progress/index.js";
 import { Rate as qo } from "./rate/index.js";
 import { ResizeBox as Vo } from "./resize-box/index.js";
@@ -49,17 +49,18 @@ import { TimelineItem as Dr } from "./timeline-item/index.js";
 import { Tooltip as Gr } from "./tooltip/index.js";
 import { TrendChart as vr } from "./trend-chart/index.js";
 import { Trigger as Rr } from "./trigger/index.js";
-import { Watermark as Br } from "./watermark/index.js";
-import { TABLE_LOCALE_EN_US as _r, TABLE_LOCALE_ZH_CN as Nr, formatLocaleText as Or } from "./table/locale.js";
-import { default as Fr } from "./table/table-tbody.js";
-import { default as Kr } from "./table/table-td.js";
-import { default as zr } from "./table/table-th.js";
-import { default as Ur } from "./table/table-thead.js";
-import { default as Zr } from "./table/table-tr.js";
-import { configProviderInjectionKey as Jr } from "./config-provider/context.js";
-import { formInjectionKey as Xr, formItemInjectionKey as $r } from "./form/context.js";
-import { vDraggable as re } from "./draggable/directive.js";
-import { vWatermark as te } from "./watermark/directive.js";
+import { Upload as Br } from "./upload/index.js";
+import { Watermark as _r } from "./watermark/index.js";
+import { TABLE_LOCALE_EN_US as Or, TABLE_LOCALE_ZH_CN as jr, formatLocaleText as Fr } from "./table/locale.js";
+import { default as Kr } from "./table/table-tbody.js";
+import { default as Ur } from "./table/table-td.js";
+import { default as Qr } from "./table/table-th.js";
+import { default as Zr } from "./table/table-thead.js";
+import { default as Jr } from "./table/table-tr.js";
+import { configProviderInjectionKey as Xr } from "./config-provider/context.js";
+import { formInjectionKey as oe, formItemInjectionKey as re } from "./form/context.js";
+import { vDraggable as te } from "./draggable/directive.js";
+import { vWatermark as me } from "./watermark/directive.js";
 export {
   e as Alert,
   p as Button,
@@ -111,17 +112,17 @@ export {
   jo as Pagination,
   Ho as Popconfirm,
   Wo as Popover,
-  Qo as Popup,
+  zo as Popup,
   Yo as Progress,
   w as QuarterPicker,
   W as Radio,
-  z as RadioGroup,
+  U as RadioGroup,
   L as RangePicker,
   qo as Rate,
   Vo as ResizeBox,
   io as Row,
   $o as Scrollbar,
-  U as Select,
+  Q as Select,
   Y as SelectDropdown,
   Z as SelectOption,
   q as SelectOptionGroup,
@@ -134,33 +135,34 @@ export {
   nr as Step,
   ir as Steps,
   $ as Switch,
-  _r as TABLE_LOCALE_EN_US,
-  Nr as TABLE_LOCALE_ZH_CN,
+  Or as TABLE_LOCALE_EN_US,
+  jr as TABLE_LOCALE_ZH_CN,
   Tr as TabPane,
   lr as Table,
   cr as TableColumn,
   Sr as Tabs,
   Pr as Tag,
-  Fr as Tbody,
-  Kr as Td,
+  Kr as Tbody,
+  Ur as Td,
   ro as Textarea,
-  zr as Th,
-  Ur as Thead,
+  Qr as Th,
+  Zr as Thead,
   kr as TimePicker,
   sr as TimeRangeSelector,
   Lr as Timeline,
   Dr as TimelineItem,
   Gr as Tooltip,
-  Zr as Tr,
+  Jr as Tr,
   vr as TrendChart,
   Rr as Trigger,
-  Br as Watermark,
+  Br as Upload,
+  _r as Watermark,
   C as WeekPicker,
   D as YearPicker,
-  Jr as configProviderInjectionKey,
-  Xr as formInjectionKey,
-  $r as formItemInjectionKey,
-  Or as formatLocaleText,
-  re as vDraggable,
-  te as vWatermark
+  Xr as configProviderInjectionKey,
+  oe as formInjectionKey,
+  re as formItemInjectionKey,
+  Fr as formatLocaleText,
+  te as vDraggable,
+  me as vWatermark
 };