vant 4.9.2 → 4.9.3

package/es/calendar/CalendarHeader.mjs

@@ -1,7 +1,7 @@
 import { createVNode as _createVNode } from "vue";
 import { computed, defineComponent } from "vue";
 import { createNamespace, HAPTICS_FEEDBACK, makeStringProp } from "../utils/index.mjs";
-import { t, bem, getPrevMonth, getPrevYear, getNextMonth, getNextYear } from "./utils.mjs";
+import { t, bem, compareMonth, getPrevMonth, getPrevYear, getNextMonth, getNextYear } from "./utils.mjs";
 import { Icon } from "../icon/index.mjs";
 const [name] = createNamespace("calendar-header");
 var stdin_default = defineComponent({
@@ -22,22 +22,10 @@ var stdin_default = defineComponent({
     slots,
     emit
   }) {
-    const prevMonthDisabled = computed(() => {
-      const prevMonth = getPrevMonth(props.date);
-      return props.minDate && prevMonth < props.minDate;
-    });
-    const prevYearDisabled = computed(() => {
-      const prevYear = getPrevYear(props.date);
-      return props.minDate && prevYear < props.minDate;
-    });
-    const nextMonthDisabled = computed(() => {
-      const nextMonth = getNextMonth(props.date);
-      return props.maxDate && nextMonth > props.maxDate;
-    });
-    const nextYearDisabled = computed(() => {
-      const nextYear = getNextYear(props.date);
-      return props.maxDate && nextYear > props.maxDate;
-    });
+    const prevMonthDisabled = computed(() => props.date && props.minDate && compareMonth(getPrevMonth(props.date), props.minDate) < 0);
+    const prevYearDisabled = computed(() => props.date && props.minDate && compareMonth(getPrevYear(props.date), props.minDate) < 0);
+    const nextMonthDisabled = computed(() => props.date && props.maxDate && compareMonth(getNextMonth(props.date), props.maxDate) > 0);
+    const nextYearDisabled = computed(() => props.date && props.maxDate && compareMonth(getNextYear(props.date), props.maxDate) > 0);
     const renderTitle = () => {
       if (props.showTitle) {
         const text = props.title || t("title");

package/es/calendar/utils.mjs

@@ -30,11 +30,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);

package/es/index.d.ts

@@ -106,4 +106,4 @@ declare namespace _default {
 }
 export default _default;
 export function install(app: any): void;
-export const version: "4.9.2";
+export const version: "4.9.3";

package/es/index.mjs

@@ -99,7 +99,7 @@ import { Toast } from "./toast/index.mjs";
 import { TreeSelect } from "./tree-select/index.mjs";
 import { Uploader } from "./uploader/index.mjs";
 import { Watermark } from "./watermark/index.mjs";
-const version = "4.9.2";
+const version = "4.9.3";
 function install(app) {
   const components = [
     ActionBar,

package/es/text-ellipsis/TextEllipsis.mjs

@@ -1,5 +1,5 @@
 import { createVNode as _createVNode } from "vue";
-import { ref, watch, computed, onActivated, onMounted, defineComponent } from "vue";
+import { ref, watch, computed, onActivated, onMounted, defineComponent, nextTick } from "vue";
 import { makeNumericProp, makeStringProp, createNamespace, windowWidth } from "../utils/index.mjs";
 import { useExpose } from "../composables/use-expose.mjs";
 const [name, bem] = createNamespace("text-ellipsis");
@@ -19,10 +19,11 @@ var stdin_default = defineComponent({
     emit,
     slots
   }) {
-    const text = ref("");
+    const text = ref(props.content);
     const expanded = ref(false);
     const hasAction = ref(false);
     const root = ref();
+    const actionRef = ref();
     let needRecalculate = false;
     const actionText = computed(() => expanded.value ? props.collapseText : props.expandText);
     const pxToNum = (value) => {
@@ -50,57 +51,60 @@ var stdin_default = defineComponent({
       document.body.appendChild(container);
       return container;
     };
-    const calcEllipsised = () => {
-      const calcEllipsisText = (container2, maxHeight2) => {
-        const {
-          content,
-          position,
-          dots
-        } = props;
-        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
+      } = props;
+      const end = content.length;
+      const middle = 0 + end >> 1;
+      const actionHTML = slots.action ? (_b = (_a = actionRef.value) == null ? void 0 : _a.outerHTML) != null ? _b : "" : props.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 = props.content.slice(0, leftMiddle) + props.dots + props.content.slice(rightMiddle, end) + props.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;
-        props.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 = props.content.slice(0, leftMiddle) + props.dots + props.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 props.position === "middle" ? middleTail([0, middle], [middle, end]) : calcEllipse();
+    };
+    const calcEllipsised = () => {
       const container = cloneContainer();
       if (!container) {
         needRecalculate = true;
@@ -133,11 +137,17 @@ var stdin_default = defineComponent({
         expanded: expanded.value
       }) : actionText.value;
       return _createVNode("span", {
+        "ref": actionRef,
         "class": bem("action"),
         "onClick": onClickAction
       }, [action]);
     };
-    onMounted(calcEllipsised);
+    onMounted(() => {
+      calcEllipsised();
+      if (slots.action) {
+        nextTick(calcEllipsised);
+      }
+    });
     onActivated(() => {
       if (needRecalculate) {
         needRecalculate = false;

package/es/uploader/Uploader.mjs

@@ -183,7 +183,7 @@ var stdin_default = defineComponent({
       emit("update:modelValue", fileList);
       emit("delete", item, getDetail(index));
     };
-    const reuploadImage = (index) => {
+    const reuploadFile = (index) => {
       isReuploading.value = true;
       reuploadIndex.value = index;
       nextTick(() => chooseFile());
@@ -203,7 +203,7 @@ var stdin_default = defineComponent({
         "onClick": () => emit(props.reupload ? "clickReupload" : "clickPreview", item, getDetail(index)),
         "onDelete": () => deleteFile(item, index),
         "onPreview": () => previewImage(item),
-        "onReupload": () => reuploadImage(index)
+        "onReupload": () => reuploadFile(index)
       }, pick(props, ["name", "lazyLoad"]), previewData), pick(slots, ["preview-cover", "preview-delete"]));
     };
     const renderPreviewList = () => {
@@ -213,10 +213,7 @@ var stdin_default = defineComponent({
     };
     const onClickUpload = (event) => emit("clickUpload", event);
     const renderUpload = () => {
-      if (props.modelValue.length >= +props.maxCount && !props.reupload) {
-        return;
-      }
-      const hideUploader = props.modelValue.length >= +props.maxCount && props.reupload;
+      const lessThanMax = props.modelValue.length < +props.maxCount;
       const Input = props.readonly ? null : _createVNode("input", {
         "ref": inputRef,
         "type": "file",
@@ -232,7 +229,7 @@ var stdin_default = defineComponent({
         return _withDirectives(_createVNode("div", {
           "class": bem("input-wrapper"),
           "onClick": onClickUpload
-        }, [slots.default(), Input]), [[_vShow, !hideUploader]]);
+        }, [slots.default(), Input]), [[_vShow, lessThanMax]]);
       }
       return _withDirectives(_createVNode("div", {
         "class": bem("upload", {
@@ -245,7 +242,7 @@ var stdin_default = defineComponent({
         "class": bem("upload-icon")
       }, null), props.uploadText && _createVNode("span", {
         "class": bem("upload-text")
-      }, [props.uploadText]), Input]), [[_vShow, props.showUpload && !hideUploader]]);
+      }, [props.uploadText]), Input]), [[_vShow, props.showUpload && lessThanMax]]);
     };
     const chooseFile = () => {
       if (inputRef.value && !props.disabled) {
@@ -257,6 +254,7 @@ var stdin_default = defineComponent({
     });
     useExpose({
       chooseFile,
+      reuploadFile,
       closeImagePreview
     });
     useCustomFieldValue(() => props.modelValue);

package/es/uploader/types.d.ts

@@ -29,6 +29,7 @@ export type UploaderAfterRead = (items: UploaderFileListItem | UploaderFileListI
 export type UploaderExpose = {
     chooseFile: () => void;
     closeImagePreview: () => void;
+    reuploadFile: (index: number) => void;
 };
 export type UploaderInstance = ComponentPublicInstance<UploaderProps, UploaderExpose>;
 export type UploaderThemeVars = {

package/lib/calendar/CalendarHeader.js

@@ -44,22 +44,10 @@ var stdin_default = (0, import_vue2.defineComponent)({
     slots,
     emit
   }) {
-    const prevMonthDisabled = (0, import_vue2.computed)(() => {
-      const prevMonth = (0, import_utils2.getPrevMonth)(props.date);
-      return props.minDate && prevMonth < props.minDate;
-    });
-    const prevYearDisabled = (0, import_vue2.computed)(() => {
-      const prevYear = (0, import_utils2.getPrevYear)(props.date);
-      return props.minDate && prevYear < props.minDate;
-    });
-    const nextMonthDisabled = (0, import_vue2.computed)(() => {
-      const nextMonth = (0, import_utils2.getNextMonth)(props.date);
-      return props.maxDate && nextMonth > props.maxDate;
-    });
-    const nextYearDisabled = (0, import_vue2.computed)(() => {
-      const nextYear = (0, import_utils2.getNextYear)(props.date);
-      return props.maxDate && nextYear > props.maxDate;
-    });
+    const prevMonthDisabled = (0, import_vue2.computed)(() => props.date && props.minDate && (0, import_utils2.compareMonth)((0, import_utils2.getPrevMonth)(props.date), props.minDate) < 0);
+    const prevYearDisabled = (0, import_vue2.computed)(() => props.date && props.minDate && (0, import_utils2.compareMonth)((0, import_utils2.getPrevYear)(props.date), props.minDate) < 0);
+    const nextMonthDisabled = (0, import_vue2.computed)(() => props.date && props.maxDate && (0, import_utils2.compareMonth)((0, import_utils2.getNextMonth)(props.date), props.maxDate) > 0);
+    const nextYearDisabled = (0, import_vue2.computed)(() => props.date && props.maxDate && (0, import_utils2.compareMonth)((0, import_utils2.getNextYear)(props.date), props.maxDate) > 0);
     const renderTitle = () => {
       if (props.showTitle) {
         const text = props.title || (0, import_utils2.t)("title");

package/lib/calendar/utils.js

@@ -70,11 +70,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);

package/lib/index.d.ts

@@ -106,4 +106,4 @@ declare namespace _default {
 }
 export default _default;
 export function install(app: any): void;
-export const version: "4.9.2";
+export const version: "4.9.3";

package/lib/index.js

@@ -226,7 +226,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.9.2";
+const version = "4.9.3";
 function install(app) {
   const components = [
     import_action_bar.ActionBar,

package/lib/text-ellipsis/TextEllipsis.js

@@ -42,10 +42,11 @@ var stdin_default = (0, import_vue2.defineComponent)({
     emit,
     slots
   }) {
-    const text = (0, import_vue2.ref)("");
+    const text = (0, import_vue2.ref)(props.content);
     const expanded = (0, import_vue2.ref)(false);
     const hasAction = (0, import_vue2.ref)(false);
     const root = (0, import_vue2.ref)();
+    const actionRef = (0, import_vue2.ref)();
     let needRecalculate = false;
     const actionText = (0, import_vue2.computed)(() => expanded.value ? props.collapseText : props.expandText);
     const pxToNum = (value) => {
@@ -73,57 +74,60 @@ var stdin_default = (0, import_vue2.defineComponent)({
       document.body.appendChild(container);
       return container;
     };
-    const calcEllipsised = () => {
-      const calcEllipsisText = (container2, maxHeight2) => {
-        const {
-          content,
-          position,
-          dots
-        } = props;
-        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
+      } = props;
+      const end = content.length;
+      const middle = 0 + end >> 1;
+      const actionHTML = slots.action ? (_b = (_a = actionRef.value) == null ? void 0 : _a.outerHTML) != null ? _b : "" : props.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 = props.content.slice(0, leftMiddle) + props.dots + props.content.slice(rightMiddle, end) + props.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;
-        props.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 = props.content.slice(0, leftMiddle) + props.dots + props.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 props.position === "middle" ? middleTail([0, middle], [middle, end]) : calcEllipse();
+    };
+    const calcEllipsised = () => {
       const container = cloneContainer();
       if (!container) {
         needRecalculate = true;
@@ -156,11 +160,17 @@ var stdin_default = (0, import_vue2.defineComponent)({
         expanded: expanded.value
       }) : actionText.value;
       return (0, import_vue.createVNode)("span", {
+        "ref": actionRef,
         "class": bem("action"),
         "onClick": onClickAction
       }, [action]);
     };
-    (0, import_vue2.onMounted)(calcEllipsised);
+    (0, import_vue2.onMounted)(() => {
+      calcEllipsised();
+      if (slots.action) {
+        (0, import_vue2.nextTick)(calcEllipsised);
+      }
+    });
     (0, import_vue2.onActivated)(() => {
       if (needRecalculate) {
         needRecalculate = false;

package/lib/uploader/Uploader.js

@@ -216,7 +216,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
       emit("update:modelValue", fileList);
       emit("delete", item, getDetail(index));
     };
-    const reuploadImage = (index) => {
+    const reuploadFile = (index) => {
       isReuploading.value = true;
       reuploadIndex.value = index;
       (0, import_vue2.nextTick)(() => chooseFile());
@@ -236,7 +236,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
         "onClick": () => emit(props.reupload ? "clickReupload" : "clickPreview", item, getDetail(index)),
         "onDelete": () => deleteFile(item, index),
         "onPreview": () => previewImage(item),
-        "onReupload": () => reuploadImage(index)
+        "onReupload": () => reuploadFile(index)
       }, (0, import_utils.pick)(props, ["name", "lazyLoad"]), previewData), (0, import_utils.pick)(slots, ["preview-cover", "preview-delete"]));
     };
     const renderPreviewList = () => {
@@ -246,10 +246,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
     };
     const onClickUpload = (event) => emit("clickUpload", event);
     const renderUpload = () => {
-      if (props.modelValue.length >= +props.maxCount && !props.reupload) {
-        return;
-      }
-      const hideUploader = props.modelValue.length >= +props.maxCount && props.reupload;
+      const lessThanMax = props.modelValue.length < +props.maxCount;
       const Input = props.readonly ? null : (0, import_vue.createVNode)("input", {
         "ref": inputRef,
         "type": "file",
@@ -265,7 +262,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
         return (0, import_vue.withDirectives)((0, import_vue.createVNode)("div", {
           "class": (0, import_utils2.bem)("input-wrapper"),
           "onClick": onClickUpload
-        }, [slots.default(), Input]), [[import_vue.vShow, !hideUploader]]);
+        }, [slots.default(), Input]), [[import_vue.vShow, lessThanMax]]);
       }
       return (0, import_vue.withDirectives)((0, import_vue.createVNode)("div", {
         "class": (0, import_utils2.bem)("upload", {
@@ -278,7 +275,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
         "class": (0, import_utils2.bem)("upload-icon")
       }, null), props.uploadText && (0, import_vue.createVNode)("span", {
         "class": (0, import_utils2.bem)("upload-text")
-      }, [props.uploadText]), Input]), [[import_vue.vShow, props.showUpload && !hideUploader]]);
+      }, [props.uploadText]), Input]), [[import_vue.vShow, props.showUpload && lessThanMax]]);
     };
     const chooseFile = () => {
       if (inputRef.value && !props.disabled) {
@@ -290,6 +287,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
     });
     (0, import_use_expose.useExpose)({
       chooseFile,
+      reuploadFile,
       closeImagePreview
     });
     (0, import_use.useCustomFieldValue)(() => props.modelValue);

package/lib/uploader/types.d.ts

@@ -29,6 +29,7 @@ export type UploaderAfterRead = (items: UploaderFileListItem | UploaderFileListI
 export type UploaderExpose = {
     chooseFile: () => void;
     closeImagePreview: () => void;
+    reuploadFile: (index: number) => void;
 };
 export type UploaderInstance = ComponentPublicInstance<UploaderProps, UploaderExpose>;
 export type UploaderThemeVars = {