Merge pull request #108 from QingWei-Li/fix/update-doc

TimePicker: fix doc demo, fixed #92
pull/110/head
杨奕 2016-09-21 00:49:49 -05:00 committed by GitHub
commit 407c0a5291
3 changed files with 77 additions and 67 deletions

View File

@ -120,32 +120,34 @@
<script> <script>
export default { export default {
data() { data() {
return { return {
pickerOptions1: { pickerOptions1: {
shortcuts: [{ shortcuts: [{
text: '今天', text: '今天',
onClick(picker) { onClick(picker) {
picker.$emit('pick', new Date()); picker.$emit('pick', new Date());
} }
}, { }, {
text: '昨天', text: '昨天',
onClick(picker) { onClick(picker) {
const date = new Date(); const date = new Date();
picker.$emit('pick', date.getTime() - 3600 * 1000 * 24); date.setTime(date.getTime() - 3600 * 1000 * 24);
} picker.$emit('pick', date);
}, { }
text: '一周前', }, {
onClick(picker) { text: '一周前',
const date = new Date(); onClick(picker) {
picker.$emit('pick', date.getTime() - 3600 * 1000 * 24 * 7); const date = new Date();
} date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
}] picker.$emit('pick', date);
}, }
value1: '', }]
value2: '', },
}; value1: '',
value2: '',
};
} }
}; };
</script> </script>
``` ```
::: :::
@ -216,36 +218,39 @@
<script> <script>
export default { export default {
data() { data() {
return { return {
pickerOptions2: { pickerOptions2: {
shortcuts: [{ shortcuts: [{
text: '最近一周', text: '最近一周',
onClick(picker) { onClick(picker) {
const end = new Date(); const end = new Date();
const start = end.getTime() - 3600 * 1000 * 24 * 7; const start = new Date();
picker.$emit('pick', [start, end]); start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
} picker.$emit('pick', [start, end]);
}, { }
text: '最近一个月', }, {
onClick(picker) { text: '最近一个月',
const end = new Date(); onClick(picker) {
const start = end.getTime() - 3600 * 1000 * 24 * 30; const end = new Date();
picker.$emit('pick', [start, end]); const start = new Date();
} start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
}, { picker.$emit('pick', [start, end]);
text: '最近三个月', }
onClick(picker) { }, {
const end = new Date(); text: '最近三个月',
const start = end.getTime() - 3600 * 1000 * 24 * 90; onClick(picker) {
picker.$emit('pick', [start, end]); const end = new Date();
} const start = new Date();
}] start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
}, picker.$emit('pick', [start, end]);
value6: '', }
value7: '' }]
}; },
value6: '',
value7: ''
};
} }
}; };
</script> </script>
``` ```
::: :::

View File

@ -138,13 +138,15 @@
text: '昨天', text: '昨天',
onClick(picker) { onClick(picker) {
const date = new Date(); const date = new Date();
picker.$emit('pick', new Date(date.getTime() - 3600 * 1000 * 24)); date.setTime(date.getTime() - 3600 * 1000 * 24);
picker.$emit('pick', date);
} }
}, { }, {
text: '一周前', text: '一周前',
onClick(picker) { onClick(picker) {
const date = new Date(); const date = new Date();
picker.$emit('pick', new Date(date.getTime() - 3600 * 1000 * 24 * 7)); date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
picker.$emit('pick', date);
} }
}] }]
}, },
@ -192,21 +194,24 @@
text: '最近一周', text: '最近一周',
onClick(picker) { onClick(picker) {
const end = new Date(); const end = new Date();
const start = end.getTime() - 3600 * 1000 * 24 * 7; const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
picker.$emit('pick', [start, end]); picker.$emit('pick', [start, end]);
} }
}, { }, {
text: '最近一个月', text: '最近一个月',
onClick(picker) { onClick(picker) {
const end = new Date(); const end = new Date();
const start = end.getTime() - 3600 * 1000 * 24 * 30; const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
picker.$emit('pick', [start, end]); picker.$emit('pick', [start, end]);
} }
}, { }, {
text: '最近三个月', text: '最近三个月',
onClick(picker) { onClick(picker) {
const end = new Date(); const end = new Date();
const start = end.getTime() - 3600 * 1000 * 24 * 90; const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
picker.$emit('pick', [start, end]); picker.$emit('pick', [start, end]);
} }
}] }]

View File

@ -189,11 +189,11 @@
``` ```
::: :::
## 全局方法 ### 全局方法
element 为 Vue.prototype 添加了全局方法 $message。因此在 vue instance 中可以采用本页面中的方式调用 `Message` element 为 Vue.prototype 添加了全局方法 $message。因此在 vue instance 中可以采用本页面中的方式调用 `Message`
## 单独引用 ### 单独引用
单独引入 `Message` 单独引入 `Message`
@ -203,7 +203,7 @@ import { Message } from 'element-ui';
此时调用方法为 `Message(options)` 此时调用方法为 `Message(options)`
## Options ### Options
| 参数 | 说明 | 类型 | 可选值 | 默认值 | | 参数 | 说明 | 类型 | 可选值 | 默认值 |
|---------- |-------------- |---------- |-------------------------------- |-------- | |---------- |-------------- |---------- |-------------------------------- |-------- |
| message | 消息文字 | string | — | — | | message | 消息文字 | string | — | — |