diff --git a/src/case/calendar/calendar.js b/src/case/calendar/calendar.js
index bfd76e2b4..88ccf198a 100644
--- a/src/case/calendar/calendar.js
+++ b/src/case/calendar/calendar.js
@@ -161,7 +161,8 @@ BI.Calendar = BI.inherit(BI.Widget, {
                     once: false,
                     forceSelected: true,
                     value: o.year + "-" + month + "-" + td.text,
-                    disabled: td.lastMonth || td.nextMonth || td.disabled,
+                    disabled: td.disabled,
+                    cls: td.lastMonth || td.nextMonth ? "not-current-month-day": "",
                     lgap: 2,
                     rgap: 2,
                     tgap: 4,
diff --git a/src/core/wrapper/layout/layout.tape.js b/src/core/wrapper/layout/layout.tape.js
index 185af813d..9303f5865 100644
--- a/src/core/wrapper/layout/layout.tape.js
+++ b/src/core/wrapper/layout/layout.tape.js
@@ -217,7 +217,7 @@ BI.VTapeLayout = BI.inherit(BI.Layout, {
                 top: self._optimiseGap(top[i] + self._optimiseItemTgap(item) + self._optimiseItemVgap(item) + o.vgap + o.tgap)
             });
 
-            if (rowSize === "" || rowSize === "fill") {
+            if (BI.isNull(rowSize) || rowSize === "" || rowSize === "fill") {
                 return true;
             }
         });
@@ -235,7 +235,7 @@ BI.VTapeLayout = BI.inherit(BI.Layout, {
                 bottom: self._optimiseGap(bottom[i] + self._optimiseItemBgap(item) + self._optimiseItemVgap(item) + o.vgap + o.bgap)
             });
 
-            if (rowSize === "" || rowSize === "fill") {
+            if (BI.isNull(rowSize) || rowSize === "" || rowSize === "fill") {
                 return true;
             }
         });
diff --git a/src/less/case/calendar/calendar.less b/src/less/case/calendar/calendar.less
new file mode 100644
index 000000000..388bcf9e3
--- /dev/null
+++ b/src/less/case/calendar/calendar.less
@@ -0,0 +1,5 @@
+@import "../../index.less";
+
+.bi-calendar-date-item.not-current-month-day {
+    color: @color-bi-text-disabled-button !important;
+}
\ No newline at end of file