Browse Source

Merge pull request #204621 in DEC/fineui from master to feature/x

* commit 'e32230427bb1ece34396f8b81151b3939a378e79':
  REPORT-83685 fix: BI.parseDateTime方法对%l:%M:%S %p这种格式的日期解析出错(后面带%p 这种的都是同类型的报错)
  无JRIA fix: 复选下拉的数字样式
master
superman 2 years ago
parent
commit
493141771f
  1. 4
      src/core/2.base.js
  2. 3
      src/less/widget/multiselect/trigger/button.checkselected.less

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

3
src/less/widget/multiselect/trigger/button.checkselected.less

@ -3,7 +3,8 @@
.bi-multi-select-check-selected-button { .bi-multi-select-check-selected-button {
z-index: 1; z-index: 1;
min-width: 16px; min-width: 16px;
.border-radius(8px); .border-radius(50%);
&:active { &:active {
color: @color-bi-text-highlight; color: @color-bi-text-highlight;
background-color: @color-bi-background-multi-select-trigger-check-selected; background-color: @color-bi-background-multi-select-trigger-check-selected;

Loading…
Cancel
Save