From 8f9b473911e3e7879686be6322f9d7f54bb45704 Mon Sep 17 00:00:00 2001 From: "cinwell.li" Date: Fri, 24 Mar 2017 15:32:34 +0800 Subject: [PATCH] DatePicker: add onPick option, close #2921 (#3681) * DatePicker: add onPick option, close #2921 * DatePicker: fix typo --- examples/docs/en-US/date-picker.md | 1 + examples/docs/zh-CN/date-picker.md | 1 + packages/date-picker/src/panel/date-range.vue | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/docs/en-US/date-picker.md b/examples/docs/en-US/date-picker.md index 093497610..55f4dc6bf 100644 --- a/examples/docs/en-US/date-picker.md +++ b/examples/docs/en-US/date-picker.md @@ -269,6 +269,7 @@ Picking a date range is supported. | shortcuts | a { text, onClick } object array to set shortcut options, check the table below | object[] | — | — | | disabledDate | a function determining if a date is disabled with that date as its parameter. Should return a Boolean | function | — | — | | firstDayOfWeek | first day of week | Number | 1 to 7 | 7 | +| onPick | a callback that triggers when the seleted date is changed. Only for `daterange` and `datetimerange`. | Function({ maxDate, minDate }) | - | - | ### shortcuts | Attribute | Description | Type | Accepted Values | Default | diff --git a/examples/docs/zh-CN/date-picker.md b/examples/docs/zh-CN/date-picker.md index 9acb4c400..0543e2f2c 100644 --- a/examples/docs/zh-CN/date-picker.md +++ b/examples/docs/zh-CN/date-picker.md @@ -303,6 +303,7 @@ | shortcuts | 设置快捷选项,需要传入 { text, onClick } 对象用法参考 demo 或下表 | Object[] | — | — | | disabledDate | 设置禁用状态,参数为当前日期,要求返回 Boolean | Function | — | — | | firstDayOfWeek | 周起始日 | Number | 1 到 7 | 7 | +| onPick | 选中日期后会执行的回调,只有当 `daterange` 或 `datetimerange` 才生效 | Function({ maxDate, minDate }) | - | - | ### Shortcuts | 参数 | 说明 | 类型 | 可选值 | 默认值 | diff --git a/packages/date-picker/src/panel/date-range.vue b/packages/date-picker/src/panel/date-range.vue index 7d35bb280..3be4013fd 100644 --- a/packages/date-picker/src/panel/date-range.vue +++ b/packages/date-picker/src/panel/date-range.vue @@ -377,9 +377,9 @@ if (this.maxDate === val.maxDate && this.minDate === val.minDate) { return; } + this.onPick && this.onPick(val); this.maxDate = val.maxDate; this.minDate = val.minDate; - if (!close || this.showTime) return; this.handleConfirm(); },