diff --git a/src/base/single/button/button.basic.js b/src/base/single/button/button.basic.js
index efad22775..bfc1090c9 100644
--- a/src/base/single/button/button.basic.js
+++ b/src/base/single/button/button.basic.js
@@ -409,4 +409,4 @@ BI.BasicButton = BI.inherit(BI.Single, {
         BI.BasicButton.superclass.destroy.apply(this, arguments);
     }
 });
-BI.BasicButton.EVENT_CHANGE = "EVENT_CHANGE";
\ No newline at end of file
+BI.BasicButton.EVENT_CHANGE = "BasicButton.EVENT_CHANGE";
\ No newline at end of file
diff --git a/src/case/calendar/calendar.year.js b/src/case/calendar/calendar.year.js
index f7e0fb19a..cd70532be 100644
--- a/src/case/calendar/calendar.year.js
+++ b/src/case/calendar/calendar.year.js
@@ -24,9 +24,12 @@ BI.YearCalendar = BI.inherit(BI.Widget, {
         Y = Y | 0;
         var start = BI.YearCalendar.getStartYear(Y);
         var items = [];
+        // 对于年控件来说，只要传入的minDate和maxDate的year区间包含v就是合法的
+        var startDate = BI.parseDateTime(o.min, "%Y-%X-%d");
+        var endDate = BI.parseDateTime(o.max, "%Y-%X-%d");
         BI.each(BI.range(BI.YearCalendar.INTERVAL), function (i) {
             var td = {};
-            if (BI.checkDateVoid(start + i, 1, 1, o.min, o.max)[0]) {
+            if (BI.checkDateVoid(start + i, 1, 1, BI.print(BI.getDate(startDate.getFullYear(), 0, 1), "%Y-%X-%d"), BI.print(BI.getDate(endDate.getFullYear(), 0, 1), "%Y-%X-%d"))[0]) {
                 td.disabled = true;
             }
             td.text = start + i;
diff --git a/src/widget/date/calendar/popup.year.js b/src/widget/date/calendar/popup.year.js
index f0d479593..15654c004 100644
--- a/src/widget/date/calendar/popup.year.js
+++ b/src/widget/date/calendar/popup.year.js
@@ -95,7 +95,10 @@ BI.YearPopup = BI.inherit(BI.Widget, {
     setValue: function (v) {
         var o = this.options;
         v = BI.parseInt(v);
-        if (BI.checkDateVoid(v, 1, 1, o.min, o.max)[0]) {
+        // 对于年控件来说，只要传入的minDate和maxDate的year区间包含v就是合法的
+        var startDate = BI.parseDateTime(o.min, "%Y-%X-%d");
+        var endDate = BI.parseDateTime(o.max, "%Y-%X-%d");
+        if (BI.checkDateVoid(v, 1, 1, BI.print(BI.getDate(startDate.getFullYear(), 0, 1), "%Y-%X-%d"), BI.print(BI.getDate(endDate.getFullYear(), 0, 1), "%Y-%X-%d"))[0]) {
             v = BI.getDate().getFullYear();
             this.selectedYear = "";
             this.navigation.setSelect(BI.YearCalendar.getPageByYear(v));