blackteay/vant
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant.git synced 2025-04-06 03:57:59 +08:00
Code Issues Projects Releases Wiki Activity

feat(Area): getArea method filter placeholder (#4717)

Browse Source
This commit is contained in:
Jake 2019-10-14 16:47:49 +08:00 committed by neverland
parent 06ad0e47d3
commit 309a5bc071
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/src/docs-entry.js
View File

@ -2,7 +2,6 @@
// This file is auto gererated by build/build-entry.js // This file is auto gererated by build/build-entry.js
export default { export default {
'changelog.en-US': () => import('../markdown/changelog.en-US.md'), 'changelog.en-US': () => import('../markdown/changelog.en-US.md'),
'changelog.generated': () => import('../markdown/changelog.generated.md'),
'changelog.zh-CN': () => import('../markdown/changelog.zh-CN.md'), 'changelog.zh-CN': () => import('../markdown/changelog.zh-CN.md'),
'contribution.zh-CN': () => import('../markdown/contribution.zh-CN.md'), 'contribution.zh-CN': () => import('../markdown/contribution.zh-CN.md'),
'design.zh-CN': () => import('../markdown/design.zh-CN.md'), 'design.zh-CN': () => import('../markdown/design.zh-CN.md'),

1
packages/address-edit/demo/index.vue
View File

@ -8,6 +8,7 @@
show-set-default show-set-default
show-search-result show-search-result
:search-result="searchResult" :search-result="searchResult"
:area-columns-placeholder="['请选择','请选择','请选择']"
@save="onSave" @save="onSave"
@delete="onDelete" @delete="onDelete"
@change-detail="onChangeDetail" @change-detail="onChangeDetail"

8
packages/area/index.js
View File

@ -198,7 +198,10 @@ export default sfc({
}, },
getValues() { getValues() {
return this.$refs.picker ? this.$refs.picker.getValues().filter(value => !!value) : []; const { picker } = this.$refs;
let getValues = picker ? picker.getValues() : [];
getValues = this.parseOutputValues(getValues);
return getValues.filter(value => !!value);
}, },
getArea() { getArea() {
@ -216,8 +219,9 @@ export default sfc({
} }
const names = values.map(item => item.name); const names = values.map(item => item.name);
const filterCodeValues = values.filter(value => !!value.code);
area.code = filterCodeValues.length ? filterCodeValues[filterCodeValues.length - 1].code : '';
area.code = values[values.length - 1].code;
if (area.code[0] === '9') { if (area.code[0] === '9') {
area.country = names[1] || ''; area.country = names[1] || '';
area.province = names[2] || ''; area.province = names[2] || '';