From 89389d33508d472cf3bda6af2698b5372f3b8859 Mon Sep 17 00:00:00 2001 From: qcc Date: Tue, 5 Mar 2019 19:33:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=B8=85=E7=A9=BA=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E8=A7=A6=E5=8F=91CONFIRM=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/bundle.ie.js | 3 +-- dist/bundle.js | 3 +-- dist/fineui.ie.js | 3 +-- dist/fineui.js | 3 +-- dist/fineui_without_jquery_polyfill.js | 3 +-- dist/widget.js | 3 +-- src/widget/time/time.combo.js | 3 +-- 7 files changed, 7 insertions(+), 14 deletions(-) diff --git a/dist/bundle.ie.js b/dist/bundle.ie.js index 6d1ee2d3dc..6d5c63ba35 100644 --- a/dist/bundle.ie.js +++ b/dist/bundle.ie.js @@ -78606,7 +78606,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { action: function () { self.setValue(); self.hidePopupView(); - self.fireEvent(BI.TimeCombo.EVENT_CANCEL); + self.fireEvent(BI.TimeCombo.EVENT_CONFIRM); } }, { eventName: BI.TimePopup.BUTTON_OK_EVENT_CHANGE, @@ -78719,7 +78719,6 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { } }); - BI.TimeCombo.EVENT_CANCEL = "EVENT_CANCEL"; BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; BI.TimeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW"; diff --git a/dist/bundle.js b/dist/bundle.js index 7aa08fce46..c2405d90fe 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -79010,7 +79010,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { action: function () { self.setValue(); self.hidePopupView(); - self.fireEvent(BI.TimeCombo.EVENT_CANCEL); + self.fireEvent(BI.TimeCombo.EVENT_CONFIRM); } }, { eventName: BI.TimePopup.BUTTON_OK_EVENT_CHANGE, @@ -79123,7 +79123,6 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { } }); - BI.TimeCombo.EVENT_CANCEL = "EVENT_CANCEL"; BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; BI.TimeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW"; diff --git a/dist/fineui.ie.js b/dist/fineui.ie.js index dd254b3571..db9d1ec4eb 100644 --- a/dist/fineui.ie.js +++ b/dist/fineui.ie.js @@ -78851,7 +78851,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { action: function () { self.setValue(); self.hidePopupView(); - self.fireEvent(BI.TimeCombo.EVENT_CANCEL); + self.fireEvent(BI.TimeCombo.EVENT_CONFIRM); } }, { eventName: BI.TimePopup.BUTTON_OK_EVENT_CHANGE, @@ -78964,7 +78964,6 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { } }); - BI.TimeCombo.EVENT_CANCEL = "EVENT_CANCEL"; BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; BI.TimeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW"; diff --git a/dist/fineui.js b/dist/fineui.js index 5805f5db4c..6c11432d1f 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -79255,7 +79255,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { action: function () { self.setValue(); self.hidePopupView(); - self.fireEvent(BI.TimeCombo.EVENT_CANCEL); + self.fireEvent(BI.TimeCombo.EVENT_CONFIRM); } }, { eventName: BI.TimePopup.BUTTON_OK_EVENT_CHANGE, @@ -79368,7 +79368,6 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { } }); - BI.TimeCombo.EVENT_CANCEL = "EVENT_CANCEL"; BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; BI.TimeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW"; diff --git a/dist/fineui_without_jquery_polyfill.js b/dist/fineui_without_jquery_polyfill.js index d1b9081ade..a932c5d837 100644 --- a/dist/fineui_without_jquery_polyfill.js +++ b/dist/fineui_without_jquery_polyfill.js @@ -62029,7 +62029,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { action: function () { self.setValue(); self.hidePopupView(); - self.fireEvent(BI.TimeCombo.EVENT_CANCEL); + self.fireEvent(BI.TimeCombo.EVENT_CONFIRM); } }, { eventName: BI.TimePopup.BUTTON_OK_EVENT_CHANGE, @@ -62142,7 +62142,6 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { } }); - BI.TimeCombo.EVENT_CANCEL = "EVENT_CANCEL"; BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; BI.TimeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW"; diff --git a/dist/widget.js b/dist/widget.js index e0fe989ea8..b05fbb72df 100644 --- a/dist/widget.js +++ b/dist/widget.js @@ -19377,7 +19377,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { action: function () { self.setValue(); self.hidePopupView(); - self.fireEvent(BI.TimeCombo.EVENT_CANCEL); + self.fireEvent(BI.TimeCombo.EVENT_CONFIRM); } }, { eventName: BI.TimePopup.BUTTON_OK_EVENT_CHANGE, @@ -19490,7 +19490,6 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { } }); - BI.TimeCombo.EVENT_CANCEL = "EVENT_CANCEL"; BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; BI.TimeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW"; diff --git a/src/widget/time/time.combo.js b/src/widget/time/time.combo.js index 50f8f26c14..8633e88f7f 100644 --- a/src/widget/time/time.combo.js +++ b/src/widget/time/time.combo.js @@ -31,7 +31,7 @@ action: function () { self.setValue(); self.hidePopupView(); - self.fireEvent(BI.TimeCombo.EVENT_CANCEL); + self.fireEvent(BI.TimeCombo.EVENT_CONFIRM); } }, { eventName: BI.TimePopup.BUTTON_OK_EVENT_CHANGE, @@ -144,7 +144,6 @@ } }); - BI.TimeCombo.EVENT_CANCEL = "EVENT_CANCEL"; BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; BI.TimeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW"; From b422b9ada50c08bf2761e49550542a76f6c63097 Mon Sep 17 00:00:00 2001 From: qcc Date: Tue, 5 Mar 2019 19:48:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4combo=E5=AE=BD?= =?UTF-8?q?=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/bundle.ie.js | 2 +- dist/bundle.js | 2 +- dist/fineui.ie.js | 2 +- dist/fineui.js | 2 +- dist/fineui_without_jquery_polyfill.js | 2 +- dist/widget.js | 2 +- src/widget/time/time.combo.js | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dist/bundle.ie.js b/dist/bundle.ie.js index 6d5c63ba35..18329fb4f8 100644 --- a/dist/bundle.ie.js +++ b/dist/bundle.ie.js @@ -78589,7 +78589,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { }, props: { baseCls: "bi-time-combo bi-border bi-border-radius", - width: 80, + width: 78, height: 22 }, diff --git a/dist/bundle.js b/dist/bundle.js index c2405d90fe..df002451c1 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -78993,7 +78993,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { }, props: { baseCls: "bi-time-combo bi-border bi-border-radius", - width: 80, + width: 78, height: 22 }, diff --git a/dist/fineui.ie.js b/dist/fineui.ie.js index db9d1ec4eb..e4468358b3 100644 --- a/dist/fineui.ie.js +++ b/dist/fineui.ie.js @@ -78834,7 +78834,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { }, props: { baseCls: "bi-time-combo bi-border bi-border-radius", - width: 80, + width: 78, height: 22 }, diff --git a/dist/fineui.js b/dist/fineui.js index 6c11432d1f..a381723e42 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -79238,7 +79238,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { }, props: { baseCls: "bi-time-combo bi-border bi-border-radius", - width: 80, + width: 78, height: 22 }, diff --git a/dist/fineui_without_jquery_polyfill.js b/dist/fineui_without_jquery_polyfill.js index a932c5d837..218f895da4 100644 --- a/dist/fineui_without_jquery_polyfill.js +++ b/dist/fineui_without_jquery_polyfill.js @@ -62012,7 +62012,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { }, props: { baseCls: "bi-time-combo bi-border bi-border-radius", - width: 80, + width: 78, height: 22 }, diff --git a/dist/widget.js b/dist/widget.js index b05fbb72df..c9dac8587a 100644 --- a/dist/widget.js +++ b/dist/widget.js @@ -19360,7 +19360,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { }, props: { baseCls: "bi-time-combo bi-border bi-border-radius", - width: 80, + width: 78, height: 22 }, diff --git a/src/widget/time/time.combo.js b/src/widget/time/time.combo.js index 8633e88f7f..644ccbd083 100644 --- a/src/widget/time/time.combo.js +++ b/src/widget/time/time.combo.js @@ -14,7 +14,7 @@ }, props: { baseCls: "bi-time-combo bi-border bi-border-radius", - width: 80, + width: 78, height: 22 },