vant 3.6.9 → 3.6.11

package/es/field/Field.mjs

@@ -178,6 +178,7 @@ var stdin_default = defineComponent({
       }
     };
     const limitValueLength = (value) => {
+      var _a;
       const {
         maxlength
       } = props;
@@ -186,27 +187,63 @@ 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;
     };
     const updateValue = (value, trigger = "onChange") => {
+      const originalValue = value;
       value = limitValueLength(value);
+      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) {
-        const {
-          selectionStart,
-          selectionEnd
-        } = inputRef.value;
-        inputRef.value.value = value;
         if (state.focused) {
-          inputRef.value.setSelectionRange(selectionStart, selectionEnd);
+          let {
+            selectionStart,
+            selectionEnd
+          } = inputRef.value;
+          inputRef.value.value = value;
+          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;
         }
       }
       if (value !== props.modelValue) {

package/es/index.d.ts

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

package/es/index.mjs

@@ -84,7 +84,7 @@ import { Tag } from "./tag/index.mjs";
 import { Toast } from "./toast/index.mjs";
 import { TreeSelect } from "./tree-select/index.mjs";
 import { Uploader } from "./uploader/index.mjs";
-const version = "3.6.9";
+const version = "3.6.11";
 function install(app) {
   const components = [
     ActionBar,

package/lib/field/Field.js

@@ -201,6 +201,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
       }
     };
     const limitValueLength = (value) => {
+      var _a;
       const {
         maxlength
       } = props;
@@ -209,27 +210,63 @@ 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;
     };
     const updateValue = (value, trigger = "onChange") => {
+      const originalValue = value;
       value = limitValueLength(value);
+      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) {
-        const {
-          selectionStart,
-          selectionEnd
-        } = inputRef.value;
-        inputRef.value.value = value;
         if (state.focused) {
-          inputRef.value.setSelectionRange(selectionStart, selectionEnd);
+          let {
+            selectionStart,
+            selectionEnd
+          } = inputRef.value;
+          inputRef.value.value = value;
+          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;
         }
       }
       if (value !== props.modelValue) {

package/lib/index.d.ts

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

package/lib/index.js

@@ -196,7 +196,7 @@ __reExport(stdin_exports, require("./tag"), 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 = "3.6.9";
+const version = "3.6.11";
 function install(app) {
   const components = [
     import_action_bar.ActionBar,

package/lib/vant.cjs.js

@@ -2832,6 +2832,7 @@ var stdin_default$1m = vue.defineComponent({
       }
     };
     const limitValueLength = (value) => {
+      var _a;
       const {
         maxlength
       } = props;
@@ -2840,27 +2841,63 @@ var stdin_default$1m = 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;
     };
     const updateValue = (value, trigger = "onChange") => {
+      const originalValue = value;
       value = limitValueLength(value);
+      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) {
-        const {
-          selectionStart,
-          selectionEnd
-        } = inputRef.value;
-        inputRef.value.value = value;
         if (state.focused) {
-          inputRef.value.setSelectionRange(selectionStart, selectionEnd);
+          let {
+            selectionStart,
+            selectionEnd
+          } = inputRef.value;
+          inputRef.value.value = value;
+          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;
         }
       }
       if (value !== props.modelValue) {
@@ -14963,7 +15000,7 @@ const Lazyload = {
     });
   }
 };
-const version = "3.6.9";
+const version = "3.6.11";
 function install(app) {
   const components = [
     ActionBar,

package/lib/vant.es.js

@@ -2830,6 +2830,7 @@ var stdin_default$1m = defineComponent({
       }
     };
     const limitValueLength = (value) => {
+      var _a;
       const {
         maxlength
       } = props;
@@ -2838,27 +2839,63 @@ var stdin_default$1m = 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;
     };
     const updateValue = (value, trigger = "onChange") => {
+      const originalValue = value;
       value = limitValueLength(value);
+      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) {
-        const {
-          selectionStart,
-          selectionEnd
-        } = inputRef.value;
-        inputRef.value.value = value;
         if (state.focused) {
-          inputRef.value.setSelectionRange(selectionStart, selectionEnd);
+          let {
+            selectionStart,
+            selectionEnd
+          } = inputRef.value;
+          inputRef.value.value = value;
+          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;
         }
       }
       if (value !== props.modelValue) {
@@ -14961,7 +14998,7 @@ const Lazyload = {
     });
   }
 };
-const version = "3.6.9";
+const version = "3.6.11";
 function install(app) {
   const components = [
     ActionBar,

package/lib/vant.js

@@ -3188,6 +3188,7 @@
         }
       };
       const limitValueLength = (value) => {
+        var _a;
         const {
           maxlength
         } = props;
@@ -3196,27 +3197,63 @@
           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;
       };
       const updateValue = (value, trigger = "onChange") => {
+        const originalValue = value;
         value = limitValueLength(value);
+        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) {
-          const {
-            selectionStart,
-            selectionEnd
-          } = inputRef.value;
-          inputRef.value.value = value;
           if (state.focused) {
-            inputRef.value.setSelectionRange(selectionStart, selectionEnd);
+            let {
+              selectionStart,
+              selectionEnd
+            } = inputRef.value;
+            inputRef.value.value = value;
+            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;
           }
         }
         if (value !== props.modelValue) {
@@ -16160,7 +16197,7 @@
       });
     }
   };
-  const version = "3.6.9";
+  const version = "3.6.11";
   function install(app) {
     const components = [
       ActionBar,