diff --git a/src/datetime-picker/README.md b/src/datetime-picker/README.md index bfb428237..be4a35c55 100644 --- a/src/datetime-picker/README.md +++ b/src/datetime-picker/README.md @@ -30,10 +30,8 @@ Vue.use(DatetimePicker); export default { data() { return { - minHour: 10, - maxHour: 20, - minDate: new Date(), - maxDate: new Date(2019, 10, 1), + minDate: new Date(2020, 0, 1), + maxDate: new Date(2025, 10, 1), currentDate: new Date() }; } @@ -47,6 +45,7 @@ export default { v-model="currentDate" type="date" :min-date="minDate" + :max-date="maxDate" /> ``` @@ -54,6 +53,8 @@ export default { export default { data() { return { + minDate: new Date(2020, 0, 1), + maxDate: new Date(2025, 10, 1), currentDate: new Date() }; } @@ -67,6 +68,7 @@ export default { v-model="currentDate" type="year-month" :min-date="minDate" + :max-date="maxDate" :formatter="formatter" /> ``` @@ -75,6 +77,8 @@ export default { export default { data() { return { + minDate: new Date(2020, 0, 1), + maxDate: new Date(2025, 10, 1), currentDate: new Date() }; }, diff --git a/src/datetime-picker/README.zh-CN.md b/src/datetime-picker/README.zh-CN.md index 2e4919e7d..86123434d 100644 --- a/src/datetime-picker/README.zh-CN.md +++ b/src/datetime-picker/README.zh-CN.md @@ -6,7 +6,7 @@ ### 引入 -``` javascript +```javascript import Vue from 'vue'; import { DatetimePicker } from 'vant'; @@ -30,10 +30,8 @@ Vue.use(DatetimePicker); export default { data() { return { - minHour: 10, - maxHour: 20, - minDate: new Date(), - maxDate: new Date(2019, 10, 1), + minDate: new Date(2020, 0, 1), + maxDate: new Date(2025, 10, 1), currentDate: new Date() }; } @@ -47,6 +45,7 @@ export default { v-model="currentDate" type="date" :min-date="minDate" + :max-date="maxDate" /> ``` @@ -54,10 +53,12 @@ export default { export default { data() { return { + minDate: new Date(2020, 0, 1), + maxDate: new Date(2025, 10, 1), currentDate: new Date() }; } -} +}; ``` ### 选择日期（年月） @@ -69,6 +70,7 @@ export default { v-model="currentDate" type="year-month" :min-date="minDate" + :max-date="maxDate" :formatter="formatter" /> ``` @@ -77,6 +79,8 @@ export default { export default { data() { return { + minDate: new Date(2020, 0, 1), + maxDate: new Date(2025, 10, 1), currentDate: new Date() }; }, @@ -112,7 +116,7 @@ export default { currentTime: '12:00' }; } -} +}; ``` ### 选项过滤器 @@ -138,13 +142,13 @@ export default { methods: { filter(type, options) { if (type === 'minute') { - return options.filter(option => option % 5 === 0) + return options.filter(option => option % 5 === 0); } return options; } } -} +}; ``` ## API diff --git a/src/datetime-picker/demo/index.vue b/src/datetime-picker/demo/index.vue index 453619fe4..009d53f4a 100644 --- a/src/datetime-picker/demo/index.vue +++ b/src/datetime-picker/demo/index.vue @@ -14,6 +14,7 @@ v-model="currentDate2" type="date" :min-date="minDate" + :max-date="maxDate" /> @@ -22,6 +23,7 @@ v-model="currentDate3" type="year-month" :min-date="minDate" + :max-date="maxDate" :formatter="formatter" /> @@ -70,11 +72,11 @@ export default { data() { return { - minDate: new Date(2018, 0, 1), - maxDate: new Date(2019, 10, 1), - currentDate1: new Date(2018, 0, 1), + minDate: new Date(2020, 0, 1), + maxDate: new Date(2025, 10, 1), + currentDate1: new Date(2020, 0, 1), currentDate2: null, - currentDate3: new Date(2018, 0, 1), + currentDate3: new Date(2020, 0, 1), currentTime1: '12:00', currentTime2: '12:00', }; diff --git a/src/datetime-picker/test/__snapshots__/date-picker.spec.js.snap b/src/datetime-picker/test/__snapshots__/date-picker.spec.js.snap index 021a425f5..85c975911 100644 --- a/src/datetime-picker/test/__snapshots__/date-picker.spec.js.snap +++ b/src/datetime-picker/test/__snapshots__/date-picker.spec.js.snap @@ -7,8 +7,7 @@ exports[`filter prop 1`] = `
diff --git a/src/datetime-picker/test/__snapshots__/demo.spec.js.snap b/src/datetime-picker/test/__snapshots__/demo.spec.js.snap index 859d83682..4e590239f 100644 --- a/src/datetime-picker/test/__snapshots__/demo.spec.js.snap +++ b/src/datetime-picker/test/__snapshots__/demo.spec.js.snap @@ -9,8 +9,12 @@ exports[`renders demo correctly 1`] = `
    -
  • 2018
    • -
  • 2019
    • +
  • 2020
    • +
  • 2021
    • +
  • 2022
    • +
  • 2023
    • +
  • 2024
    • +
  • 2025
@@ -169,18 +173,12 @@ exports[`renders demo correctly 1`] = `
    -
  • 2018
    • -
  • 2019
    • -
  • 2020
    • +
  • 2020
  • 2021
  • 2022
  • 2023
  • 2024
  • 2025
    • -
  • 2026
    • -
  • 2027
    • -
  • 2028
    • -
  • 2029
@@ -247,18 +245,12 @@ exports[`renders demo correctly 1`] = `
    -
  • 2018年
    • -
  • 2019年
    • -
  • 2020年
    • +
  • 2020年
  • 2021年
  • 2022年
  • 2023年
  • 2024年
  • 2025年
    • -
  • 2026年
    • -
  • 2027年
    • -
  • 2028年
    • -
  • 2029年
diff --git a/src/datetime-picker/test/date-picker.spec.js b/src/datetime-picker/test/date-picker.spec.js index b0a94dc4b..cfba0df9e 100644 --- a/src/datetime-picker/test/date-picker.spec.js +++ b/src/datetime-picker/test/date-picker.spec.js @@ -14,7 +14,9 @@ test('filter prop', () => { const wrapper = mount(DatePicker, { propsData: { filter, - value: new Date(2019, 10, 1, 0, 0) + minDate: new Date(2020, 0, 1), + maxDate: new Date(2025, 10, 1), + value: new Date(2020, 10, 1, 0, 0) } }); @@ -26,7 +28,9 @@ test('formatter prop', async () => { propsData: { filter, formatter, - value: new Date(2019, 10, 1, 0, 0) + minDate: new Date(2010, 0, 1), + maxDate: new Date(2025, 10, 1), + value: new Date(2020, 10, 1, 0, 0) } }); @@ -46,20 +50,22 @@ test('formatter prop', async () => { }); test('confirm event', () => { - const date = new Date(2019, 10, 1, 0, 0); + const date = new Date(2020, 10, 1, 0, 0); const wrapper = mount(DatePicker, { propsData: { - value: date + value: date, + minDate: new Date(2020, 0, 1), + maxDate: new Date(2025, 10, 1) } }); wrapper.find('.van-picker__confirm').trigger('click'); - expect(wrapper.emitted('confirm')[0][0].getFullYear()).toEqual(2019); + expect(wrapper.emitted('confirm')[0][0].getFullYear()).toEqual(2020); triggerDrag(wrapper.find('.van-picker-column'), 0, -100); wrapper.find('.van-picker__confirm').trigger('click'); - expect(wrapper.emitted('confirm')[1][0].getFullYear()).toEqual(2029); + expect(wrapper.emitted('confirm')[1][0].getFullYear()).toEqual(2025); }); test('cancel event', () => {