Merge pull request #172 in ~GUY/fineui from ~WINDY/fineui:master to master

* commit '67dcc9f89a4576482c4c1455c385381cf3e3f583':
  月份和季度删除内容弹出面板

bi/widget.js

@@ -5694,6 +5694,9 @@ BI.MonthCombo = BI.inherit(BI.Widget, {
         });
 
         this.trigger.on(BI.MonthTrigger.EVENT_CONFIRM, function (v) {
+            if (self.combo.isViewVisible()) {
+                return;
+            }
             if (this.getKey() && this.getKey() !== self.storeValue) {
                 self.setValue(this.getValue());
             } else if (!this.getKey()) {
@@ -5712,9 +5715,6 @@ BI.MonthCombo = BI.inherit(BI.Widget, {
                 self.combo.showView();
             }
         });
-        this.trigger.on(BI.MonthTrigger.EVENT_CHANGE, function () {
-            self.combo.isViewVisible() && self.combo.hideView();
-        });
 
         this.popup = BI.createWidget({
             type: "bi.month_popup",
@@ -13161,9 +13161,6 @@ BI.QuarterCombo = BI.inherit(BI.Widget, {
         this.trigger.on(BI.QuarterTrigger.EVENT_FOCUS, function () {
             self.storeValue = this.getKey();
         });
-        this.trigger.on(BI.QuarterTrigger.EVENT_CHANGE, function () {
-            self.combo.isViewVisible() && self.combo.hideView();
-        });
         this.trigger.on(BI.QuarterTrigger.EVENT_START, function () {
             self.combo.isViewVisible() && self.combo.hideView();
         });

dist/bundle.js

@@ -84023,6 +84023,9 @@ BI.MonthCombo = BI.inherit(BI.Widget, {
         });
 
         this.trigger.on(BI.MonthTrigger.EVENT_CONFIRM, function (v) {
+            if (self.combo.isViewVisible()) {
+                return;
+            }
             if (this.getKey() && this.getKey() !== self.storeValue) {
                 self.setValue(this.getValue());
             } else if (!this.getKey()) {
@@ -84041,9 +84044,6 @@ BI.MonthCombo = BI.inherit(BI.Widget, {
                 self.combo.showView();
             }
         });
-        this.trigger.on(BI.MonthTrigger.EVENT_CHANGE, function () {
-            self.combo.isViewVisible() && self.combo.hideView();
-        });
 
         this.popup = BI.createWidget({
             type: "bi.month_popup",
@@ -91490,9 +91490,6 @@ BI.QuarterCombo = BI.inherit(BI.Widget, {
         this.trigger.on(BI.QuarterTrigger.EVENT_FOCUS, function () {
             self.storeValue = this.getKey();
         });
-        this.trigger.on(BI.QuarterTrigger.EVENT_CHANGE, function () {
-            self.combo.isViewVisible() && self.combo.hideView();
-        });
         this.trigger.on(BI.QuarterTrigger.EVENT_START, function () {
             self.combo.isViewVisible() && self.combo.hideView();
         });

dist/widget.js

@@ -5694,6 +5694,9 @@ BI.MonthCombo = BI.inherit(BI.Widget, {
         });
 
         this.trigger.on(BI.MonthTrigger.EVENT_CONFIRM, function (v) {
+            if (self.combo.isViewVisible()) {
+                return;
+            }
             if (this.getKey() && this.getKey() !== self.storeValue) {
                 self.setValue(this.getValue());
             } else if (!this.getKey()) {
@@ -5712,9 +5715,6 @@ BI.MonthCombo = BI.inherit(BI.Widget, {
                 self.combo.showView();
             }
         });
-        this.trigger.on(BI.MonthTrigger.EVENT_CHANGE, function () {
-            self.combo.isViewVisible() && self.combo.hideView();
-        });
 
         this.popup = BI.createWidget({
             type: "bi.month_popup",
@@ -13161,9 +13161,6 @@ BI.QuarterCombo = BI.inherit(BI.Widget, {
         this.trigger.on(BI.QuarterTrigger.EVENT_FOCUS, function () {
             self.storeValue = this.getKey();
         });
-        this.trigger.on(BI.QuarterTrigger.EVENT_CHANGE, function () {
-            self.combo.isViewVisible() && self.combo.hideView();
-        });
         this.trigger.on(BI.QuarterTrigger.EVENT_START, function () {
             self.combo.isViewVisible() && self.combo.hideView();
         });

src/widget/month/combo.month.js

@@ -22,6 +22,9 @@ BI.MonthCombo = BI.inherit(BI.Widget, {
         });
 
         this.trigger.on(BI.MonthTrigger.EVENT_CONFIRM, function (v) {
+            if (self.combo.isViewVisible()) {
+                return;
+            }
             if (this.getKey() && this.getKey() !== self.storeValue) {
                 self.setValue(this.getValue());
             } else if (!this.getKey()) {
@@ -40,9 +43,6 @@ BI.MonthCombo = BI.inherit(BI.Widget, {
                 self.combo.showView();
             }
         });
-        this.trigger.on(BI.MonthTrigger.EVENT_CHANGE, function () {
-            self.combo.isViewVisible() && self.combo.hideView();
-        });
 
         this.popup = BI.createWidget({
             type: "bi.month_popup",

src/widget/quarter/combo.quarter.js

@@ -24,9 +24,6 @@ BI.QuarterCombo = BI.inherit(BI.Widget, {
         this.trigger.on(BI.QuarterTrigger.EVENT_FOCUS, function () {
             self.storeValue = this.getKey();
         });
-        this.trigger.on(BI.QuarterTrigger.EVENT_CHANGE, function () {
-            self.combo.isViewVisible() && self.combo.hideView();
-        });
         this.trigger.on(BI.QuarterTrigger.EVENT_START, function () {
             self.combo.isViewVisible() && self.combo.hideView();
         });