Skip to content

Commit

Permalink
Merge branch 'hotfix/filename'
Browse files Browse the repository at this point in the history
Former-commit-id: 6cb01eb064fecaf5a738762db167bbef3d77fd2f [formerly 6cb01eb064fecaf5a738762db167bbef3d77fd2f [formerly 6cb01eb064fecaf5a738762db167bbef3d77fd2f [formerly 6cb01eb064fecaf5a738762db167bbef3d77fd2f [formerly 19674e9 [formerly 285f8c6666c9c0a5d54dda6d6f8313211db5fe4d]]]]]
Former-commit-id: c233c5d
Former-commit-id: a167aab
Former-commit-id: c53936144a453b2386e59a6fcf1ab291857e6552 [formerly fac3ce872db3c2e0711dc7747fd7d06ec05fef8d]
Former-commit-id: aabccd2fa72245c48952ab986a09453e906d92d7
Former-commit-id: 28fdd45e3235df6bf6d1835ae4adce89d6abe4e9
Former-commit-id: fce44665ba21df30fd37cbd3883c81e3ecaa8eb1
Former-commit-id: ff19996c0b0aea88fa9e5f3a0d6619df2f7cb09f
Former-commit-id: 4c657cb99eb944e7af32e0c7270216218a604aa8
  • Loading branch information
FairyEver committed Dec 16, 2018
2 parents 685946e + 06099f2 commit 33ba31c
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/pages/demo/filters/day/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<d2-container>
<d2-container :filename="filename">
<div slot="header" flex="main:justify">
<el-date-picker size="mini" type="datetime" v-model="value" placeholder="选择一个日期"/>
<el-button size="mini" type="primary">原值 value : {{value}}</el-button>
Expand Down Expand Up @@ -88,7 +88,8 @@ export default {
},
data () {
return {
value: new Date()
value: new Date(),
filename: __filename
}
}
}
Expand Down

0 comments on commit 33ba31c

Please sign in to comment.