From 1e474244cae783d22abeb577993ee9d4d89eff6a Mon Sep 17 00:00:00 2001
From: niunai <colonD.wny@gmail.com>
Date: Thu, 24 Aug 2017 00:15:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Ddatetime-pick=E5=88=9D?=
=?UTF-8?q?=E5=A7=8B=E5=80=BC=E4=B8=8D=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
docs/examples-docs/datetime-picker.md | 36 ++++++++-----------
packages/datetime-picker/index.js | 4 +--
.../datetime-picker/src/datetime-picker.vue | 4 +++
3 files changed, 20 insertions(+), 24 deletions(-)
diff --git a/docs/examples-docs/datetime-picker.md b/docs/examples-docs/datetime-picker.md
index 1d90f56c3..f7c633f46 100644
--- a/docs/examples-docs/datetime-picker.md
+++ b/docs/examples-docs/datetime-picker.md
@@ -5,15 +5,16 @@ export default {
minHour: 10,
maxHour: 20,
minDate: new Date(),
- currentDate1: null,
+ maxDate: new Date(2019, 10, 1),
+ currentDate1: new Date(2018, 0, 1),
currentDate2: null,
currentDate3: null
};
},
methods: {
- handlePickerChange(picker, values) {
- console.log(values);
+ handlePickerChange(picker) {
+ console.log(picker);
},
handlePickerCancel() {
console.log('picker cancel');
@@ -36,10 +37,10 @@ export default {
<van-datetime-picker
v-model="currentDate1"
type="datetime"
- format="yyyy.mm.dd hh时 mm分"
:min-hour="minHour"
:max-hour="maxHour"
:min-date="minDate"
+ :max-date="maxDate"
@change="handlePickerChange">
</van-datetime-picker>
@@ -50,13 +51,14 @@ export default {
minHour: 10,
maxHour: 20,
minDate: new Date(),
- currentDate: null
+ maxDate: new Date(2019, 10, 1),
+ currentDate: new Date(2018, 0, 1)
};
},
methods: {
- handlePickerChange(picker, values) {
- picker.setColumnValues(1, citys[values[0]]);
+ handlePickerChange(picker) {
+ console.log(picker);
}
}
};
@@ -71,7 +73,6 @@ export default {
<van-datetime-picker
v-model="currentDate2"
type="date"
- format="yyyy.mm.dd hh时 mm分"
:min-hour="minHour"
:max-hour="maxHour"
:min-date="minDate"
@@ -87,7 +88,6 @@ export default {
<van-datetime-picker
v-model="currentDate3"
type="time"
- format="yyyy.mm.dd hh时 mm分"
:min-hour="minHour"
:max-hour="maxHour"
:min-date="minDate"
@@ -102,19 +102,11 @@ export default {
| 参数 | 说明 | 类型 | 默认值 | 可选值 |
|-----------|-----------|-----------|-------------|-------------|
| visibileColumnCount | 每一列可见备选元素的个数 | Number | 5 | |
-| itemHeight | 选中元素区高度 | Number | 44 | |
-| columns | 对象数组，配置每一列显示的数据 | Array | | |
-| showToolbar | 是否在组件顶部显示一个toolbar | Boolean | true | |
-
-### columns
-
-`API`中的`columns`为一个对象数组，数组中的每一个对象配置每一列，每一列有以下`key`：
-
-| key | 说明 |
-|-----------|-----------|
-| values | 列中对应的备选值 |
-| defaultIndex | 初始选中值的索引，默认为0 |
-| className | 为对应列添加特殊的`class` |
+| type | 组件类型 | String | 'datetime' | 'datetime', 'date', 'time' |
+| minDate | 可选的最小日期 | Date | 十年前的 1 月 1 日 | |
+| maxDate | 可选的最大日期 | Date | 十年后的 12 月 31 日 | |
+| minHour | 可选的最小小时 | Number | 0 | |
+| maxHour | 可选的最大小时 | Number | 23 | |
### Event
diff --git a/packages/datetime-picker/index.js b/packages/datetime-picker/index.js
index c6ad7f9b3..ca80ede95 100644
--- a/packages/datetime-picker/index.js
+++ b/packages/datetime-picker/index.js
@@ -1,3 +1,3 @@
-import DateTimePicker from './src/datetime-picker';
+import DatetimePicker from './src/datetime-picker';
-export default DateTimePicker;
+export default DatetimePicker;
diff --git a/packages/datetime-picker/src/datetime-picker.vue b/packages/datetime-picker/src/datetime-picker.vue
index 5569efd63..6dbadea55 100644
--- a/packages/datetime-picker/src/datetime-picker.vue
+++ b/packages/datetime-picker/src/datetime-picker.vue
@@ -285,6 +285,10 @@ export default {
}
[].forEach.call(this.$refs.picker.$children, child => child.doOnValueChange());
}
+ },
+
+ mounted() {
+ this.updateColumnValue(this.innerValue);
}
};
</script>