vant 4.9.1 → 4.9.3

package/lib/vant.es.js

@@ -1983,11 +1983,13 @@ function scrollLeftTo(scroller, to, duration) {
   let count = 0;
   const from = scroller.scrollLeft;
   const frames = duration === 0 ? 1 : Math.round(duration * 1e3 / 16);
+  let scrollLeft = from;
   function cancel() {
     cancelRaf(rafId);
   }
   function animate() {
-    scroller.scrollLeft += (to - from) / frames;
+    scrollLeft += (to - from) / frames;
+    scroller.scrollLeft = scrollLeft;
     if (++count < frames) {
       rafId = raf(animate);
     }
@@ -3819,6 +3821,7 @@ const formProps = {
   labelAlign: String,
   inputAlign: String,
   scrollToError: Boolean,
+  scrollToErrorPosition: String,
   validateFirst: Boolean,
   submitOnEnter: truthProp,
   showErrorMessage: truthProp,
@@ -3932,8 +3935,14 @@ var stdin_default$1w = defineComponent({
           values,
           errors
         });
-        if (props2.scrollToError && errors[0].name) {
-          scrollToField(errors[0].name);
+        const {
+          scrollToError,
+          scrollToErrorPosition
+        } = props2;
+        if (scrollToError && errors[0].name) {
+          scrollToField(errors[0].name, scrollToErrorPosition ? {
+            block: scrollToErrorPosition
+          } : void 0);
         }
       });
     };
@@ -6328,11 +6337,17 @@ function getDayByOffset(date, offset) {
 function getMonthByOffset(date, offset) {
   const cloned = cloneDate(date);
   cloned.setMonth(cloned.getMonth() + offset);
+  if (cloned.getDate() !== date.getDate()) {
+    cloned.setDate(0);
+  }
   return cloned;
 }
 function getYearByOffset(date, offset) {
   const cloned = cloneDate(date);
   cloned.setFullYear(cloned.getFullYear() + offset);
+  if (cloned.getDate() !== date.getDate()) {
+    cloned.setDate(0);
+  }
   return cloned;
 }
 const getPrevDay = (date) => getDayByOffset(date, -1);
@@ -6736,22 +6751,10 @@ var stdin_default$1e = defineComponent({
     slots,
     emit
   }) {
-    const prevMonthDisabled = computed(() => {
-      const prevMonth = getPrevMonth(props2.date);
-      return props2.minDate && prevMonth < props2.minDate;
-    });
-    const prevYearDisabled = computed(() => {
-      const prevYear = getPrevYear(props2.date);
-      return props2.minDate && prevYear < props2.minDate;
-    });
-    const nextMonthDisabled = computed(() => {
-      const nextMonth = getNextMonth(props2.date);
-      return props2.maxDate && nextMonth > props2.maxDate;
-    });
-    const nextYearDisabled = computed(() => {
-      const nextYear = getNextYear(props2.date);
-      return props2.maxDate && nextYear > props2.maxDate;
-    });
+    const prevMonthDisabled = computed(() => props2.date && props2.minDate && compareMonth(getPrevMonth(props2.date), props2.minDate) < 0);
+    const prevYearDisabled = computed(() => props2.date && props2.minDate && compareMonth(getPrevYear(props2.date), props2.minDate) < 0);
+    const nextMonthDisabled = computed(() => props2.date && props2.maxDate && compareMonth(getNextMonth(props2.date), props2.maxDate) > 0);
+    const nextYearDisabled = computed(() => props2.date && props2.maxDate && compareMonth(getNextYear(props2.date), props2.maxDate) > 0);
     const renderTitle = () => {
       if (props2.showTitle) {
         const text = props2.title || t$g("title");
@@ -7517,9 +7520,9 @@ var stdin_default$1b = defineComponent({
         "class": bem$11("price-currency")
       }, [props2.currency]), createVNode("span", {
         "class": bem$11("price-integer")
-      }, [priceArr[0]]), createTextVNode("."), createVNode("span", {
+      }, [priceArr[0]]), priceArr.length > 1 && createVNode(Fragment, null, [createTextVNode("."), createVNode("span", {
         "class": bem$11("price-decimal")
-      }, [priceArr[1]])]);
+      }, [priceArr[1]])])]);
     };
     return () => {
       var _a, _b, _c;
@@ -15226,10 +15229,11 @@ var stdin_default$9 = defineComponent({
     emit,
     slots
   }) {
-    const text = ref("");
+    const text = ref(props2.content);
     const expanded = ref(false);
     const hasAction = ref(false);
     const root = ref();
+    const actionRef = ref();
     let needRecalculate = false;
     const actionText = computed(() => expanded.value ? props2.collapseText : props2.expandText);
     const pxToNum = (value) => {
@@ -15257,57 +15261,60 @@ var stdin_default$9 = defineComponent({
       document.body.appendChild(container);
       return container;
     };
-    const calcEllipsised = () => {
-      const calcEllipsisText = (container2, maxHeight2) => {
-        const {
-          content,
-          position,
-          dots
-        } = props2;
-        const end = content.length;
-        const calcEllipse = () => {
-          const tail = (left, right) => {
-            if (right - left <= 1) {
-              if (position === "end") {
-                return content.slice(0, left) + dots;
-              }
-              return dots + content.slice(right, end);
-            }
-            const middle2 = Math.round((left + right) / 2);
+    const calcEllipsisText = (container, maxHeight) => {
+      var _a, _b;
+      const {
+        content,
+        position,
+        dots
+      } = props2;
+      const end = content.length;
+      const middle = 0 + end >> 1;
+      const actionHTML = slots.action ? (_b = (_a = actionRef.value) == null ? void 0 : _a.outerHTML) != null ? _b : "" : props2.expandText;
+      const calcEllipse = () => {
+        const tail = (left, right) => {
+          if (right - left <= 1) {
             if (position === "end") {
-              container2.innerText = content.slice(0, middle2) + dots + actionText.value;
-            } else {
-              container2.innerText = dots + content.slice(middle2, end) + actionText.value;
-            }
-            if (container2.offsetHeight > maxHeight2) {
-              if (position === "end") {
-                return tail(left, middle2);
-              }
-              return tail(middle2, right);
+              return content.slice(0, left) + dots;
             }
+            return dots + content.slice(right, end);
+          }
+          const middle2 = Math.round((left + right) / 2);
+          if (position === "end") {
+            container.innerText = content.slice(0, middle2) + dots;
+          } else {
+            container.innerText = dots + content.slice(middle2, end);
+          }
+          container.innerHTML += actionHTML;
+          if (container.offsetHeight > maxHeight) {
             if (position === "end") {
-              return tail(middle2, right);
+              return tail(left, middle2);
             }
-            return tail(left, middle2);
-          };
-          container2.innerText = tail(0, end);
-        };
-        const middleTail = (leftPart, rightPart) => {
-          if (leftPart[1] - leftPart[0] <= 1 && rightPart[1] - rightPart[0] <= 1) {
-            return content.slice(0, leftPart[0]) + dots + content.slice(rightPart[1], end);
+            return tail(middle2, right);
           }
-          const leftMiddle = Math.floor((leftPart[0] + leftPart[1]) / 2);
-          const rightMiddle = Math.ceil((rightPart[0] + rightPart[1]) / 2);
-          container2.innerText = props2.content.slice(0, leftMiddle) + props2.dots + props2.content.slice(rightMiddle, end) + props2.expandText;
-          if (container2.offsetHeight >= maxHeight2) {
-            return middleTail([leftPart[0], leftMiddle], [rightMiddle, rightPart[1]]);
+          if (position === "end") {
+            return tail(middle2, right);
           }
-          return middleTail([leftMiddle, leftPart[1]], [rightPart[0], rightMiddle]);
+          return tail(left, middle2);
         };
-        const middle = 0 + end >> 1;
-        props2.position === "middle" ? container2.innerText = middleTail([0, middle], [middle, end]) : calcEllipse();
-        return container2.innerText;
+        return tail(0, end);
+      };
+      const middleTail = (leftPart, rightPart) => {
+        if (leftPart[1] - leftPart[0] <= 1 && rightPart[1] - rightPart[0] <= 1) {
+          return content.slice(0, leftPart[0]) + dots + content.slice(rightPart[1], end);
+        }
+        const leftMiddle = Math.floor((leftPart[0] + leftPart[1]) / 2);
+        const rightMiddle = Math.ceil((rightPart[0] + rightPart[1]) / 2);
+        container.innerText = props2.content.slice(0, leftMiddle) + props2.dots + props2.content.slice(rightMiddle, end);
+        container.innerHTML += actionHTML;
+        if (container.offsetHeight >= maxHeight) {
+          return middleTail([leftPart[0], leftMiddle], [rightMiddle, rightPart[1]]);
+        }
+        return middleTail([leftMiddle, leftPart[1]], [rightPart[0], rightMiddle]);
       };
+      return props2.position === "middle" ? middleTail([0, middle], [middle, end]) : calcEllipse();
+    };
+    const calcEllipsised = () => {
       const container = cloneContainer();
       if (!container) {
         needRecalculate = true;
@@ -15340,11 +15347,17 @@ var stdin_default$9 = defineComponent({
         expanded: expanded.value
       }) : actionText.value;
       return createVNode("span", {
+        "ref": actionRef,
         "class": bem$3("action"),
         "onClick": onClickAction
       }, [action]);
     };
-    onMounted(calcEllipsised);
+    onMounted(() => {
+      calcEllipsised();
+      if (slots.action) {
+        nextTick(calcEllipsised);
+      }
+    });
     onActivated(() => {
       if (needRecalculate) {
         needRecalculate = false;
@@ -15943,7 +15956,7 @@ var stdin_default$5 = defineComponent({
       emit("update:modelValue", fileList);
       emit("delete", item, getDetail(index));
     };
-    const reuploadImage = (index) => {
+    const reuploadFile = (index) => {
       isReuploading.value = true;
       reuploadIndex.value = index;
       nextTick(() => chooseFile());
@@ -15963,7 +15976,7 @@ var stdin_default$5 = defineComponent({
         "onClick": () => emit(props2.reupload ? "clickReupload" : "clickPreview", item, getDetail(index)),
         "onDelete": () => deleteFile(item, index),
         "onPreview": () => previewImage(item),
-        "onReupload": () => reuploadImage(index)
+        "onReupload": () => reuploadFile(index)
       }, pick(props2, ["name", "lazyLoad"]), previewData), pick(slots, ["preview-cover", "preview-delete"]));
     };
     const renderPreviewList = () => {
@@ -15973,10 +15986,7 @@ var stdin_default$5 = defineComponent({
     };
     const onClickUpload = (event) => emit("clickUpload", event);
     const renderUpload = () => {
-      if (props2.modelValue.length >= +props2.maxCount && !props2.reupload) {
-        return;
-      }
-      const hideUploader = props2.modelValue.length >= +props2.maxCount && props2.reupload;
+      const lessThanMax = props2.modelValue.length < +props2.maxCount;
       const Input = props2.readonly ? null : createVNode("input", {
         "ref": inputRef,
         "type": "file",
@@ -15992,7 +16002,7 @@ var stdin_default$5 = defineComponent({
         return withDirectives(createVNode("div", {
           "class": bem$1("input-wrapper"),
           "onClick": onClickUpload
-        }, [slots.default(), Input]), [[vShow, !hideUploader]]);
+        }, [slots.default(), Input]), [[vShow, lessThanMax]]);
       }
       return withDirectives(createVNode("div", {
         "class": bem$1("upload", {
@@ -16005,7 +16015,7 @@ var stdin_default$5 = defineComponent({
         "class": bem$1("upload-icon")
       }, null), props2.uploadText && createVNode("span", {
         "class": bem$1("upload-text")
-      }, [props2.uploadText]), Input]), [[vShow, props2.showUpload && !hideUploader]]);
+      }, [props2.uploadText]), Input]), [[vShow, props2.showUpload && lessThanMax]]);
     };
     const chooseFile = () => {
       if (inputRef.value && !props2.disabled) {
@@ -16017,6 +16027,7 @@ var stdin_default$5 = defineComponent({
     });
     useExpose({
       chooseFile,
+      reuploadFile,
       closeImagePreview
     });
     useCustomFieldValue(() => props2.modelValue);
@@ -17032,7 +17043,7 @@ const Lazyload = {
     });
   }
 };
-const version = "4.9.1";
+const version = "4.9.3";
 function install(app) {
   const components = [
     ActionBar,

package/lib/vant.js

@@ -2369,7 +2369,7 @@
     return propRef;
   };
   /**
-  * @vue/shared v3.4.27
+  * @vue/shared v3.4.33
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -2456,11 +2456,13 @@
     let count = 0;
     const from = scroller.scrollLeft;
     const frames = duration === 0 ? 1 : Math.round(duration * 1e3 / 16);
+    let scrollLeft = from;
     function cancel() {
       cancelRaf(rafId);
     }
     function animate() {
-      scroller.scrollLeft += (to - from) / frames;
+      scrollLeft += (to - from) / frames;
+      scroller.scrollLeft = scrollLeft;
       if (++count < frames) {
         rafId = raf(animate);
       }
@@ -4283,6 +4285,7 @@
     labelAlign: String,
     inputAlign: String,
     scrollToError: Boolean,
+    scrollToErrorPosition: String,
     validateFirst: Boolean,
     submitOnEnter: truthProp,
     showErrorMessage: truthProp,
@@ -4396,8 +4399,14 @@
             values,
             errors
           });
-          if (props2.scrollToError && errors[0].name) {
-            scrollToField(errors[0].name);
+          const {
+            scrollToError,
+            scrollToErrorPosition
+          } = props2;
+          if (scrollToError && errors[0].name) {
+            scrollToField(errors[0].name, scrollToErrorPosition ? {
+              block: scrollToErrorPosition
+            } : void 0);
           }
         });
       };
@@ -6789,11 +6798,17 @@
   function getMonthByOffset(date, offset2) {
     const cloned = cloneDate(date);
     cloned.setMonth(cloned.getMonth() + offset2);
+    if (cloned.getDate() !== date.getDate()) {
+      cloned.setDate(0);
+    }
     return cloned;
   }
   function getYearByOffset(date, offset2) {
     const cloned = cloneDate(date);
     cloned.setFullYear(cloned.getFullYear() + offset2);
+    if (cloned.getDate() !== date.getDate()) {
+      cloned.setDate(0);
+    }
     return cloned;
   }
   const getPrevDay = (date) => getDayByOffset(date, -1);
@@ -7197,22 +7212,10 @@
       slots,
       emit
     }) {
-      const prevMonthDisabled = vue.computed(() => {
-        const prevMonth = getPrevMonth(props2.date);
-        return props2.minDate && prevMonth < props2.minDate;
-      });
-      const prevYearDisabled = vue.computed(() => {
-        const prevYear = getPrevYear(props2.date);
-        return props2.minDate && prevYear < props2.minDate;
-      });
-      const nextMonthDisabled = vue.computed(() => {
-        const nextMonth = getNextMonth(props2.date);
-        return props2.maxDate && nextMonth > props2.maxDate;
-      });
-      const nextYearDisabled = vue.computed(() => {
-        const nextYear = getNextYear(props2.date);
-        return props2.maxDate && nextYear > props2.maxDate;
-      });
+      const prevMonthDisabled = vue.computed(() => props2.date && props2.minDate && compareMonth(getPrevMonth(props2.date), props2.minDate) < 0);
+      const prevYearDisabled = vue.computed(() => props2.date && props2.minDate && compareMonth(getPrevYear(props2.date), props2.minDate) < 0);
+      const nextMonthDisabled = vue.computed(() => props2.date && props2.maxDate && compareMonth(getNextMonth(props2.date), props2.maxDate) > 0);
+      const nextYearDisabled = vue.computed(() => props2.date && props2.maxDate && compareMonth(getNextYear(props2.date), props2.maxDate) > 0);
       const renderTitle = () => {
         if (props2.showTitle) {
           const text = props2.title || t$g("title");
@@ -7978,9 +7981,9 @@
           "class": bem$11("price-currency")
         }, [props2.currency]), vue.createVNode("span", {
           "class": bem$11("price-integer")
-        }, [priceArr[0]]), vue.createTextVNode("."), vue.createVNode("span", {
+        }, [priceArr[0]]), priceArr.length > 1 && vue.createVNode(vue.Fragment, null, [vue.createTextVNode("."), vue.createVNode("span", {
           "class": bem$11("price-decimal")
-        }, [priceArr[1]])]);
+        }, [priceArr[1]])])]);
       };
       return () => {
         var _a, _b, _c;
@@ -16461,10 +16464,11 @@
       emit,
       slots
     }) {
-      const text = vue.ref("");
+      const text = vue.ref(props2.content);
       const expanded = vue.ref(false);
       const hasAction = vue.ref(false);
       const root = vue.ref();
+      const actionRef = vue.ref();
       let needRecalculate = false;
       const actionText = vue.computed(() => expanded.value ? props2.collapseText : props2.expandText);
       const pxToNum = (value) => {
@@ -16492,57 +16496,60 @@
         document.body.appendChild(container);
         return container;
       };
-      const calcEllipsised = () => {
-        const calcEllipsisText = (container2, maxHeight2) => {
-          const {
-            content,
-            position,
-            dots
-          } = props2;
-          const end2 = content.length;
-          const calcEllipse = () => {
-            const tail = (left2, right2) => {
-              if (right2 - left2 <= 1) {
-                if (position === "end") {
-                  return content.slice(0, left2) + dots;
-                }
-                return dots + content.slice(right2, end2);
-              }
-              const middle2 = Math.round((left2 + right2) / 2);
+      const calcEllipsisText = (container, maxHeight) => {
+        var _a, _b;
+        const {
+          content,
+          position,
+          dots
+        } = props2;
+        const end2 = content.length;
+        const middle = 0 + end2 >> 1;
+        const actionHTML = slots.action ? (_b = (_a = actionRef.value) == null ? void 0 : _a.outerHTML) != null ? _b : "" : props2.expandText;
+        const calcEllipse = () => {
+          const tail = (left2, right2) => {
+            if (right2 - left2 <= 1) {
               if (position === "end") {
-                container2.innerText = content.slice(0, middle2) + dots + actionText.value;
-              } else {
-                container2.innerText = dots + content.slice(middle2, end2) + actionText.value;
-              }
-              if (container2.offsetHeight > maxHeight2) {
-                if (position === "end") {
-                  return tail(left2, middle2);
-                }
-                return tail(middle2, right2);
+                return content.slice(0, left2) + dots;
               }
+              return dots + content.slice(right2, end2);
+            }
+            const middle2 = Math.round((left2 + right2) / 2);
+            if (position === "end") {
+              container.innerText = content.slice(0, middle2) + dots;
+            } else {
+              container.innerText = dots + content.slice(middle2, end2);
+            }
+            container.innerHTML += actionHTML;
+            if (container.offsetHeight > maxHeight) {
               if (position === "end") {
-                return tail(middle2, right2);
+                return tail(left2, middle2);
               }
-              return tail(left2, middle2);
-            };
-            container2.innerText = tail(0, end2);
-          };
-          const middleTail = (leftPart, rightPart) => {
-            if (leftPart[1] - leftPart[0] <= 1 && rightPart[1] - rightPart[0] <= 1) {
-              return content.slice(0, leftPart[0]) + dots + content.slice(rightPart[1], end2);
+              return tail(middle2, right2);
             }
-            const leftMiddle = Math.floor((leftPart[0] + leftPart[1]) / 2);
-            const rightMiddle = Math.ceil((rightPart[0] + rightPart[1]) / 2);
-            container2.innerText = props2.content.slice(0, leftMiddle) + props2.dots + props2.content.slice(rightMiddle, end2) + props2.expandText;
-            if (container2.offsetHeight >= maxHeight2) {
-              return middleTail([leftPart[0], leftMiddle], [rightMiddle, rightPart[1]]);
+            if (position === "end") {
+              return tail(middle2, right2);
             }
-            return middleTail([leftMiddle, leftPart[1]], [rightPart[0], rightMiddle]);
+            return tail(left2, middle2);
           };
-          const middle = 0 + end2 >> 1;
-          props2.position === "middle" ? container2.innerText = middleTail([0, middle], [middle, end2]) : calcEllipse();
-          return container2.innerText;
+          return tail(0, end2);
+        };
+        const middleTail = (leftPart, rightPart) => {
+          if (leftPart[1] - leftPart[0] <= 1 && rightPart[1] - rightPart[0] <= 1) {
+            return content.slice(0, leftPart[0]) + dots + content.slice(rightPart[1], end2);
+          }
+          const leftMiddle = Math.floor((leftPart[0] + leftPart[1]) / 2);
+          const rightMiddle = Math.ceil((rightPart[0] + rightPart[1]) / 2);
+          container.innerText = props2.content.slice(0, leftMiddle) + props2.dots + props2.content.slice(rightMiddle, end2);
+          container.innerHTML += actionHTML;
+          if (container.offsetHeight >= maxHeight) {
+            return middleTail([leftPart[0], leftMiddle], [rightMiddle, rightPart[1]]);
+          }
+          return middleTail([leftMiddle, leftPart[1]], [rightPart[0], rightMiddle]);
         };
+        return props2.position === "middle" ? middleTail([0, middle], [middle, end2]) : calcEllipse();
+      };
+      const calcEllipsised = () => {
         const container = cloneContainer();
         if (!container) {
           needRecalculate = true;
@@ -16575,11 +16582,17 @@
           expanded: expanded.value
         }) : actionText.value;
         return vue.createVNode("span", {
+          "ref": actionRef,
           "class": bem$3("action"),
           "onClick": onClickAction
         }, [action]);
       };
-      vue.onMounted(calcEllipsised);
+      vue.onMounted(() => {
+        calcEllipsised();
+        if (slots.action) {
+          vue.nextTick(calcEllipsised);
+        }
+      });
       vue.onActivated(() => {
         if (needRecalculate) {
           needRecalculate = false;
@@ -17175,7 +17188,7 @@
         emit("update:modelValue", fileList);
         emit("delete", item, getDetail(index));
       };
-      const reuploadImage = (index) => {
+      const reuploadFile = (index) => {
         isReuploading.value = true;
         reuploadIndex.value = index;
         vue.nextTick(() => chooseFile());
@@ -17195,7 +17208,7 @@
           "onClick": () => emit(props2.reupload ? "clickReupload" : "clickPreview", item, getDetail(index)),
           "onDelete": () => deleteFile(item, index),
           "onPreview": () => previewImage(item),
-          "onReupload": () => reuploadImage(index)
+          "onReupload": () => reuploadFile(index)
         }, pick(props2, ["name", "lazyLoad"]), previewData), pick(slots, ["preview-cover", "preview-delete"]));
       };
       const renderPreviewList = () => {
@@ -17205,10 +17218,7 @@
       };
       const onClickUpload = (event) => emit("clickUpload", event);
       const renderUpload = () => {
-        if (props2.modelValue.length >= +props2.maxCount && !props2.reupload) {
-          return;
-        }
-        const hideUploader = props2.modelValue.length >= +props2.maxCount && props2.reupload;
+        const lessThanMax = props2.modelValue.length < +props2.maxCount;
         const Input = props2.readonly ? null : vue.createVNode("input", {
           "ref": inputRef,
           "type": "file",
@@ -17224,7 +17234,7 @@
           return vue.withDirectives(vue.createVNode("div", {
             "class": bem$1("input-wrapper"),
             "onClick": onClickUpload
-          }, [slots.default(), Input]), [[vue.vShow, !hideUploader]]);
+          }, [slots.default(), Input]), [[vue.vShow, lessThanMax]]);
         }
         return vue.withDirectives(vue.createVNode("div", {
           "class": bem$1("upload", {
@@ -17237,7 +17247,7 @@
           "class": bem$1("upload-icon")
         }, null), props2.uploadText && vue.createVNode("span", {
           "class": bem$1("upload-text")
-        }, [props2.uploadText]), Input]), [[vue.vShow, props2.showUpload && !hideUploader]]);
+        }, [props2.uploadText]), Input]), [[vue.vShow, props2.showUpload && lessThanMax]]);
       };
       const chooseFile = () => {
         if (inputRef.value && !props2.disabled) {
@@ -17249,6 +17259,7 @@
       });
       useExpose({
         chooseFile,
+        reuploadFile,
         closeImagePreview
       });
       useCustomFieldValue(() => props2.modelValue);
@@ -18247,7 +18258,7 @@
       });
     }
   };
-  const version = "4.9.1";
+  const version = "4.9.3";
   function install(app) {
     const components = [
       ActionBar,