vant 2.12.47 → 2.12.48

package/es/dialog/Dialog.js

@@ -176,7 +176,8 @@ export default createComponent({
         "attrs": {
           "size": "large",
           "loading": this.loading.cancel,
-          "text": this.cancelButtonText || t('cancel')
+          "text": this.cancelButtonText || t('cancel'),
+          "nativeType": "button"
         },
         "class": bem('cancel'),
         "style": {
@@ -191,7 +192,8 @@ export default createComponent({
         "attrs": {
           "size": "large",
           "loading": this.loading.confirm,
-          "text": this.confirmButtonText || t('confirm')
+          "text": this.confirmButtonText || t('confirm'),
+          "nativeType": "button"
         },
         "class": [bem('confirm'), (_ref = {}, _ref[BORDER_LEFT] = multiple, _ref)],
         "style": {

package/es/index.js

@@ -87,7 +87,7 @@ import Tag from './tag';
 import Toast from './toast';
 import TreeSelect from './tree-select';
 import Uploader from './uploader';
-var version = '2.12.47';
+var version = '2.12.48';
 
 function install(Vue) {
   var components = [ActionSheet, AddressEdit, AddressList, Area, Badge, Button, Calendar, Card, Cascader, Cell, CellGroup, Checkbox, CheckboxGroup, Circle, Col, Collapse, CollapseItem, ContactCard, ContactEdit, ContactList, CountDown, Coupon, CouponCell, CouponList, DatetimePicker, Dialog, Divider, DropdownItem, DropdownMenu, Empty, Field, Form, GoodsAction, GoodsActionButton, GoodsActionIcon, Grid, GridItem, Icon, Image, ImagePreview, IndexAnchor, IndexBar, Info, List, Loading, Locale, NavBar, NoticeBar, Notify, NumberKeyboard, Overlay, Pagination, Panel, PasswordInput, Picker, Popover, Popup, Progress, PullRefresh, Radio, RadioGroup, Rate, Row, Search, ShareSheet, Sidebar, SidebarItem, Skeleton, Sku, Slider, Step, Stepper, Steps, Sticky, SubmitBar, Swipe, SwipeCell, SwipeItem, Switch, SwitchCell, Tab, Tabbar, TabbarItem, Tabs, Tag, Toast, TreeSelect, Uploader];

package/es/step/index.js

@@ -23,15 +23,27 @@ export default createComponent({
       return this.status === 'process';
     },
     lineStyle: function lineStyle() {
-      if (this.status === 'finish') {
+      var _this$parent = this.parent,
+          activeColor = _this$parent.activeColor,
+          inactiveColor = _this$parent.inactiveColor,
+          center = _this$parent.center,
+          direction = _this$parent.direction;
+      var style = {
+        background: this.status === 'finish' ? activeColor : inactiveColor
+      };
+
+      if (center && direction === 'vertical') {
+        style.top = '50%';
+      }
+
+      return style;
+    },
+    circleContainerStyle: function circleContainerStyle() {
+      if (this.parent.center && this.parent.direction === 'vertical') {
         return {
-          background: this.parent.activeColor
+          top: '50%'
         };
       }
-
-      return {
-        background: this.parent.inactiveColor
-      };
     },
     titleStyle: function titleStyle() {
       if (this.active) {
@@ -50,12 +62,12 @@ export default createComponent({
   methods: {
     genCircle: function genCircle() {
       var h = this.$createElement;
-      var _this$parent = this.parent,
-          activeIcon = _this$parent.activeIcon,
-          iconPrefix = _this$parent.iconPrefix,
-          activeColor = _this$parent.activeColor,
-          finishIcon = _this$parent.finishIcon,
-          inactiveIcon = _this$parent.inactiveIcon;
+      var _this$parent2 = this.parent,
+          activeIcon = _this$parent2.activeIcon,
+          iconPrefix = _this$parent2.iconPrefix,
+          activeColor = _this$parent2.activeColor,
+          finishIcon = _this$parent2.finishIcon,
+          inactiveIcon = _this$parent2.inactiveIcon;
 
       if (this.active) {
         return this.slots('active-icon') || h(Icon, {
@@ -123,7 +135,8 @@ export default createComponent({
       "class": bem('circle-container'),
       "on": {
         "click": this.onClickStep
-      }
+      },
+      "style": this.circleContainerStyle
     }, [this.genCircle()]), h("div", {
       "class": bem('line'),
       "style": this.lineStyle

package/es/steps/index.js

@@ -8,6 +8,7 @@ var _createNamespace = createNamespace('steps'),
 export default createComponent({
   mixins: [ParentMixin('vanSteps')],
   props: {
+    center: Boolean,
     iconPrefix: String,
     finishIcon: String,
     activeColor: String,

package/es/utils/dom/scroll.js

@@ -4,7 +4,7 @@ function isWindow(val) {
 // https://github.com/youzan/vant/issues/3823
 
 
-var overflowScrollReg = /scroll|auto/i;
+var overflowScrollReg = /scroll|auto|overlay/i;
 export function getScroller(el, root) {
   if (root === void 0) {
     root = window;

package/lib/dialog/Dialog.js

@@ -189,7 +189,8 @@ var _default = createComponent({
         "attrs": {
           "size": "large",
           "loading": this.loading.cancel,
-          "text": this.cancelButtonText || t('cancel')
+          "text": this.cancelButtonText || t('cancel'),
+          "nativeType": "button"
         },
         "class": bem('cancel'),
         "style": {
@@ -204,7 +205,8 @@ var _default = createComponent({
         "attrs": {
           "size": "large",
           "loading": this.loading.confirm,
-          "text": this.confirmButtonText || t('confirm')
+          "text": this.confirmButtonText || t('confirm'),
+          "nativeType": "button"
         },
         "class": [bem('confirm'), (_ref = {}, _ref[_constant.BORDER_LEFT] = multiple, _ref)],
         "style": {

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.47';
+var version = '2.12.48';
 exports.version = version;
 
 function install(Vue) {

package/lib/step/index.js

@@ -33,15 +33,27 @@ var _default = createComponent({
       return this.status === 'process';
     },
     lineStyle: function lineStyle() {
-      if (this.status === 'finish') {
+      var _this$parent = this.parent,
+          activeColor = _this$parent.activeColor,
+          inactiveColor = _this$parent.inactiveColor,
+          center = _this$parent.center,
+          direction = _this$parent.direction;
+      var style = {
+        background: this.status === 'finish' ? activeColor : inactiveColor
+      };
+
+      if (center && direction === 'vertical') {
+        style.top = '50%';
+      }
+
+      return style;
+    },
+    circleContainerStyle: function circleContainerStyle() {
+      if (this.parent.center && this.parent.direction === 'vertical') {
         return {
-          background: this.parent.activeColor
+          top: '50%'
         };
       }
-
-      return {
-        background: this.parent.inactiveColor
-      };
     },
     titleStyle: function titleStyle() {
       if (this.active) {
@@ -60,12 +72,12 @@ var _default = createComponent({
   methods: {
     genCircle: function genCircle() {
       var h = this.$createElement;
-      var _this$parent = this.parent,
-          activeIcon = _this$parent.activeIcon,
-          iconPrefix = _this$parent.iconPrefix,
-          activeColor = _this$parent.activeColor,
-          finishIcon = _this$parent.finishIcon,
-          inactiveIcon = _this$parent.inactiveIcon;
+      var _this$parent2 = this.parent,
+          activeIcon = _this$parent2.activeIcon,
+          iconPrefix = _this$parent2.iconPrefix,
+          activeColor = _this$parent2.activeColor,
+          finishIcon = _this$parent2.finishIcon,
+          inactiveIcon = _this$parent2.inactiveIcon;
 
       if (this.active) {
         return this.slots('active-icon') || h(_icon.default, {
@@ -133,7 +145,8 @@ var _default = createComponent({
       "class": bem('circle-container'),
       "on": {
         "click": this.onClickStep
-      }
+      },
+      "style": this.circleContainerStyle
     }, [this.genCircle()]), h("div", {
       "class": bem('line'),
       "style": this.lineStyle

package/lib/steps/index.js

@@ -14,6 +14,7 @@ var _createNamespace = (0, _utils.createNamespace)('steps'),
 var _default = createComponent({
   mixins: [(0, _relation.ParentMixin)('vanSteps')],
   props: {
+    center: Boolean,
     iconPrefix: String,
     finishIcon: String,
     activeColor: String,

package/lib/utils/dom/scroll.js

@@ -16,7 +16,7 @@ function isWindow(val) {
 // https://github.com/youzan/vant/issues/3823
 
 
-var overflowScrollReg = /scroll|auto/i;
+var overflowScrollReg = /scroll|auto|overlay/i;
 
 function getScroller(el, root) {
   if (root === void 0) {