vant 4.0.3 → 4.0.4

package/README.md

@@ -8,7 +8,6 @@
 
 <p align="center">
     <img src="https://img.shields.io/npm/v/vant?style=flat-square" alt="npm version" />
-    <img src="https://img.shields.io/github/workflow/status/vant-ui/vant/CI/dev?style=flat-square" alt="CI Status" />
     <img src="https://img.shields.io/codecov/c/github/vant-ui/vant/dev.svg?style=flat-square&color=#4fc08d" alt="Coverage Status" />
     <img src="https://img.shields.io/npm/dm/vant.svg?style=flat-square&color=#4fc08d" alt="downloads" />
     <img src="https://img.badgesize.io/https://unpkg.com/vant/lib/vant.min.js?compression=gzip&style=flat-square&label=gzip%20size&color=#4fc08d" alt="Gzip Size" />

package/es/field/Field.mjs

@@ -179,6 +179,7 @@ var stdin_default = defineComponent({
       }
     };
     const limitValueLength = (value) => {
+      var _a;
       const {
         maxlength
       } = props;
@@ -187,6 +188,13 @@ var stdin_default = defineComponent({
         if (modelValue && getStringLength(modelValue) === +maxlength) {
           return modelValue;
         }
+        const selectionEnd = (_a = inputRef.value) == null ? void 0 : _a.selectionEnd;
+        if (state.focused && selectionEnd) {
+          const valueArr = [...value];
+          const exceededLength = valueArr.length - +maxlength;
+          valueArr.splice(selectionEnd - exceededLength, exceededLength);
+          return valueArr.join("");
+        }
         return cutString(value, +maxlength);
       }
       return value;
@@ -194,22 +202,47 @@ var stdin_default = defineComponent({
     const updateValue = (value, trigger = "onChange") => {
       const originalValue = value;
       value = limitValueLength(value);
-      const isExceedLimit = value !== originalValue;
+      const limitDiffLen = getStringLength(originalValue) - getStringLength(value);
       if (props.type === "number" || props.type === "digit") {
         const isNumber = props.type === "number";
         value = formatNumber(value, isNumber, isNumber);
       }
+      let formatterDiffLen = 0;
       if (props.formatter && trigger === props.formatTrigger) {
-        value = props.formatter(value);
+        const {
+          formatter,
+          maxlength
+        } = props;
+        value = formatter(value);
+        if (isDef(maxlength) && getStringLength(value) > maxlength) {
+          value = cutString(value, +maxlength);
+        }
+        if (inputRef.value && state.focused) {
+          const {
+            selectionEnd
+          } = inputRef.value;
+          const bcoVal = cutString(originalValue, selectionEnd);
+          formatterDiffLen = getStringLength(formatter(bcoVal)) - getStringLength(bcoVal);
+        }
       }
       if (inputRef.value && inputRef.value.value !== value) {
-        if (state.focused && isExceedLimit) {
-          const {
+        if (state.focused) {
+          let {
             selectionStart,
             selectionEnd
           } = inputRef.value;
           inputRef.value.value = value;
-          inputRef.value.setSelectionRange(selectionStart - 1, selectionEnd - 1);
+          if (isDef(selectionStart) && isDef(selectionEnd)) {
+            const valueLen = getStringLength(value);
+            if (limitDiffLen) {
+              selectionStart -= limitDiffLen;
+              selectionEnd -= limitDiffLen;
+            } else if (formatterDiffLen) {
+              selectionStart += formatterDiffLen;
+              selectionEnd += formatterDiffLen;
+            }
+            inputRef.value.setSelectionRange(Math.min(selectionStart, valueLen), Math.min(selectionEnd, valueLen));
+          }
         } else {
           inputRef.value.value = value;
         }

package/es/image/Image.mjs

@@ -56,6 +56,14 @@ var stdin_default = defineComponent({
         emit("load", event);
       }
     };
+    const triggerLoad = () => {
+      const loadEvent = new Event("load");
+      Object.defineProperty(loadEvent, "target", {
+        value: imageRef.value,
+        enumerable: true
+      });
+      onLoad(loadEvent);
+    };
     const onError = (event) => {
       error.value = true;
       loading.value = false;
@@ -113,7 +121,7 @@ var stdin_default = defineComponent({
     }) => {
       const check = () => {
         if (el === imageRef.value && loading.value) {
-          onLoad();
+          triggerLoad();
         }
       };
       if (imageRef.value) {
@@ -141,7 +149,7 @@ var stdin_default = defineComponent({
       nextTick(() => {
         var _a;
         if ((_a = imageRef.value) == null ? void 0 : _a.complete) {
-          onLoad();
+          triggerLoad();
         }
       });
     });

package/es/index.d.ts

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

package/es/index.mjs

@@ -87,7 +87,7 @@ import { TimePicker } from "./time-picker/index.mjs";
 import { Toast } from "./toast/index.mjs";
 import { TreeSelect } from "./tree-select/index.mjs";
 import { Uploader } from "./uploader/index.mjs";
-const version = "4.0.3";
+const version = "4.0.4";
 function install(app) {
   const components = [
     ActionBar,

package/lib/field/Field.js

@@ -203,6 +203,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
       }
     };
     const limitValueLength = (value) => {
+      var _a;
       const {
         maxlength
       } = props;
@@ -211,6 +212,13 @@ var stdin_default = (0, import_vue2.defineComponent)({
         if (modelValue && (0, import_utils2.getStringLength)(modelValue) === +maxlength) {
           return modelValue;
         }
+        const selectionEnd = (_a = inputRef.value) == null ? void 0 : _a.selectionEnd;
+        if (state.focused && selectionEnd) {
+          const valueArr = [...value];
+          const exceededLength = valueArr.length - +maxlength;
+          valueArr.splice(selectionEnd - exceededLength, exceededLength);
+          return valueArr.join("");
+        }
         return (0, import_utils2.cutString)(value, +maxlength);
       }
       return value;
@@ -218,22 +226,47 @@ var stdin_default = (0, import_vue2.defineComponent)({
     const updateValue = (value, trigger = "onChange") => {
       const originalValue = value;
       value = limitValueLength(value);
-      const isExceedLimit = value !== originalValue;
+      const limitDiffLen = (0, import_utils2.getStringLength)(originalValue) - (0, import_utils2.getStringLength)(value);
       if (props.type === "number" || props.type === "digit") {
         const isNumber = props.type === "number";
         value = (0, import_utils.formatNumber)(value, isNumber, isNumber);
       }
+      let formatterDiffLen = 0;
       if (props.formatter && trigger === props.formatTrigger) {
-        value = props.formatter(value);
+        const {
+          formatter,
+          maxlength
+        } = props;
+        value = formatter(value);
+        if ((0, import_utils.isDef)(maxlength) && (0, import_utils2.getStringLength)(value) > maxlength) {
+          value = (0, import_utils2.cutString)(value, +maxlength);
+        }
+        if (inputRef.value && state.focused) {
+          const {
+            selectionEnd
+          } = inputRef.value;
+          const bcoVal = (0, import_utils2.cutString)(originalValue, selectionEnd);
+          formatterDiffLen = (0, import_utils2.getStringLength)(formatter(bcoVal)) - (0, import_utils2.getStringLength)(bcoVal);
+        }
       }
       if (inputRef.value && inputRef.value.value !== value) {
-        if (state.focused && isExceedLimit) {
-          const {
+        if (state.focused) {
+          let {
             selectionStart,
             selectionEnd
           } = inputRef.value;
           inputRef.value.value = value;
-          inputRef.value.setSelectionRange(selectionStart - 1, selectionEnd - 1);
+          if ((0, import_utils.isDef)(selectionStart) && (0, import_utils.isDef)(selectionEnd)) {
+            const valueLen = (0, import_utils2.getStringLength)(value);
+            if (limitDiffLen) {
+              selectionStart -= limitDiffLen;
+              selectionEnd -= limitDiffLen;
+            } else if (formatterDiffLen) {
+              selectionStart += formatterDiffLen;
+              selectionEnd += formatterDiffLen;
+            }
+            inputRef.value.setSelectionRange(Math.min(selectionStart, valueLen), Math.min(selectionEnd, valueLen));
+          }
         } else {
           inputRef.value.value = value;
         }

package/lib/image/Image.js

@@ -79,6 +79,14 @@ var stdin_default = (0, import_vue2.defineComponent)({
         emit("load", event);
       }
     };
+    const triggerLoad = () => {
+      const loadEvent = new Event("load");
+      Object.defineProperty(loadEvent, "target", {
+        value: imageRef.value,
+        enumerable: true
+      });
+      onLoad(loadEvent);
+    };
     const onError = (event) => {
       error.value = true;
       loading.value = false;
@@ -136,7 +144,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
     }) => {
       const check = () => {
         if (el === imageRef.value && loading.value) {
-          onLoad();
+          triggerLoad();
         }
       };
       if (imageRef.value) {
@@ -164,7 +172,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
       (0, import_vue2.nextTick)(() => {
         var _a;
         if ((_a = imageRef.value) == null ? void 0 : _a.complete) {
-          onLoad();
+          triggerLoad();
         }
       });
     });

package/lib/index.d.ts

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

package/lib/index.js

@@ -202,7 +202,7 @@ __reExport(stdin_exports, require("./time-picker"), module.exports);
 __reExport(stdin_exports, require("./toast"), module.exports);
 __reExport(stdin_exports, require("./tree-select"), module.exports);
 __reExport(stdin_exports, require("./uploader"), module.exports);
-const version = "4.0.3";
+const version = "4.0.4";
 function install(app) {
   const components = [
     import_action_bar.ActionBar,

package/lib/vant.cjs.js

@@ -3969,6 +3969,7 @@ var stdin_default$1j = vue.defineComponent({
       }
     };
     const limitValueLength = (value) => {
+      var _a;
       const {
         maxlength
       } = props;
@@ -3977,6 +3978,13 @@ var stdin_default$1j = vue.defineComponent({
         if (modelValue && getStringLength(modelValue) === +maxlength) {
           return modelValue;
         }
+        const selectionEnd = (_a = inputRef.value) == null ? void 0 : _a.selectionEnd;
+        if (state.focused && selectionEnd) {
+          const valueArr = [...value];
+          const exceededLength = valueArr.length - +maxlength;
+          valueArr.splice(selectionEnd - exceededLength, exceededLength);
+          return valueArr.join("");
+        }
         return cutString(value, +maxlength);
       }
       return value;
@@ -3984,22 +3992,47 @@ var stdin_default$1j = vue.defineComponent({
     const updateValue = (value, trigger = "onChange") => {
       const originalValue = value;
       value = limitValueLength(value);
-      const isExceedLimit = value !== originalValue;
+      const limitDiffLen = getStringLength(originalValue) - getStringLength(value);
       if (props.type === "number" || props.type === "digit") {
         const isNumber = props.type === "number";
         value = formatNumber(value, isNumber, isNumber);
       }
+      let formatterDiffLen = 0;
       if (props.formatter && trigger === props.formatTrigger) {
-        value = props.formatter(value);
+        const {
+          formatter,
+          maxlength
+        } = props;
+        value = formatter(value);
+        if (isDef(maxlength) && getStringLength(value) > maxlength) {
+          value = cutString(value, +maxlength);
+        }
+        if (inputRef.value && state.focused) {
+          const {
+            selectionEnd
+          } = inputRef.value;
+          const bcoVal = cutString(originalValue, selectionEnd);
+          formatterDiffLen = getStringLength(formatter(bcoVal)) - getStringLength(bcoVal);
+        }
       }
       if (inputRef.value && inputRef.value.value !== value) {
-        if (state.focused && isExceedLimit) {
-          const {
+        if (state.focused) {
+          let {
             selectionStart,
             selectionEnd
           } = inputRef.value;
           inputRef.value.value = value;
-          inputRef.value.setSelectionRange(selectionStart - 1, selectionEnd - 1);
+          if (isDef(selectionStart) && isDef(selectionEnd)) {
+            const valueLen = getStringLength(value);
+            if (limitDiffLen) {
+              selectionStart -= limitDiffLen;
+              selectionEnd -= limitDiffLen;
+            } else if (formatterDiffLen) {
+              selectionStart += formatterDiffLen;
+              selectionEnd += formatterDiffLen;
+            }
+            inputRef.value.setSelectionRange(Math.min(selectionStart, valueLen), Math.min(selectionEnd, valueLen));
+          }
         } else {
           inputRef.value.value = value;
         }
@@ -6522,6 +6555,14 @@ var stdin_default$13 = vue.defineComponent({
         emit("load", event);
       }
     };
+    const triggerLoad = () => {
+      const loadEvent = new Event("load");
+      Object.defineProperty(loadEvent, "target", {
+        value: imageRef.value,
+        enumerable: true
+      });
+      onLoad(loadEvent);
+    };
     const onError = (event) => {
       error.value = true;
       loading.value = false;
@@ -6579,7 +6620,7 @@ var stdin_default$13 = vue.defineComponent({
     }) => {
       const check = () => {
         if (el === imageRef.value && loading.value) {
-          onLoad();
+          triggerLoad();
         }
       };
       if (imageRef.value) {
@@ -6607,7 +6648,7 @@ var stdin_default$13 = vue.defineComponent({
       vue.nextTick(() => {
         var _a;
         if ((_a = imageRef.value) == null ? void 0 : _a.complete) {
-          onLoad();
+          triggerLoad();
         }
       });
     });
@@ -14847,7 +14888,7 @@ const Lazyload = {
     });
   }
 };
-const version = "4.0.3";
+const version = "4.0.4";
 function install(app) {
   const components = [
     ActionBar,

package/lib/vant.es.js

@@ -3967,6 +3967,7 @@ var stdin_default$1j = defineComponent({
       }
     };
     const limitValueLength = (value) => {
+      var _a;
       const {
         maxlength
       } = props;
@@ -3975,6 +3976,13 @@ var stdin_default$1j = defineComponent({
         if (modelValue && getStringLength(modelValue) === +maxlength) {
           return modelValue;
         }
+        const selectionEnd = (_a = inputRef.value) == null ? void 0 : _a.selectionEnd;
+        if (state.focused && selectionEnd) {
+          const valueArr = [...value];
+          const exceededLength = valueArr.length - +maxlength;
+          valueArr.splice(selectionEnd - exceededLength, exceededLength);
+          return valueArr.join("");
+        }
         return cutString(value, +maxlength);
       }
       return value;
@@ -3982,22 +3990,47 @@ var stdin_default$1j = defineComponent({
     const updateValue = (value, trigger = "onChange") => {
       const originalValue = value;
       value = limitValueLength(value);
-      const isExceedLimit = value !== originalValue;
+      const limitDiffLen = getStringLength(originalValue) - getStringLength(value);
       if (props.type === "number" || props.type === "digit") {
         const isNumber = props.type === "number";
         value = formatNumber(value, isNumber, isNumber);
       }
+      let formatterDiffLen = 0;
       if (props.formatter && trigger === props.formatTrigger) {
-        value = props.formatter(value);
+        const {
+          formatter,
+          maxlength
+        } = props;
+        value = formatter(value);
+        if (isDef(maxlength) && getStringLength(value) > maxlength) {
+          value = cutString(value, +maxlength);
+        }
+        if (inputRef.value && state.focused) {
+          const {
+            selectionEnd
+          } = inputRef.value;
+          const bcoVal = cutString(originalValue, selectionEnd);
+          formatterDiffLen = getStringLength(formatter(bcoVal)) - getStringLength(bcoVal);
+        }
       }
       if (inputRef.value && inputRef.value.value !== value) {
-        if (state.focused && isExceedLimit) {
-          const {
+        if (state.focused) {
+          let {
             selectionStart,
             selectionEnd
           } = inputRef.value;
           inputRef.value.value = value;
-          inputRef.value.setSelectionRange(selectionStart - 1, selectionEnd - 1);
+          if (isDef(selectionStart) && isDef(selectionEnd)) {
+            const valueLen = getStringLength(value);
+            if (limitDiffLen) {
+              selectionStart -= limitDiffLen;
+              selectionEnd -= limitDiffLen;
+            } else if (formatterDiffLen) {
+              selectionStart += formatterDiffLen;
+              selectionEnd += formatterDiffLen;
+            }
+            inputRef.value.setSelectionRange(Math.min(selectionStart, valueLen), Math.min(selectionEnd, valueLen));
+          }
         } else {
           inputRef.value.value = value;
         }
@@ -6520,6 +6553,14 @@ var stdin_default$13 = defineComponent({
         emit("load", event);
       }
     };
+    const triggerLoad = () => {
+      const loadEvent = new Event("load");
+      Object.defineProperty(loadEvent, "target", {
+        value: imageRef.value,
+        enumerable: true
+      });
+      onLoad(loadEvent);
+    };
     const onError = (event) => {
       error.value = true;
       loading.value = false;
@@ -6577,7 +6618,7 @@ var stdin_default$13 = defineComponent({
     }) => {
       const check = () => {
         if (el === imageRef.value && loading.value) {
-          onLoad();
+          triggerLoad();
         }
       };
       if (imageRef.value) {
@@ -6605,7 +6646,7 @@ var stdin_default$13 = defineComponent({
       nextTick(() => {
         var _a;
         if ((_a = imageRef.value) == null ? void 0 : _a.complete) {
-          onLoad();
+          triggerLoad();
         }
       });
     });
@@ -14845,7 +14886,7 @@ const Lazyload = {
     });
   }
 };
-const version = "4.0.3";
+const version = "4.0.4";
 function install(app) {
   const components = [
     ActionBar,

package/lib/vant.js

@@ -4327,6 +4327,7 @@
         }
       };
       const limitValueLength = (value) => {
+        var _a;
         const {
           maxlength
         } = props;
@@ -4335,6 +4336,13 @@
           if (modelValue && getStringLength(modelValue) === +maxlength) {
             return modelValue;
           }
+          const selectionEnd = (_a = inputRef.value) == null ? void 0 : _a.selectionEnd;
+          if (state.focused && selectionEnd) {
+            const valueArr = [...value];
+            const exceededLength = valueArr.length - +maxlength;
+            valueArr.splice(selectionEnd - exceededLength, exceededLength);
+            return valueArr.join("");
+          }
           return cutString(value, +maxlength);
         }
         return value;
@@ -4342,22 +4350,47 @@
       const updateValue = (value, trigger = "onChange") => {
         const originalValue = value;
         value = limitValueLength(value);
-        const isExceedLimit = value !== originalValue;
+        const limitDiffLen = getStringLength(originalValue) - getStringLength(value);
         if (props.type === "number" || props.type === "digit") {
           const isNumber = props.type === "number";
           value = formatNumber(value, isNumber, isNumber);
         }
+        let formatterDiffLen = 0;
         if (props.formatter && trigger === props.formatTrigger) {
-          value = props.formatter(value);
+          const {
+            formatter,
+            maxlength
+          } = props;
+          value = formatter(value);
+          if (isDef(maxlength) && getStringLength(value) > maxlength) {
+            value = cutString(value, +maxlength);
+          }
+          if (inputRef.value && state.focused) {
+            const {
+              selectionEnd
+            } = inputRef.value;
+            const bcoVal = cutString(originalValue, selectionEnd);
+            formatterDiffLen = getStringLength(formatter(bcoVal)) - getStringLength(bcoVal);
+          }
         }
         if (inputRef.value && inputRef.value.value !== value) {
-          if (state.focused && isExceedLimit) {
-            const {
+          if (state.focused) {
+            let {
               selectionStart,
               selectionEnd
             } = inputRef.value;
             inputRef.value.value = value;
-            inputRef.value.setSelectionRange(selectionStart - 1, selectionEnd - 1);
+            if (isDef(selectionStart) && isDef(selectionEnd)) {
+              const valueLen = getStringLength(value);
+              if (limitDiffLen) {
+                selectionStart -= limitDiffLen;
+                selectionEnd -= limitDiffLen;
+              } else if (formatterDiffLen) {
+                selectionStart += formatterDiffLen;
+                selectionEnd += formatterDiffLen;
+              }
+              inputRef.value.setSelectionRange(Math.min(selectionStart, valueLen), Math.min(selectionEnd, valueLen));
+            }
           } else {
             inputRef.value.value = value;
           }
@@ -6877,6 +6910,14 @@
           emit("load", event);
         }
       };
+      const triggerLoad = () => {
+        const loadEvent = new Event("load");
+        Object.defineProperty(loadEvent, "target", {
+          value: imageRef.value,
+          enumerable: true
+        });
+        onLoad(loadEvent);
+      };
       const onError = (event) => {
         error.value = true;
         loading.value = false;
@@ -6934,7 +6975,7 @@
       }) => {
         const check = () => {
           if (el === imageRef.value && loading.value) {
-            onLoad();
+            triggerLoad();
           }
         };
         if (imageRef.value) {
@@ -6962,7 +7003,7 @@
         vue.nextTick(() => {
           var _a;
           if ((_a = imageRef.value) == null ? void 0 : _a.complete) {
-            onLoad();
+            triggerLoad();
           }
         });
       });
@@ -16053,7 +16094,7 @@
       });
     }
   };
-  const version = "4.0.3";
+  const version = "4.0.4";
   function install(app) {
     const components = [
       ActionBar,