vant 4.6.8 → 4.7.0

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.0";

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.0";
 function install(app) {
   const components = [
     import_action_bar.ActionBar,

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-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/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) {
@@ -4992,7 +4993,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 +5027,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 +5144,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 +5152,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 +6147,7 @@ var stdin_default$1h = vue.defineComponent({
     offset: makeNumberProp(0),
     rowHeight: String
   },
-  emits: ["click"],
+  emits: ["click", "clickDisabledDate"],
   setup(props2, {
     emit,
     slots
@@ -6186,6 +6193,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 +6281,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 +6440,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 +6566,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 +6834,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 = () => {
@@ -9402,7 +9413,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) {
@@ -10033,7 +10044,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
     });
@@ -13259,12 +13270,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 +13302,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 +13313,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 +14387,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 +14464,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 +16499,7 @@ const Lazyload = {
     });
   }
 };
-const version = "4.6.8";
+const version = "4.7.0";
 function install(app) {
   const components = [
     ActionBar,

package/lib/vant.es.js

@@ -378,7 +378,8 @@ const TAP_OFFSET = 5;
 function callInterceptor(interceptor, {
   args = [],
   done,
-  canceled
+  canceled,
+  error
 }) {
   if (interceptor) {
     const returnVal = interceptor.apply(null, args);
@@ -389,7 +390,7 @@ function callInterceptor(interceptor, {
         } else if (canceled) {
           canceled();
         }
-      }).catch(noop);
+      }).catch(error || noop);
     } else if (returnVal) {
       done();
     } else if (canceled) {
@@ -4990,7 +4991,7 @@ const addressEditProps = {
 var stdin_default$1q = 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
@@ -5024,6 +5025,12 @@ var stdin_default$1q = defineComponent({
       detailFocused.value = key === "addressDetail";
       emit("focus", key);
     };
+    const onChange = (key, value) => {
+      emit("change", {
+        key,
+        value
+      });
+    };
     const rules = computed(() => {
       const {
         validator,
@@ -5135,7 +5142,7 @@ var stdin_default$1q = defineComponent({
             "class": bem$1c("fields")
           }, [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,
@@ -5143,7 +5150,7 @@ var stdin_default$1q = defineComponent({
             "onFocus": () => onFocus("name")
           }, null), 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"),
@@ -6138,7 +6145,7 @@ var stdin_default$1h = defineComponent({
     offset: makeNumberProp(0),
     rowHeight: String
   },
-  emits: ["click"],
+  emits: ["click", "clickDisabledDate"],
   setup(props2, {
     emit,
     slots
@@ -6184,6 +6191,8 @@ var stdin_default$1h = defineComponent({
     const onClick = () => {
       if (props2.item.type !== "disabled") {
         emit("click", props2.item);
+      } else {
+        emit("clickDisabledDate", props2.item);
       }
     };
     const renderTopInfo = () => {
@@ -6270,7 +6279,7 @@ const calendarMonthProps = {
 var stdin_default$1g = defineComponent({
   name: name$16,
   props: calendarMonthProps,
-  emits: ["click"],
+  emits: ["click", "clickDisabledDate"],
   setup(props2, {
     emit,
     slots
@@ -6429,7 +6438,8 @@ var stdin_default$1g = 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 = () => createVNode("div", {
       "ref": daysRef,
@@ -6554,7 +6564,7 @@ const calendarProps = {
 var stdin_default$1e = 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
@@ -6822,7 +6832,8 @@ var stdin_default$1e = 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 = () => {
@@ -9400,7 +9411,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) {
@@ -10031,7 +10042,7 @@ var stdin_default$Q = defineComponent({
     }, {
       immediate: true
     });
-    useLockScroll(rootRef, () => props2.lockScroll);
+    useLockScroll(rootRef, () => props2.lockScroll || dragging.value);
     useEventListener("touchmove", onTouchmove, {
       target: rootRef
     });
@@ -13257,12 +13268,16 @@ var stdin_default$r = 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 = () => {
@@ -13285,7 +13300,7 @@ var stdin_default$r = defineComponent({
       if (state.ctx) {
         state.ctx.clearRect(0, 0, state.width, state.height);
         state.ctx.closePath();
-        setCanvasBgColor();
+        setCanvasBgColor(state.ctx);
       }
       emit("clear");
     };
@@ -13296,7 +13311,7 @@ var stdin_default$r = 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;
         nextTick(() => {
-          setCanvasBgColor();
+          setCanvasBgColor(state.ctx);
         });
       }
     });
@@ -14370,6 +14385,7 @@ var stdin_default$c = defineComponent({
     let opened;
     let lockClick2;
     let startOffset;
+    let isInBeforeClosing;
     const root = ref();
     const leftRef = ref();
     const rightRef = ref();
@@ -14446,14 +14462,22 @@ var stdin_default$c = 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
         });
       }
     };
@@ -16473,7 +16497,7 @@ const Lazyload = {
     });
   }
 };
-const version = "4.6.8";
+const version = "4.7.0";
 function install(app) {
   const components = [
     ActionBar,