Browse Source

Pull request #304880: REPORT-146679 fix: 自定义格式时check判断(合到final分支)

Merge in DEC/fineui from ~STAN.YANG/fineui-dec:final/11.0 to final/11.0

* commit '9098fd9c2b82441026399c53f135a379d8c44f54':
  REPORT-146679 fix: 自定义格式时check判断
master
parent
commit
04d503911c
  1. 3
      packages/fineui/src/widget/timeinterval/dateinterval.js
  2. 3
      packages/fineui/src/widget/timeinterval/timeinterval.js

3
packages/fineui/src/widget/timeinterval/dateinterval.js

@ -181,7 +181,8 @@ export class DateInterval extends Single {
print(parseDateTime(date, "%Y-%x-%d"), "%Y-%x-%d") === date || print(parseDateTime(date, "%Y-%x-%d"), "%Y-%x-%d") === date ||
print(parseDateTime(date, "%Y-%X-%d"), "%Y-%X-%d") === date || print(parseDateTime(date, "%Y-%X-%d"), "%Y-%X-%d") === date ||
print(parseDateTime(date, "%Y-%x-%e"), "%Y-%x-%e") === date || print(parseDateTime(date, "%Y-%x-%e"), "%Y-%x-%e") === date ||
print(parseDateTime(date, "%Y-%X-%e"), "%Y-%X-%e") === date print(parseDateTime(date, "%Y-%X-%e"), "%Y-%X-%e") === date ||
print(parseDateTime(date, this.options.format), this.options.format) === date
); );
} }

3
packages/fineui/src/widget/timeinterval/timeinterval.js

@ -197,7 +197,8 @@ export class TimeInterval extends Single {
print(parseDateTime(date, "%Y-%x-%d %H:%M:%S"), "%Y-%x-%d %H:%M:%S") === date || print(parseDateTime(date, "%Y-%x-%d %H:%M:%S"), "%Y-%x-%d %H:%M:%S") === date ||
print(parseDateTime(date, "%Y-%X-%d %H:%M:%S"), "%Y-%X-%d %H:%M:%S") === date || print(parseDateTime(date, "%Y-%X-%d %H:%M:%S"), "%Y-%X-%d %H:%M:%S") === date ||
print(parseDateTime(date, "%Y-%x-%e %H:%M:%S"), "%Y-%x-%e %H:%M:%S") === date || print(parseDateTime(date, "%Y-%x-%e %H:%M:%S"), "%Y-%x-%e %H:%M:%S") === date ||
print(parseDateTime(date, "%Y-%X-%e %H:%M:%S"), "%Y-%X-%e %H:%M:%S") === date print(parseDateTime(date, "%Y-%X-%e %H:%M:%S"), "%Y-%X-%e %H:%M:%S") === date ||
print(parseDateTime(date, this.options.format), this.options.format) === date
); );
} }

Loading…
Cancel
Save