vant 3.4.1 → 3.4.2

package/lib/vant.es.js

@@ -1093,6 +1093,7 @@ const overlayProps = {
   duration: numericProp,
   className: unknownProp,
   lockScroll: truthProp,
+  lazyRender: truthProp,
   customStyle: Object
 };
 var stdin_default$1t = defineComponent({
@@ -1101,7 +1102,7 @@ var stdin_default$1t = defineComponent({
   setup(props, {
     slots
   }) {
-    const lazyRender = useLazyRender(() => props.show);
+    const lazyRender = useLazyRender(() => props.show || !props.lazyRender);
     const preventTouchMove = (event) => {
       preventDefault(event, true);
     };
@@ -4208,9 +4209,13 @@ const proxyPickerMethods = (picker, callback) => {
 };
 const useHeight = (element) => {
   const height = ref();
-  onMounted(() => nextTick(() => {
+  const setHeight = () => {
     height.value = useRect(element).height;
-  }));
+  };
+  onMounted(() => {
+    nextTick(setHeight);
+    setTimeout(setHeight, 100);
+  });
   return height;
 };
 const [name$13] = createNamespace("calendar-day");
@@ -4839,7 +4844,12 @@ var stdin_default$17 = defineComponent({
           if (compareToStart === 1) {
             const disabledDay = getDisabledDate(disabledDays.value, startDay, date);
             if (disabledDay) {
-              select([startDay, getPrevDay(disabledDay)]);
+              const endDay2 = getPrevDay(disabledDay);
+              if (compareDay(startDay, endDay2) === -1) {
+                select([startDay, endDay2]);
+              } else {
+                select([date]);
+              }
             } else {
               select([startDay, date], true);
             }
@@ -4963,6 +4973,7 @@ const imageProps = {
   src: String,
   alt: String,
   fit: String,
+  position: String,
   round: Boolean,
   width: numericProp,
   height: numericProp,
@@ -5044,7 +5055,8 @@ var stdin_default$16 = defineComponent({
         alt: props.alt,
         class: bem$$("img"),
         style: {
-          objectFit: props.fit
+          objectFit: props.fit,
+          objectPosition: props.position
         }
       };
       if (props.lazyLoad) {
@@ -5061,8 +5073,15 @@ var stdin_default$16 = defineComponent({
     const onLazyLoaded = ({
       el
     }) => {
-      if (el === imageRef.value && loading.value) {
-        onLoad();
+      const check = () => {
+        if (el === imageRef.value && loading.value) {
+          onLoad();
+        }
+      };
+      if (imageRef.value) {
+        check();
+      } else {
+        nextTick(check);
       }
     };
     const onLazyLoadError = ({
@@ -6374,6 +6393,7 @@ const cascaderProps = {
   closeable: truthProp,
   swipeable: truthProp,
   closeIcon: makeStringProp("cross"),
+  showHeader: truthProp,
   modelValue: numericProp,
   fieldNames: Object,
   placeholder: String,
@@ -6487,7 +6507,7 @@ var stdin_default$Z = defineComponent({
       name: name2,
       title
     }) => emit("click-tab", name2, title);
-    const renderHeader = () => createVNode("div", {
+    const renderHeader = () => props.showHeader ? createVNode("div", {
       "class": bem$S("header")
     }, [createVNode("h2", {
       "class": bem$S("title")
@@ -6495,7 +6515,7 @@ var stdin_default$Z = defineComponent({
       "name": props.closeIcon,
       "class": [bem$S("close-icon"), HAPTICS_FEEDBACK],
       "onClick": onClose
-    }, null) : null]);
+    }, null) : null]) : null;
     const renderOption = (option, selectedOption, tabIndex) => {
       const {
         disabled
@@ -9174,7 +9194,7 @@ var stdin_default$z = defineComponent({
       return 0;
     });
     const setScale = (scale) => {
-      scale = clamp(scale, +props.minZoom, +props.maxZoom);
+      scale = clamp(scale, +props.minZoom, +props.maxZoom + 1);
       if (scale !== state.scale) {
         state.scale = scale;
         emit("scale", {
@@ -9194,6 +9214,7 @@ var stdin_default$z = defineComponent({
       state.moveX = 0;
       state.moveY = 0;
     };
+    let fingerNum;
     let startMoveX;
     let startMoveY;
     let startScale;
@@ -9208,11 +9229,12 @@ var stdin_default$z = defineComponent({
         offsetX
       } = touch;
       touch.start(event);
+      fingerNum = touches.length;
       startMoveX = state.moveX;
       startMoveY = state.moveY;
       touchStartTime = Date.now();
-      state.moving = touches.length === 1 && state.scale !== 1;
-      state.zooming = touches.length === 2 && !offsetX.value;
+      state.moving = fingerNum === 1 && state.scale !== 1;
+      state.zooming = fingerNum === 2 && !offsetX.value;
       if (state.zooming) {
         startScale = state.scale;
         startDistance = getDistance(event.touches);
@@ -9243,13 +9265,16 @@ var stdin_default$z = defineComponent({
       }
     };
     const checkTap = () => {
+      if (fingerNum > 1) {
+        return;
+      }
       const {
         offsetX,
         offsetY
       } = touch;
       const deltaTime = Date.now() - touchStartTime;
       const TAP_TIME = 250;
-      const TAP_OFFSET = 10;
+      const TAP_OFFSET = 5;
       if (offsetX.value < TAP_OFFSET && offsetY.value < TAP_OFFSET && deltaTime < TAP_TIME) {
         if (doubleTapTimer) {
           clearTimeout(doubleTapTimer);
@@ -9283,6 +9308,9 @@ var stdin_default$z = defineComponent({
           if (state.scale < 1) {
             resetScale();
           }
+          if (state.scale > props.maxZoom) {
+            state.scale = +props.maxZoom;
+          }
         }
       }
       preventDefault(event, stopPropagation2);
@@ -11755,7 +11783,7 @@ var stdin_default$f = defineComponent({
       }
       return rowWidth;
     };
-    const renderRows = () => Array(props.row).fill("").map((_, i) => createVNode("div", {
+    const renderRows = () => Array(+props.row).fill("").map((_, i) => createVNode("div", {
       "class": bem$a("row"),
       "style": {
         width: addUnit(getRowWidth(i))
@@ -14208,7 +14236,7 @@ const Lazyload = {
     });
   }
 };
-const version = "3.4.1";
+const version = "3.4.2";
 function install(app) {
   const components = [
     ActionBar,

package/lib/vant.es.min.js

@@ -1093,6 +1093,7 @@ const overlayProps = {
   duration: numericProp,
   className: unknownProp,
   lockScroll: truthProp,
+  lazyRender: truthProp,
   customStyle: Object
 };
 var stdin_default$1t = defineComponent({
@@ -1101,7 +1102,7 @@ var stdin_default$1t = defineComponent({
   setup(props, {
     slots
   }) {
-    const lazyRender = useLazyRender(() => props.show);
+    const lazyRender = useLazyRender(() => props.show || !props.lazyRender);
     const preventTouchMove = (event) => {
       preventDefault(event, true);
     };
@@ -4208,9 +4209,13 @@ const proxyPickerMethods = (picker, callback) => {
 };
 const useHeight = (element) => {
   const height = ref();
-  onMounted(() => nextTick(() => {
+  const setHeight = () => {
     height.value = useRect(element).height;
-  }));
+  };
+  onMounted(() => {
+    nextTick(setHeight);
+    setTimeout(setHeight, 100);
+  });
   return height;
 };
 const [name$13] = createNamespace("calendar-day");
@@ -4839,7 +4844,12 @@ var stdin_default$17 = defineComponent({
           if (compareToStart === 1) {
             const disabledDay = getDisabledDate(disabledDays.value, startDay, date);
             if (disabledDay) {
-              select([startDay, getPrevDay(disabledDay)]);
+              const endDay2 = getPrevDay(disabledDay);
+              if (compareDay(startDay, endDay2) === -1) {
+                select([startDay, endDay2]);
+              } else {
+                select([date]);
+              }
             } else {
               select([startDay, date], true);
             }
@@ -4963,6 +4973,7 @@ const imageProps = {
   src: String,
   alt: String,
   fit: String,
+  position: String,
   round: Boolean,
   width: numericProp,
   height: numericProp,
@@ -5044,7 +5055,8 @@ var stdin_default$16 = defineComponent({
         alt: props.alt,
         class: bem$$("img"),
         style: {
-          objectFit: props.fit
+          objectFit: props.fit,
+          objectPosition: props.position
         }
       };
       if (props.lazyLoad) {
@@ -5061,8 +5073,15 @@ var stdin_default$16 = defineComponent({
     const onLazyLoaded = ({
       el
     }) => {
-      if (el === imageRef.value && loading.value) {
-        onLoad();
+      const check = () => {
+        if (el === imageRef.value && loading.value) {
+          onLoad();
+        }
+      };
+      if (imageRef.value) {
+        check();
+      } else {
+        nextTick(check);
       }
     };
     const onLazyLoadError = ({
@@ -6374,6 +6393,7 @@ const cascaderProps = {
   closeable: truthProp,
   swipeable: truthProp,
   closeIcon: makeStringProp("cross"),
+  showHeader: truthProp,
   modelValue: numericProp,
   fieldNames: Object,
   placeholder: String,
@@ -6487,7 +6507,7 @@ var stdin_default$Z = defineComponent({
       name: name2,
       title
     }) => emit("click-tab", name2, title);
-    const renderHeader = () => createVNode("div", {
+    const renderHeader = () => props.showHeader ? createVNode("div", {
       "class": bem$S("header")
     }, [createVNode("h2", {
       "class": bem$S("title")
@@ -6495,7 +6515,7 @@ var stdin_default$Z = defineComponent({
       "name": props.closeIcon,
       "class": [bem$S("close-icon"), HAPTICS_FEEDBACK],
       "onClick": onClose
-    }, null) : null]);
+    }, null) : null]) : null;
     const renderOption = (option, selectedOption, tabIndex) => {
       const {
         disabled
@@ -9174,7 +9194,7 @@ var stdin_default$z = defineComponent({
       return 0;
     });
     const setScale = (scale) => {
-      scale = clamp(scale, +props.minZoom, +props.maxZoom);
+      scale = clamp(scale, +props.minZoom, +props.maxZoom + 1);
       if (scale !== state.scale) {
         state.scale = scale;
         emit("scale", {
@@ -9194,6 +9214,7 @@ var stdin_default$z = defineComponent({
       state.moveX = 0;
       state.moveY = 0;
     };
+    let fingerNum;
     let startMoveX;
     let startMoveY;
     let startScale;
@@ -9208,11 +9229,12 @@ var stdin_default$z = defineComponent({
         offsetX
       } = touch;
       touch.start(event);
+      fingerNum = touches.length;
       startMoveX = state.moveX;
       startMoveY = state.moveY;
       touchStartTime = Date.now();
-      state.moving = touches.length === 1 && state.scale !== 1;
-      state.zooming = touches.length === 2 && !offsetX.value;
+      state.moving = fingerNum === 1 && state.scale !== 1;
+      state.zooming = fingerNum === 2 && !offsetX.value;
       if (state.zooming) {
         startScale = state.scale;
         startDistance = getDistance(event.touches);
@@ -9243,13 +9265,16 @@ var stdin_default$z = defineComponent({
       }
     };
     const checkTap = () => {
+      if (fingerNum > 1) {
+        return;
+      }
       const {
         offsetX,
         offsetY
       } = touch;
       const deltaTime = Date.now() - touchStartTime;
       const TAP_TIME = 250;
-      const TAP_OFFSET = 10;
+      const TAP_OFFSET = 5;
       if (offsetX.value < TAP_OFFSET && offsetY.value < TAP_OFFSET && deltaTime < TAP_TIME) {
         if (doubleTapTimer) {
           clearTimeout(doubleTapTimer);
@@ -9283,6 +9308,9 @@ var stdin_default$z = defineComponent({
           if (state.scale < 1) {
             resetScale();
           }
+          if (state.scale > props.maxZoom) {
+            state.scale = +props.maxZoom;
+          }
         }
       }
       preventDefault(event, stopPropagation2);
@@ -11755,7 +11783,7 @@ var stdin_default$f = defineComponent({
       }
       return rowWidth;
     };
-    const renderRows = () => Array(props.row).fill("").map((_, i) => createVNode("div", {
+    const renderRows = () => Array(+props.row).fill("").map((_, i) => createVNode("div", {
       "class": bem$a("row"),
       "style": {
         width: addUnit(getRowWidth(i))
@@ -14208,7 +14236,7 @@ const Lazyload = {
     });
   }
 };
-const version = "3.4.1";
+const version = "3.4.2";
 function install(app) {
   const components = [
     ActionBar,

package/lib/vant.js

@@ -1446,6 +1446,7 @@
     duration: numericProp,
     className: unknownProp,
     lockScroll: truthProp,
+    lazyRender: truthProp,
     customStyle: Object
   };
   var stdin_default$1t = vue.defineComponent({
@@ -1454,7 +1455,7 @@
     setup(props, {
       slots
     }) {
-      const lazyRender = useLazyRender(() => props.show);
+      const lazyRender = useLazyRender(() => props.show || !props.lazyRender);
       const preventTouchMove = (event) => {
         preventDefault(event, true);
       };
@@ -4561,9 +4562,13 @@
   };
   const useHeight = (element) => {
     const height2 = vue.ref();
-    vue.onMounted(() => vue.nextTick(() => {
+    const setHeight = () => {
       height2.value = useRect(element).height;
-    }));
+    };
+    vue.onMounted(() => {
+      vue.nextTick(setHeight);
+      setTimeout(setHeight, 100);
+    });
     return height2;
   };
   const [name$13] = createNamespace("calendar-day");
@@ -5192,7 +5197,12 @@
             if (compareToStart === 1) {
               const disabledDay = getDisabledDate(disabledDays.value, startDay, date);
               if (disabledDay) {
-                select([startDay, getPrevDay(disabledDay)]);
+                const endDay2 = getPrevDay(disabledDay);
+                if (compareDay(startDay, endDay2) === -1) {
+                  select([startDay, endDay2]);
+                } else {
+                  select([date]);
+                }
               } else {
                 select([startDay, date], true);
               }
@@ -5316,6 +5326,7 @@
     src: String,
     alt: String,
     fit: String,
+    position: String,
     round: Boolean,
     width: numericProp,
     height: numericProp,
@@ -5397,7 +5408,8 @@
           alt: props.alt,
           class: bem$$("img"),
           style: {
-            objectFit: props.fit
+            objectFit: props.fit,
+            objectPosition: props.position
           }
         };
         if (props.lazyLoad) {
@@ -5414,8 +5426,15 @@
       const onLazyLoaded = ({
         el
       }) => {
-        if (el === imageRef.value && loading.value) {
-          onLoad();
+        const check = () => {
+          if (el === imageRef.value && loading.value) {
+            onLoad();
+          }
+        };
+        if (imageRef.value) {
+          check();
+        } else {
+          vue.nextTick(check);
         }
       };
       const onLazyLoadError = ({
@@ -6727,6 +6746,7 @@
     closeable: truthProp,
     swipeable: truthProp,
     closeIcon: makeStringProp("cross"),
+    showHeader: truthProp,
     modelValue: numericProp,
     fieldNames: Object,
     placeholder: String,
@@ -6840,7 +6860,7 @@
         name: name2,
         title
       }) => emit("click-tab", name2, title);
-      const renderHeader = () => vue.createVNode("div", {
+      const renderHeader = () => props.showHeader ? vue.createVNode("div", {
         "class": bem$S("header")
       }, [vue.createVNode("h2", {
         "class": bem$S("title")
@@ -6848,7 +6868,7 @@
         "name": props.closeIcon,
         "class": [bem$S("close-icon"), HAPTICS_FEEDBACK],
         "onClick": onClose
-      }, null) : null]);
+      }, null) : null]) : null;
       const renderOption = (option, selectedOption, tabIndex) => {
         const {
           disabled
@@ -9527,7 +9547,7 @@
         return 0;
       });
       const setScale = (scale) => {
-        scale = clamp(scale, +props.minZoom, +props.maxZoom);
+        scale = clamp(scale, +props.minZoom, +props.maxZoom + 1);
         if (scale !== state.scale) {
           state.scale = scale;
           emit("scale", {
@@ -9547,6 +9567,7 @@
         state.moveX = 0;
         state.moveY = 0;
       };
+      let fingerNum;
       let startMoveX;
       let startMoveY;
       let startScale;
@@ -9561,11 +9582,12 @@
           offsetX
         } = touch;
         touch.start(event);
+        fingerNum = touches.length;
         startMoveX = state.moveX;
         startMoveY = state.moveY;
         touchStartTime = Date.now();
-        state.moving = touches.length === 1 && state.scale !== 1;
-        state.zooming = touches.length === 2 && !offsetX.value;
+        state.moving = fingerNum === 1 && state.scale !== 1;
+        state.zooming = fingerNum === 2 && !offsetX.value;
         if (state.zooming) {
           startScale = state.scale;
           startDistance = getDistance(event.touches);
@@ -9596,13 +9618,16 @@
         }
       };
       const checkTap = () => {
+        if (fingerNum > 1) {
+          return;
+        }
         const {
           offsetX,
           offsetY
         } = touch;
         const deltaTime = Date.now() - touchStartTime;
         const TAP_TIME = 250;
-        const TAP_OFFSET = 10;
+        const TAP_OFFSET = 5;
         if (offsetX.value < TAP_OFFSET && offsetY.value < TAP_OFFSET && deltaTime < TAP_TIME) {
           if (doubleTapTimer) {
             clearTimeout(doubleTapTimer);
@@ -9636,6 +9661,9 @@
             if (state.scale < 1) {
               resetScale();
             }
+            if (state.scale > props.maxZoom) {
+              state.scale = +props.maxZoom;
+            }
           }
         }
         preventDefault(event, stopPropagation2);
@@ -12965,7 +12993,7 @@
         }
         return rowWidth;
       };
-      const renderRows = () => Array(props.row).fill("").map((_, i) => vue.createVNode("div", {
+      const renderRows = () => Array(+props.row).fill("").map((_, i) => vue.createVNode("div", {
         "class": bem$a("row"),
         "style": {
           width: addUnit(getRowWidth(i))
@@ -15418,7 +15446,7 @@
       });
     }
   };
-  const version = "3.4.1";
+  const version = "3.4.2";
   function install(app) {
     const components = [
       ActionBar,