Browse Source

Merge pull request #204814 in DEC/fineui from release/11.0 to bugfix/11.0

* commit 'cb806c5da10310dfcd0d364e737198832b313120':
  Pull request #3195: KERNEL-13158: context跳过popup
  REPORT-83685 fix: BI.parseDateTime方法对%l:%M:%S %p这种格式的日期解析出错(后面带%p 这种的都是同类型的报错)
  REPORT-83685 fix: BI.parseDateTime方法对%l:%M:%S %p这种格式的日期解析出错(后面带%p 这种的都是同类型的报错)
research/test
superman 2 years ago
parent
commit
0aa714992b
  1. 3
      src/case/layer/panel.js
  2. 4
      src/core/2.base.js
  3. 2
      src/core/func/alias.js

3
src/case/layer/panel.js

@ -18,9 +18,6 @@ BI.Panel = BI.inherit(BI.Widget, {
}, },
render: function () { render: function () {
BI.Panel.superclass._init.apply(this, arguments);
var o = this.options;
return { return {
type: "bi.vertical_fill", type: "bi.vertical_fill",
rowSize: ["", "fill"], rowSize: ["", "fill"],

4
src/core/2.base.js

@ -1079,7 +1079,7 @@
case "%b": case "%b":
case "%B": case "%B":
for (j = 0; j < 12; ++j) { 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; m = j;
break; break;
} }
@ -1144,7 +1144,7 @@
if (a[i].search(/[a-zA-Z]+/) != -1) { if (a[i].search(/[a-zA-Z]+/) != -1) {
var t = -1; var t = -1;
for (j = 0; j < 12; ++j) { 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; t = j;
break; break;
} }

2
src/core/func/alias.js

@ -815,7 +815,7 @@
break; break;
case "M": // 月 case "M": // 月
if (len > 2) { if (len > 2) {
str = BI.Date._MN[date.getMonth()]; str = BI.getMonthName(date.getMonth());
} else if (len < 2) { } else if (len < 2) {
str = date.getMonth() + 1; str = date.getMonth() + 1;
} else { } else {

Loading…
Cancel
Save