Merge branch 'hotfix/filename' into develop

Former-commit-id: 407c3c0f5c5a2725152858704b8a32bd21ec0a26 [formerly 0f313c1c79afee98c81b111e972f577798091331] [formerly 407c3c0f5c5a2725152858704b8a32bd21ec0a26 [formerly 0f313c1c79afee98c81b111e972f577798091331] [formerly 407c3c0f5c5a2725152858704b8a32bd21ec0a26 [formerly 0f313c1c79afee98c81b111e972f577798091331] [formerly 0f313c1c79afee98c81b111e972f577798091331 [formerly e65a39e38bc48b0bb5338da7b30bb3ec501a65fd [formerly 3ad23057065c2789c4251937d5cc1f72c047fc7f]]]]]
Former-commit-id: 0a624e7e502e0c57eca548e62508b8a37c55bc74
Former-commit-id: ae9b01721f79ca4e2c1a9ce9efcf058ceb34f845
Former-commit-id: d0f19e4f99f00b413f8d34b4dea7ef530555d546 [formerly a832035835a65f7c4acfe7b916e14d9b2670cc37]
Former-commit-id: eba9371c6cdfa0482ebfda57bd2eaa71798a26b8
Former-commit-id: 5d90bbfa8cf2022911f16d8369a43370a66aaa71
Former-commit-id: 905dc782ff8430519c67520133a30ce73b3ccc73
Former-commit-id: 1614b6501471974e9da0f8e065944966bc9426fa
Former-commit-id: 17c52638bc834c7153ce75e1b8b35a85dbddc857
This commit is contained in:
liyang
2018-12-16 18:31:57 +08:00

View File

@@ -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>
@@ -88,7 +88,8 @@ export default {
},
data () {
return {
value: new Date()
value: new Date(),
filename: __filename
}
}
}