zartui 2.0.18 → 2.0.20

package/es/datetime-picker/DatePicker.js

@@ -123,6 +123,14 @@ export default createComponent({
     formatValue: function formatValue(value) {
       var _this2 = this;
 
+      if (typeof value === "string") {
+        try {
+          value = new Date(value);
+        } catch (error) {
+          console.error("datetime-picker strToDate error", error);
+        }
+      }
+
       if (!isDate(value)) {
         return null;
       }
@@ -276,6 +284,9 @@ export default createComponent({
       this.updateInnerValue();
       this.$nextTick(function () {
         _this4.$nextTick(function () {
+          // https://github.com/vant-ui/vant/issues/9775
+          _this4.updateInnerValue();
+
           _this4.$emit('change', picker);
         });
       });

package/es/datetime-picker/TimePicker.js

@@ -122,6 +122,9 @@ export default createComponent({
       this.updateInnerValue();
       this.$nextTick(function () {
         _this2.$nextTick(function () {
+          // https://github.com/vant-ui/vant/issues/9775
+          _this2.updateInnerValue();
+
           _this2.$emit('change', picker);
         });
       });

package/es/datetime-picker/index.js

@@ -12,7 +12,7 @@ export default createComponent({
   methods: {
     // @exposed-api
     getPicker: function getPicker() {
-      return this.$refs.root.getPicker();
+      return this.$refs.root.getProxiedPicker();
     }
   },
   render: function render() {

package/es/datetime-picker/shared.js

@@ -123,10 +123,32 @@ export var TimePickerMixin = {
     }
   },
   methods: {
-    // @exposed-api
     getPicker: function getPicker() {
       return this.$refs.picker;
     },
+    // https://github.com/vant-ui/vant/issues/10013
+    getProxiedPicker: function getProxiedPicker() {
+      var _this5 = this;
+
+      var picker = this.$refs.picker;
+
+      if (picker) {
+        var proxy = function proxy(fn) {
+          return function () {
+            picker[fn].apply(picker, arguments);
+
+            _this5.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);
@@ -136,12 +158,12 @@ export var TimePickerMixin = {
     }
   },
   render: function render() {
-    var _this5 = this;
+    var _this6 = this;
 
     var h = arguments[0];
     var props = {};
     Object.keys(pickerProps).forEach(function (key) {
-      props[key] = _this5[key];
+      props[key] = _this6[key];
     });
     return h(Picker, {
       "attrs": {

package/es/datetime-picker/utils.js

@@ -1,5 +1,9 @@
 import { isNaN } from '../utils/validate/number';
 export function times(n, iteratee) {
+  if (n < 0) {
+    return [];
+  }
+
   var index = -1;
   var result = Array(n);
 

package/es/index.js

@@ -76,7 +76,7 @@ import Tag from './tag';
 import Timeline from './timeline';
 import Toast from './toast';
 import Uploader from './uploader';
-var version = '2.0.18';
+var version = '2.0.20';
 
 function install(Vue) {
   var components = [ActionSheet, Area, Avatar, BackTop, Badge, Button, Calendar, Cascader, Cell, CellGroup, Checkbox, CheckboxGroup, Col, Collapse, CollapseItem, CountDown, DatetimePicker, Dialog, Divider, DropdownItem, DropdownMenu, Empty, Field, FoldDialog, Form, Grid, GridItem, HierarchySelect, Icon, Image, ImagePreview, IndexAnchor, IndexBar, Info, Lazyload, List, Loading, Locale, MediaPicker, MediaPlayer, MultiplePicker, NavBar, NoticeBar, NumberKeyboard, Overlay, PasswordInput, PdfViewer, PdfViewerV2, Picker, Popover, Popup, PullRefresh, Radio, RadioGroup, Rate, Row, Search, Signature, Skeleton, Slider, Step, Stepper, Steps, Sticky, Swipe, SwipeCell, SwipeItem, Switch, SwitchCell, Tab, Tabbar, TabbarItem, Table, Tabs, Tag, Timeline, Toast, Uploader];

package/es/picker/PickerColumn.js

@@ -1,16 +1,16 @@
 import _mergeJSXProps2 from "@vue/babel-helper-vue-jsx-merge-props";
 import _mergeJSXProps from "@vue/babel-helper-vue-jsx-merge-props";
 import { deepClone } from '../utils/deep-clone';
-import { createNamespace, isObject } from '../utils';
+import { createNamespace, inBrowser, isObject } from '../utils';
 import { range } from '../utils/format/number';
-import { preventDefault } from '../utils/dom/event';
+import { preventDefault, on, off } from '../utils/dom/event';
 import { TouchMixin } from '../mixins/touch';
 var DEFAULT_DURATION = 200; // 惯性滑动思路:
 // 在手指离开屏幕时，如果和上一次 move 时的间隔小于 `MOMENTUM_LIMIT_TIME` 且 move
 // 距离大于 `MOMENTUM_LIMIT_DISTANCE` 时，执行惯性滑动
 
-var MOMENTUM_LIMIT_TIME = 300;
-var MOMENTUM_LIMIT_DISTANCE = 15;
+export var MOMENTUM_LIMIT_TIME = 300;
+export var MOMENTUM_LIMIT_DISTANCE = 15;
 
 var _createNamespace = createNamespace('picker-column'),
     createComponent = _createNamespace[0],
@@ -25,8 +25,12 @@ function getElementTranslateY(element) {
 
 function isOptionDisabled(option) {
   return isObject(option) && option.disabled;
-}
+} // use standard WheelEvent:
+// https://developer.mozilla.org/en-US/docs/Web/API/WheelEvent
+
 
+var supportMousewheel = inBrowser && 'onwheel' in window;
+var mousewheelTimer = null;
 export default createComponent({
   mixins: [TouchMixin],
   props: {
@@ -64,11 +68,19 @@ export default createComponent({
   },
   mounted: function mounted() {
     this.bindTouchEvent(this.$el);
+
+    if (supportMousewheel) {
+      on(this.$el, 'wheel', this.onMouseWheel, false);
+    }
   },
   destroyed: function destroyed() {
     if (this.columnCollector) {
       this.columnCollector.splice(this.columnCollector.indexOf(this), 1);
     }
+
+    if (supportMousewheel) {
+      off(this.$el, 'wheel');
+    }
   },
   watch: {
     initialOptions: 'setOptions',
@@ -156,6 +168,43 @@ export default createComponent({
         _this.moving = false;
       }, 0);
     },
+    onMouseWheel: function onMouseWheel(event) {
+      var _this2 = this;
+
+      if (this.readonly) {
+        return;
+      }
+
+      preventDefault(event, true); // simply combine touchstart and touchmove
+
+      var translateY = getElementTranslateY(this.$refs.wrapper);
+      this.startOffset = Math.min(0, translateY - this.baseOffset);
+      this.momentumOffset = this.startOffset;
+      this.transitionEndTrigger = null; // directly use deltaY, see https://caniuse.com/?search=deltaY
+      // use deltaY to detect direction for not special setting device
+      // https://developer.mozilla.org/en-US/docs/Web/API/Element/wheel_event
+
+      var deltaY = event.deltaY;
+
+      if (this.startOffset === 0 && deltaY < 0) {
+        return;
+      } // get offset
+      // if necessary, can adjust distance value to make scrolling smoother
+
+
+      var distance = -deltaY;
+      this.offset = range(this.startOffset + distance, -(this.count * this.itemHeight), this.itemHeight);
+
+      if (mousewheelTimer) {
+        clearTimeout(mousewheelTimer);
+      }
+
+      mousewheelTimer = setTimeout(function () {
+        _this2.onTouchEnd();
+
+        _this2.touchStartTime = 0;
+      }, MOMENTUM_LIMIT_TIME);
+    },
     onTransitionEnd: function onTransitionEnd() {
       this.stopMomentum();
     },
@@ -187,17 +236,17 @@ export default createComponent({
       return option;
     },
     setIndex: function setIndex(index, emitChange) {
-      var _this2 = this;
+      var _this3 = this;
 
       index = this.adjustIndex(index) || 0;
       var offset = -index * this.itemHeight;
 
       var trigger = function trigger() {
-        if (index !== _this2.currentIndex) {
-          _this2.currentIndex = index;
+        if (index !== _this3.currentIndex) {
+          _this3.currentIndex = index;
 
           if (emitChange) {
-            _this2.$emit('change', index);
+            _this3.$emit('change', index);
           }
         }
       }; // trigger the change event after transitionend when moving
@@ -243,7 +292,7 @@ export default createComponent({
       }
     },
     genOptions: function genOptions() {
-      var _this3 = this;
+      var _this4 = this;
 
       var h = this.$createElement;
       var optionStyle = {
@@ -252,7 +301,7 @@ export default createComponent({
       return this.options.map(function (option, index) {
         var _domProps;
 
-        var text = _this3.getOptionText(option);
+        var text = _this4.getOptionText(option);
 
         var disabled = isOptionDisabled(option);
         var data = {
@@ -263,19 +312,19 @@ export default createComponent({
           },
           class: [bem('item', {
             disabled: disabled,
-            selected: index === _this3.currentIndex
+            selected: index === _this4.currentIndex
           })],
           on: {
             click: function click() {
-              _this3.onClickItem(index);
+              _this4.onClickItem(index);
             }
           }
         };
         var childData = {
           class: 'zt-ellipsis',
-          domProps: (_domProps = {}, _domProps[_this3.allowHtml ? 'innerHTML' : 'textContent'] = text, _domProps)
+          domProps: (_domProps = {}, _domProps[_this4.allowHtml ? 'innerHTML' : 'textContent'] = text, _domProps)
         };
-        return h("li", _mergeJSXProps2([{}, data]), [_this3.slots('option', option) || h("div", _mergeJSXProps([{}, childData]))]);
+        return h("li", _mergeJSXProps2([{}, data]), [_this4.slots('option', option) || h("div", _mergeJSXProps([{}, childData]))]);
       });
     },
     recordConfirmIndex: function recordConfirmIndex() {
@@ -284,8 +333,6 @@ export default createComponent({
     setConfirmIndex: function setConfirmIndex() {
       if (this.confirmIndex || this.confirmIndex === 0) {
         this.setIndex(this.confirmIndex, true);
-      } else {
-        this.setIndex(this.defaultIndex, true);
       }
     }
   },

package/es/picker/index.js

@@ -152,7 +152,7 @@ export default createComponent({
       } else {
         var values = this.getValues(); // compatible with old version of wrong parameters
         // should be removed in next major version
-        // see: https://github.com/youzan/vant/issues/5905
+        // see: https://github.com/vant-ui/vant/issues/5905
 
         if (this.dataType === 'cascade') {
           values = values.map(function (item) {
@@ -191,7 +191,7 @@ export default createComponent({
       } else {
         var values = this.getValues(); // compatible with old version of wrong parameters
         // should be removed in next major version
-        // see: https://github.com/youzan/vant/issues/5905
+        // see: https://github.com/vant-ui/vant/issues/5905
 
         if (this.dataType === 'cascade') {
           values = values.map(function (item) {

package/lib/datetime-picker/DatePicker.js

@@ -137,6 +137,14 @@ var _default2 = createComponent({
     formatValue: function formatValue(value) {
       var _this2 = this;
 
+      if (typeof value === "string") {
+        try {
+          value = new Date(value);
+        } catch (error) {
+          console.error("datetime-picker strToDate error", error);
+        }
+      }
+
       if (!(0, _date.isDate)(value)) {
         return null;
       }
@@ -290,6 +298,9 @@ var _default2 = createComponent({
       this.updateInnerValue();
       this.$nextTick(function () {
         _this4.$nextTick(function () {
+          // https://github.com/vant-ui/vant/issues/9775
+          _this4.updateInnerValue();
+
           _this4.$emit('change', picker);
         });
       });

package/lib/datetime-picker/TimePicker.js

@@ -133,6 +133,9 @@ var _default = createComponent({
       this.updateInnerValue();
       this.$nextTick(function () {
         _this2.$nextTick(function () {
+          // https://github.com/vant-ui/vant/issues/9775
+          _this2.updateInnerValue();
+
           _this2.$emit('change', picker);
         });
       });

package/lib/datetime-picker/index.js

@@ -22,7 +22,7 @@ var _default = createComponent({
   methods: {
     // @exposed-api
     getPicker: function getPicker() {
-      return this.$refs.root.getPicker();
+      return this.$refs.root.getProxiedPicker();
     }
   },
   render: function render() {

package/lib/datetime-picker/shared.js

@@ -137,10 +137,32 @@ var TimePickerMixin = {
     }
   },
   methods: {
-    // @exposed-api
     getPicker: function getPicker() {
       return this.$refs.picker;
     },
+    // https://github.com/vant-ui/vant/issues/10013
+    getProxiedPicker: function getProxiedPicker() {
+      var _this5 = this;
+
+      var picker = this.$refs.picker;
+
+      if (picker) {
+        var proxy = function proxy(fn) {
+          return function () {
+            picker[fn].apply(picker, arguments);
+
+            _this5.updateInnerValue();
+          };
+        };
+
+        return (0, _extends2.default)({}, 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);
@@ -150,12 +172,12 @@ var TimePickerMixin = {
     }
   },
   render: function render() {
-    var _this5 = this;
+    var _this6 = this;
 
     var h = arguments[0];
     var props = {};
     Object.keys(_shared.pickerProps).forEach(function (key) {
-      props[key] = _this5[key];
+      props[key] = _this6[key];
     });
     return h(_picker.default, {
       "attrs": {

package/lib/datetime-picker/utils.js

@@ -8,6 +8,10 @@ exports.getMonthEndDay = getMonthEndDay;
 var _number = require("../utils/validate/number");
 
 function times(n, iteratee) {
+  if (n < 0) {
+    return [];
+  }
+
   var index = -1;
   var result = Array(n);
 

package/lib/index.js

@@ -317,7 +317,7 @@ exports.Toast = _toast.default;
 var _uploader = _interopRequireDefault(require("./uploader"));
 
 exports.Uploader = _uploader.default;
-var version = '2.0.18';
+var version = '2.0.20';
 exports.version = version;
 
 function install(Vue) {

package/lib/picker/PickerColumn.js

@@ -3,7 +3,7 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
-exports.default = void 0;
+exports.default = exports.MOMENTUM_LIMIT_DISTANCE = exports.MOMENTUM_LIMIT_TIME = void 0;
 
 var _babelHelperVueJsxMergeProps = _interopRequireDefault(require("@vue/babel-helper-vue-jsx-merge-props"));
 
@@ -22,7 +22,9 @@ var DEFAULT_DURATION = 200; // 惯性滑动思路:
 // 距离大于 `MOMENTUM_LIMIT_DISTANCE` 时，执行惯性滑动
 
 var MOMENTUM_LIMIT_TIME = 300;
+exports.MOMENTUM_LIMIT_TIME = MOMENTUM_LIMIT_TIME;
 var MOMENTUM_LIMIT_DISTANCE = 15;
+exports.MOMENTUM_LIMIT_DISTANCE = MOMENTUM_LIMIT_DISTANCE;
 
 var _createNamespace = (0, _utils.createNamespace)('picker-column'),
     createComponent = _createNamespace[0],
@@ -37,7 +39,12 @@ function getElementTranslateY(element) {
 
 function isOptionDisabled(option) {
   return (0, _utils.isObject)(option) && option.disabled;
-}
+} // use standard WheelEvent:
+// https://developer.mozilla.org/en-US/docs/Web/API/WheelEvent
+
+
+var supportMousewheel = _utils.inBrowser && 'onwheel' in window;
+var mousewheelTimer = null;
 
 var _default2 = createComponent({
   mixins: [_touch.TouchMixin],
@@ -76,11 +83,19 @@ var _default2 = createComponent({
   },
   mounted: function mounted() {
     this.bindTouchEvent(this.$el);
+
+    if (supportMousewheel) {
+      (0, _event.on)(this.$el, 'wheel', this.onMouseWheel, false);
+    }
   },
   destroyed: function destroyed() {
     if (this.columnCollector) {
       this.columnCollector.splice(this.columnCollector.indexOf(this), 1);
     }
+
+    if (supportMousewheel) {
+      (0, _event.off)(this.$el, 'wheel');
+    }
   },
   watch: {
     initialOptions: 'setOptions',
@@ -168,6 +183,43 @@ var _default2 = createComponent({
         _this.moving = false;
       }, 0);
     },
+    onMouseWheel: function onMouseWheel(event) {
+      var _this2 = this;
+
+      if (this.readonly) {
+        return;
+      }
+
+      (0, _event.preventDefault)(event, true); // simply combine touchstart and touchmove
+
+      var translateY = getElementTranslateY(this.$refs.wrapper);
+      this.startOffset = Math.min(0, translateY - this.baseOffset);
+      this.momentumOffset = this.startOffset;
+      this.transitionEndTrigger = null; // directly use deltaY, see https://caniuse.com/?search=deltaY
+      // use deltaY to detect direction for not special setting device
+      // https://developer.mozilla.org/en-US/docs/Web/API/Element/wheel_event
+
+      var deltaY = event.deltaY;
+
+      if (this.startOffset === 0 && deltaY < 0) {
+        return;
+      } // get offset
+      // if necessary, can adjust distance value to make scrolling smoother
+
+
+      var distance = -deltaY;
+      this.offset = (0, _number.range)(this.startOffset + distance, -(this.count * this.itemHeight), this.itemHeight);
+
+      if (mousewheelTimer) {
+        clearTimeout(mousewheelTimer);
+      }
+
+      mousewheelTimer = setTimeout(function () {
+        _this2.onTouchEnd();
+
+        _this2.touchStartTime = 0;
+      }, MOMENTUM_LIMIT_TIME);
+    },
     onTransitionEnd: function onTransitionEnd() {
       this.stopMomentum();
     },
@@ -199,17 +251,17 @@ var _default2 = createComponent({
       return option;
     },
     setIndex: function setIndex(index, emitChange) {
-      var _this2 = this;
+      var _this3 = this;
 
       index = this.adjustIndex(index) || 0;
       var offset = -index * this.itemHeight;
 
       var trigger = function trigger() {
-        if (index !== _this2.currentIndex) {
-          _this2.currentIndex = index;
+        if (index !== _this3.currentIndex) {
+          _this3.currentIndex = index;
 
           if (emitChange) {
-            _this2.$emit('change', index);
+            _this3.$emit('change', index);
           }
         }
       }; // trigger the change event after transitionend when moving
@@ -255,7 +307,7 @@ var _default2 = createComponent({
       }
     },
     genOptions: function genOptions() {
-      var _this3 = this;
+      var _this4 = this;
 
       var h = this.$createElement;
       var optionStyle = {
@@ -264,7 +316,7 @@ var _default2 = createComponent({
       return this.options.map(function (option, index) {
         var _domProps;
 
-        var text = _this3.getOptionText(option);
+        var text = _this4.getOptionText(option);
 
         var disabled = isOptionDisabled(option);
         var data = {
@@ -275,19 +327,19 @@ var _default2 = createComponent({
           },
           class: [bem('item', {
             disabled: disabled,
-            selected: index === _this3.currentIndex
+            selected: index === _this4.currentIndex
           })],
           on: {
             click: function click() {
-              _this3.onClickItem(index);
+              _this4.onClickItem(index);
             }
           }
         };
         var childData = {
           class: 'zt-ellipsis',
-          domProps: (_domProps = {}, _domProps[_this3.allowHtml ? 'innerHTML' : 'textContent'] = text, _domProps)
+          domProps: (_domProps = {}, _domProps[_this4.allowHtml ? 'innerHTML' : 'textContent'] = text, _domProps)
         };
-        return h("li", (0, _babelHelperVueJsxMergeProps.default)([{}, data]), [_this3.slots('option', option) || h("div", (0, _babelHelperVueJsxMergeProps.default)([{}, childData]))]);
+        return h("li", (0, _babelHelperVueJsxMergeProps.default)([{}, data]), [_this4.slots('option', option) || h("div", (0, _babelHelperVueJsxMergeProps.default)([{}, childData]))]);
       });
     },
     recordConfirmIndex: function recordConfirmIndex() {
@@ -296,8 +348,6 @@ var _default2 = createComponent({
     setConfirmIndex: function setConfirmIndex() {
       if (this.confirmIndex || this.confirmIndex === 0) {
         this.setIndex(this.confirmIndex, true);
-      } else {
-        this.setIndex(this.defaultIndex, true);
       }
     }
   },

package/lib/picker/index.js

@@ -168,7 +168,7 @@ var _default2 = createComponent({
       } else {
         var values = this.getValues(); // compatible with old version of wrong parameters
         // should be removed in next major version
-        // see: https://github.com/youzan/vant/issues/5905
+        // see: https://github.com/vant-ui/vant/issues/5905
 
         if (this.dataType === 'cascade') {
           values = values.map(function (item) {
@@ -207,7 +207,7 @@ var _default2 = createComponent({
       } else {
         var values = this.getValues(); // compatible with old version of wrong parameters
         // should be removed in next major version
-        // see: https://github.com/youzan/vant/issues/5905
+        // see: https://github.com/vant-ui/vant/issues/5905
 
         if (this.dataType === 'cascade') {
           values = values.map(function (item) {