From 7787330045ebf521338e7371a80d57833a903f5e Mon Sep 17 00:00:00 2001 From: zsmj Date: Thu, 3 Nov 2022 13:36:46 +0800 Subject: [PATCH 1/3] =?UTF-8?q?REPORT-83685=20fix:=20BI.parseDateTime?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=AF=B9%l:%M:%S=20%p=E8=BF=99=E7=A7=8D?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E7=9A=84=E6=97=A5=E6=9C=9F=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E5=87=BA=E9=94=99=EF=BC=88=E5=90=8E=E9=9D=A2=E5=B8=A6%p=20?= =?UTF-8?q?=E8=BF=99=E7=A7=8D=E7=9A=84=E9=83=BD=E6=98=AF=E5=90=8C=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E7=9A=84=E6=8A=A5=E9=94=99=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/2.base.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/2.base.js b/src/core/2.base.js index d7007de52..63ff1821d 100644 --- a/src/core/2.base.js +++ b/src/core/2.base.js @@ -1079,7 +1079,7 @@ case "%b": case "%B": for (j = 0; j < 12; ++j) { - if (BI.Date._MN[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { + if (BI.getMonthName(j).substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { m = j; break; } @@ -1144,7 +1144,7 @@ if (a[i].search(/[a-zA-Z]+/) != -1) { var t = -1; for (j = 0; j < 12; ++j) { - if (BI.Date._MN[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { + if (BI.getMonthName(j).substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { t = j; break; } From 5368bef358b2f0c757e4662830f9dee67a0cc55e Mon Sep 17 00:00:00 2001 From: zsmj Date: Thu, 3 Nov 2022 14:32:03 +0800 Subject: [PATCH 2/3] =?UTF-8?q?REPORT-83685=20fix:=20BI.parseDateTime?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=AF=B9%l:%M:%S=20%p=E8=BF=99=E7=A7=8D?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E7=9A=84=E6=97=A5=E6=9C=9F=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E5=87=BA=E9=94=99=EF=BC=88=E5=90=8E=E9=9D=A2=E5=B8=A6%p=20?= =?UTF-8?q?=E8=BF=99=E7=A7=8D=E7=9A=84=E9=83=BD=E6=98=AF=E5=90=8C=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E7=9A=84=E6=8A=A5=E9=94=99=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/func/alias.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/func/alias.js b/src/core/func/alias.js index 0dca26ca6..2884e492b 100644 --- a/src/core/func/alias.js +++ b/src/core/func/alias.js @@ -815,7 +815,7 @@ break; case "M": // 月 if (len > 2) { - str = BI.Date._MN[date.getMonth()]; + str = BI.getMonthName(date.getMonth()); } else if (len < 2) { str = date.getMonth() + 1; } else { From 8c884ee7ee8d391037d32efe917e6efea6e2f759 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?guy-=E7=8E=8B=E5=B7=9D?= Date: Thu, 3 Nov 2022 15:09:07 +0800 Subject: [PATCH 3/3] =?UTF-8?q?Pull=20request=20#3195:=20KERNEL-13158:=20c?= =?UTF-8?q?ontext=E8=B7=B3=E8=BF=87popup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Merge in VISUAL/fineui from ~GUY/fineui:master to master * commit 'afa941bc135f7dc5881e6a2f96f6356b94e66543': KERNEL-13158: context跳过popup --- src/case/layer/panel.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/case/layer/panel.js b/src/case/layer/panel.js index f73423789..4ec115b51 100644 --- a/src/case/layer/panel.js +++ b/src/case/layer/panel.js @@ -18,9 +18,6 @@ BI.Panel = BI.inherit(BI.Widget, { }, render: function () { - BI.Panel.superclass._init.apply(this, arguments); - var o = this.options; - return { type: "bi.vertical_fill", rowSize: ["", "fill"],