vant 2.12.36 → 2.12.40

package/lib/index.js

@@ -361,7 +361,7 @@ exports.TreeSelect = _treeSelect.default;
 var _uploader = _interopRequireDefault(require("./uploader"));
 
 exports.Uploader = _uploader.default;
-var version = '2.12.36';
+var version = '2.12.40';
 exports.version = version;
 
 function install(Vue) {

package/lib/mixins/touch.js

@@ -5,14 +5,12 @@ exports.TouchMixin = void 0;
 
 var _event = require("../utils/dom/event");
 
-var MIN_DISTANCE = 10;
-
 function getDirection(x, y) {
-  if (x > y && x > MIN_DISTANCE) {
+  if (x > y) {
     return 'horizontal';
   }
 
-  if (y > x && y > MIN_DISTANCE) {
+  if (y > x) {
     return 'vertical';
   }
 
@@ -32,13 +30,18 @@ var TouchMixin = {
       this.startY = event.touches[0].clientY;
     },
     touchMove: function touchMove(event) {
-      var touch = event.touches[0]; // Fix: Safari back will set clientX to negative number
+      var touch = event.touches[0]; // safari back will set clientX to negative number
 
       this.deltaX = touch.clientX < 0 ? 0 : touch.clientX - this.startX;
       this.deltaY = touch.clientY - this.startY;
       this.offsetX = Math.abs(this.deltaX);
-      this.offsetY = Math.abs(this.deltaY);
-      this.direction = this.direction || getDirection(this.offsetX, this.offsetY);
+      this.offsetY = Math.abs(this.deltaY); // lock direction when distance is greater than a certain value
+
+      var LOCK_DIRECTION_DISTANCE = 10;
+
+      if (!this.direction || this.offsetX < LOCK_DIRECTION_DISTANCE && this.offsetY < LOCK_DIRECTION_DISTANCE) {
+        this.direction = getDirection(this.offsetX, this.offsetY);
+      }
     },
     resetTouchStatus: function resetTouchStatus() {
       this.direction = '';

package/lib/nav-bar/index.js

@@ -38,8 +38,16 @@ var _default = createComponent({
     };
   },
   mounted: function mounted() {
+    var _this = this;
+
     if (this.placeholder && this.fixed) {
-      this.height = this.$refs.navBar.getBoundingClientRect().height;
+      var setHeight = function setHeight() {
+        _this.height = _this.$refs.navBar.getBoundingClientRect().height;
+      };
+
+      setHeight(); // https://github.com/youzan/vant/issues/10131
+
+      setTimeout(setHeight, 100);
     }
   },
   methods: {

package/lib/slider/index.js

@@ -243,6 +243,7 @@ var _default = createComponent({
     var renderButton = function renderButton(i) {
       var map = ['left', 'right'];
       var isNumber = typeof i === 'number';
+      var current = isNumber ? _this.value[i] : _this.value;
 
       var getClassName = function getClassName() {
         if (isNumber) {
@@ -260,6 +261,27 @@ var _default = createComponent({
         return "wrapper";
       };
 
+      var renderButtonContent = function renderButtonContent() {
+        if (isNumber) {
+          var slot = _this.slots(i === 0 ? 'left-button' : 'right-button', {
+            value: current
+          });
+
+          if (slot) {
+            return slot;
+          }
+        }
+
+        if (_this.slots('button')) {
+          return _this.slots('button');
+        }
+
+        return h("div", {
+          "class": bem('button'),
+          "style": _this.buttonStyle
+        });
+      };
+
       return h("div", {
         "ref": getRefName(),
         "attrs": {
@@ -282,10 +304,7 @@ var _default = createComponent({
             return e.stopPropagation();
           }
         }
-      }, [_this.slots('button') || h("div", {
-        "class": bem('button'),
-        "style": _this.buttonStyle
-      })]);
+      }, [renderButtonContent()]);
     };
 
     return h("div", {

package/lib/swipe/index.js

@@ -193,16 +193,10 @@ var _default = createComponent({
     },
     onTouchMove: function onTouchMove(event) {
       if (!this.touchable || !this.swiping) return;
-      this.touchMove(event); // if user starting to touchmove, prevent the event bubbling to
-      // avoid affecting the parent components
-
-      var shouldPrevent = this.isCorrectDirection || this.offsetY > this.offsetX === this.vertical;
-
-      if (shouldPrevent) {
-        (0, _event.preventDefault)(event, this.stopPropagation);
-      }
+      this.touchMove(event);
 
       if (this.isCorrectDirection) {
+        (0, _event.preventDefault)(event, this.stopPropagation);
         this.move({
           offset: this.delta
         });

package/lib/tabbar/index.js

@@ -61,28 +61,36 @@ var _default = createComponent({
     children: 'setActiveItem'
   },
   mounted: function mounted() {
+    var _this = this;
+
     if (this.placeholder && this.fixed) {
-      this.height = this.$refs.tabbar.getBoundingClientRect().height;
+      var setHeight = function setHeight() {
+        _this.height = _this.$refs.tabbar.getBoundingClientRect().height;
+      };
+
+      setHeight(); // https://github.com/youzan/vant/issues/10131
+
+      setTimeout(setHeight, 100);
     }
   },
   methods: {
     setActiveItem: function setActiveItem() {
-      var _this = this;
+      var _this2 = this;
 
       this.children.forEach(function (item, index) {
-        item.nameMatched = (item.name || index) === _this.value;
+        item.nameMatched = (item.name || index) === _this2.value;
       });
     },
     triggerChange: function triggerChange(active, afterChange) {
-      var _this2 = this;
+      var _this3 = this;
 
       (0, _interceptor.callInterceptor)({
         interceptor: this.beforeChange,
         args: [active],
         done: function done() {
-          _this2.$emit('input', active);
+          _this3.$emit('input', active);
 
-          _this2.$emit('change', active);
+          _this3.$emit('change', active);
 
           afterChange();
         }

package/lib/vant.js

@@ -790,7 +790,7 @@ __webpack_require__.d(__webpack_exports__, "Overlay", function() { return /* ree
 __webpack_require__.d(__webpack_exports__, "Pagination", function() { return /* reexport */ pagination; });
 __webpack_require__.d(__webpack_exports__, "Panel", function() { return /* reexport */ panel; });
 __webpack_require__.d(__webpack_exports__, "PasswordInput", function() { return /* reexport */ password_input; });
-__webpack_require__.d(__webpack_exports__, "Picker", function() { return /* reexport */ picker; });
+__webpack_require__.d(__webpack_exports__, "Picker", function() { return /* reexport */ es_picker; });
 __webpack_require__.d(__webpack_exports__, "Popover", function() { return /* reexport */ popover; });
 __webpack_require__.d(__webpack_exports__, "Popup", function() { return /* reexport */ popup; });
 __webpack_require__.d(__webpack_exports__, "Progress", function() { return /* reexport */ es_progress; });
@@ -1194,14 +1194,13 @@ function getVisibleTop(el) {
 }
 // CONCATENATED MODULE: ./es/mixins/touch.js
 
-var MIN_DISTANCE = 10;
 
 function getDirection(x, y) {
-  if (x > y && x > MIN_DISTANCE) {
+  if (x > y) {
     return 'horizontal';
   }
 
-  if (y > x && y > MIN_DISTANCE) {
+  if (y > x) {
     return 'vertical';
   }
 
@@ -1221,13 +1220,18 @@ var TouchMixin = {
       this.startY = event.touches[0].clientY;
     },
     touchMove: function touchMove(event) {
-      var touch = event.touches[0]; // Fix: Safari back will set clientX to negative number
+      var touch = event.touches[0]; // safari back will set clientX to negative number
 
       this.deltaX = touch.clientX < 0 ? 0 : touch.clientX - this.startX;
       this.deltaY = touch.clientY - this.startY;
       this.offsetX = Math.abs(this.deltaX);
-      this.offsetY = Math.abs(this.deltaY);
-      this.direction = this.direction || getDirection(this.offsetX, this.offsetY);
+      this.offsetY = Math.abs(this.deltaY); // lock direction when distance is greater than a certain value
+
+      var LOCK_DIRECTION_DISTANCE = 10;
+
+      if (!this.direction || this.offsetX < LOCK_DIRECTION_DISTANCE && this.offsetY < LOCK_DIRECTION_DISTANCE) {
+        this.direction = getDirection(this.offsetX, this.offsetY);
+      }
     },
     resetTouchStatus: function resetTouchStatus() {
       this.direction = '';
@@ -2560,7 +2564,7 @@ var picker_createNamespace = Object(create["a" /* createNamespace */])('picker')
     picker_bem = picker_createNamespace[1],
     t = picker_createNamespace[2];
 
-/* harmony default export */ var picker = (picker_createComponent({
+/* harmony default export */ var es_picker = (picker_createComponent({
   props: _extends({}, pickerProps, {
     defaultIndex: {
       type: [Number, String],
@@ -3228,7 +3232,7 @@ function pickSlots(instance, keys) {
       confirm: this.onConfirm
     });
 
-    return h(picker, {
+    return h(es_picker, {
       "ref": "picker",
       "class": area_bem(),
       "attrs": {
@@ -6557,6 +6561,10 @@ function copyDates(dates) {
 // CONCATENATED MODULE: ./es/datetime-picker/utils.js
 
 function times(n, iteratee) {
+  if (n < 0) {
+    return [];
+  }
+
   var index = -1;
   var result = Array(n);
 
@@ -8835,6 +8843,10 @@ var cascader_createNamespace = Object(create["a" /* createNamespace */])('cascad
     closeable: {
       type: Boolean,
       default: true
+    },
+    showHeader: {
+      type: Boolean,
+      default: true
     }
   },
   data: function data() {
@@ -8995,19 +9007,22 @@ var cascader_createNamespace = Object(create["a" /* createNamespace */])('cascad
     },
     renderHeader: function renderHeader() {
       var h = this.$createElement;
-      return h("div", {
-        "class": cascader_bem('header')
-      }, [h("h2", {
-        "class": cascader_bem('title')
-      }, [this.slots('title') || this.title]), this.closeable ? h(es_icon, {
-        "attrs": {
-          "name": "cross"
-        },
-        "class": cascader_bem('close-icon'),
-        "on": {
-          "click": this.onClose
-        }
-      }) : null]);
+
+      if (this.showHeader) {
+        return h("div", {
+          "class": cascader_bem('header')
+        }, [h("h2", {
+          "class": cascader_bem('title')
+        }, [this.slots('title') || this.title]), this.closeable ? h(es_icon, {
+          "attrs": {
+            "name": "cross"
+          },
+          "class": cascader_bem('close-icon'),
+          "on": {
+            "click": this.onClose
+          }
+        }) : null]);
+      }
     },
     renderOptions: function renderOptions(options, selectedOption, tabIndex) {
       var _this4 = this;
@@ -10881,10 +10896,32 @@ var TimePickerMixin = {
     });
   },
   methods: {
-    // @exposed-api
     getPicker: function getPicker() {
       return this.$refs.picker;
     },
+    // https://github.com/youzan/vant/issues/10013
+    getProxiedPicker: function getProxiedPicker() {
+      var _this4 = this;
+
+      var picker = this.$refs.picker;
+
+      if (picker) {
+        var proxy = function proxy(fn) {
+          return function () {
+            picker[fn].apply(picker, arguments);
+
+            _this4.updateInnerValue();
+          };
+        };
+
+        return _extends({}, picker, {
+          setValues: proxy('setValues'),
+          setIndexes: proxy('setIndexes'),
+          setColumnIndex: proxy('setColumnIndex'),
+          setColumnValue: proxy('setColumnValue')
+        });
+      }
+    },
     onConfirm: function onConfirm() {
       this.$emit('input', this.innerValue);
       this.$emit('confirm', this.innerValue);
@@ -10894,14 +10931,14 @@ var TimePickerMixin = {
     }
   },
   render: function render() {
-    var _this4 = this;
+    var _this5 = this;
 
     var h = arguments[0];
     var props = {};
     Object.keys(pickerProps).forEach(function (key) {
-      props[key] = _this4[key];
+      props[key] = _this5[key];
     });
-    return h(picker, {
+    return h(es_picker, {
       "ref": "picker",
       "attrs": {
         "columns": this.columns,
@@ -11424,7 +11461,7 @@ var datetime_picker_createNamespace = Object(create["a" /* createNamespace */])(
   methods: {
     // @exposed-api
     getPicker: function getPicker() {
-      return this.$refs.root.getPicker();
+      return this.$refs.root.getProxiedPicker();
     }
   },
   render: function render() {
@@ -12794,16 +12831,10 @@ var swipe_createNamespace = Object(create["a" /* createNamespace */])('swipe'),
     },
     onTouchMove: function onTouchMove(event) {
       if (!this.touchable || !this.swiping) return;
-      this.touchMove(event); // if user starting to touchmove, prevent the event bubbling to
-      // avoid affecting the parent components
-
-      var shouldPrevent = this.isCorrectDirection || this.offsetY > this.offsetX === this.vertical;
-
-      if (shouldPrevent) {
-        preventDefault(event, this.stopPropagation);
-      }
+      this.touchMove(event);
 
       if (this.isCorrectDirection) {
+        preventDefault(event, this.stopPropagation);
         this.move({
           offset: this.delta
         });
@@ -13245,10 +13276,11 @@ function getDistance(touches) {
           offsetX = _this$offsetX === void 0 ? 0 : _this$offsetX;
       this.touchStart(event);
       this.touchStartTime = new Date();
+      this.fingerNum = touches.length;
       this.startMoveX = this.moveX;
       this.startMoveY = this.moveY;
-      this.moving = touches.length === 1 && this.scale !== 1;
-      this.zooming = touches.length === 2 && !offsetX;
+      this.moving = this.fingerNum === 1 && this.scale !== 1;
+      this.zooming = this.fingerNum === 2 && !offsetX;
 
       if (this.zooming) {
         this.startScale = this.scale;
@@ -13313,13 +13345,17 @@ function getDistance(touches) {
     checkTap: function checkTap() {
       var _this = this;
 
+      if (this.fingerNum > 1) {
+        return;
+      }
+
       var _this$offsetX2 = this.offsetX,
           offsetX = _this$offsetX2 === void 0 ? 0 : _this$offsetX2,
           _this$offsetY = this.offsetY,
           offsetY = _this$offsetY === void 0 ? 0 : _this$offsetY;
       var deltaTime = new Date() - this.touchStartTime;
       var TAP_TIME = 250;
-      var TAP_OFFSET = 10;
+      var TAP_OFFSET = 5;
 
       if (offsetX < TAP_OFFSET && offsetY < TAP_OFFSET && deltaTime < TAP_TIME) {
         if (this.doubleTapTimer) {
@@ -13393,6 +13429,7 @@ function getDistance(touches) {
     className: null,
     closeable: Boolean,
     asyncClose: Boolean,
+    overlayStyle: Object,
     showIndicators: Boolean,
     images: {
       type: Array,
@@ -13626,6 +13663,7 @@ var image_preview_defaultConfig = {
   asyncClose: false,
   transition: 'van-fade',
   getContainer: 'body',
+  overlayStyle: null,
   startPosition: 0,
   swipeDuration: 300,
   showIndicators: false,
@@ -14222,8 +14260,16 @@ var nav_bar_createNamespace = Object(create["a" /* createNamespace */])('nav-bar
     };
   },
   mounted: function mounted() {
+    var _this = this;
+
     if (this.placeholder && this.fixed) {
-      this.height = this.$refs.navBar.getBoundingClientRect().height;
+      var setHeight = function setHeight() {
+        _this.height = _this.$refs.navBar.getBoundingClientRect().height;
+      };
+
+      setHeight(); // https://github.com/youzan/vant/issues/10131
+
+      setTimeout(setHeight, 100);
     }
   },
   methods: {
@@ -21085,6 +21131,7 @@ var isSameValue = function isSameValue(newValue, oldValue) {
     var renderButton = function renderButton(i) {
       var map = ['left', 'right'];
       var isNumber = typeof i === 'number';
+      var current = isNumber ? _this.value[i] : _this.value;
 
       var getClassName = function getClassName() {
         if (isNumber) {
@@ -21102,6 +21149,27 @@ var isSameValue = function isSameValue(newValue, oldValue) {
         return "wrapper";
       };
 
+      var renderButtonContent = function renderButtonContent() {
+        if (isNumber) {
+          var slot = _this.slots(i === 0 ? 'left-button' : 'right-button', {
+            value: current
+          });
+
+          if (slot) {
+            return slot;
+          }
+        }
+
+        if (_this.slots('button')) {
+          return _this.slots('button');
+        }
+
+        return h("div", {
+          "class": slider_bem('button'),
+          "style": _this.buttonStyle
+        });
+      };
+
       return h("div", {
         "ref": getRefName(),
         "attrs": {
@@ -21124,10 +21192,7 @@ var isSameValue = function isSameValue(newValue, oldValue) {
             return e.stopPropagation();
           }
         }
-      }, [_this.slots('button') || h("div", {
-        "class": slider_bem('button'),
-        "style": _this.buttonStyle
-      })]);
+      }, [renderButtonContent()]);
     };
 
     return h("div", {
@@ -21744,28 +21809,36 @@ var tabbar_createNamespace = Object(create["a" /* createNamespace */])('tabbar')
     children: 'setActiveItem'
   },
   mounted: function mounted() {
+    var _this = this;
+
     if (this.placeholder && this.fixed) {
-      this.height = this.$refs.tabbar.getBoundingClientRect().height;
+      var setHeight = function setHeight() {
+        _this.height = _this.$refs.tabbar.getBoundingClientRect().height;
+      };
+
+      setHeight(); // https://github.com/youzan/vant/issues/10131
+
+      setTimeout(setHeight, 100);
     }
   },
   methods: {
     setActiveItem: function setActiveItem() {
-      var _this = this;
+      var _this2 = this;
 
       this.children.forEach(function (item, index) {
-        item.nameMatched = (item.name || index) === _this.value;
+        item.nameMatched = (item.name || index) === _this2.value;
       });
     },
     triggerChange: function triggerChange(active, afterChange) {
-      var _this2 = this;
+      var _this3 = this;
 
       callInterceptor({
         interceptor: this.beforeChange,
         args: [active],
         done: function done() {
-          _this2.$emit('input', active);
+          _this3.$emit('input', active);
 
-          _this2.$emit('change', active);
+          _this3.$emit('change', active);
 
           afterChange();
         }
@@ -22149,10 +22222,10 @@ TreeSelect.props = {
 
 
 
-var version = '2.12.36';
+var version = '2.12.40';
 
 function install(Vue) {
-  var components = [action_sheet, address_edit, address_list, es_area, badge, es_button, calendar, card, cascader, cell, cell_group, es_checkbox, checkbox_group, circle, col, collapse, collapse_item, contact_card, contact_edit, contact_list, count_down, es_coupon, coupon_cell, coupon_list, datetime_picker, dialog, divider, dropdown_item, dropdown_menu, empty, es_field, es_form, goods_action, goods_action_button, goods_action_icon, grid, grid_item, es_icon, es_image, image_preview, index_anchor, index_bar, es_info, es_list, es_loading, locale["a" /* default */], nav_bar, notice_bar, notify, number_keyboard, es_overlay, pagination, panel, password_input, picker, popover, popup, es_progress, pull_refresh, es_radio, radio_group, es_rate, row, search, share_sheet, sidebar, sidebar_item, skeleton, es_sku, slider, es_step, stepper, steps, es_sticky, submit_bar, swipe, swipe_cell, swipe_item, es_switch, switch_cell, tab, tabbar, tabbar_item, tabs, es_tag, es_toast, tree_select, uploader];
+  var components = [action_sheet, address_edit, address_list, es_area, badge, es_button, calendar, card, cascader, cell, cell_group, es_checkbox, checkbox_group, circle, col, collapse, collapse_item, contact_card, contact_edit, contact_list, count_down, es_coupon, coupon_cell, coupon_list, datetime_picker, dialog, divider, dropdown_item, dropdown_menu, empty, es_field, es_form, goods_action, goods_action_button, goods_action_icon, grid, grid_item, es_icon, es_image, image_preview, index_anchor, index_bar, es_info, es_list, es_loading, locale["a" /* default */], nav_bar, notice_bar, notify, number_keyboard, es_overlay, pagination, panel, password_input, es_picker, popover, popup, es_progress, pull_refresh, es_radio, radio_group, es_rate, row, search, share_sheet, sidebar, sidebar_item, skeleton, es_sku, slider, es_step, stepper, steps, es_sticky, submit_bar, swipe, swipe_cell, swipe_item, es_switch, switch_cell, tab, tabbar, tabbar_item, tabs, es_tag, es_toast, tree_select, uploader];
   components.forEach(function (item) {
     if (item.install) {
       Vue.use(item);