vant 4.9.2 → 4.9.3

package/lib/vant.cjs.js

@@ -6339,11 +6339,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);
@@ -6747,22 +6753,10 @@ var stdin_default$1e = vue.defineComponent({
     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");
@@ -15237,10 +15231,11 @@ var stdin_default$9 = vue.defineComponent({
     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) => {
@@ -15268,57 +15263,60 @@ var stdin_default$9 = vue.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;
@@ -15351,11 +15349,17 @@ var stdin_default$9 = vue.defineComponent({
         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;
@@ -15954,7 +15958,7 @@ var stdin_default$5 = vue.defineComponent({
       emit("update:modelValue", fileList);
       emit("delete", item, getDetail(index));
     };
-    const reuploadImage = (index) => {
+    const reuploadFile = (index) => {
       isReuploading.value = true;
       reuploadIndex.value = index;
       vue.nextTick(() => chooseFile());
@@ -15974,7 +15978,7 @@ var stdin_default$5 = vue.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 = () => {
@@ -15984,10 +15988,7 @@ var stdin_default$5 = vue.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 : vue.createVNode("input", {
         "ref": inputRef,
         "type": "file",
@@ -16003,7 +16004,7 @@ var stdin_default$5 = vue.defineComponent({
         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", {
@@ -16016,7 +16017,7 @@ var stdin_default$5 = vue.defineComponent({
         "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) {
@@ -16028,6 +16029,7 @@ var stdin_default$5 = vue.defineComponent({
     });
     useExpose({
       chooseFile,
+      reuploadFile,
       closeImagePreview
     });
     use.useCustomFieldValue(() => props2.modelValue);
@@ -17043,7 +17045,7 @@ const Lazyload = {
     });
   }
 };
-const version = "4.9.2";
+const version = "4.9.3";
 function install(app) {
   const components = [
     ActionBar,

package/lib/vant.es.js

@@ -6337,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);
@@ -6745,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");
@@ -15235,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) => {
@@ -15266,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;
@@ -15349,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;
@@ -15952,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());
@@ -15972,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 = () => {
@@ -15982,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",
@@ -16001,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", {
@@ -16014,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) {
@@ -16026,6 +16027,7 @@ var stdin_default$5 = defineComponent({
     });
     useExpose({
       chooseFile,
+      reuploadFile,
       closeImagePreview
     });
     useCustomFieldValue(() => props2.modelValue);
@@ -17041,7 +17043,7 @@ const Lazyload = {
     });
   }
 };
-const version = "4.9.2";
+const version = "4.9.3";
 function install(app) {
   const components = [
     ActionBar,