vant 3.4.6 → 3.4.7

package/lib/composables/use-touch.js

@@ -58,7 +58,7 @@ function useTouch() {
   };
   const move = (event) => {
     const touch = event.touches[0];
-    deltaX.value = touch.clientX < 0 ? 0 : touch.clientX - startX.value;
+    deltaX.value = (touch.clientX < 0 ? 0 : touch.clientX) - startX.value;
     deltaY.value = touch.clientY - startY.value;
     offsetX.value = Math.abs(deltaX.value);
     offsetY.value = Math.abs(deltaY.value);

package/lib/config-provider/ConfigProvider.d.ts

@@ -1,4 +1,5 @@
 import { type PropType, type InjectionKey, type ExtractPropTypes } from 'vue';
+import { type Numeric } from '../utils';
 export declare type ConfigProviderProvide = {
     iconPrefix?: string;
 };
@@ -8,7 +9,7 @@ declare const configProviderProps: {
         type: PropType<keyof HTMLElementTagNameMap>;
         default: keyof HTMLElementTagNameMap;
     };
-    themeVars: PropType<Record<string, string | number>>;
+    themeVars: PropType<Record<string, Numeric>>;
     iconPrefix: StringConstructor;
 };
 export declare type ConfigProviderProps = ExtractPropTypes<typeof configProviderProps>;
@@ -17,14 +18,14 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<keyof HTMLElementTagNameMap>;
         default: keyof HTMLElementTagNameMap;
     };
-    themeVars: PropType<Record<string, string | number>>;
+    themeVars: PropType<Record<string, Numeric>>;
     iconPrefix: StringConstructor;
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
     tag: {
         type: PropType<keyof HTMLElementTagNameMap>;
         default: keyof HTMLElementTagNameMap;
     };
-    themeVars: PropType<Record<string, string | number>>;
+    themeVars: PropType<Record<string, Numeric>>;
     iconPrefix: StringConstructor;
 }>>, {
     tag: keyof HTMLElementTagNameMap;

package/lib/config-provider/index.d.ts

@@ -3,14 +3,14 @@ export declare const ConfigProvider: import("../utils").WithInstall<import("vue"
         type: import("vue").PropType<keyof HTMLElementTagNameMap>;
         default: keyof HTMLElementTagNameMap;
     };
-    themeVars: import("vue").PropType<Record<string, string | number>>;
+    themeVars: import("vue").PropType<Record<string, import("../utils").Numeric>>;
     iconPrefix: StringConstructor;
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     tag: {
         type: import("vue").PropType<keyof HTMLElementTagNameMap>;
         default: keyof HTMLElementTagNameMap;
     };
-    themeVars: import("vue").PropType<Record<string, string | number>>;
+    themeVars: import("vue").PropType<Record<string, import("../utils").Numeric>>;
     iconPrefix: StringConstructor;
 }>>, {
     tag: keyof HTMLElementTagNameMap;

package/lib/contact-list/ContactList.d.ts

@@ -1,7 +1,8 @@
 import { type PropType, type ExtractPropTypes } from 'vue';
+import { type Numeric } from '../utils';
 export declare type ContactListItem = {
-    id?: number | string;
-    tel: number | string;
+    id?: Numeric;
+    tel: Numeric;
     name: string;
     isDefault?: boolean;
 };

package/lib/coupon/Coupon.d.ts

@@ -1,6 +1,7 @@
 import { type PropType } from 'vue';
+import { type Numeric } from '../utils';
 export declare type CouponInfo = {
-    id: string | number;
+    id: Numeric;
     name: string;
     endAt: number;
     value: number;

package/lib/coupon-list/CouponList.d.ts

@@ -17,10 +17,7 @@ declare const couponListProps: {
         type: BooleanConstructor;
         default: true;
     };
-    emptyImage: {
-        type: import("vue").PropType<string>;
-        default: string;
-    };
+    emptyImage: StringConstructor;
     chosenCoupon: {
         type: NumberConstructor;
         default: number;
@@ -71,10 +68,7 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: true;
     };
-    emptyImage: {
-        type: import("vue").PropType<string>;
-        default: string;
-    };
+    emptyImage: StringConstructor;
     chosenCoupon: {
         type: NumberConstructor;
         default: number;
@@ -123,10 +117,7 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: true;
     };
-    emptyImage: {
-        type: import("vue").PropType<string>;
-        default: string;
-    };
+    emptyImage: StringConstructor;
     chosenCoupon: {
         type: NumberConstructor;
         default: number;
@@ -168,7 +159,6 @@ declare const _default: import("vue").DefineComponent<{
     coupons: CouponInfo[];
     chosenCoupon: number;
     showCount: boolean;
-    emptyImage: string;
     disabledCoupons: CouponInfo[];
     showExchangeBar: boolean;
     showCloseButton: boolean;

package/lib/coupon-list/CouponList.js

@@ -30,18 +30,18 @@ var import_utils = require("../utils");
 var import_use_refs = require("../composables/use-refs");
 var import_tab = require("../tab");
 var import_tabs = require("../tabs");
+var import_empty = require("../empty");
 var import_field = require("../field");
 var import_button = require("../button");
 var import_coupon = require("../coupon");
 var import_use = require("@vant/use");
 const [name, bem, t] = (0, import_utils.createNamespace)("coupon-list");
-const EMPTY_IMAGE = "https://img.yzcdn.cn/vant/coupon-empty.png";
 const couponListProps = {
   code: (0, import_utils.makeStringProp)(""),
   coupons: (0, import_utils.makeArrayProp)(),
   currency: (0, import_utils.makeStringProp)("\xA5"),
   showCount: import_utils.truthProp,
-  emptyImage: (0, import_utils.makeStringProp)(EMPTY_IMAGE),
+  emptyImage: String,
   chosenCoupon: (0, import_utils.makeNumberProp)(-1),
   enabledTitle: String,
   disabledTitle: String,
@@ -89,11 +89,13 @@ var stdin_default = (0, import_vue2.defineComponent)({
         return (_a = couponRefs.value[index]) == null ? void 0 : _a.scrollIntoView();
       });
     };
-    const renderEmpty = () => (0, import_vue.createVNode)("div", {
-      "class": bem("empty")
-    }, [(0, import_vue.createVNode)("img", {
-      "src": props.emptyImage
-    }, null), (0, import_vue.createVNode)("p", null, [t("noCoupon")])]);
+    const renderEmpty = () => (0, import_vue.createVNode)(import_empty.Empty, {
+      "image": props.emptyImage
+    }, {
+      default: () => [(0, import_vue.createVNode)("p", {
+        "class": bem("empty-tip")
+      }, [t("noCoupon")])]
+    });
     const renderExchangeBar = () => {
       if (props.showExchangeBar) {
         return (0, import_vue.createVNode)("div", {

package/lib/coupon-list/index.css

@@ -1 +1 @@
-:root{--van-coupon-list-background-color: var(--van-background-color);--van-coupon-list-field-padding: 5px 0 5px var(--van-padding-md);--van-coupon-list-exchange-button-height: 32px;--van-coupon-list-close-button-height: 40px;--van-coupon-list-empty-image-size: 200px;--van-coupon-list-empty-tip-color: var(--van-text-color-2);--van-coupon-list-empty-tip-font-size: var(--van-font-size-md);--van-coupon-list-empty-tip-line-height: var(--van-line-height-md)}.van-coupon-list{position:relative;height:100%;background:var(--van-coupon-list-background-color)}.van-coupon-list__field{padding:var(--van-coupon-list-field-padding)}.van-coupon-list__field .van-field__body{height:34px;padding-left:var(--van-padding-sm);line-height:34px;background:var(--van-gray-1);border-radius:17px}.van-coupon-list__field .van-field__body::-webkit-input-placeholder{color:var(--van-text-color-3)}.van-coupon-list__field .van-field__body::placeholder{color:var(--van-text-color-3)}.van-coupon-list__field .van-field__clear{margin-right:0}.van-coupon-list__exchange-bar{display:flex;align-items:center;background-color:var(--van-background-color-light)}.van-coupon-list__exchange{flex:none;height:var(--van-coupon-list-exchange-button-height);font-size:var(--van-font-size-lg);line-height:calc(var(--van-coupon-list-exchange-button-height) - 2px);border:0}.van-coupon-list .van-tabs__wrap{box-shadow:0 6px 12px -12px var(--van-gray-6)}.van-coupon-list__list{box-sizing:border-box;padding:var(--van-padding-md) 0 var(--van-padding-lg);overflow-y:auto;-webkit-overflow-scrolling:touch}.van-coupon-list__list--with-bottom{padding-bottom:50px}.van-coupon-list__bottom{position:absolute;bottom:0;left:0;z-index:999;box-sizing:border-box;width:100%;padding:5px var(--van-padding-md);font-weight:var(--van-font-weight-bold);background-color:var(--van-background-color-light)}.van-coupon-list__close{height:var(--van-coupon-list-close-button-height)}.van-coupon-list__empty{padding-top:60px;text-align:center}.van-coupon-list__empty p{margin:var(--van-padding-md) 0;color:var(--van-coupon-list-empty-tip-color);font-size:var(--van-coupon-list-empty-tip-font-size);line-height:var(--van-coupon-list-empty-tip-line-height)}.van-coupon-list__empty img{width:var(--van-coupon-list-empty-image-size);height:var(--van-coupon-list-empty-image-size)}
+:root{--van-coupon-list-background-color: var(--van-background-color);--van-coupon-list-field-padding: 5px 0 5px var(--van-padding-md);--van-coupon-list-exchange-button-height: 32px;--van-coupon-list-close-button-height: 40px;--van-coupon-list-empty-tip-color: var(--van-text-color-2);--van-coupon-list-empty-tip-font-size: var(--van-font-size-md);--van-coupon-list-empty-tip-line-height: var(--van-line-height-md)}.van-coupon-list{position:relative;height:100%;background:var(--van-coupon-list-background-color)}.van-coupon-list__field{padding:var(--van-coupon-list-field-padding)}.van-coupon-list__field .van-field__body{height:34px;padding-left:var(--van-padding-sm);line-height:34px;background:var(--van-gray-1);border-radius:17px}.van-coupon-list__field .van-field__body::-webkit-input-placeholder{color:var(--van-text-color-3)}.van-coupon-list__field .van-field__body::placeholder{color:var(--van-text-color-3)}.van-coupon-list__field .van-field__clear{margin-right:0}.van-coupon-list__exchange-bar{display:flex;align-items:center;background-color:var(--van-background-color-light)}.van-coupon-list__exchange{flex:none;height:var(--van-coupon-list-exchange-button-height);font-size:var(--van-font-size-lg);line-height:calc(var(--van-coupon-list-exchange-button-height) - 2px);border:0}.van-coupon-list .van-tabs__wrap{box-shadow:0 6px 12px -12px var(--van-gray-6)}.van-coupon-list__list{box-sizing:border-box;padding:var(--van-padding-md) 0 var(--van-padding-lg);overflow-y:auto;-webkit-overflow-scrolling:touch}.van-coupon-list__list--with-bottom{padding-bottom:50px}.van-coupon-list__bottom{position:absolute;bottom:0;left:0;z-index:999;box-sizing:border-box;width:100%;padding:5px var(--van-padding-md);font-weight:var(--van-font-weight-bold);background-color:var(--van-background-color-light)}.van-coupon-list__close{height:var(--van-coupon-list-close-button-height)}.van-coupon-list__empty-tip{color:var(--van-coupon-list-empty-tip-color);font-size:var(--van-coupon-list-empty-tip-font-size);line-height:var(--van-coupon-list-empty-tip-line-height)}

package/lib/coupon-list/index.d.ts

@@ -15,10 +15,7 @@ export declare const CouponList: import("../utils").WithInstall<import("vue").De
         type: BooleanConstructor;
         default: true;
     };
-    emptyImage: {
-        type: import("vue").PropType<string>;
-        default: string;
-    };
+    emptyImage: StringConstructor;
     chosenCoupon: {
         type: NumberConstructor;
         default: number;
@@ -67,10 +64,7 @@ export declare const CouponList: import("../utils").WithInstall<import("vue").De
         type: BooleanConstructor;
         default: true;
     };
-    emptyImage: {
-        type: import("vue").PropType<string>;
-        default: string;
-    };
+    emptyImage: StringConstructor;
     chosenCoupon: {
         type: NumberConstructor;
         default: number;
@@ -112,7 +106,6 @@ export declare const CouponList: import("../utils").WithInstall<import("vue").De
     coupons: import("..").CouponInfo[];
     chosenCoupon: number;
     showCount: boolean;
-    emptyImage: string;
     disabledCoupons: import("..").CouponInfo[];
     showExchangeBar: boolean;
     showCloseButton: boolean;

package/lib/coupon-list/index.less

@@ -5,7 +5,6 @@
   --van-coupon-list-field-padding: @coupon-list-field-padding;
   --van-coupon-list-exchange-button-height: @coupon-list-exchange-button-height;
   --van-coupon-list-close-button-height: @coupon-list-close-button-height;
-  --van-coupon-list-empty-image-size: @coupon-list-empty-image-size;
   --van-coupon-list-empty-tip-color: @coupon-list-empty-tip-color;
   --van-coupon-list-empty-tip-font-size: @coupon-list-empty-tip-font-size;
   --van-coupon-list-empty-tip-line-height: @coupon-list-empty-tip-line-height;
@@ -81,20 +80,9 @@
     height: var(--van-coupon-list-close-button-height);
   }
 
-  &__empty {
-    padding-top: 60px;
-    text-align: center;
-
-    p {
-      margin: var(--van-padding-md) 0;
-      color: var(--van-coupon-list-empty-tip-color);
-      font-size: var(--van-coupon-list-empty-tip-font-size);
-      line-height: var(--van-coupon-list-empty-tip-line-height);
-    }
-
-    img {
-      width: var(--van-coupon-list-empty-image-size);
-      height: var(--van-coupon-list-empty-image-size);
-    }
+  &__empty-tip {
+    color: var(--van-coupon-list-empty-tip-color);
+    font-size: var(--van-coupon-list-empty-tip-font-size);
+    line-height: var(--van-coupon-list-empty-tip-line-height);
   }
 }

package/lib/coupon-list/style/index.js

@@ -13,4 +13,5 @@ require("../../swipe/index.css");
 require("../../swipe-item/index.css");
 require("../../tabs/index.css");
 require("../../tab/index.css");
+require("../../empty/index.css");
 require("../index.css");

package/lib/coupon-list/style/less.js

@@ -13,4 +13,5 @@ require("../../swipe/index.less");
 require("../../swipe-item/index.less");
 require("../../tabs/index.less");
 require("../../tab/index.less");
+require("../../empty/index.less");
 require("../index.less");

package/lib/coupon-list/var.less

@@ -4,7 +4,6 @@
 @coupon-list-field-padding: 5px 0 5px var(--van-padding-md);
 @coupon-list-exchange-button-height: 32px;
 @coupon-list-close-button-height: 40px;
-@coupon-list-empty-image-size: 200px;
 @coupon-list-empty-tip-color: var(--van-text-color-2);
 @coupon-list-empty-tip-font-size: var(--van-font-size-md);
 @coupon-list-empty-tip-line-height: var(--van-line-height-md);

package/lib/datetime-picker/DatePicker.js

@@ -248,8 +248,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
     });
     (0, import_vue2.watch)(columns, updateColumnValue);
     (0, import_vue2.watch)(currentDate, (value, oldValue) => emit("update:modelValue", oldValue ? value : null));
-    (0, import_vue2.watch)(() => [props.filter, props.maxDate], updateInnerValue);
-    (0, import_vue2.watch)(() => props.minDate, () => {
+    (0, import_vue2.watch)(() => [props.filter, props.minDate, props.maxDate], () => {
       (0, import_vue2.nextTick)(updateInnerValue);
     });
     (0, import_vue2.watch)(() => props.modelValue, (value) => {

package/lib/dialog/types.d.ts

@@ -1,13 +1,13 @@
 import { Dialog } from './function-call';
 import type { CSSProperties, TeleportProps } from 'vue';
-import type { Interceptor } from '../utils';
+import type { Interceptor, Numeric } from '../utils';
 export declare type DialogTheme = 'default' | 'round-button';
 export declare type DialogAction = 'confirm' | 'cancel';
 export declare type DialogMessage = string | (() => JSX.Element);
 export declare type DialogMessageAlign = 'left' | 'center' | 'right';
 export declare type DialogOptions = {
     title?: string;
-    width?: string | number;
+    width?: Numeric;
     theme?: DialogTheme;
     message?: DialogMessage;
     overlay?: boolean;

package/lib/dropdown-item/types.d.ts

@@ -1,9 +1,10 @@
 import type { DropdownItemProps } from './DropdownItem';
 import type { VNode, ComponentPublicInstance } from 'vue';
+import type { Numeric } from '../utils';
 export declare type DropdownItemOption = {
     text: string;
     icon?: string;
-    value: number | string;
+    value: Numeric;
 };
 export declare type DropdownItemExpose = {
     toggle: (show?: boolean, options?: {

package/lib/index-bar/IndexBar.d.ts

@@ -1,4 +1,5 @@
 import { type PropType, type InjectionKey, type ExtractPropTypes } from 'vue';
+import { type Numeric } from '../utils';
 import { IndexBarProvide } from './types';
 declare function genAlphabet(): string[];
 declare const indexBarProps: {
@@ -14,7 +15,7 @@ declare const indexBarProps: {
         default: number;
     };
     indexList: {
-        type: PropType<(string | number)[]>;
+        type: PropType<Numeric[]>;
         default: typeof genAlphabet;
     };
 };
@@ -33,7 +34,7 @@ declare const _default: import("vue").DefineComponent<{
         default: number;
     };
     indexList: {
-        type: PropType<(string | number)[]>;
+        type: PropType<Numeric[]>;
         default: typeof genAlphabet;
     };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("select" | "change")[], "select" | "change", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
@@ -49,7 +50,7 @@ declare const _default: import("vue").DefineComponent<{
         default: number;
     };
     indexList: {
-        type: PropType<(string | number)[]>;
+        type: PropType<Numeric[]>;
         default: typeof genAlphabet;
     };
 }>> & {
@@ -58,6 +59,6 @@ declare const _default: import("vue").DefineComponent<{
 }, {
     sticky: boolean;
     stickyOffsetTop: number;
-    indexList: (string | number)[];
+    indexList: Numeric[];
 }>;
 export default _default;

package/lib/index-bar/IndexBar.js

@@ -65,6 +65,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
       children,
       linkChildren
     } = (0, import_use.useChildren)(INDEX_BAR_KEY);
+    let selectActiveIndex;
     linkChildren({
       props
     });
@@ -92,6 +93,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
       }
       return -1;
     };
+    const getMatchAnchor = (index) => children.find((item) => String(item.index) === index);
     const onScroll = () => {
       if ((0, import_utils.isHidden)(root)) {
         return;
@@ -103,7 +105,16 @@ var stdin_default = (0, import_vue2.defineComponent)({
       const scrollTop = (0, import_utils.getScrollTop)(scrollParent.value);
       const scrollParentRect = (0, import_use.useRect)(scrollParent);
       const rects = children.map((item) => item.getRect(scrollParent.value, scrollParentRect));
-      const active = getActiveAnchor(scrollTop, rects);
+      let active = -1;
+      if (selectActiveIndex) {
+        const match = getMatchAnchor(selectActiveIndex);
+        if (match) {
+          const rect = match.getRect(scrollParent.value, scrollParentRect);
+          active = getActiveAnchor(rect.top, rects);
+        }
+      } else {
+        active = getActiveAnchor(scrollTop, rects);
+      }
       activeAnchor.value = indexList[active];
       if (sticky) {
         children.forEach((item, index) => {
@@ -122,7 +133,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
           if (index === active) {
             state.active = true;
             state.top = Math.max(props.stickyOffsetTop, rects[index].top - scrollTop) + scrollParentRect.top;
-          } else if (index === active - 1) {
+          } else if (index === active - 1 && selectActiveIndex === "") {
             const activeItemTop = rects[active].top - scrollTop;
             state.active = activeItemTop > 0;
             state.top = activeItemTop + scrollParentRect.top - rects[index].height;
@@ -131,6 +142,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
           }
         });
       }
+      selectActiveIndex = "";
     };
     const init = () => {
       (0, import_vue2.nextTick)(onScroll);
@@ -156,9 +168,18 @@ var stdin_default = (0, import_vue2.defineComponent)({
       }, [index]);
     });
     const scrollTo = (index) => {
-      index = String(index);
-      const match = children.find((item) => String(item.index) === index);
+      selectActiveIndex = String(index);
+      const match = getMatchAnchor(selectActiveIndex);
       if (match) {
+        const scrollTop = (0, import_utils.getScrollTop)(scrollParent.value);
+        const scrollParentRect = (0, import_use.useRect)(scrollParent);
+        const {
+          offsetHeight
+        } = document.documentElement;
+        if (scrollTop === offsetHeight - scrollParentRect.height) {
+          onScroll();
+          return;
+        }
         match.$el.scrollIntoView();
         if (props.sticky && props.stickyOffsetTop) {
           (0, import_utils.setRootScrollTop)((0, import_utils.getRootScrollTop)() - props.stickyOffsetTop);

package/lib/index-bar/index.d.ts

@@ -12,7 +12,7 @@ export declare const IndexBar: import("../utils").WithInstall<import("vue").Defi
         default: number;
     };
     indexList: {
-        type: import("vue").PropType<(string | number)[]>;
+        type: import("vue").PropType<import("../utils").Numeric[]>;
         default: () => string[];
     };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("select" | "change")[], "select" | "change", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
@@ -28,7 +28,7 @@ export declare const IndexBar: import("../utils").WithInstall<import("vue").Defi
         default: number;
     };
     indexList: {
-        type: import("vue").PropType<(string | number)[]>;
+        type: import("vue").PropType<import("../utils").Numeric[]>;
         default: () => string[];
     };
 }>> & {
@@ -37,7 +37,7 @@ export declare const IndexBar: import("../utils").WithInstall<import("vue").Defi
 }, {
     sticky: boolean;
     stickyOffsetTop: number;
-    indexList: (string | number)[];
+    indexList: import("../utils").Numeric[];
 }>>;
 export default IndexBar;
 export type { IndexBarProps };

package/lib/index-bar/types.d.ts

@@ -1,9 +1,10 @@
 import type { ComponentPublicInstance } from 'vue';
+import type { Numeric } from '../utils';
 import type { IndexBarProps } from './IndexBar';
 export declare type IndexBarProvide = {
     props: IndexBarProps;
 };
 export declare type IndexBarExpose = {
-    scrollTo: (index: string | number) => void;
+    scrollTo: (index: Numeric) => void;
 };
 export declare type IndexBarInstance = ComponentPublicInstance<IndexBarProps, IndexBarExpose>;