Browse Source

Merge pull request #305704 in DEC/fineui from final/11.0 to release/11.0

* commit '17c4dfd321ba9e96eedf8d8a13585a51c8da99e3':
  BI-163235 fix: 需要加个判空, 没有fmt不需要走到里面去
master^2
superman 1 day ago
parent
commit
e54a6eaf0e
  1. 2
      packages/fineui/src/widget/timeinterval/dateinterval.js
  2. 2
      packages/fineui/src/widget/timeinterval/timeinterval.js

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

@ -182,7 +182,7 @@ 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-%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 this.options.format !== '' && print(parseDateTime(date, this.options.format), this.options.format) === date
); );
} }

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

@ -198,7 +198,7 @@ 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-%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 this.options.format !== '' && print(parseDateTime(date, this.options.format), this.options.format) === date
); );
} }

Loading…
Cancel
Save