Skip to content

fix:issues #216 #471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MissEcho wants to merge 2 commits into
base: refactoring
Choose a base branch
from
Open

fix:issues #216 #471

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ade9197
Update date.js
MissEcho Jan 24, 2022
d873baf
Update date.js
MissEcho Jan 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/mock/random/date.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,18 @@ module.exports = {
_randomDate: function(min, max) { // min, max
min = min === undefined ? new Date(0) : min
max = max === undefined ? new Date() : max
return new Date(Math.random() * (max.getTime() - min.getTime()))
return new Date(Math.random() * (max.getTime() - min.getTime()) + min.getTime())
},
// 返回一个随机的日期字符串。
date: function(format) {
format = format || 'yyyy-MM-dd'
return this._formatDate(this._randomDate(), format)
},
// 返回一个区间内随机的日期字符串。
dateRange: function(min,max,format) {
format = format || 'yyyy-MM-dd'
return this._formatDate(this._randomDate(new Date(min),new Date(max)), format)
},
// 返回一个随机的时间字符串。
time: function(format) {
format = format || 'HH:mm:ss'
Expand Down Expand Up @@ -138,4 +143,4 @@ module.exports = {

return this._formatDate(date, format)
}
}
}