zartui 2.1.6 → 2.1.8

package/es/picker/PickerColumn.js

@@ -1,34 +1,30 @@
-import _mergeJSXProps2 from "@vue/babel-helper-vue-jsx-merge-props";
-import _mergeJSXProps from "@vue/babel-helper-vue-jsx-merge-props";
+import _mergeJSXProps, { default as _mergeJSXProps2 } from "@vue/babel-helper-vue-jsx-merge-props";
 import { deepClone } from '../utils/deep-clone';
 import { createNamespace, inBrowser, isObject } from '../utils';
 import { range } from '../utils/format/number';
 import { preventDefault, on, off } from '../utils/dom/event';
 import { TouchMixin } from '../mixins/touch';
-var DEFAULT_DURATION = 200; // 惯性滑动思路:
+var DEFAULT_DURATION = 200;
+
+// 惯性滑动思路:
 // 在手指离开屏幕时，如果和上一次 move 时的间隔小于 `MOMENTUM_LIMIT_TIME` 且 move
 // 距离大于 `MOMENTUM_LIMIT_DISTANCE` 时，执行惯性滑动
-
 export var MOMENTUM_LIMIT_TIME = 300;
 export var MOMENTUM_LIMIT_DISTANCE = 15;
-
 var _createNamespace = createNamespace('picker-column'),
-    createComponent = _createNamespace[0],
-    bem = _createNamespace[1];
-
+  createComponent = _createNamespace[0],
+  bem = _createNamespace[1];
 function getElementTranslateY(element) {
   var style = window.getComputedStyle(element);
   var transform = style.transform || style.webkitTransform;
   var translateY = transform.slice(7, transform.length - 1).split(', ')[5];
   return Number(translateY);
 }
-
 function isOptionDisabled(option) {
   return isObject(option) && option.disabled;
-} // use standard WheelEvent:
+}
+// 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({
@@ -63,12 +59,10 @@ export default createComponent({
     if (this.columnCollector) {
       this.columnCollector.push(this);
     }
-
     this.setIndex(this.currentIndex);
   },
   mounted: function mounted() {
     this.bindTouchEvent(this.$el);
-
     if (supportMousewheel) {
       on(this.$el, 'wheel', this.onMouseWheel, false);
     }
@@ -77,7 +71,6 @@ export default createComponent({
     if (this.columnCollector) {
       this.columnCollector.splice(this.columnCollector.indexOf(this), 1);
     }
-
     if (supportMousewheel) {
       off(this.$el, 'wheel');
     }
@@ -107,9 +100,7 @@ export default createComponent({
       if (this.readonly) {
         return;
       }
-
       this.touchStart(event);
-
       if (this.moving) {
         var translateY = getElementTranslateY(this.$refs.wrapper);
         this.offset = Math.min(0, translateY - this.baseOffset);
@@ -117,7 +108,6 @@ export default createComponent({
       } else {
         this.startOffset = this.offset;
       }
-
       this.duration = 0;
       this.transitionEndTrigger = null;
       this.touchStartTime = Date.now();
@@ -127,17 +117,13 @@ export default createComponent({
       if (this.readonly) {
         return;
       }
-
       this.touchMove(event);
-
       if (this.direction === 'vertical') {
         this.moving = true;
         preventDefault(event, true);
       }
-
       this.offset = range(this.startOffset + this.deltaY, -(this.count * this.itemHeight), this.itemHeight);
       var now = Date.now();
-
       if (now - this.touchStartTime > MOMENTUM_LIMIT_TIME) {
         this.touchStartTime = now;
         this.momentumOffset = this.offset;
@@ -145,63 +131,55 @@ export default createComponent({
     },
     onTouchEnd: function onTouchEnd() {
       var _this = this;
-
       if (this.readonly) {
         return;
       }
-
       var distance = this.offset - this.momentumOffset;
       var duration = Date.now() - this.touchStartTime;
       var allowMomentum = duration < MOMENTUM_LIMIT_TIME && Math.abs(distance) > MOMENTUM_LIMIT_DISTANCE;
-
       if (allowMomentum) {
         this.momentum(distance, duration);
         return;
       }
-
       var index = this.getIndexByOffset(this.offset);
       this.duration = DEFAULT_DURATION;
-      this.setIndex(index, true); // compatible with desktop scenario
-      // use setTimeout to skip the click event Emitted after touchstart
+      this.setIndex(index, true);
 
+      // compatible with desktop scenario
+      // use setTimeout to skip the click event Emitted after touchstart
       setTimeout(function () {
         _this.moving = false;
       }, 0);
     },
     onMouseWheel: function onMouseWheel(event) {
       var _this2 = this;
-
       if (this.readonly) {
         return;
       }
-
-      preventDefault(event, true); // simply combine touchstart and touchmove
-
+      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
+      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
-
+      }
 
+      // 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);
     },
@@ -212,18 +190,15 @@ export default createComponent({
       if (this.moving || this.readonly) {
         return;
       }
-
       this.transitionEndTrigger = null;
       this.duration = DEFAULT_DURATION;
       this.setIndex(index, true);
     },
     adjustIndex: function adjustIndex(index) {
       index = range(index, 0, this.count);
-
       for (var i = index; i < this.count; i++) {
         if (!isOptionDisabled(this.options[i])) return i;
       }
-
       for (var _i = index - 1; _i >= 0; _i--) {
         if (!isOptionDisabled(this.options[_i])) return _i;
       }
@@ -232,37 +207,31 @@ export default createComponent({
       if (isObject(option) && this.valueKey in option) {
         return option[this.valueKey];
       }
-
       return option;
     },
     setIndex: function setIndex(index, emitChange) {
       var _this3 = this;
-
       index = this.adjustIndex(index) || 0;
       var offset = -index * this.itemHeight;
-
       var trigger = function trigger() {
         if (index !== _this3.currentIndex) {
           _this3.currentIndex = index;
-
           if (emitChange) {
             _this3.$emit('change', index);
           }
         }
-      }; // trigger the change event after transitionend when moving
-
+      };
 
+      // trigger the change event after transitionend when moving
       if (this.moving && offset !== this.offset) {
         this.transitionEndTrigger = trigger;
       } else {
         trigger();
       }
-
       this.offset = offset;
     },
     setValue: function setValue(value) {
       var options = this.options;
-
       for (var i = 0; i < options.length; i++) {
         if (this.getOptionText(options[i]) === value) {
           return this.setIndex(i);
@@ -285,7 +254,6 @@ export default createComponent({
     stopMomentum: function stopMomentum() {
       this.moving = false;
       this.duration = 0;
-
       if (this.transitionEndTrigger) {
         this.transitionEndTrigger();
         this.transitionEndTrigger = null;
@@ -293,16 +261,13 @@ export default createComponent({
     },
     genOptions: function genOptions() {
       var _this4 = this;
-
       var h = this.$createElement;
       var optionStyle = {
         height: this.itemHeight + "px"
       };
       return this.options.map(function (option, index) {
         var _domProps;
-
         var text = _this4.getOptionText(option);
-
         var disabled = isOptionDisabled(option);
         var data = {
           style: optionStyle,

package/es/picker/index.js

@@ -3,19 +3,18 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import { createNamespace } from '../utils';
 import { preventDefault } from '../utils/dom/event';
 import { pickerProps, DEFAULT_ITEM_HEIGHT } from './shared';
-import { unitToPx } from '../utils/format/unit'; // Components
+import { unitToPx } from '../utils/format/unit';
 
+// Components
 import Loading from '../loading';
 import PickerColumn from './PickerColumn';
 import Popup from '../popup';
 import Button from '../button';
 import { PopupMixin } from '../mixins/popup';
-
 var _createNamespace = createNamespace('picker'),
-    createComponent = _createNamespace[0],
-    bem = _createNamespace[1],
-    t = _createNamespace[2];
-
+  createComponent = _createNamespace[0],
+  bem = _createNamespace[1],
+  t = _createNamespace[2];
 export default createComponent({
   mixins: [PopupMixin()],
   props: _extends({}, pickerProps, {
@@ -68,15 +67,12 @@ export default createComponent({
     dataType: function dataType() {
       var columns = this.columns;
       var firstColumn = columns[0] || {};
-
       if (firstColumn.children && firstColumn.children.length) {
         return 'cascade';
       }
-
       if (firstColumn.values) {
         return 'object';
       }
-
       return 'text';
     }
   },
@@ -88,13 +84,11 @@ export default createComponent({
     showPicker: {
       handler: function handler(val) {
         var _this = this;
-
         if (val) {
           this.$nextTick(function () {
             _this.children.forEach(function (child) {
               child.setConfirmIndex();
             });
-
             _this.children.forEach(function (child) {
               child.recordConfirmIndex();
             });
@@ -112,8 +106,7 @@ export default createComponent({
     },
     format: function format() {
       var columns = this.columns,
-          dataType = this.dataType;
-
+        dataType = this.dataType;
       if (dataType === 'text') {
         this.formattedColumns = [{
           values: columns
@@ -129,14 +122,11 @@ export default createComponent({
       var cursor = {
         children: this.columns
       };
-
       while (cursor && cursor.children) {
         var _cursor$defaultIndex;
-
         var _cursor = cursor,
-            children = _cursor.children;
+          children = _cursor.children;
         var defaultIndex = (_cursor$defaultIndex = cursor.defaultIndex) != null ? _cursor$defaultIndex : +this.defaultIndex;
-
         while (children[defaultIndex] && children[defaultIndex].disabled) {
           if (defaultIndex < children.length - 1) {
             defaultIndex++;
@@ -145,7 +135,6 @@ export default createComponent({
             break;
           }
         }
-
         formatted.push({
           values: cursor.children,
           className: cursor.className,
@@ -153,25 +142,23 @@ export default createComponent({
         });
         cursor = children[defaultIndex];
       }
-
       this.formattedColumns = formatted;
     },
     emit: function emit(event) {
       var _this2 = this;
-
       if (this.dataType === 'text') {
         this.$emit(event, this.getColumnValue(0), this.getColumnIndex(0));
       } else {
-        var values = this.getValues(); // compatible with old version of wrong parameters
+        var values = this.getValues();
+
+        // compatible with old version of wrong parameters
         // should be removed in next major version
         // see: https://github.com/vant-ui/vant/issues/5905
-
         if (this.dataType === 'cascade') {
           values = values.map(function (item) {
             return item[_this2.valueKey];
           });
         }
-
         this.$emit(event, values, this.getIndexes());
       }
     },
@@ -180,11 +167,9 @@ export default createComponent({
         children: this.columns
       };
       var indexes = this.getIndexes();
-
       for (var i = 0; i <= columnIndex; i++) {
         cursor = cursor.children[indexes[i]];
       }
-
       while (cursor && cursor.children) {
         columnIndex++;
         this.setColumnValues(columnIndex, cursor.children);
@@ -193,24 +178,21 @@ export default createComponent({
     },
     onChange: function onChange(columnIndex) {
       var _this3 = this;
-
       if (this.dataType === 'cascade') {
         this.onCascadeChange(columnIndex);
       }
-
       if (this.dataType === 'text') {
         this.$emit('change', this, this.getColumnValue(0), this.getColumnIndex(0));
       } else {
-        var values = this.getValues(); // compatible with old version of wrong parameters
+        var values = this.getValues();
+        // compatible with old version of wrong parameters
         // should be removed in next major version
         // see: https://github.com/vant-ui/vant/issues/5905
-
         if (this.dataType === 'cascade') {
           values = values.map(function (item) {
             return item[_this3.valueKey];
           });
         }
-
         this.$emit('change', this, values, columnIndex);
       }
     },
@@ -231,10 +213,8 @@ export default createComponent({
     // set column value by index
     setColumnValue: function setColumnValue(index, value) {
       var column = this.getColumn(index);
-
       if (column) {
         column.setValue(value);
-
         if (this.dataType === 'cascade') {
           this.onCascadeChange(index);
         }
@@ -249,10 +229,8 @@ export default createComponent({
     // set column option index by column index
     setColumnIndex: function setColumnIndex(columnIndex, optionIndex) {
       var column = this.getColumn(columnIndex);
-
       if (column) {
         column.setIndex(optionIndex);
-
         if (this.dataType === 'cascade') {
           this.onCascadeChange(columnIndex);
         }
@@ -267,7 +245,6 @@ export default createComponent({
     // set options of column by index
     setColumnValues: function setColumnValues(index, options) {
       var column = this.children[index];
-
       if (column) {
         column.setOptions(options);
       }
@@ -283,7 +260,6 @@ export default createComponent({
     // set values of all columns
     setValues: function setValues(values) {
       var _this4 = this;
-
       values.forEach(function (value, index) {
         _this4.setColumnValue(index, value);
       });
@@ -299,7 +275,6 @@ export default createComponent({
     // set indexes of all columns
     setIndexes: function setIndexes(indexes) {
       var _this5 = this;
-
       indexes.forEach(function (optionIndex, columnIndex) {
         _this5.setColumnIndex(columnIndex, optionIndex);
       });
@@ -330,11 +305,9 @@ export default createComponent({
     genTitle: function genTitle() {
       var h = this.$createElement;
       var titleSlot = this.slots('title');
-
       if (titleSlot) {
         return titleSlot;
       }
-
       if (this.title) {
         return h("div", {
           "class": ['zt2-ellipsis', bem('title')]
@@ -375,7 +348,6 @@ export default createComponent({
     },
     genToolbar: function genToolbar() {
       var h = this.$createElement;
-
       if (this.showToolbar) {
         return h("div", {
           "class": bem('toolbar')
@@ -425,11 +397,9 @@ export default createComponent({
     },
     genColumnItems: function genColumnItems() {
       var _this6 = this;
-
       var h = this.$createElement;
       return this.formattedColumns.map(function (item, columnIndex) {
         var _item$defaultIndex;
-
         return h(PickerColumn, {
           "attrs": {
             "columnCollector": _this6.children,
@@ -457,7 +427,6 @@ export default createComponent({
   },
   render: function render(h) {
     var _this7 = this;
-
     var renderPicker = function renderPicker() {
       return h("div", {
         "class": bem(),
@@ -470,7 +439,6 @@ export default createComponent({
         "class": bem('border')
       }) : h(), _this7.genColumns(), _this7.slots('columns-bottom'), _this7.toolbarPosition === 'bottom' ? _this7.genToolbar() : h()]);
     };
-
     if (this.popup) {
       return h(Popup, {
         "attrs": {
@@ -489,7 +457,6 @@ export default createComponent({
         }
       }, [renderPicker()]);
     }
-
     return renderPicker();
   }
 });