From c880da684f2f1ea195d3f18384ffc130bf71b54d Mon Sep 17 00:00:00 2001
From: data <dep@finereport.com>
Date: Mon, 21 Nov 2022 19:06:10 +0800
Subject: [PATCH 1/2] auto upgrade version to 2.0.20221121190600

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 841972678..b54ae8401 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221117172352",
+  "version": "2.0.20221121190600",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

From 7434617a2e8458c0ebfb5622274071d78344dab3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?treecat-=E7=BD=97=E7=BE=A4?= <treecat@fanruan.com>
Date: Tue, 22 Nov 2022 10:15:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?Pull=20request=20#3222:=20REPORT-85040=20fi?=
 =?UTF-8?q?x:=20=E6=97=A5=E6=9C=9F=E6=8E=A7=E4=BB=B6=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E4=BC=9A=E8=B6=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Merge in VISUAL/fineui from ~TREECAT/fineui:master to master

* commit '016c8de5dc9be8054329411ee2b35a4b2d39aa12':
  REPORT-85040 fix: 日期控件时间会超
---
 src/case/calendar/calendar.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/case/calendar/calendar.js b/src/case/calendar/calendar.js
index 88ccf198a..0a9d40e05 100644
--- a/src/case/calendar/calendar.js
+++ b/src/case/calendar/calendar.js
@@ -156,13 +156,21 @@ BI.Calendar = BI.inherit(BI.Widget, {
         return BI.map(items, function (i, item) {
             return BI.map(item, function (j, td) {
                 var month = td.lastMonth ? o.month - 1 : (td.nextMonth ? o.month + 1 : o.month);
+                var year = o.year;
+                if (month > 12) {
+                    month = 1;
+                    year++;
+                } else if (month < 1) {
+                    month = 12;
+                    year--;
+                }
                 return BI.extend(td, {
                     type: "bi.calendar_date_item",
                     once: false,
                     forceSelected: true,
-                    value: o.year + "-" + month + "-" + td.text,
+                    value: year + "-" + month + "-" + td.text,
                     disabled: td.disabled,
-                    cls: td.lastMonth || td.nextMonth ? "not-current-month-day": "",
+                    cls: td.lastMonth || td.nextMonth ? "not-current-month-day" : "",
                     lgap: 2,
                     rgap: 2,
                     tgap: 4,