vant 4.0.0-rc.4 → 4.0.0-rc.5

package/lib/vant.es.js

@@ -737,6 +737,13 @@ var stdin_default$1z = defineComponent({
     const spinnerStyle = computed(() => extend({
       color: props.color
     }, getSizeStyle(props.size)));
+    const renderIcon = () => {
+      const DefaultIcon = props.type === "spinner" ? SpinIcon : CircularIcon;
+      return createVNode("span", {
+        "class": bem$1n("spinner", props.type),
+        "style": spinnerStyle.value
+      }, [slots.icon ? slots.icon() : DefaultIcon]);
+    };
     const renderText = () => {
       var _a;
       if (slots.default) {
@@ -760,10 +767,7 @@ var stdin_default$1z = defineComponent({
         }]),
         "aria-live": "polite",
         "aria-busy": true
-      }, [createVNode("span", {
-        "class": bem$1n("spinner", type),
-        "style": spinnerStyle.value
-      }, [type === "spinner" ? SpinIcon : CircularIcon]), renderText()]);
+      }, [renderIcon(), renderText()]);
     };
   }
 });
@@ -2641,17 +2645,19 @@ var stdin_default$1m = defineComponent({
       const newTab = children[newIndex];
       const newName = getTabName(newTab, newIndex);
       const shouldEmitChange = state.currentIndex !== null;
-      state.currentIndex = newIndex;
+      if (state.currentIndex !== newIndex) {
+        state.currentIndex = newIndex;
+        if (!skipScrollIntoView) {
+          scrollIntoView();
+        }
+        setLine();
+      }
       if (newName !== props.active) {
         emit("update:active", newName);
         if (shouldEmitChange) {
           emit("change", newName, newTab.title);
         }
       }
-      if (!skipScrollIntoView) {
-        scrollIntoView();
-      }
-      setLine();
       if (stickyFixed && !props.scrollspy) {
         setRootScrollTop(Math.ceil(getElementTop(root.value) - offsetTopPx.value));
       }
@@ -2750,13 +2756,14 @@ var stdin_default$1m = defineComponent({
       }
     };
     const renderHeader = () => {
-      var _a, _b;
+      var _a, _b, _c;
       const {
         type,
-        border
+        border,
+        sticky
       } = props;
-      return createVNode("div", {
-        "ref": wrapRef,
+      const Header = [createVNode("div", {
+        "ref": sticky ? void 0 : wrapRef,
         "class": [bem$1a("wrap"), {
           [BORDER_TOP_BOTTOM]: type === "line" && border
         }]
@@ -2769,7 +2776,13 @@ var stdin_default$1m = defineComponent({
         }]),
         "style": navStyle.value,
         "aria-orientation": "horizontal"
-      }, [(_a = slots["nav-left"]) == null ? void 0 : _a.call(slots), renderNav(), renderLine(), (_b = slots["nav-right"]) == null ? void 0 : _b.call(slots)])]);
+      }, [(_a = slots["nav-left"]) == null ? void 0 : _a.call(slots), renderNav(), renderLine(), (_b = slots["nav-right"]) == null ? void 0 : _b.call(slots)])]), (_c = slots["nav-bottom"]) == null ? void 0 : _c.call(slots)];
+      if (sticky) {
+        return createVNode("div", {
+          "ref": wrapRef
+        }, [Header]);
+      }
+      return Header;
     };
     watch([() => props.color, windowWidth], setLine);
     watch(() => props.active, (value) => {
@@ -2823,37 +2836,31 @@ var stdin_default$1m = defineComponent({
       currentName,
       scrollIntoView
     });
-    return () => {
-      var _a;
-      return createVNode("div", {
-        "ref": root,
-        "class": bem$1a([props.type])
-      }, [props.sticky ? createVNode(Sticky, {
-        "container": root.value,
-        "offsetTop": offsetTopPx.value,
-        "onScroll": onStickyScroll
-      }, {
-        default: () => {
-          var _a2;
-          return [renderHeader(), (_a2 = slots["nav-bottom"]) == null ? void 0 : _a2.call(slots)];
-        }
-      }) : [renderHeader(), (_a = slots["nav-bottom"]) == null ? void 0 : _a.call(slots)], createVNode(stdin_default$1n, {
-        "ref": contentRef,
-        "count": children.length,
-        "inited": state.inited,
-        "animated": props.animated,
-        "duration": props.duration,
-        "swipeable": props.swipeable,
-        "lazyRender": props.lazyRender,
-        "currentIndex": state.currentIndex,
-        "onChange": setCurrentIndex
-      }, {
-        default: () => {
-          var _a2;
-          return [(_a2 = slots.default) == null ? void 0 : _a2.call(slots)];
-        }
-      })]);
-    };
+    return () => createVNode("div", {
+      "ref": root,
+      "class": bem$1a([props.type])
+    }, [props.sticky ? createVNode(Sticky, {
+      "container": root.value,
+      "offsetTop": offsetTopPx.value,
+      "onScroll": onStickyScroll
+    }, {
+      default: () => [renderHeader()]
+    }) : renderHeader(), createVNode(stdin_default$1n, {
+      "ref": contentRef,
+      "count": children.length,
+      "inited": state.inited,
+      "animated": props.animated,
+      "duration": props.duration,
+      "swipeable": props.swipeable,
+      "lazyRender": props.lazyRender,
+      "currentIndex": state.currentIndex,
+      "onChange": setCurrentIndex
+    }, {
+      default: () => {
+        var _a;
+        return [(_a = slots.default) == null ? void 0 : _a.call(slots)];
+      }
+    })]);
   }
 });
 const TAB_STATUS_KEY = Symbol();
@@ -4189,9 +4196,9 @@ var stdin_default$1e = defineComponent({
       const labelAlign = getProp("labelAlign");
       const Label = renderLabel();
       const LeftIcon = renderLeftIcon();
+      const renderTitle = () => labelAlign === "top" ? [LeftIcon, Label] : Label;
       return createVNode(Cell, {
         "size": props.size,
-        "icon": props.leftIcon,
         "class": bem$13({
           error: showError.value,
           disabled,
@@ -4208,8 +4215,8 @@ var stdin_default$1e = defineComponent({
         }]), props.labelClass],
         "arrowDirection": props.arrowDirection
       }, {
-        icon: LeftIcon ? () => LeftIcon : null,
-        title: Label ? () => Label : null,
+        icon: LeftIcon && labelAlign !== "top" ? () => LeftIcon : null,
+        title: Label || labelAlign === "top" ? renderTitle : null,
         value: renderFieldBody,
         extra: slots.extra
       });
@@ -5397,6 +5404,16 @@ const genOptions = (min, max, type, formatter, filter) => {
   });
   return filter ? filter(type, options) : options;
 };
+const formatValueRange = (values, columns) => values.map((value, index) => {
+  const column = columns[index];
+  if (column.length) {
+    const maxValue = +column[column.length - 1].value;
+    if (+value > maxValue) {
+      return String(maxValue);
+    }
+  }
+  return value;
+});
 const [name$Y] = createNamespace("calendar-day");
 var stdin_default$13 = defineComponent({
   name: name$Y,
@@ -8332,9 +8349,12 @@ var stdin_default$I = defineComponent({
       }
     });
     watch(() => props.modelValue, (newValues) => {
+      newValues = formatValueRange(newValues, columns.value);
       if (!isSameValue(newValues, currentValues.value)) {
         currentValues.value = newValues;
       }
+    }, {
+      immediate: true
     });
     const onChange = (...args) => emit("change", ...args);
     const onCancel = (...args) => emit("cancel", ...args);
@@ -10015,7 +10035,8 @@ const navBarProps = {
   rightText: String,
   leftArrow: Boolean,
   placeholder: Boolean,
-  safeAreaInsetTop: Boolean
+  safeAreaInsetTop: Boolean,
+  clickable: truthProp
 };
 var stdin_default$w = defineComponent({
   name: name$r,
@@ -10070,12 +10091,12 @@ var stdin_default$w = defineComponent({
       }, [createVNode("div", {
         "class": bem$q("content")
       }, [hasLeft && createVNode("div", {
-        "class": [bem$q("left"), HAPTICS_FEEDBACK],
+        "class": [bem$q("left"), props.clickable ? HAPTICS_FEEDBACK : ""],
         "onClick": onClickLeft
       }, [renderLeft()]), createVNode("div", {
         "class": [bem$q("title"), "van-ellipsis"]
       }, [slots.title ? slots.title() : title]), hasRight && createVNode("div", {
-        "class": [bem$q("right"), HAPTICS_FEEDBACK],
+        "class": [bem$q("right"), props.clickable ? HAPTICS_FEEDBACK : ""],
         "onClick": onClickRight
       }, [renderRight()])])]);
     };
@@ -12408,6 +12429,7 @@ const stepperProps = {
   showMinus: truthProp,
   showInput: truthProp,
   longPress: truthProp,
+  autoFixed: truthProp,
   allowEmpty: Boolean,
   modelValue: numericProp,
   inputWidth: numericProp,
@@ -12427,7 +12449,7 @@ var stdin_default$c = defineComponent({
   setup(props, {
     emit
   }) {
-    const format2 = (value) => {
+    const format2 = (value, autoFixed = true) => {
       const {
         min,
         max,
@@ -12440,7 +12462,7 @@ var stdin_default$c = defineComponent({
       value = formatNumber(String(value), !props.integer);
       value = value === "" ? 0 : +value;
       value = Number.isNaN(value) ? +min : value;
-      value = Math.max(Math.min(+max, value), +min);
+      value = autoFixed ? Math.max(Math.min(+max, value), +min) : value;
       if (isDef(decimalLength)) {
         value = value.toFixed(+decimalLength);
       }
@@ -12524,7 +12546,7 @@ var stdin_default$c = defineComponent({
     };
     const onBlur = (event) => {
       const input = event.target;
-      const value = format2(input.value);
+      const value = format2(input.value, props.autoFixed);
       input.value = String(value);
       current2.value = value;
       nextTick(() => {
@@ -13123,13 +13145,14 @@ var stdin_default$7 = defineComponent({
       if (!isSameValue(newValues, props.modelValue)) {
         emit("update:modelValue", newValues);
       }
-    }, {
-      immediate: true
     });
     watch(() => props.modelValue, (newValues) => {
+      newValues = formatValueRange(newValues, columns.value);
       if (!isSameValue(newValues, currentValues.value)) {
         currentValues.value = newValues;
       }
+    }, {
+      immediate: true
     });
     const onChange = (...args) => emit("change", ...args);
     const onCancel = (...args) => emit("cancel", ...args);
@@ -14550,7 +14573,7 @@ const Lazyload = {
     });
   }
 };
-const version = "4.0.0-rc.4";
+const version = "4.0.0-rc.5";
 function install(app) {
   const components = [
     ActionBar,

package/lib/vant.js

@@ -1106,6 +1106,13 @@
       const spinnerStyle = vue.computed(() => extend({
         color: props.color
       }, getSizeStyle(props.size)));
+      const renderIcon = () => {
+        const DefaultIcon = props.type === "spinner" ? SpinIcon : CircularIcon;
+        return vue.createVNode("span", {
+          "class": bem$1n("spinner", props.type),
+          "style": spinnerStyle.value
+        }, [slots.icon ? slots.icon() : DefaultIcon]);
+      };
       const renderText = () => {
         var _a;
         if (slots.default) {
@@ -1129,10 +1136,7 @@
           }]),
           "aria-live": "polite",
           "aria-busy": true
-        }, [vue.createVNode("span", {
-          "class": bem$1n("spinner", type),
-          "style": spinnerStyle.value
-        }, [type === "spinner" ? SpinIcon : CircularIcon]), renderText()]);
+        }, [renderIcon(), renderText()]);
       };
     }
   });
@@ -3007,17 +3011,19 @@
         const newTab = children[newIndex];
         const newName = getTabName(newTab, newIndex);
         const shouldEmitChange = state.currentIndex !== null;
-        state.currentIndex = newIndex;
+        if (state.currentIndex !== newIndex) {
+          state.currentIndex = newIndex;
+          if (!skipScrollIntoView) {
+            scrollIntoView();
+          }
+          setLine();
+        }
         if (newName !== props.active) {
           emit("update:active", newName);
           if (shouldEmitChange) {
             emit("change", newName, newTab.title);
           }
         }
-        if (!skipScrollIntoView) {
-          scrollIntoView();
-        }
-        setLine();
         if (stickyFixed && !props.scrollspy) {
           setRootScrollTop(Math.ceil(getElementTop(root.value) - offsetTopPx.value));
         }
@@ -3116,13 +3122,14 @@
         }
       };
       const renderHeader = () => {
-        var _a, _b;
+        var _a, _b, _c;
         const {
           type,
-          border
+          border,
+          sticky
         } = props;
-        return vue.createVNode("div", {
-          "ref": wrapRef,
+        const Header = [vue.createVNode("div", {
+          "ref": sticky ? void 0 : wrapRef,
           "class": [bem$1a("wrap"), {
             [BORDER_TOP_BOTTOM]: type === "line" && border
           }]
@@ -3135,7 +3142,13 @@
           }]),
           "style": navStyle.value,
           "aria-orientation": "horizontal"
-        }, [(_a = slots["nav-left"]) == null ? void 0 : _a.call(slots), renderNav(), renderLine(), (_b = slots["nav-right"]) == null ? void 0 : _b.call(slots)])]);
+        }, [(_a = slots["nav-left"]) == null ? void 0 : _a.call(slots), renderNav(), renderLine(), (_b = slots["nav-right"]) == null ? void 0 : _b.call(slots)])]), (_c = slots["nav-bottom"]) == null ? void 0 : _c.call(slots)];
+        if (sticky) {
+          return vue.createVNode("div", {
+            "ref": wrapRef
+          }, [Header]);
+        }
+        return Header;
       };
       vue.watch([() => props.color, windowWidth], setLine);
       vue.watch(() => props.active, (value) => {
@@ -3189,37 +3202,31 @@
         currentName,
         scrollIntoView
       });
-      return () => {
-        var _a;
-        return vue.createVNode("div", {
-          "ref": root,
-          "class": bem$1a([props.type])
-        }, [props.sticky ? vue.createVNode(Sticky, {
-          "container": root.value,
-          "offsetTop": offsetTopPx.value,
-          "onScroll": onStickyScroll
-        }, {
-          default: () => {
-            var _a2;
-            return [renderHeader(), (_a2 = slots["nav-bottom"]) == null ? void 0 : _a2.call(slots)];
-          }
-        }) : [renderHeader(), (_a = slots["nav-bottom"]) == null ? void 0 : _a.call(slots)], vue.createVNode(stdin_default$1n, {
-          "ref": contentRef,
-          "count": children.length,
-          "inited": state.inited,
-          "animated": props.animated,
-          "duration": props.duration,
-          "swipeable": props.swipeable,
-          "lazyRender": props.lazyRender,
-          "currentIndex": state.currentIndex,
-          "onChange": setCurrentIndex
-        }, {
-          default: () => {
-            var _a2;
-            return [(_a2 = slots.default) == null ? void 0 : _a2.call(slots)];
-          }
-        })]);
-      };
+      return () => vue.createVNode("div", {
+        "ref": root,
+        "class": bem$1a([props.type])
+      }, [props.sticky ? vue.createVNode(Sticky, {
+        "container": root.value,
+        "offsetTop": offsetTopPx.value,
+        "onScroll": onStickyScroll
+      }, {
+        default: () => [renderHeader()]
+      }) : renderHeader(), vue.createVNode(stdin_default$1n, {
+        "ref": contentRef,
+        "count": children.length,
+        "inited": state.inited,
+        "animated": props.animated,
+        "duration": props.duration,
+        "swipeable": props.swipeable,
+        "lazyRender": props.lazyRender,
+        "currentIndex": state.currentIndex,
+        "onChange": setCurrentIndex
+      }, {
+        default: () => {
+          var _a;
+          return [(_a = slots.default) == null ? void 0 : _a.call(slots)];
+        }
+      })]);
     }
   });
   const TAB_STATUS_KEY = Symbol();
@@ -4549,9 +4556,9 @@
         const labelAlign = getProp("labelAlign");
         const Label = renderLabel();
         const LeftIcon = renderLeftIcon();
+        const renderTitle = () => labelAlign === "top" ? [LeftIcon, Label] : Label;
         return vue.createVNode(Cell, {
           "size": props.size,
-          "icon": props.leftIcon,
           "class": bem$13({
             error: showError.value,
             disabled,
@@ -4568,8 +4575,8 @@
           }]), props.labelClass],
           "arrowDirection": props.arrowDirection
         }, {
-          icon: LeftIcon ? () => LeftIcon : null,
-          title: Label ? () => Label : null,
+          icon: LeftIcon && labelAlign !== "top" ? () => LeftIcon : null,
+          title: Label || labelAlign === "top" ? renderTitle : null,
           value: renderFieldBody,
           extra: slots.extra
         });
@@ -5757,6 +5764,16 @@
     });
     return filter ? filter(type, options) : options;
   };
+  const formatValueRange = (values, columns) => values.map((value, index) => {
+    const column = columns[index];
+    if (column.length) {
+      const maxValue = +column[column.length - 1].value;
+      if (+value > maxValue) {
+        return String(maxValue);
+      }
+    }
+    return value;
+  });
   const [name$Y] = createNamespace("calendar-day");
   var stdin_default$13 = vue.defineComponent({
     name: name$Y,
@@ -8675,9 +8692,12 @@
         }
       });
       vue.watch(() => props.modelValue, (newValues) => {
+        newValues = formatValueRange(newValues, columns.value);
         if (!isSameValue(newValues, currentValues.value)) {
           currentValues.value = newValues;
         }
+      }, {
+        immediate: true
       });
       const onChange = (...args) => emit("change", ...args);
       const onCancel = (...args) => emit("cancel", ...args);
@@ -10349,7 +10369,8 @@
     rightText: String,
     leftArrow: Boolean,
     placeholder: Boolean,
-    safeAreaInsetTop: Boolean
+    safeAreaInsetTop: Boolean,
+    clickable: truthProp
   };
   var stdin_default$w = vue.defineComponent({
     name: name$r,
@@ -10404,12 +10425,12 @@
         }, [vue.createVNode("div", {
           "class": bem$q("content")
         }, [hasLeft && vue.createVNode("div", {
-          "class": [bem$q("left"), HAPTICS_FEEDBACK],
+          "class": [bem$q("left"), props.clickable ? HAPTICS_FEEDBACK : ""],
           "onClick": onClickLeft
         }, [renderLeft()]), vue.createVNode("div", {
           "class": [bem$q("title"), "van-ellipsis"]
         }, [slots.title ? slots.title() : title]), hasRight && vue.createVNode("div", {
-          "class": [bem$q("right"), HAPTICS_FEEDBACK],
+          "class": [bem$q("right"), props.clickable ? HAPTICS_FEEDBACK : ""],
           "onClick": onClickRight
         }, [renderRight()])])]);
       };
@@ -13645,6 +13666,7 @@
     showMinus: truthProp,
     showInput: truthProp,
     longPress: truthProp,
+    autoFixed: truthProp,
     allowEmpty: Boolean,
     modelValue: numericProp,
     inputWidth: numericProp,
@@ -13664,7 +13686,7 @@
     setup(props, {
       emit
     }) {
-      const format2 = (value) => {
+      const format2 = (value, autoFixed = true) => {
         const {
           min,
           max,
@@ -13677,7 +13699,7 @@
         value = formatNumber(String(value), !props.integer);
         value = value === "" ? 0 : +value;
         value = Number.isNaN(value) ? +min : value;
-        value = Math.max(Math.min(+max, value), +min);
+        value = autoFixed ? Math.max(Math.min(+max, value), +min) : value;
         if (isDef(decimalLength)) {
           value = value.toFixed(+decimalLength);
         }
@@ -13761,7 +13783,7 @@
       };
       const onBlur = (event) => {
         const input = event.target;
-        const value = format2(input.value);
+        const value = format2(input.value, props.autoFixed);
         input.value = String(value);
         current2.value = value;
         vue.nextTick(() => {
@@ -14357,13 +14379,14 @@
         if (!isSameValue(newValues, props.modelValue)) {
           emit("update:modelValue", newValues);
         }
-      }, {
-        immediate: true
       });
       vue.watch(() => props.modelValue, (newValues) => {
+        newValues = formatValueRange(newValues, columns.value);
         if (!isSameValue(newValues, currentValues.value)) {
           currentValues.value = newValues;
         }
+      }, {
+        immediate: true
       });
       const onChange = (...args) => emit("change", ...args);
       const onCancel = (...args) => emit("cancel", ...args);
@@ -15767,7 +15790,7 @@
       });
     }
   };
-  const version = "4.0.0-rc.4";
+  const version = "4.0.0-rc.5";
   function install(app) {
     const components = [
       ActionBar,