diff --git a/src/less/base/tree/ztree.less b/src/less/base/tree/ztree.less
index 181aa69e4..c45be8d5a 100644
--- a/src/less/base/tree/ztree.less
+++ b/src/less/base/tree/ztree.less
@@ -35,11 +35,11 @@
   vertical-align: top;
   display: inline-block;
   &:hover {
-    .background-color(@color-bi-background-highlight, 6%);
+    .background-color(@color-bi-background-highlight, 10%);
   }
   &:active {
     color: @color-bi-text-highlight;
-    .background-color(@color-bi-background-highlight, 6%);
+    .background-color(@color-bi-background-highlight, 15%);
   }
 }
 
diff --git a/src/less/core/utils/common.less b/src/less/core/utils/common.less
index 05d979099..1b5965b26 100644
--- a/src/less/core/utils/common.less
+++ b/src/less/core/utils/common.less
@@ -685,7 +685,7 @@ textarea {
     & .bi-textarea {
       color: @color-bi-text-black;
     }
-    .background-color(@color-bi-background-highlight, 6%);
+    .background-color(@color-bi-background-highlight, 10%);
   }
   &:active {
     color: @color-bi-text-highlight;
@@ -695,7 +695,7 @@ textarea {
     & .bi-textarea {
       color: @color-bi-text-highlight;
     }
-    .background-color(@color-bi-background-highlight, 6%);
+    .background-color(@color-bi-background-highlight, 15%);
   }
   &.active {
     color: @color-bi-text-highlight;
@@ -773,7 +773,7 @@ textarea {
     & .bi-textarea {
       color: @color-bi-text-black;
     }
-    .background-color(@color-bi-background-highlight, 6%);
+    .background-color(@color-bi-background-highlight, 10%);
   }
   &:active, &.active {
     color: @color-bi-text-highlight;
@@ -783,7 +783,7 @@ textarea {
     & .bi-textarea {
       color: @color-bi-text-highlight;
     }
-    .background-color(@color-bi-background-highlight, 6%);
+    .background-color(@color-bi-background-highlight, 15%);
   }
   &.disabled {
     &, &:hover, &:active {
@@ -812,7 +812,7 @@ textarea {
       & .bi-textarea {
         color: @color-bi-text;
       }
-      .background-color(@color-bi-background-highlight, 6%);
+      .background-color(@color-bi-background-highlight, 10%);
     }
     &:active, &.active {
       color: @color-bi-text-highlight;
@@ -822,7 +822,7 @@ textarea {
       & .bi-textarea {
         color: @color-bi-text-highlight;
       }
-      .background-color(@color-bi-background-highlight, 6%);
+      .background-color(@color-bi-background-highlight, 15%);
     }
     &.disabled {
       &, &:hover, &:active {
@@ -845,7 +845,7 @@ textarea {
 // 激活和选中时背景高亮
 .bi-list-item-select {
   &:hover, &.hover {
-    .background-color(@color-bi-background-highlight, 6%);
+    .background-color(@color-bi-background-highlight, 10%);
   }
   &:active, &.active {
     color: @color-bi-text;
diff --git a/src/widget/date/calendar/popup.year.js b/src/widget/date/calendar/popup.year.js
index c77471bc9..39cac5621 100644
--- a/src/widget/date/calendar/popup.year.js
+++ b/src/widget/date/calendar/popup.year.js
@@ -71,8 +71,8 @@ BI.YearPopup = BI.inherit(BI.Widget, {
             afterCardCreated: function () {
                 this.setValue(self.selectedYear);
                 var calendar = this.getSelectedCard();
-                calendar && self.backBtn.setEnable(!calendar.isFrontYear());
-                calendar && self.preBtn.setEnable(!calendar.isFinalYear());
+                calendar && self.backBtn.setEnable(self._checkMinYearValid());
+                calendar && self.preBtn.setEnable(self._checkMaxYearValid());
             }
         });
 
@@ -87,12 +87,22 @@ BI.YearPopup = BI.inherit(BI.Widget, {
         }
     },
 
+    _checkMinYearValid: function () {
+        var o = this.options;
+        return this.selectedYear > BI.parseDateTime(o.min, "%Y-%X-%d").getFullYear();
+    },
+
+    _checkMaxYearValid: function () {
+        var o = this.options;
+        return this.selectedYear < BI.parseDateTime(o.max, "%Y-%X-%d").getFullYear();
+    },
+
     _checkMin: function () {
         var calendar = this.navigation.getSelectedCard();
         if (BI.isNotNull(calendar)) {
             calendar.setMinDate(this.options.min);
-            this.backBtn.setEnable(!calendar.isFrontYear());
-            this.preBtn.setEnable(!calendar.isFinalYear());
+            this.backBtn.setEnable(this._checkMinYearValid());
+            this.preBtn.setEnable(this._checkMaxYearValid());
         }
     },
 
@@ -100,8 +110,8 @@ BI.YearPopup = BI.inherit(BI.Widget, {
         var calendar = this.navigation.getSelectedCard();
         if (BI.isNotNull(calendar)) {
             calendar.setMaxDate(this.options.max);
-            this.backBtn.setEnable(!calendar.isFrontYear());
-            this.preBtn.setEnable(!calendar.isFinalYear());
+            this.backBtn.setEnable(this._checkMinYearValid());
+            this.preBtn.setEnable(this._checkMaxYearValid());
         }
     },