From c880da684f2f1ea195d3f18384ffc130bf71b54d Mon Sep 17 00:00:00 2001 From: data Date: Mon, 21 Nov 2022 19:06:10 +0800 Subject: [PATCH 1/6] 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?= Date: Tue, 22 Nov 2022 10:15:56 +0800 Subject: [PATCH 2/6] =?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, From 8114b75e2da64f336528d236de315a22bec28e38 Mon Sep 17 00:00:00 2001 From: data Date: Thu, 24 Nov 2022 20:38:28 +0800 Subject: [PATCH 3/6] auto upgrade version to 2.0.20221124203811 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5ee1f98d2..b194a1dc2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221123105406", + "version": "2.0.20221124203811", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 3c7b5118d548a543e1b81c2d2ed02e24d19dbdb6 Mon Sep 17 00:00:00 2001 From: data Date: Mon, 28 Nov 2022 10:16:37 +0800 Subject: [PATCH 4/6] auto upgrade version to 2.0.20221128101611 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b194a1dc2..fb398af51 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221124203811", + "version": "2.0.20221128101611", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 12e3009c08a3b08336f03aa87f169d7ddee413d9 Mon Sep 17 00:00:00 2001 From: Sylar Date: Tue, 29 Nov 2022 10:14:43 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20MultiLaye?= =?UTF-8?q?rSelectTreeCombo=E9=83=A8=E5=88=86=E6=96=B9=E6=B3=95=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../multilayerselecttree/multilayerselecttree.combo.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/widget/multilayerselecttree/multilayerselecttree.combo.js b/src/widget/multilayerselecttree/multilayerselecttree.combo.js index 9d334bffd..ec2a9a393 100644 --- a/src/widget/multilayerselecttree/multilayerselecttree.combo.js +++ b/src/widget/multilayerselecttree/multilayerselecttree.combo.js @@ -260,11 +260,11 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, { }, focus: function () { - this.trigger.focus(); + this.trigger ? this.trigger.focus() : this.textTrigger.focus(); }, blur: function () { - this.trigger.blur(); + this.trigger ? this.trigger.blur() : this.textTrigger.blur(); }, showView: function () { @@ -272,7 +272,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, { }, setWaterMark: function (v) { - this.trigger.setWaterMark(v); + this.trigger ? this.trigger.setWaterMark(v) : this.textTrigger.setWaterMark(v); } }); From dd3c91ff5566d747ed642bc9c1f576c78908895d Mon Sep 17 00:00:00 2001 From: data Date: Tue, 29 Nov 2022 15:24:58 +0800 Subject: [PATCH 6/6] auto upgrade version to 2.0.20221129152444 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fb398af51..5db81c903 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221128101611", + "version": "2.0.20221129152444", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts",