github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

fix the default value of 'date' in time-picker

pull/206/head
Leopoldthecoder 2016-10-01 09:05:56 +08:00
parent b4d800ec41
commit c0d39d0265
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -1,6 +1,6 @@
## 更新日志 ## 更新日志
### 1.0.0-rc.6 ### 1.0.0（待发布）
*2016-XX-XX* *2016-XX-XX*

4
package.json
View File

@ -71,11 +71,11 @@
"theaterjs": "^3.0.0", "theaterjs": "^3.0.0",
"uppercamelcase": "^1.1.0", "uppercamelcase": "^1.1.0",
"url-loader": "^0.5.7", "url-loader": "^0.5.7",
"vue": "^2.0.0-rc.8", "vue": "^2.0.1",
"vue-loader": "^9.5.1", "vue-loader": "^9.5.1",
"vue-markdown-loader": "^0.5.1", "vue-markdown-loader": "^0.5.1",
"vue-popup": "^0.2.5", "vue-popup": "^0.2.5",
"vue-router": "^2.0.0-rc.7", "vue-router": "^2.0.0",
"webpack": "^1.13.2", "webpack": "^1.13.2",
"webpack-dev-server": "^1.15.1", "webpack-dev-server": "^1.15.1",
"wind-dom": "0.0.3" "wind-dom": "0.0.3"

4
packages/date-picker/src/panel/time.vue
View File

@ -39,7 +39,9 @@
props: { props: {
date: { date: {
default: new Date() default() {
return new Date();
}
}, },
visible: Boolean visible: Boolean