vant 4.0.2 → 4.0.4

package/lib/vant.es.js

@@ -3477,11 +3477,16 @@ var stdin_default$1l = defineComponent({
       }
     };
     const renderTitle = () => {
+      var _a;
       if (slots.title || isDef(props.title)) {
+        const titleSlot = (_a = slots.title) == null ? void 0 : _a.call(slots);
+        if (Array.isArray(titleSlot) && titleSlot.length === 0) {
+          return;
+        }
         return createVNode("div", {
           "class": [bem$1a("title"), props.titleClass],
           "style": props.titleStyle
-        }, [slots.title ? slots.title() : createVNode("span", null, [props.title]), renderLabel()]);
+        }, [titleSlot || createVNode("span", null, [props.title]), renderLabel()]);
       }
     };
     const renderValue = () => {
@@ -3962,6 +3967,7 @@ var stdin_default$1j = defineComponent({
       }
     };
     const limitValueLength = (value) => {
+      var _a;
       const {
         maxlength
       } = props;
@@ -3970,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;
@@ -3977,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;
         }
@@ -4219,9 +4257,14 @@ var stdin_default$1j = defineComponent({
     return () => {
       const disabled = getProp("disabled");
       const labelAlign = getProp("labelAlign");
-      const Label = renderLabel();
       const LeftIcon = renderLeftIcon();
-      const renderTitle = () => labelAlign === "top" ? [LeftIcon, Label] : Label;
+      const renderTitle = () => {
+        const Label = renderLabel();
+        if (labelAlign === "top") {
+          return [LeftIcon, Label].filter(Boolean);
+        }
+        return Label || [];
+      };
       return createVNode(Cell, {
         "size": props.size,
         "class": bem$18({
@@ -4241,7 +4284,7 @@ var stdin_default$1j = defineComponent({
         "arrowDirection": props.arrowDirection
       }, {
         icon: LeftIcon && labelAlign !== "top" ? () => LeftIcon : null,
-        title: Label || labelAlign === "top" ? renderTitle : null,
+        title: renderTitle,
         value: renderFieldBody,
         extra: slots.extra
       });
@@ -6510,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;
@@ -6567,7 +6618,7 @@ var stdin_default$13 = defineComponent({
     }) => {
       const check = () => {
         if (el === imageRef.value && loading.value) {
-          onLoad();
+          triggerLoad();
         }
       };
       if (imageRef.value) {
@@ -6592,10 +6643,12 @@ var stdin_default$13 = defineComponent({
       });
     }
     onMounted(() => {
-      var _a;
-      if ((_a = imageRef.value) == null ? void 0 : _a.complete) {
-        onLoad();
-      }
+      nextTick(() => {
+        var _a;
+        if ((_a = imageRef.value) == null ? void 0 : _a.complete) {
+          triggerLoad();
+        }
+      });
     });
     return () => {
       var _a;
@@ -14833,7 +14886,7 @@ const Lazyload = {
     });
   }
 };
-const version = "4.0.2";
+const version = "4.0.4";
 function install(app) {
   const components = [
     ActionBar,

package/lib/vant.js

@@ -3837,11 +3837,16 @@
         }
       };
       const renderTitle = () => {
+        var _a;
         if (slots.title || isDef(props.title)) {
+          const titleSlot = (_a = slots.title) == null ? void 0 : _a.call(slots);
+          if (Array.isArray(titleSlot) && titleSlot.length === 0) {
+            return;
+          }
           return vue.createVNode("div", {
             "class": [bem$1a("title"), props.titleClass],
             "style": props.titleStyle
-          }, [slots.title ? slots.title() : vue.createVNode("span", null, [props.title]), renderLabel()]);
+          }, [titleSlot || vue.createVNode("span", null, [props.title]), renderLabel()]);
         }
       };
       const renderValue = () => {
@@ -4322,6 +4327,7 @@
         }
       };
       const limitValueLength = (value) => {
+        var _a;
         const {
           maxlength
         } = props;
@@ -4330,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;
@@ -4337,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;
           }
@@ -4579,9 +4617,14 @@
       return () => {
         const disabled = getProp("disabled");
         const labelAlign = getProp("labelAlign");
-        const Label = renderLabel();
         const LeftIcon = renderLeftIcon();
-        const renderTitle = () => labelAlign === "top" ? [LeftIcon, Label] : Label;
+        const renderTitle = () => {
+          const Label = renderLabel();
+          if (labelAlign === "top") {
+            return [LeftIcon, Label].filter(Boolean);
+          }
+          return Label || [];
+        };
         return vue.createVNode(Cell, {
           "size": props.size,
           "class": bem$18({
@@ -4601,7 +4644,7 @@
           "arrowDirection": props.arrowDirection
         }, {
           icon: LeftIcon && labelAlign !== "top" ? () => LeftIcon : null,
-          title: Label || labelAlign === "top" ? renderTitle : null,
+          title: renderTitle,
           value: renderFieldBody,
           extra: slots.extra
         });
@@ -6867,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;
@@ -6924,7 +6975,7 @@
       }) => {
         const check = () => {
           if (el === imageRef.value && loading.value) {
-            onLoad();
+            triggerLoad();
           }
         };
         if (imageRef.value) {
@@ -6949,10 +7000,12 @@
         });
       }
       vue.onMounted(() => {
-        var _a;
-        if ((_a = imageRef.value) == null ? void 0 : _a.complete) {
-          onLoad();
-        }
+        vue.nextTick(() => {
+          var _a;
+          if ((_a = imageRef.value) == null ? void 0 : _a.complete) {
+            triggerLoad();
+          }
+        });
       });
       return () => {
         var _a;
@@ -16041,7 +16094,7 @@
       });
     }
   };
-  const version = "4.0.2";
+  const version = "4.0.4";
   function install(app) {
     const components = [
       ActionBar,