Skip to content
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.

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

DatePicker: fix date not disabled when type=datetime and input by text #4309

Merged
merged 1 commit into from
Apr 21, 2017
Merged

Conversation

xingoxu
Copy link
Contributor

@xingoxu xingoxu commented Apr 19, 2017

Please makes sure these boxes are checked before submitting your PR, thank you!

  • Make sure you follow Element's contributing guide (中文 | English).
  • Make sure you are merging your commits to dev branch.
  • Add some descriptions and refer relative issues for you PR.

fix #2516 by not set the date model.

return;
}
let dateDisabled = typeof this.disabledDate === 'function' && this.disabledDate(new Date(val));
if (dateDisabled) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

感觉可以合并成一行,或者 dateDisabled 应该是 const

@xingoxu
Copy link
Contributor Author

xingoxu commented Apr 21, 2017

Amended. And use the date in line 409.

@Leopoldthecoder Leopoldthecoder merged commit 4665028 into ElemeFE:dev Apr 21, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

DateTimePicker disabledDate的两个问题
3 participants