Merge remote-tracking branch 'origin/master'

src/controls/input/datetimepicker.js

@@ -82,6 +82,12 @@ export default function () {
                 // $up.on('click', () => {
                 //     debugger
                 // });
+                extHandle.on('click', (sender) => {
+                    const hideBak = me.hide
+                    me.hide = Ext.emptyFn
+                    extHandle.focus()
+                    me.hide = hideBak
+                })
 
                 const changeValue = (delta) => {
                     if (_.trim(extHandle.getValue()) === '') {
@@ -104,12 +110,14 @@ export default function () {
                     e.stopPropagation()
                     const event = e.originalEvent
                     let delta = 0
-                    if (event.wheelDelta) {
-                        delta = event.wheelDelta / 120;
-                    } else if (event.detail) {
-                        delta = -event.detail / 3;
-                    }
-                    changeValue(delta)
+                    let eventDelta = event.wheelDelta || -event.deltaY + 40
+                    // if (event.wheelDelta) {
+                    //     delta = event.wheelDelta / 120;
+                    // } else if (event.detail) {
+                    //     delta = -event.detail / 3;
+                    // }
+                    let zoomSize = Math.ceil(eventDelta / 120)
+                    changeValue(zoomSize)
                     // console.log('delta', delta)
                     // $input.focus()
                 })
@@ -260,7 +268,7 @@ export default function () {
             return this.update(this.value);
         },
 
-        setDisabledStatus: function (disabled) {
+        setDisabledStatus(disabled) {
             var me = this;
 
             debugger
@@ -274,7 +282,7 @@ export default function () {
             }
         },
 
-        handleDateClick: function (e, t) {
+        handleDateClick(e, t) {
             var me = this,
                 handler = me.handler;
 
@@ -299,7 +307,7 @@ export default function () {
             }
         },
 
-        selectToday: function () {
+        selectToday() {
             var me = this,
                 btn = me.todayBtn,
                 handler = me.handler;
@@ -313,11 +321,12 @@ export default function () {
                     handler.call(me.scope || me, me, me.value);
                 }
                 me.onSelect();
+                me.hide();
             }
             return me;
         },
 
-        confirmClick: function () {
+        confirmClick() {
             var me = this,
                 btn = me.confirmBtn,
                 handler = me.handler;
@@ -328,11 +337,12 @@ export default function () {
                     handler.call(me.scope || me, me, me.value);
                 }
                 me.onSelect();
+                me.hide();
             }
             return me;
         },
 
-        selectedUpdate: function (date) {
+        selectedUpdate(date) {
             var me = this,
                 //t         = date.getTime(),
                 t = Ext.Date.clearTime(date, true).getTime(),
@@ -362,7 +372,7 @@ export default function () {
         },
 
         // private, inherit docs
-        beforeDestroy: function () {
+        beforeDestroy() {
             var me = this;
 
             if (me.rendered) {