Browse Source

Pull request #3579: BI-127907 fix: 【6.0.11】仪表板设置动态可选区间,还是可以选到左区间前时间

Merge in VISUAL/fineui from ~DAILER/fineui:es6 to es6

* commit 'b60694568acbf96c61343869854a9256fc556d33':
  BI-127907 fix: 【6.0.11】仪表板设置动态可选区间,还是可以选到左区间前时间
es6
Dailer-刘荣歆 1 year ago
parent
commit
88955c4677
  1. 8
      packages/fineui/src/core/2.base.js

8
packages/fineui/src/core/2.base.js

@ -1227,19 +1227,19 @@ export function checkDateVoid(YY, MM, DD, minDate, maxDate) {
} else if (YY > maxDate[0]) { } else if (YY > maxDate[0]) {
back = ["y", 1]; back = ["y", 1];
} else if (YY >= minDate[0] && YY <= maxDate[0]) { } else if (YY >= minDate[0] && YY <= maxDate[0]) {
if (YY === minDate[0]) { if (YY == minDate[0]) {
if (MM < minDate[1]) { if (MM < minDate[1]) {
back = ["m"]; back = ["m"];
} else if (MM === minDate[1]) { } else if (MM == minDate[1]) {
if (DD < minDate[2]) { if (DD < minDate[2]) {
back = ["d"]; back = ["d"];
} }
} }
} }
if (YY === maxDate[0]) { if (YY == maxDate[0]) {
if (MM > maxDate[1]) { if (MM > maxDate[1]) {
back = ["m", 1]; back = ["m", 1];
} else if (MM === maxDate[1]) { } else if (MM == maxDate[1]) {
if (DD > maxDate[2]) { if (DD > maxDate[2]) {
back = ["d", 1]; back = ["d", 1];
} }

Loading…
Cancel
Save