Merge pull request #206 from Leopoldthecoder/master

fix the default value of 'date' in time-picker
pull/216/head
cinwell.li 2016-10-01 11:22:48 +08:00 committed by GitHub
commit fc4262d3b4
3 changed files with 6 additions and 4 deletions

View File

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

View File

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

View File

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