Skip to content

Commit

Permalink
fix #7
Browse files Browse the repository at this point in the history
  • Loading branch information
@dwqs
dwqs committed Dec 25, 2017
1 parent 34f7a92 commit 660bd48
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 21 deletions.
28 changes: 21 additions & 7 deletions src/area-cascader.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
curProvince: '',
curCity: '',
curArea: '',
curAreaCode: '',
isSetDefault: false,
isCode: false
};
Expand All @@ -74,6 +75,7 @@
},
curProvince (val, oldVal) {
this.isSetDefault = true;
this.citys = AreaData[val];
if (this.curDefaultVal[1]) {
if (this.isCode) {
Expand All @@ -96,7 +98,7 @@
return;
}
this.areas = AreaData[val];
if (this.curDefaultVal[2]) {
if (this.curDefaultVal[2] && this.areas) {
if (this.isCode) {
const curArea = find(Object.keys(this.areas), (item) => item === this.curDefaultVal[2]);
assert(curArea, `县区 ${this.curDefaultVal[2]} 不存在于城市 ${this.curDefaultVal[1]} 中`);
Expand All @@ -107,8 +109,10 @@
this.curArea = find(Object.keys(this.areas), (item) => this.areas[item] === this.curDefaultVal[2]);
}
} else {
this.curArea = Object.keys(this.areas)[0];
// fix 市级下不存在城区(#7)
this.curArea = this.areas ? Object.keys(this.areas)[0] : val;
}
this.curAreaCode = this.curArea;
this.selectChange();
}
},
Expand Down Expand Up @@ -154,18 +158,20 @@
getAreaText (selected) {
const texts = [];
const provinces = this.provinces;
let city = '';
let area = '';
for (let i = 0, l = selected.length; i < l; i++) {
switch (i) {
case 0:
texts.push(provinces[selected[i]]);
break;
case 1:
const city = AreaData[selected[0]][selected[i]];
city = AreaData[selected[0]][selected[i]];
texts.push(city);
break;
case 2:
const area = AreaData[selected[1]][selected[i]];
area = AreaData[selected[1]] ? AreaData[selected[1]][selected[i]] : city;
texts.push(area);
break;
}
Expand Down Expand Up @@ -235,11 +241,19 @@
const city = cities[i];
for (let j = 0, l = cities[i].children.length; j < l; j++) {
const item = cities[i].children[j];
item['children'] = this.iterate(AreaData[cities[i].children[j].value]);
const areas = this.iterate(AreaData[cities[i].children[j].value]);
if (areas.length) {
item['children'] = areas;
} else {
item['children'] = [{
label: item.label,
value: item.value
}]
}
// item['children'] = this.iterate(AreaData[cities[i].children[j].value]);
}
temp.push(city);
}
return temp;
},
Expand All @@ -251,7 +265,7 @@
selected = [this.curProvince, this.curCity];
break;
case 1:
selected = [this.curProvince, this.curCity, this.curArea];
selected = [this.curProvince, this.curCity, this.curAreaCode];
break;
}
this.defaultValCode = selected;
Expand Down
52 changes: 38 additions & 14 deletions src/area-select.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,10 @@
streets: {},
curProvince: '',
curCity: '',
curArea: '',
curArea: '', // code/text
curAreaCode: '', // only code
curStreet: '',
curStreetCode: '',
defaults: [],
isCode: false,
isSetDefault: false
Expand All @@ -92,6 +94,7 @@
watch: {
curProvince (val, oldVal) {
this.isSetDefault = true;
if (this.level === 0) {
this.selectChange();
return;
Expand Down Expand Up @@ -121,7 +124,7 @@
}
this.areas = AreaData[val];
if (this.level >= 2) {
if (this.defaults[2]) {
if (this.defaults[2] && this.areas) {
if (this.isCode) {
const curArea = find(Object.keys(this.areas), (item) => item === this.defaults[2]);
assert(curArea, `县区 ${this.defaults[2]} 不存在于城市 ${this.defaults[1]} 中`);
Expand All @@ -132,19 +135,24 @@
this.curArea = find(Object.keys(this.areas), (item) => this.areas[item] === this.defaults[2]);
}
} else {
this.curArea = Object.keys(this.areas)[0];
// fix 市级下不存在城区(#7)
this.curArea = this.areas ? Object.keys(this.areas)[0] : val;
}
}
},
curArea (val, oldVal) {
if (!/^\d+$/.test(String(val))) {
return;
}
this.curAreaCode = val;
if (this.level === 2) {
this.selectChange();
return;
}
this.streets = AreaData[val];
if (this.level >= 3) {
if (this.defaults[3]) {
if (this.defaults[3] && this.streets) {
if (this.isCode) {
const curStreet = find(Object.keys(this.streets), (item) => item === this.defaults[3]);
assert(curStreet, `街道 ${this.defaults[3]} 不存在于县区 ${this.defaults[2]} 中`);
Expand All @@ -155,12 +163,16 @@
this.curStreet = find(Object.keys(this.streets), (item) => this.streets[item] === this.defaults[3]);
}
} else {
this.curStreet = Object.keys(this.streets)[0];
this.curStreet = this.streets ? Object.keys(this.streets)[0] : val;
}
}
},
curStreet (val, oldVal) {
if (!/^\d+$/.test(String(val))) {
return;
}
this.curStreetCode = val;
this.selectChange();
},
Expand All @@ -175,22 +187,31 @@
methods: {
getAreaText (selected) {
const texts = [];
let city = '';
let area = '';
let street = '';
for (let i = 0, l = selected.length; i < l; i++) {
switch (i) {
case 0:
texts.push(this.provinces[this.curProvince]);
break;
case 1:
const city = AreaData[this.curProvince][this.curCity];
city = AreaData[this.curProvince][this.curCity];
texts.push(city);
break;
case 2:
const area = AreaData[this.curCity][this.curArea];
area = AreaData[this.curCity] ? AreaData[this.curCity][this.curArea] : city;
if (!AreaData[this.curCity]) {
this.curArea = city;
}
texts.push(area);
break;
case 3:
const street = AreaData[this.curArea][this.curStreet];
street = AreaData[this.curArea] ? AreaData[this.curArea][this.curStreet] : area;
if (!AreaData[this.curArea]) {
this.curStreet = area;
}
texts.push(street);
break;
}
Expand Down Expand Up @@ -253,6 +274,7 @@
selectChange () {
let selected = [];
let res = [];
switch (this.level) {
case 0:
Expand All @@ -262,20 +284,22 @@
selected = [this.curProvince, this.curCity];
break;
case 2:
selected = [this.curProvince, this.curCity, this.curArea];
selected = [this.curProvince, this.curCity, this.curAreaCode];
break;
case 3:
selected = [this.curProvince, this.curCity, this.curArea, this.curStreet];
selected = [this.curProvince, this.curCity, this.curAreaCode, this.curStreetCode];
break;
}
if (this.type === 'code') {
this.$emit('input', selected);
this.getAreaText(selected);
res = selected;
} else if (this.type === 'text') {
this.$emit('input', this.getAreaText(selected));
res = this.getAreaText(selected);
} else {
this.$emit('input', this.getAll(selected));
res = this.getAll(selected);
}
this.$emit('input', res);
}
},
Expand Down

0 comments on commit 660bd48

Please sign in to comment.