Merge pull request #278 in FUI/fineui from ~WINDY/fui:master to master

* commit '577b345837bca74993be535f300df70cf5eb7435':
  update

dist/bundle.js

@@ -89152,7 +89152,11 @@ BI.MonthCombo = BI.inherit(BI.Widget, {
     },
 
     getValue: function () {
-        return this.popup.getValue();
+        if (BI.isNull(this.popup)) {
+            return this.options.value || "";
+        } else {
+            return this.popup.getValue() || "";
+        }
     }
 });
 
@@ -96802,8 +96806,12 @@ BI.QuarterCombo = BI.inherit(BI.Widget, {
     },
 
     getValue: function () {
+        if (BI.isNull(this.popup)) {
+            return this.options.value || "";
+        } else {
             return this.popup.getValue() || "";
         }
+    }
 });
 
 BI.QuarterCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
@@ -102316,8 +102324,12 @@ BI.YearCombo = BI.inherit(BI.Widget, {
     },
 
     getValue: function () {
+        if (BI.isNull(this.popup)) {
+            return this.options.value;
+        } else {
             return this.popup.getValue();
         }
+    }
 });
 BI.YearCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
 BI.YearCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
@@ -102576,6 +102588,7 @@ BI.YearMonthCombo = BI.inherit(BI.Widget, {
         });
 
         this.month.on(BI.MonthCombo.EVENT_CONFIRM, function () {
+            self.getValue();
             self.fireEvent(BI.YearMonthCombo.EVENT_CONFIRM);
         });
         this.month.on(BI.MonthCombo.EVENT_BEFORE_POPUPVIEW, function () {

dist/fineui.js

@@ -90958,7 +90958,11 @@ BI.MonthCombo = BI.inherit(BI.Widget, {
     },
 
     getValue: function () {
-        return this.popup.getValue();
+        if (BI.isNull(this.popup)) {
+            return this.options.value || "";
+        } else {
+            return this.popup.getValue() || "";
+        }
     }
 });
 
@@ -98608,8 +98612,12 @@ BI.QuarterCombo = BI.inherit(BI.Widget, {
     },
 
     getValue: function () {
+        if (BI.isNull(this.popup)) {
+            return this.options.value || "";
+        } else {
             return this.popup.getValue() || "";
         }
+    }
 });
 
 BI.QuarterCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
@@ -104122,8 +104130,12 @@ BI.YearCombo = BI.inherit(BI.Widget, {
     },
 
     getValue: function () {
+        if (BI.isNull(this.popup)) {
+            return this.options.value;
+        } else {
             return this.popup.getValue();
         }
+    }
 });
 BI.YearCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
 BI.YearCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
@@ -104382,6 +104394,7 @@ BI.YearMonthCombo = BI.inherit(BI.Widget, {
         });
 
         this.month.on(BI.MonthCombo.EVENT_CONFIRM, function () {
+            self.getValue();
             self.fireEvent(BI.YearMonthCombo.EVENT_CONFIRM);
         });
         this.month.on(BI.MonthCombo.EVENT_BEFORE_POPUPVIEW, function () {

dist/widget.js

@@ -4307,7 +4307,11 @@ BI.MonthCombo = BI.inherit(BI.Widget, {
     },
 
     getValue: function () {
-        return this.popup.getValue();
+        if (BI.isNull(this.popup)) {
+            return this.options.value || "";
+        } else {
+            return this.popup.getValue() || "";
+        }
     }
 });
 
@@ -11957,8 +11961,12 @@ BI.QuarterCombo = BI.inherit(BI.Widget, {
     },
 
     getValue: function () {
+        if (BI.isNull(this.popup)) {
+            return this.options.value || "";
+        } else {
             return this.popup.getValue() || "";
         }
+    }
 });
 
 BI.QuarterCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
@@ -17471,8 +17479,12 @@ BI.YearCombo = BI.inherit(BI.Widget, {
     },
 
     getValue: function () {
+        if (BI.isNull(this.popup)) {
+            return this.options.value;
+        } else {
             return this.popup.getValue();
         }
+    }
 });
 BI.YearCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
 BI.YearCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
@@ -17731,6 +17743,7 @@ BI.YearMonthCombo = BI.inherit(BI.Widget, {
         });
 
         this.month.on(BI.MonthCombo.EVENT_CONFIRM, function () {
+            self.getValue();
             self.fireEvent(BI.YearMonthCombo.EVENT_CONFIRM);
         });
         this.month.on(BI.MonthCombo.EVENT_BEFORE_POPUPVIEW, function () {

src/widget/month/combo.month.js

@@ -78,7 +78,11 @@ BI.MonthCombo = BI.inherit(BI.Widget, {
     },
 
     getValue: function () {
-        return this.popup.getValue();
+        if (BI.isNull(this.popup)) {
+            return this.options.value || "";
+        } else {
+            return this.popup.getValue() || "";
+        }
     }
 });
 

src/widget/quarter/combo.quarter.js

@@ -78,8 +78,12 @@ BI.QuarterCombo = BI.inherit(BI.Widget, {
     },
 
     getValue: function () {
+        if (BI.isNull(this.popup)) {
+            return this.options.value || "";
+        } else {
             return this.popup.getValue() || "";
         }
+    }
 });
 
 BI.QuarterCombo.EVENT_CONFIRM = "EVENT_CONFIRM";

src/widget/year/combo.year.js

@@ -97,8 +97,12 @@ BI.YearCombo = BI.inherit(BI.Widget, {
     },
 
     getValue: function () {
+        if (BI.isNull(this.popup)) {
+            return this.options.value;
+        } else {
             return this.popup.getValue();
         }
+    }
 });
 BI.YearCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
 BI.YearCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";

src/widget/yearmonth/combo.yearmonth.js

@@ -39,6 +39,7 @@ BI.YearMonthCombo = BI.inherit(BI.Widget, {
         });
 
         this.month.on(BI.MonthCombo.EVENT_CONFIRM, function () {
+            self.getValue();
             self.fireEvent(BI.YearMonthCombo.EVENT_CONFIRM);
         });
         this.month.on(BI.MonthCombo.EVENT_BEFORE_POPUPVIEW, function () {