@nutui/nutui 2.3.11 → 2.3.12

package/dist/nutui.css

@@ -1,5 +1,5 @@
 /*!
- * @nutui/nutui v2.3.11 - nutui.css, 7583ccf991fc50ff5df7, Mon Oct 17 2022 18:27:02 GMT+0800 (中国标准时间)
+ * @nutui/nutui v2.3.12 - nutui.css, 158992d16877409c74e5, Mon Oct 24 2022 16:30:36 GMT+0800 (中国标准时间)
  * (c) 2017-2020 JDC
  * Released under the MIT License.
  */

package/dist/nutui.js

@@ -1,5 +1,5 @@
 /*!
- * @nutui/nutui v2.3.11 - nutui.js, 7583ccf991fc50ff5df7, Mon Oct 17 2022 18:27:02 GMT+0800 (中国标准时间)
+ * @nutui/nutui v2.3.12 - nutui.js, 158992d16877409c74e5, Mon Oct 24 2022 16:30:36 GMT+0800 (中国标准时间)
  * (c) 2017-2020 JDC
  * Released under the MIT License.
  */
@@ -712,7 +712,7 @@ module.exports = _unsupportedIterableToArray, module.exports.__esModule = true,
 /* 88 */
 /***/ (function(module) {
 
-module.exports = JSON.parse("{\"a\":\"2.3.11\"}");
+module.exports = JSON.parse("{\"a\":\"2.3.12\"}");
 
 /***/ }),
 /* 89 */
@@ -3565,23 +3565,30 @@ var datepickervue_type_template_id_4a4c3d78_staticRenderFns = []
 
 // CONCATENATED MODULE: ./src/packages/datepicker/datepicker.vue?vue&type=template&id=4a4c3d78&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/cache-loader/dist/cjs.js!./node_modules/vue-loader/lib??vue-loader-options!./src/packages/picker/picker.vue?vue&type=template&id=5963ec84&
-var pickervue_type_template_id_5963ec84_render = function render(){var _vm=this,_c=_vm._self._c;return _c('nut-actionsheet',{attrs:{"is-visible":_vm.isVisible},on:{"close":_vm.closeActionSheet}},[_c('div',{staticClass:"nut-picker",class:_vm.customClassName ? _vm.customClassName : null,attrs:{"slot":"custom"},slot:"custom"},[_c('div',{staticClass:"nut-picker-control"},[_c('span',{staticClass:"nut-picker-cancel-btn",on:{"click":_vm.closeActionSheet}},[_vm._v(_vm._s(_vm.nutTranslate('lang.cancelBtnTxt')))]),_vm._v(" "),_c('div',{staticClass:"nut-picker-title"},[_vm._v(_vm._s(_vm.title ? _vm.title : ''))]),_vm._v(" "),_c('span',{staticClass:"nut-picker-confirm-btn",on:{"click":_vm.confirm}},[_vm._v(_vm._s(_vm.nutTranslate('lang.okBtnTxt')))])]),_vm._v(" "),_c('div',{staticClass:"nut-picker-panel"},[_vm._l((_vm.listData),function(item,index){return [_c('nut-picker-slot',{key:index,ref:`picker-slot-${index}`,refInFor:true,attrs:{"default-value":_vm.chooseValueData[index],"is-update":_vm.isUpdate,"list-data":item,"key-index":index,"swipe-duration":_vm.swipeDuration},on:{"chooseItem":_vm.chooseItem}})]})],2)])])
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/cache-loader/dist/cjs.js!./node_modules/vue-loader/lib??vue-loader-options!./src/packages/picker/picker.vue?vue&type=template&id=a029fcdc&
+var pickervue_type_template_id_a029fcdc_render = function render(){var _vm=this,_c=_vm._self._c;return _c('nut-actionsheet',{attrs:{"is-visible":_vm.isVisible},on:{"close":_vm.closeActionSheet}},[_c('div',{staticClass:"nut-picker",class:_vm.customClassName ? _vm.customClassName : null,attrs:{"slot":"custom"},slot:"custom"},[_c('div',{staticClass:"nut-picker-control"},[_c('span',{staticClass:"nut-picker-cancel-btn",on:{"click":_vm.closeActionSheet}},[_vm._v(_vm._s(_vm.nutTranslate('lang.cancelBtnTxt')))]),_vm._v(" "),_c('div',{staticClass:"nut-picker-title"},[_vm._v(_vm._s(_vm.title ? _vm.title : ''))]),_vm._v(" "),_c('span',{staticClass:"nut-picker-confirm-btn",on:{"click":_vm.confirm}},[_vm._v(_vm._s(_vm.nutTranslate('lang.okBtnTxt')))])]),_vm._v(" "),_c('div',{staticClass:"nut-picker-panel"},[_vm._l((_vm.listData),function(item,index){return [_c('nut-picker-slot',{key:index,ref:`picker-slot-${index}`,refInFor:true,attrs:{"default-value":_vm.chooseValueData[index],"is-update":_vm.isUpdate,"list-data":item,"key-index":index,"swipe-duration":_vm.swipeDuration},on:{"chooseItem":_vm.chooseItem}})]})],2)])])
 }
-var pickervue_type_template_id_5963ec84_staticRenderFns = []
+var pickervue_type_template_id_a029fcdc_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./src/packages/picker/picker.vue?vue&type=template&id=5963ec84&
+// CONCATENATED MODULE: ./src/packages/picker/picker.vue?vue&type=template&id=a029fcdc&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/cache-loader/dist/cjs.js!./node_modules/vue-loader/lib??vue-loader-options!./src/packages/picker/picker-slot.vue?vue&type=template&id=22209d6c&
-var picker_slotvue_type_template_id_22209d6c_render = function render(){var _vm=this,_c=_vm._self._c;return _c('div',{staticClass:"nut-picker-list"},[_c('div',{ref:"roller",staticClass:"nut-picker-roller"},_vm._l((_vm.listData),function(item,index){return _c('div',{key:item.label ? item.label : index,staticClass:"nut-picker-roller-item",class:{ 'nut-picker-roller-item-hidden': _vm.isHidden(index + 1) },style:(_vm.setRollerStyle(index + 1))},[_vm._v("\n      "+_vm._s(item.value ? item.value : item)+"\n    ")])}),0),_vm._v(" "),_c('div',{staticClass:"nut-picker-content"},[_c('div',{ref:"list",staticClass:"nut-picker-list-panel"},[_vm._l((_vm.listData),function(item,index){return _c('div',{key:item.label ? item.label : index,staticClass:"nut-picker-item"},[_vm._v(_vm._s(item.value ? item.value : item)+"\n      ")])}),_vm._v(" "),(_vm.listData && _vm.listData.length === 1)?_c('div',{staticClass:"nut-picker-placeholder"}):_vm._e()],2)]),_vm._v(" "),_c('div',{staticClass:"nut-picker-mask"}),_vm._v(" "),_c('div',{staticClass:"nut-picker-indicator"})])
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/cache-loader/dist/cjs.js!./node_modules/vue-loader/lib??vue-loader-options!./src/packages/picker/picker-slot.vue?vue&type=template&id=bf0f2630&
+var picker_slotvue_type_template_id_bf0f2630_render = function render(){var _vm=this,_c=_vm._self._c;return _c('div',{staticClass:"nut-picker-list",on:{"touchstart":_vm.onTouchStart,"touchmove":_vm.onTouchMove,"touchend":_vm.onTouchEnd}},[_c('div',{ref:"roller",staticClass:"nut-picker-roller",on:{"transitionend":_vm.stopMomentum}},_vm._l((_vm.listData),function(item,index){return _c('div',{key:item.label ? item.label : index,staticClass:"nut-picker-roller-item",class:{ 'nut-picker-roller-item-hidden': _vm.isHidden(index + 1) },style:(_vm.setRollerStyle(index + 1))},[_vm._v("\n      "+_vm._s(item.value ? item.value : item)+"\n    ")])}),0),_vm._v(" "),_c('div',{staticClass:"nut-picker-content"},[_c('div',{ref:"list",staticClass:"nut-picker-list-panel"},[_vm._l((_vm.listData),function(item,index){return _c('div',{key:item.label ? item.label : index,staticClass:"nut-picker-item"},[_vm._v(_vm._s(item.value ? item.value : item)+"\n      ")])}),_vm._v(" "),(_vm.listData && _vm.listData.length === 1)?_c('div',{staticClass:"nut-picker-placeholder"}):_vm._e()],2)]),_vm._v(" "),_c('div',{staticClass:"nut-picker-mask"}),_vm._v(" "),_c('div',{staticClass:"nut-picker-indicator"})])
 }
-var picker_slotvue_type_template_id_22209d6c_staticRenderFns = []
+var picker_slotvue_type_template_id_bf0f2630_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./src/packages/picker/picker-slot.vue?vue&type=template&id=22209d6c&
+// CONCATENATED MODULE: ./src/packages/picker/picker-slot.vue?vue&type=template&id=bf0f2630&
 
 // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/packages/picker/picker-slot.vue?vue&type=script&lang=js&
+var DEFAULT_DURATION = 200;
+
+// 触发惯性滑动条件:
+// 在手指离开屏幕时，如果和上一次 move 时的间隔小于 `MOMENTUM_TIME` 且 move
+// 距离大于 `MOMENTUM_DISTANCE` 时，执行惯性滑动
+var INERTIA_TIME = 300;
+var INERTIA_DISTANCE = 15;
 /* harmony default export */ var picker_slotvue_type_script_lang_js_ = ({
   name: 'nut-picker-slot',
   props: {
@@ -3618,7 +3625,8 @@ var picker_slotvue_type_template_id_22209d6c_staticRenderFns = []
       scrollDistance: 0,
       lineSpacing: 36,
       rotation: 20,
-      timer: null
+      timer: null,
+      touchTime: 0
     };
   },
   watch: {
@@ -3654,7 +3662,7 @@ var picker_slotvue_type_template_id_22209d6c_staticRenderFns = []
     setTransform: function setTransform() {
       var translateY = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
       var type = arguments.length > 1 ? arguments[1] : undefined;
-      var time = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1000;
+      var time = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : DEFAULT_DURATION;
       var deg = arguments.length > 3 ? arguments[3] : undefined;
       if (type === 'end') {
         this.$refs.list.style.webkitTransition = "transform ".concat(time, "ms cubic-bezier(0.19, 1, 0.22, 1)");
@@ -3663,9 +3671,11 @@ var picker_slotvue_type_template_id_22209d6c_staticRenderFns = []
         this.$refs.list.style.webkitTransition = '';
         this.$refs.roller.style.webkitTransition = '';
       }
-      this.$refs.list.style.webkitTransform = "translate3d(0, ".concat(translateY, "px, 0)");
-      this.$refs.roller.style.webkitTransform = "rotate3d(1, 0, 0, ".concat(deg, ")");
-      this.scrollDistance = translateY;
+      if (translateY != null) {
+        this.$refs.list.style.webkitTransform = "translate3d(0, ".concat(translateY, "px, 0)");
+        this.$refs.roller.style.webkitTransform = "rotate3d(1, 0, 0, ".concat(deg, ")");
+        this.scrollDistance = translateY;
+      }
     },
     setMove: function setMove(move, type, time) {
       var _this2 = this;
@@ -3701,14 +3711,14 @@ var picker_slotvue_type_template_id_22209d6c_staticRenderFns = []
     setChooseValue: function setChooseValue(move) {
       this.$emit('chooseItem', this.listData[Math.round(-move / this.lineSpacing)], this.keyIndex);
     },
-    touchStart: function touchStart(event) {
+    onTouchStart: function onTouchStart(event) {
       event.preventDefault();
       var changedTouches = event.changedTouches[0];
       this.touchParams.startY = changedTouches.pageY;
       this.touchParams.startTime = event.timestamp || Date.now();
       this.transformY = this.scrollDistance;
     },
-    touchMove: function touchMove(event) {
+    onTouchMove: function onTouchMove(event) {
       event.preventDefault();
       var changedTouches = event.changedTouches[0];
       this.touchParams.lastY = changedTouches.pageY;
@@ -3716,16 +3726,16 @@ var picker_slotvue_type_template_id_22209d6c_staticRenderFns = []
       var move = this.touchParams.lastY - this.touchParams.startY;
       this.setMove(move);
     },
-    touchEnd: function touchEnd(event) {
+    onTouchEnd: function onTouchEnd(event) {
       event.preventDefault();
       var changedTouches = event.changedTouches[0];
       this.touchParams.lastY = changedTouches.pageY;
       this.touchParams.lastTime = event.timestamp || Date.now();
       var move = this.touchParams.lastY - this.touchParams.startY;
       var moveTime = this.touchParams.lastTime - this.touchParams.startTime;
-      if (moveTime <= 300) {
-        move = move * 2;
-        this.setMove(move, 'end', +this.swipeDuration);
+      if (moveTime <= INERTIA_TIME && Math.abs(move) > INERTIA_DISTANCE) {
+        var distance = this.momentum(move, moveTime);
+        this.setMove(distance, 'end', +this.swipeDuration);
       } else {
         this.setMove(move, 'end');
       }
@@ -3747,6 +3757,20 @@ var picker_slotvue_type_template_id_22209d6c_staticRenderFns = []
       var move = index === -1 ? 0 : index * this.lineSpacing;
       type && this.setChooseValue(-move);
       this.setMove(-move);
+    },
+    // 惯性滚动结束
+    stopMomentum: function stopMomentum() {
+      console.log('惯性滚动结束');
+      this.setChooseValue(this.scrollDistance);
+      this.setTransform(null, 'end');
+    },
+    // 惯性滚动 距离
+    momentum: function momentum(distance, duration) {
+      // 惯性滚动的速度
+      var speed = Math.abs(distance / duration);
+      // 惯性滚动的距离
+      distance = speed / 0.003 * (distance < 0 ? -1 : 1);
+      return distance;
     }
   },
   mounted: function mounted() {
@@ -3754,16 +3778,16 @@ var picker_slotvue_type_template_id_22209d6c_staticRenderFns = []
     this.$nextTick(function () {
       _this3.modifyStatus(true);
       // 监听
-      _this3.$el.addEventListener('touchstart', _this3.touchStart);
-      _this3.$el.addEventListener('touchmove', _this3.touchMove);
-      _this3.$el.addEventListener('touchend', _this3.touchEnd);
+      // this.$el.addEventListener('touchstart', this.touchStart);
+      // this.$el.addEventListener('touchmove', this.touchMove);
+      // this.$el.addEventListener('touchend', this.touchEnd);
     });
   },
   beforeDestroy: function beforeDestroy() {
     // 移除监听
-    this.$el.removeEventListener('touchstart', this.touchStart);
-    this.$el.removeEventListener('touchmove', this.touchMove);
-    this.$el.removeEventListener('touchend', this.touchEnd);
+    // this.$el.removeEventListener('touchstart', this.touchStart);
+    // this.$el.removeEventListener('touchmove', this.touchMove);
+    // this.$el.removeEventListener('touchend', this.touchEnd);
     clearTimeout(this.timer);
   }
 });
@@ -3779,8 +3803,8 @@ var picker_slotvue_type_template_id_22209d6c_staticRenderFns = []
 
 var picker_slot_component = normalizeComponent(
   picker_picker_slotvue_type_script_lang_js_,
-  picker_slotvue_type_template_id_22209d6c_render,
-  picker_slotvue_type_template_id_22209d6c_staticRenderFns,
+  picker_slotvue_type_template_id_bf0f2630_render,
+  picker_slotvue_type_template_id_bf0f2630_staticRenderFns,
   false,
   null,
   null,
@@ -3861,6 +3885,11 @@ var _components;
       this.$emit('close-update', this, this.chooseValueData);
     },
     confirm: function confirm() {
+      var _this = this;
+      this.listData.map(function (tag, i) {
+        var ref = "picker-slot-".concat(i);
+        _this.$refs[ref] && _this.$refs[ref][0].stopMomentum();
+      });
       this.$emit('confirm', this.cacheValueData);
       this.chooseValueData = toConsumableArray_default()(this.cacheValueData);
       this.$emit('close');
@@ -3899,8 +3928,8 @@ var _components;
 
 var picker_component = normalizeComponent(
   picker_pickervue_type_script_lang_js_,
-  pickervue_type_template_id_5963ec84_render,
-  pickervue_type_template_id_5963ec84_staticRenderFns,
+  pickervue_type_template_id_a029fcdc_render,
+  pickervue_type_template_id_a029fcdc_staticRenderFns,
   false,
   null,
   null,