From ebaf1dad8a7257d8e44a19e8026d6fb0a663519c Mon Sep 17 00:00:00 2001
From: Treecat <treecat@fanruan.com>
Date: Wed, 9 Nov 2022 17:43:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?REPORT-83562=20feat:=20=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E9=9D=9E=E6=9C=AC=E6=9C=88=E7=9A=84=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E5=8F=AF=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/case/calendar/calendar.js        | 3 ++-
 src/less/case/calendar/calendar.less | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 src/less/case/calendar/calendar.less

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/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

From f9b6a56b102eeedf4d6ad63a76ec81b6a0c670d4 Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Wed, 9 Nov 2022 19:30:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=A0JIRA=20fix:=20=E4=BF=AE=E5=A4=8Dta?=
 =?UTF-8?q?pe=E5=B8=83=E5=B1=80=20NaN=E7=9A=84=E5=9C=BA=E6=99=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/wrapper/layout/layout.tape.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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;
             }
         });