From 1363abdcf99708e3cf3207aae47a01273844ea8d Mon Sep 17 00:00:00 2001 From: Rijn Date: Mon, 9 Jan 2017 02:03:28 -0600 Subject: [PATCH] fixed #178 assign query to child's label --- src/components/select/select.vue | 4 ++-- test/routers/select.vue | 26 +++++++++++--------------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/components/select/select.vue b/src/components/select/select.vue index ca9b436d..9b8999f3 100644 --- a/src/components/select/select.vue +++ b/src/components/select/select.vue @@ -447,7 +447,7 @@ if (model !== '') { this.findChild((child) => { if (child.value === model) { - this.query = child.searchLabel; + this.query = child.label === undefined ? child.searchLabel : child.label; } }); } @@ -574,7 +574,7 @@ if (this.filterable) { this.findChild((child) => { if (child.value === value) { - this.query = child.searchLabel; + this.query = child.label === undefined ? child.searchLabel : child.label; } }); } diff --git a/test/routers/select.vue b/test/routers/select.vue index a1ede98c..749005a3 100644 --- a/test/routers/select.vue +++ b/test/routers/select.vue @@ -2,12 +2,12 @@ - {{ item.label }} + {{ item.label }}{{ item.des }} - {{ item.label }} + {{ item.label }}{{ item.des }} @@ -19,30 +19,26 @@ cityList: [ { value: 'beijing', - label: '北京市' + label: '北京市', + des: '帝都' }, { value: 'shanghai', - label: '上海市' + label: '上海市', + des: '魔都' }, { value: 'shenzhen', - label: '深圳市' - }, - { - value: 'hangzhou', - label: '杭州市' - }, - { - value: 'nanjing', - label: '南京市' + label: '深圳市', + des: '渔村' }, { value: 'chongqing', - label: '重庆市' + label: '重庆市', + des: '山城' } ], - model11: 'beijing', + model11: '', model12: ['beijing', 'shanghai'] } }