vant 4.6.8 → 4.7.0

package/lib/vant.js

@@ -768,7 +768,8 @@
   function callInterceptor(interceptor, {
     args = [],
     done,
-    canceled
+    canceled,
+    error
   }) {
     if (interceptor) {
       const returnVal = interceptor.apply(null, args);
@@ -779,7 +780,7 @@
           } else if (canceled) {
             canceled();
           }
-        }).catch(noop);
+        }).catch(error || noop);
       } else if (returnVal) {
         done();
       } else if (canceled) {
@@ -5451,7 +5452,7 @@
   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
@@ -5485,6 +5486,12 @@
         detailFocused.value = key === "addressDetail";
         emit("focus", key);
       };
+      const onChange = (key, value) => {
+        emit("change", {
+          key,
+          value
+        });
+      };
       const rules = vue.computed(() => {
         const {
           validator,
@@ -5596,7 +5603,7 @@
               "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,
@@ -5604,7 +5611,7 @@
               "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"),
@@ -6596,7 +6603,7 @@
       offset: makeNumberProp(0),
       rowHeight: String
     },
-    emits: ["click"],
+    emits: ["click", "clickDisabledDate"],
     setup(props2, {
       emit,
       slots
@@ -6642,6 +6649,8 @@
       const onClick = () => {
         if (props2.item.type !== "disabled") {
           emit("click", props2.item);
+        } else {
+          emit("clickDisabledDate", props2.item);
         }
       };
       const renderTopInfo = () => {
@@ -6728,7 +6737,7 @@
   var stdin_default$1g = vue.defineComponent({
     name: name$16,
     props: calendarMonthProps,
-    emits: ["click"],
+    emits: ["click", "clickDisabledDate"],
     setup(props2, {
       emit,
       slots
@@ -6887,7 +6896,8 @@
         "color": props2.color,
         "offset": offset2.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,
@@ -7012,7 +7022,7 @@
   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
@@ -7280,7 +7290,8 @@
           "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 = () => {
@@ -9838,7 +9849,7 @@
   }
   function showDialog(options) {
     if (!inBrowser$1) {
-      return Promise.resolve();
+      return Promise.resolve(void 0);
     }
     return new Promise((resolve, reject) => {
       if (!instance$2) {
@@ -10466,7 +10477,7 @@
       }, {
         immediate: true
       });
-      useLockScroll(rootRef, () => props2.lockScroll);
+      useLockScroll(rootRef, () => props2.lockScroll || dragging.value);
       useEventListener("touchmove", onTouchmove, {
         target: rootRef
       });
@@ -14495,12 +14506,16 @@
         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 = () => {
@@ -14523,7 +14538,7 @@
         if (state.ctx) {
           state.ctx.clearRect(0, 0, state.width, state.height);
           state.ctx.closePath();
-          setCanvasBgColor();
+          setCanvasBgColor(state.ctx);
         }
         emit("clear");
       };
@@ -14534,7 +14549,7 @@
           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);
           });
         }
       });
@@ -15605,6 +15620,7 @@
       let opened;
       let lockClick2;
       let startOffset;
+      let isInBeforeClosing;
       const root = vue.ref();
       const leftRef = vue.ref();
       const rightRef = vue.ref();
@@ -15681,14 +15697,22 @@
         }
       };
       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
           });
         }
       };
@@ -17685,7 +17709,7 @@
       });
     }
   };
-  const version = "4.6.8";
+  const version = "4.7.0";
   function install(app) {
     const components = [
       ActionBar,