From 9b6d85a887a27e614577efa0795bf11ea4a891aa Mon Sep 17 00:00:00 2001 From: cookfront Date: Fri, 17 Feb 2017 17:49:49 +0800 Subject: [PATCH] picker component --- packages/picker/src/picker-column.vue | 13 +++++++++++-- packages/picker/src/picker.vue | 3 ++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/packages/picker/src/picker-column.vue b/packages/picker/src/picker-column.vue index 88593abfd..b07316837 100644 --- a/packages/picker/src/picker-column.vue +++ b/packages/picker/src/picker-column.vue @@ -1,6 +1,10 @@ @@ -35,17 +39,22 @@ export default { data() { return { currentValue: this.value, + currentValues: this.values, dragging: false }; }, watch: { values(val) { + this.currentValue = val; + }, + + currentValues(val) { }, currentValue(val) { - this.$emit('change'); + this.$emit('change', this); } }, diff --git a/packages/picker/src/picker.vue b/packages/picker/src/picker.vue index b3c3a2d7a..513e33c8b 100644 --- a/packages/picker/src/picker.vue +++ b/packages/picker/src/picker.vue @@ -115,6 +115,7 @@ export default { */ getColumnValues(index) { let column = this.getColumn(index); + return column && column.currentValues; }, /** @@ -123,7 +124,7 @@ export default { setColumnValues(index, values) { let column = this.getColumn(index); if (column) { - + column.currentValues = values; } },