vant 4.6.8 → 4.7.1

package/lib/index.d.ts

@@ -105,4 +105,4 @@ declare namespace _default {
 }
 export default _default;
 export function install(app: any): void;
-export const version: "4.6.8";
+export const version: "4.7.1";

package/lib/index.js

@@ -224,7 +224,7 @@ __reExport(stdin_exports, require("./toast"), module.exports);
 __reExport(stdin_exports, require("./tree-select"), module.exports);
 __reExport(stdin_exports, require("./uploader"), module.exports);
 __reExport(stdin_exports, require("./watermark"), module.exports);
-const version = "4.6.8";
+const version = "4.7.1";
 function install(app) {
   const components = [
     import_action_bar.ActionBar,

package/lib/notify/function-call.d.ts

@@ -1,6 +1,18 @@
 import { type ComponentInstance } from '../utils';
 import type { NotifyMessage, NotifyOptions } from './types';
+/**
+ * Close the currently displayed Notify
+ */
 export declare const closeNotify: () => void;
+/**
+ * Display Notify at the top of the page
+ */
 export declare function showNotify(options: NotifyMessage | NotifyOptions): ComponentInstance | undefined;
+/**
+ * Modify the default configuration, affecting all `showNotify` calls
+ */
 export declare const setNotifyDefaultOptions: (options: NotifyOptions) => NotifyOptions;
+/**
+ * Reset the default configuration, affecting all `showNotify` calls
+ */
 export declare const resetNotifyDefaultOptions: () => void;

package/lib/popover/Popover.js

@@ -26,6 +26,7 @@ var import_vue2 = require("vue");
 var import_popperjs = require("@vant/popperjs");
 var import_utils = require("../utils");
 var import_use = require("@vant/use");
+var import_use_scope_id = require("../composables/use-scope-id");
 var import_use_sync_prop_ref = require("../composables/use-sync-prop-ref");
 var import_icon = require("../icon");
 var import_popup = require("../popup");
@@ -203,7 +204,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
         "transition": "van-popover-zoom",
         "lockScroll": false,
         "onUpdate:show": updateShow
-      }, attrs, (0, import_utils.pick)(props, popupProps)), {
+      }, attrs, (0, import_use_scope_id.useScopeId)(), (0, import_utils.pick)(props, popupProps)), {
         default: () => [props.showArrow && (0, import_vue.createVNode)("div", {
           "class": bem("arrow")
         }, null), (0, import_vue.createVNode)("div", {

package/lib/popup/Popup.js

@@ -31,6 +31,7 @@ var import_use_lock_scroll = require("../composables/use-lock-scroll");
 var import_use_lazy_render = require("../composables/use-lazy-render");
 var import_on_popup_reopen = require("../composables/on-popup-reopen");
 var import_use_global_z_index = require("../composables/use-global-z-index");
+var import_use_scope_id = require("../composables/use-scope-id");
 var import_icon = require("../icon");
 var import_overlay = require("../overlay");
 const popupProps = (0, import_utils.extend)({}, import_shared.popupSharedProps, {
@@ -97,16 +98,17 @@ var stdin_default = (0, import_vue2.defineComponent)({
     };
     const renderOverlay = () => {
       if (props.overlay) {
-        return (0, import_vue.createVNode)(import_overlay.Overlay, {
+        return (0, import_vue.createVNode)(import_overlay.Overlay, (0, import_vue.mergeProps)({
           "show": props.show,
           "class": props.overlayClass,
           "zIndex": zIndex.value,
           "duration": props.duration,
           "customStyle": props.overlayStyle,
           "role": props.closeOnClickOverlay ? "button" : void 0,
-          "tabindex": props.closeOnClickOverlay ? 0 : void 0,
+          "tabindex": props.closeOnClickOverlay ? 0 : void 0
+        }, (0, import_use_scope_id.useScopeId)(), {
           "onClick": onClickOverlay
-        }, {
+        }), {
           default: slots["overlay-content"]
         });
       }
@@ -158,7 +160,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
           "van-safe-area-bottom": safeAreaInsetBottom
         }],
         "onKeydown": onKeydown
-      }, attrs), [(_a = slots.default) == null ? void 0 : _a.call(slots), renderCloseIcon()]), [[import_vue.vShow, props.show]]);
+      }, attrs, (0, import_use_scope_id.useScopeId)()), [(_a = slots.default) == null ? void 0 : _a.call(slots), renderCloseIcon()]), [[import_vue.vShow, props.show]]);
     });
     const renderTransition = () => {
       const {

package/lib/signature/Signature.js

@@ -91,12 +91,16 @@ var stdin_default = (0, import_vue2.defineComponent)({
       const empty = document.createElement("canvas");
       empty.width = canvas.width;
       empty.height = canvas.height;
+      if (props.backgroundColor) {
+        const emptyCtx = empty.getContext("2d");
+        setCanvasBgColor(emptyCtx);
+      }
       return canvas.toDataURL() === empty.toDataURL();
     };
-    const setCanvasBgColor = () => {
-      if (state.ctx && props.backgroundColor) {
-        state.ctx.fillStyle = props.backgroundColor;
-        state.ctx.fillRect(0, 0, state.width, state.height);
+    const setCanvasBgColor = (ctx) => {
+      if (ctx && props.backgroundColor) {
+        ctx.fillStyle = props.backgroundColor;
+        ctx.fillRect(0, 0, state.width, state.height);
       }
     };
     const submit = () => {
@@ -119,7 +123,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
       if (state.ctx) {
         state.ctx.clearRect(0, 0, state.width, state.height);
         state.ctx.closePath();
-        setCanvasBgColor();
+        setCanvasBgColor(state.ctx);
       }
       emit("clear");
     };
@@ -130,7 +134,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
         state.width = (((_b = wrapRef.value) == null ? void 0 : _b.offsetWidth) || 0) * state.ratio;
         state.height = (((_c = wrapRef.value) == null ? void 0 : _c.offsetHeight) || 0) * state.ratio;
         (0, import_vue2.nextTick)(() => {
-          setCanvasBgColor();
+          setCanvasBgColor(state.ctx);
         });
       }
     });

package/lib/swipe/Swipe.js

@@ -89,7 +89,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
     const trackStyle = (0, import_vue2.computed)(() => {
       const style = {
         transitionDuration: `${state.swiping ? 0 : props.duration}ms`,
-        transform: `translate${props.vertical ? "Y" : "X"}(${state.offset}px)`
+        transform: `translate${props.vertical ? "Y" : "X"}(${+state.offset.toFixed(2)}px)`
       };
       if (size.value) {
         const mainAxis = props.vertical ? "height" : "width";

package/lib/swipe/index.css

@@ -1 +1 @@
-:root{--van-swipe-indicator-size: 6px;--van-swipe-indicator-margin: var(--van-padding-sm);--van-swipe-indicator-active-opacity: 1;--van-swipe-indicator-inactive-opacity: .3;--van-swipe-indicator-active-background: var(--van-primary-color);--van-swipe-indicator-inactive-background: var(--van-border-color)}.van-swipe{position:relative;overflow:hidden;transform:translateZ(0);cursor:-webkit-grab;cursor:grab;-webkit-user-select:none;user-select:none}.van-swipe__track{display:flex;height:100%}.van-swipe__track--vertical{flex-direction:column}.van-swipe__indicators{position:absolute;bottom:var(--van-swipe-indicator-margin);left:50%;display:flex;transform:translate(-50%)}.van-swipe__indicators--vertical{top:50%;bottom:auto;left:var(--van-swipe-indicator-margin);flex-direction:column;transform:translateY(-50%)}.van-swipe__indicators--vertical .van-swipe__indicator:not(:last-child){margin-bottom:var(--van-swipe-indicator-size)}.van-swipe__indicator{width:var(--van-swipe-indicator-size);height:var(--van-swipe-indicator-size);background-color:var(--van-swipe-indicator-inactive-background);border-radius:100%;opacity:var(--van-swipe-indicator-inactive-opacity);transition:opacity var(--van-duration-fast),background-color var(--van-duration-fast)}.van-swipe__indicator:not(:last-child){margin-right:var(--van-swipe-indicator-size)}.van-swipe__indicator--active{background-color:var(--van-swipe-indicator-active-background);opacity:var(--van-swipe-indicator-active-opacity)}
+:root{--van-swipe-indicator-size: 6px;--van-swipe-indicator-margin: var(--van-padding-sm);--van-swipe-indicator-active-opacity: 1;--van-swipe-indicator-inactive-opacity: .3;--van-swipe-indicator-active-background: var(--van-primary-color);--van-swipe-indicator-inactive-background: var(--van-border-color)}.van-swipe{position:relative;overflow:hidden;transform:translateZ(0);cursor:-webkit-grab;cursor:grab;-webkit-user-select:none;user-select:none}.van-swipe__track{display:flex;height:100%;transition-property:transform}.van-swipe__track--vertical{flex-direction:column}.van-swipe__indicators{position:absolute;bottom:var(--van-swipe-indicator-margin);left:50%;display:flex;transform:translate(-50%)}.van-swipe__indicators--vertical{top:50%;bottom:auto;left:var(--van-swipe-indicator-margin);flex-direction:column;transform:translateY(-50%)}.van-swipe__indicators--vertical .van-swipe__indicator:not(:last-child){margin-bottom:var(--van-swipe-indicator-size)}.van-swipe__indicator{width:var(--van-swipe-indicator-size);height:var(--van-swipe-indicator-size);background-color:var(--van-swipe-indicator-inactive-background);border-radius:100%;opacity:var(--van-swipe-indicator-inactive-opacity);transition:opacity var(--van-duration-fast),background-color var(--van-duration-fast)}.van-swipe__indicator:not(:last-child){margin-right:var(--van-swipe-indicator-size)}.van-swipe__indicator--active{background-color:var(--van-swipe-indicator-active-background);opacity:var(--van-swipe-indicator-active-opacity)}

package/lib/swipe-cell/SwipeCell.js

@@ -47,6 +47,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
     let opened;
     let lockClick;
     let startOffset;
+    let isInBeforeClosing;
     const root = (0, import_vue2.ref)();
     const leftRef = (0, import_vue2.ref)();
     const rightRef = (0, import_vue2.ref)();
@@ -123,14 +124,22 @@ var stdin_default = (0, import_vue2.defineComponent)({
       }
     };
     const onClick = (position = "outside") => {
+      if (isInBeforeClosing)
+        return;
       emit("click", position);
       if (opened && !lockClick) {
+        isInBeforeClosing = true;
         (0, import_utils.callInterceptor)(props.beforeClose, {
           args: [{
             name: props.name,
             position
           }],
-          done: () => close(position)
+          done: () => {
+            isInBeforeClosing = false;
+            close(position);
+          },
+          canceled: () => isInBeforeClosing = false,
+          error: () => isInBeforeClosing = false
         });
       }
     };

package/lib/toast/function-call.d.ts

@@ -1,10 +1,36 @@
 import type { ToastType, ToastOptions, ToastWrapperInstance } from './types';
+/**
+ * Display a text toast
+ */
 export declare function showToast(options?: string | ToastOptions): ToastWrapperInstance;
+/**
+ * Display a loading toast
+ */
 export declare const showLoadingToast: (options: string | ToastOptions) => ToastWrapperInstance;
+/**
+ * Display a success toast
+ */
 export declare const showSuccessToast: (options: string | ToastOptions) => ToastWrapperInstance;
+/**
+ * Display a fail toast
+ */
 export declare const showFailToast: (options: string | ToastOptions) => ToastWrapperInstance;
+/**
+ * Close the currently displayed toast
+ */
 export declare const closeToast: (all?: boolean) => void;
+/**
+ * Modify the default configuration that affects all `showToast` calls.
+ * Specify the `type` parameter to modify the default configuration of a specific type of toast
+ */
 export declare function setToastDefaultOptions(options: ToastOptions): void;
 export declare function setToastDefaultOptions(type: ToastType, options: ToastOptions): void;
+/**
+ * Reset the default configuration that affects all `showToast` calls.
+ * Specify the `type` parameter to reset the default configuration of a specific type of toast
+ */
 export declare const resetToastDefaultOptions: (type?: ToastType) => void;
+/**
+ * Allow multiple toasts to be displayed as the same time
+ */
 export declare const allowMultipleToast: (value?: boolean) => void;

package/lib/uploader/index.css

@@ -1 +1 @@
-:root{--van-uploader-size: 80px;--van-uploader-icon-size: 24px;--van-uploader-icon-color: var(--van-gray-4);--van-uploader-text-color: var(--van-text-color-2);--van-uploader-text-font-size: var(--van-font-size-sm);--van-uploader-upload-background: var(--van-gray-1);--van-uploader-upload-active-color: var(--van-active-color);--van-uploader-delete-color: var(--van-white);--van-uploader-delete-icon-size: 14px;--van-uploader-delete-background: rgba(0, 0, 0, .7);--van-uploader-file-background: var(--van-background);--van-uploader-file-icon-size: 20px;--van-uploader-file-icon-color: var(--van-gray-7);--van-uploader-file-name-padding: 0 var(--van-padding-base);--van-uploader-file-name-margin-top: var(--van-padding-xs);--van-uploader-file-name-font-size: var(--van-font-size-sm);--van-uploader-file-name-text-color: var(--van-gray-7);--van-uploader-mask-text-color: var(--van-white);--van-uploader-mask-background: rgba(50, 50, 51, .88);--van-uploader-mask-icon-size: 22px;--van-uploader-mask-message-font-size: var(--van-font-size-sm);--van-uploader-mask-message-line-height: var(--van-line-height-xs);--van-uploader-loading-icon-size: 22px;--van-uploader-loading-icon-color: var(--van-white);--van-uploader-disabled-opacity: var(--van-disabled-opacity)}.van-uploader{position:relative;display:inline-block}.van-uploader__wrapper{display:flex;flex-wrap:wrap}.van-uploader__wrapper--disabled{opacity:var(--van-uploader-disabled-opacity)}.van-uploader__input{position:absolute;top:0;left:0;width:100%;height:100%;overflow:hidden;cursor:pointer;opacity:0}.van-uploader__input-wrapper{position:relative}.van-uploader__input:disabled{cursor:not-allowed}.van-uploader__upload{position:relative;display:flex;flex-direction:column;align-items:center;justify-content:center;box-sizing:border-box;width:var(--van-uploader-size);height:var(--van-uploader-size);margin:0 var(--van-padding-xs) var(--van-padding-xs) 0;background:var(--van-uploader-upload-background)}.van-uploader__upload:active{background-color:var(--van-uploader-upload-active-color)}.van-uploader__upload--readonly:active{background-color:var(--van-uploader-upload-background)}.van-uploader__upload-icon{color:var(--van-uploader-icon-color);font-size:var(--van-uploader-icon-size)}.van-uploader__upload-text{margin-top:var(--van-padding-xs);color:var(--van-uploader-text-color);font-size:var(--van-uploader-text-font-size)}.van-uploader__preview{position:relative;margin:0 var(--van-padding-xs) var(--van-padding-xs) 0;cursor:pointer}.van-uploader__preview-image{display:block;width:var(--van-uploader-size);height:var(--van-uploader-size);overflow:hidden}.van-uploader__preview-delete{position:absolute;top:0;right:0}.van-uploader__preview-delete--shadow{width:var(--van-uploader-delete-icon-size);height:var(--van-uploader-delete-icon-size);background:var(--van-uploader-delete-background);border-radius:0 0 0 12px}.van-uploader__preview-delete-icon{position:absolute;top:0;right:0;color:var(--van-uploader-delete-color);font-size:var(--van-uploader-delete-icon-size);transform:scale(.7) translate(10%,-10%)}.van-uploader__preview-cover{position:absolute;top:0;right:0;bottom:0;left:0}.van-uploader__mask{position:absolute;top:0;right:0;bottom:0;left:0;display:flex;flex-direction:column;align-items:center;justify-content:center;color:var(--van-uploader-mask-text-color);background:var(--van-uploader-mask-background)}.van-uploader__mask-icon{font-size:var(--van-uploader-mask-icon-size)}.van-uploader__mask-message{margin-top:6px;padding:0 var(--van-padding-base);font-size:var(--van-uploader-mask-message-font-size);line-height:var(--van-uploader-mask-message-line-height)}.van-uploader__loading{width:var(--van-uploader-loading-icon-size);height:var(--van-uploader-loading-icon-size);color:var(--van-uploader-loading-icon-color)}.van-uploader__file{display:flex;flex-direction:column;align-items:center;justify-content:center;width:var(--van-uploader-size);height:var(--van-uploader-size);background:var(--van-uploader-file-background)}.van-uploader__file-icon{color:var(--van-uploader-file-icon-color);font-size:var(--van-uploader-file-icon-size)}.van-uploader__file-name{box-sizing:border-box;width:100%;margin-top:var(--van-uploader-file-name-margin-top);padding:var(--van-uploader-file-name-padding);color:var(--van-uploader-file-name-text-color);font-size:var(--van-uploader-file-name-font-size);text-align:center}
+:root{--van-uploader-size: 80px;--van-uploader-icon-size: 24px;--van-uploader-icon-color: var(--van-gray-4);--van-uploader-text-color: var(--van-text-color-2);--van-uploader-text-font-size: var(--van-font-size-sm);--van-uploader-upload-background: var(--van-gray-1);--van-uploader-upload-active-color: var(--van-active-color);--van-uploader-delete-color: var(--van-white);--van-uploader-delete-icon-size: 14px;--van-uploader-delete-background: rgba(0, 0, 0, .7);--van-uploader-file-background: var(--van-background);--van-uploader-file-icon-size: 20px;--van-uploader-file-icon-color: var(--van-gray-7);--van-uploader-file-name-padding: 0 var(--van-padding-base);--van-uploader-file-name-margin-top: var(--van-padding-xs);--van-uploader-file-name-font-size: var(--van-font-size-sm);--van-uploader-file-name-text-color: var(--van-gray-7);--van-uploader-mask-text-color: var(--van-white);--van-uploader-mask-background: rgba(50, 50, 51, .88);--van-uploader-mask-icon-size: 22px;--van-uploader-mask-message-font-size: var(--van-font-size-sm);--van-uploader-mask-message-line-height: var(--van-line-height-xs);--van-uploader-loading-icon-size: 22px;--van-uploader-loading-icon-color: var(--van-white);--van-uploader-disabled-opacity: var(--van-disabled-opacity);--van-uploader-border-radius: 0px}.van-uploader{position:relative;display:inline-block}.van-uploader__wrapper{display:flex;flex-wrap:wrap}.van-uploader__wrapper--disabled{opacity:var(--van-uploader-disabled-opacity)}.van-uploader__input{position:absolute;top:0;left:0;width:100%;height:100%;overflow:hidden;cursor:pointer;opacity:0}.van-uploader__input-wrapper{position:relative}.van-uploader__input:disabled{cursor:not-allowed}.van-uploader__upload{position:relative;display:flex;flex-direction:column;align-items:center;justify-content:center;box-sizing:border-box;width:var(--van-uploader-size);height:var(--van-uploader-size);margin:0 var(--van-padding-xs) var(--van-padding-xs) 0;background:var(--van-uploader-upload-background);border-radius:var(--van-uploader-border-radius)}.van-uploader__upload:active{background-color:var(--van-uploader-upload-active-color)}.van-uploader__upload--readonly:active{background-color:var(--van-uploader-upload-background)}.van-uploader__upload-icon{color:var(--van-uploader-icon-color);font-size:var(--van-uploader-icon-size)}.van-uploader__upload-text{margin-top:var(--van-padding-xs);color:var(--van-uploader-text-color);font-size:var(--van-uploader-text-font-size)}.van-uploader__preview{position:relative;margin:0 var(--van-padding-xs) var(--van-padding-xs) 0;cursor:pointer}.van-uploader__preview-image{display:block;width:var(--van-uploader-size);height:var(--van-uploader-size);overflow:hidden;border-radius:var(--van-uploader-border-radius)}.van-uploader__preview-delete{position:absolute;top:0;right:0}.van-uploader__preview-delete--shadow{width:var(--van-uploader-delete-icon-size);height:var(--van-uploader-delete-icon-size);background:var(--van-uploader-delete-background);border-radius:0 0 0 12px}.van-uploader__preview-delete-icon{position:absolute;top:0;right:0;color:var(--van-uploader-delete-color);font-size:var(--van-uploader-delete-icon-size);transform:scale(.7) translate(10%,-10%)}.van-uploader__preview-cover{position:absolute;top:0;right:0;bottom:0;left:0}.van-uploader__mask{position:absolute;top:0;right:0;bottom:0;left:0;display:flex;flex-direction:column;align-items:center;justify-content:center;color:var(--van-uploader-mask-text-color);background:var(--van-uploader-mask-background);border-radius:var(--van-uploader-border-radius)}.van-uploader__mask-icon{font-size:var(--van-uploader-mask-icon-size)}.van-uploader__mask-message{margin-top:6px;padding:0 var(--van-padding-base);font-size:var(--van-uploader-mask-message-font-size);line-height:var(--van-uploader-mask-message-line-height)}.van-uploader__loading{width:var(--van-uploader-loading-icon-size);height:var(--van-uploader-loading-icon-size);color:var(--van-uploader-loading-icon-color)}.van-uploader__file{display:flex;flex-direction:column;align-items:center;justify-content:center;width:var(--van-uploader-size);height:var(--van-uploader-size);background:var(--van-uploader-file-background)}.van-uploader__file-icon{color:var(--van-uploader-file-icon-color);font-size:var(--van-uploader-file-icon-size)}.van-uploader__file-name{box-sizing:border-box;width:100%;margin-top:var(--van-uploader-file-name-margin-top);padding:var(--van-uploader-file-name-padding);color:var(--van-uploader-file-name-text-color);font-size:var(--van-uploader-file-name-font-size);text-align:center}

package/lib/utils/interceptor.d.ts

@@ -1,6 +1,7 @@
 export type Interceptor = (...args: any[]) => Promise<boolean> | boolean | undefined | void;
-export declare function callInterceptor(interceptor: Interceptor | undefined, { args, done, canceled, }: {
+export declare function callInterceptor(interceptor: Interceptor | undefined, { args, done, canceled, error, }: {
     args?: unknown[];
     done: () => void;
     canceled?: () => void;
+    error?: () => void;
 }): void;

package/lib/utils/interceptor.js

@@ -24,7 +24,8 @@ var import_basic = require("./basic");
 function callInterceptor(interceptor, {
   args = [],
   done,
-  canceled
+  canceled,
+  error
 }) {
   if (interceptor) {
     const returnVal = interceptor.apply(null, args);
@@ -35,7 +36,7 @@ function callInterceptor(interceptor, {
         } else if (canceled) {
           canceled();
         }
-      }).catch(import_basic.noop);
+      }).catch(error || import_basic.noop);
     } else if (returnVal) {
       done();
     } else if (canceled) {

package/lib/vant.cjs.js

@@ -380,7 +380,8 @@ const TAP_OFFSET = 5;
 function callInterceptor(interceptor, {
   args = [],
   done,
-  canceled
+  canceled,
+  error
 }) {
   if (interceptor) {
     const returnVal = interceptor.apply(null, args);
@@ -391,7 +392,7 @@ function callInterceptor(interceptor, {
         } else if (canceled) {
           canceled();
         }
-      }).catch(noop);
+      }).catch(error || noop);
     } else if (returnVal) {
       done();
     } else if (canceled) {
@@ -1249,6 +1250,11 @@ function useLazyRender(show) {
   );
   return (render) => () => inited.value ? render() : null;
 }
+const useScopeId = () => {
+  var _a;
+  const { scopeId } = ((_a = vue.getCurrentInstance()) == null ? void 0 : _a.vnode) || {};
+  return scopeId ? { [scopeId]: "" } : null;
+};
 const [name$1B, bem$1w] = createNamespace("overlay");
 const overlayProps = {
   show: Boolean,
@@ -1360,16 +1366,17 @@ var stdin_default$1J = vue.defineComponent({
     };
     const renderOverlay = () => {
       if (props2.overlay) {
-        return vue.createVNode(Overlay, {
+        return vue.createVNode(Overlay, vue.mergeProps({
           "show": props2.show,
           "class": props2.overlayClass,
           "zIndex": zIndex.value,
           "duration": props2.duration,
           "customStyle": props2.overlayStyle,
           "role": props2.closeOnClickOverlay ? "button" : void 0,
-          "tabindex": props2.closeOnClickOverlay ? 0 : void 0,
+          "tabindex": props2.closeOnClickOverlay ? 0 : void 0
+        }, useScopeId(), {
           "onClick": onClickOverlay
-        }, {
+        }), {
           default: slots["overlay-content"]
         });
       }
@@ -1421,7 +1428,7 @@ var stdin_default$1J = vue.defineComponent({
           "van-safe-area-bottom": safeAreaInsetBottom
         }],
         "onKeydown": onKeydown
-      }, attrs), [(_a = slots.default) == null ? void 0 : _a.call(slots), renderCloseIcon()]), [[vue.vShow, props2.show]]);
+      }, attrs, useScopeId()), [(_a = slots.default) == null ? void 0 : _a.call(slots), renderCloseIcon()]), [[vue.vShow, props2.show]]);
     });
     const renderTransition = () => {
       const {
@@ -2221,7 +2228,7 @@ var stdin_default$1E = vue.defineComponent({
     const trackStyle = vue.computed(() => {
       const style = {
         transitionDuration: `${state.swiping ? 0 : props2.duration}ms`,
-        transform: `translate${props2.vertical ? "Y" : "X"}(${state.offset}px)`
+        transform: `translate${props2.vertical ? "Y" : "X"}(${+state.offset.toFixed(2)}px)`
       };
       if (size.value) {
         const mainAxis = props2.vertical ? "height" : "width";
@@ -4992,7 +4999,7 @@ const addressEditProps = {
 var stdin_default$1q = vue.defineComponent({
   name: name$1g,
   props: addressEditProps,
-  emits: ["save", "focus", "delete", "clickArea", "changeArea", "changeDetail", "selectSearch", "changeDefault"],
+  emits: ["save", "focus", "change", "delete", "clickArea", "changeArea", "changeDetail", "selectSearch", "changeDefault"],
   setup(props2, {
     emit,
     slots
@@ -5026,6 +5033,12 @@ var stdin_default$1q = vue.defineComponent({
       detailFocused.value = key === "addressDetail";
       emit("focus", key);
     };
+    const onChange = (key, value) => {
+      emit("change", {
+        key,
+        value
+      });
+    };
     const rules = vue.computed(() => {
       const {
         validator,
@@ -5137,7 +5150,7 @@ var stdin_default$1q = vue.defineComponent({
             "class": bem$1c("fields")
           }, [vue.createVNode(Field, {
             "modelValue": data.name,
-            "onUpdate:modelValue": ($event) => data.name = $event,
+            "onUpdate:modelValue": [($event) => data.name = $event, (val) => onChange("name", val)],
             "clearable": true,
             "label": t$i("name"),
             "rules": rules.value.name,
@@ -5145,7 +5158,7 @@ var stdin_default$1q = vue.defineComponent({
             "onFocus": () => onFocus("name")
           }, null), vue.createVNode(Field, {
             "modelValue": data.tel,
-            "onUpdate:modelValue": ($event) => data.tel = $event,
+            "onUpdate:modelValue": [($event) => data.tel = $event, (val) => onChange("tel", val)],
             "clearable": true,
             "type": "tel",
             "label": t$i("tel"),
@@ -6140,7 +6153,7 @@ var stdin_default$1h = vue.defineComponent({
     offset: makeNumberProp(0),
     rowHeight: String
   },
-  emits: ["click"],
+  emits: ["click", "clickDisabledDate"],
   setup(props2, {
     emit,
     slots
@@ -6186,6 +6199,8 @@ var stdin_default$1h = vue.defineComponent({
     const onClick = () => {
       if (props2.item.type !== "disabled") {
         emit("click", props2.item);
+      } else {
+        emit("clickDisabledDate", props2.item);
       }
     };
     const renderTopInfo = () => {
@@ -6272,7 +6287,7 @@ const calendarMonthProps = {
 var stdin_default$1g = vue.defineComponent({
   name: name$16,
   props: calendarMonthProps,
-  emits: ["click"],
+  emits: ["click", "clickDisabledDate"],
   setup(props2, {
     emit,
     slots
@@ -6431,7 +6446,8 @@ var stdin_default$1g = vue.defineComponent({
       "color": props2.color,
       "offset": offset.value,
       "rowHeight": rowHeight.value,
-      "onClick": (item2) => emit("click", item2)
+      "onClick": (item2) => emit("click", item2),
+      "onClickDisabledDate": (item2) => emit("clickDisabledDate", item2)
     }, pick(slots, ["top-info", "bottom-info"]));
     const renderDays = () => vue.createVNode("div", {
       "ref": daysRef,
@@ -6556,7 +6572,7 @@ const calendarProps = {
 var stdin_default$1e = vue.defineComponent({
   name: name$18,
   props: calendarProps,
-  emits: ["select", "confirm", "unselect", "monthShow", "overRange", "update:show", "clickSubtitle"],
+  emits: ["select", "confirm", "unselect", "monthShow", "overRange", "update:show", "clickSubtitle", "clickDisabledDate"],
   setup(props2, {
     emit,
     slots
@@ -6824,7 +6840,8 @@ var stdin_default$1e = vue.defineComponent({
         "showMonthTitle": showMonthTitle,
         "firstDayOfWeek": dayOffset.value
       }, pick(props2, ["type", "color", "minDate", "maxDate", "showMark", "formatter", "rowHeight", "lazyRender", "showSubtitle", "allowSameDay"]), {
-        "onClick": onClickDay
+        "onClick": onClickDay,
+        "onClickDisabledDate": (item) => emit("clickDisabledDate", item)
       }), pick(slots, ["top-info", "bottom-info", "month-title"]));
     };
     const renderFooterButton = () => {
@@ -7442,7 +7459,7 @@ var stdin_default$1a = vue.defineComponent({
         }), {
           [BORDER_TOP_BOTTOM]: props2.border && !props2.inset
         }]
-      }, attrs), [(_a = slots.default) == null ? void 0 : _a.call(slots)]);
+      }, attrs, useScopeId()), [(_a = slots.default) == null ? void 0 : _a.call(slots)]);
     };
     const renderTitle = () => vue.createVNode("div", {
       "class": bem$10("title", {
@@ -9402,7 +9419,7 @@ function initInstance$2() {
 }
 function showDialog(options) {
   if (!inBrowser) {
-    return Promise.resolve();
+    return Promise.resolve(void 0);
   }
   return new Promise((resolve, reject) => {
     if (!instance$2) {
@@ -9943,7 +9960,7 @@ const FloatingBubble = withInstall(stdin_default$R);
 const floatingPanelProps = {
   height: makeNumericProp(0),
   anchors: makeArrayProp(),
-  duration: makeNumericProp(0.2),
+  duration: makeNumericProp(0.3),
   contentDraggable: truthProp,
   lockScroll: Boolean,
   safeAreaInsetBottom: truthProp
@@ -9973,7 +9990,7 @@ var stdin_default$Q = vue.defineComponent({
     const rootStyle = vue.computed(() => ({
       height: addUnit(boundary.value.max),
       transform: `translateY(calc(100% + ${addUnit(-height.value)}))`,
-      transition: !dragging.value ? `transform ${props2.duration}s` : "none"
+      transition: !dragging.value ? `transform ${props2.duration}s cubic-bezier(0.18, 0.89, 0.32, 1.28)` : "none"
     }));
     const ease = (moveY) => {
       const absDistance = Math.abs(moveY);
@@ -10033,7 +10050,7 @@ var stdin_default$Q = vue.defineComponent({
     }, {
       immediate: true
     });
-    useLockScroll(rootRef, () => props2.lockScroll);
+    useLockScroll(rootRef, () => props2.lockScroll || dragging.value);
     use.useEventListener("touchmove", onTouchmove, {
       target: rootRef
     });
@@ -12256,7 +12273,7 @@ var stdin_default$B = vue.defineComponent({
         "transition": "van-popover-zoom",
         "lockScroll": false,
         "onUpdate:show": updateShow
-      }, attrs, pick(props2, popupProps)), {
+      }, attrs, useScopeId(), pick(props2, popupProps)), {
         default: () => [props2.showArrow && vue.createVNode("div", {
           "class": bem$s("arrow")
         }, null), vue.createVNode("div", {
@@ -13259,12 +13276,16 @@ var stdin_default$r = vue.defineComponent({
       const empty = document.createElement("canvas");
       empty.width = canvas.width;
       empty.height = canvas.height;
+      if (props2.backgroundColor) {
+        const emptyCtx = empty.getContext("2d");
+        setCanvasBgColor(emptyCtx);
+      }
       return canvas.toDataURL() === empty.toDataURL();
     };
-    const setCanvasBgColor = () => {
-      if (state.ctx && props2.backgroundColor) {
-        state.ctx.fillStyle = props2.backgroundColor;
-        state.ctx.fillRect(0, 0, state.width, state.height);
+    const setCanvasBgColor = (ctx) => {
+      if (ctx && props2.backgroundColor) {
+        ctx.fillStyle = props2.backgroundColor;
+        ctx.fillRect(0, 0, state.width, state.height);
       }
     };
     const submit = () => {
@@ -13287,7 +13308,7 @@ var stdin_default$r = vue.defineComponent({
       if (state.ctx) {
         state.ctx.clearRect(0, 0, state.width, state.height);
         state.ctx.closePath();
-        setCanvasBgColor();
+        setCanvasBgColor(state.ctx);
       }
       emit("clear");
     };
@@ -13298,7 +13319,7 @@ var stdin_default$r = vue.defineComponent({
         state.width = (((_b = wrapRef.value) == null ? void 0 : _b.offsetWidth) || 0) * state.ratio;
         state.height = (((_c = wrapRef.value) == null ? void 0 : _c.offsetHeight) || 0) * state.ratio;
         vue.nextTick(() => {
-          setCanvasBgColor();
+          setCanvasBgColor(state.ctx);
         });
       }
     });
@@ -14372,6 +14393,7 @@ var stdin_default$c = vue.defineComponent({
     let opened;
     let lockClick2;
     let startOffset;
+    let isInBeforeClosing;
     const root = vue.ref();
     const leftRef = vue.ref();
     const rightRef = vue.ref();
@@ -14448,14 +14470,22 @@ var stdin_default$c = vue.defineComponent({
       }
     };
     const onClick = (position = "outside") => {
+      if (isInBeforeClosing)
+        return;
       emit("click", position);
       if (opened && !lockClick2) {
+        isInBeforeClosing = true;
         callInterceptor(props2.beforeClose, {
           args: [{
             name: props2.name,
             position
           }],
-          done: () => close(position)
+          done: () => {
+            isInBeforeClosing = false;
+            close(position);
+          },
+          canceled: () => isInBeforeClosing = false,
+          error: () => isInBeforeClosing = false
         });
       }
     };
@@ -16475,7 +16505,7 @@ const Lazyload = {
     });
   }
 };
-const version = "4.6.8";
+const version = "4.7.1";
 function install(app) {
   const components = [
     ActionBar,