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

fix(area): fix setValues error (#3443)

Browse Source 
fix #3405
This commit is contained in:
rex 2020-07-28 20:35:28 +08:00 committed by GitHub
parent aefad39a36
commit 1ad284bb56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
example/project.config.json
View File

@ -6,7 +6,6 @@
"setting": { "setting": {
"urlCheck": false, "urlCheck": false,
"es6": true, "es6": true,
"enhance": false,
"postcss": true, "postcss": true,
"preloadBackgroundData": false, "preloadBackgroundData": false,
"minified": true, "minified": true,
@ -16,19 +15,20 @@
"autoAudits": false, "autoAudits": false,
"showShadowRootInWxmlPanel": true, "showShadowRootInWxmlPanel": true,
"scopeDataCheck": false, "scopeDataCheck": false,
"uglifyFileName": false,
"checkInvalidKey": true, "checkInvalidKey": true,
"checkSiteMap": true, "checkSiteMap": true,
"uploadWithSourceMap": true, "uploadWithSourceMap": true,
"compileHotReLoad": false,
"babelSetting": { "babelSetting": {
"ignore": [], "ignore": [],
"disablePlugins": [], "disablePlugins": [],
"outputPath": "" "outputPath": ""
}, },
"useIsolateContext": true,
"useCompilerModule": false, "useCompilerModule": false,
"userConfirmedUseCompilerModuleSwitch": false "userConfirmedUseCompilerModuleSwitch": false,
"enhance": false,
"uglifyFileName": false,
"compileHotReLoad": false,
"useIsolateContext": true
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"cloudfunctionRoot": "functions/", "cloudfunctionRoot": "functions/",

48
packages/area/index.ts
View File

@ -19,21 +19,21 @@ VantComponent({
observer(value: string) { observer(value: string) {
this.code = value; this.code = value;
this.setValues(); this.setValues();
}, }
}, },
areaList: { areaList: {
type: Object, type: Object,
value: {}, value: {},
observer: 'setValues', observer: 'setValues'
}, },
columnsNum: { columnsNum: {
type: null, type: null,
value: 3, value: 3,
observer(value: number) { observer(value: number) {
this.setData({ this.setData({
displayColumns: this.data.columns.slice(0, +value), displayColumns: this.data.columns.slice(0, +value)
}); });
}, }
}, },
columnsPlaceholder: { columnsPlaceholder: {
type: Array, type: Array,
@ -42,17 +42,17 @@ VantComponent({
typeToColumnsPlaceholder: { typeToColumnsPlaceholder: {
province: val[0] || '', province: val[0] || '',
city: val[1] || '', city: val[1] || '',
county: val[2] || '', county: val[2] || ''
}, }
}); });
}, }
}, }
}, },
data: { data: {
columns: [{ values: [] }, { values: [] }, { values: [] }], columns: [{ values: [] }, { values: [] }, { values: [] }],
displayColumns: [{ values: [] }, { values: [] }, { values: [] }], displayColumns: [{ values: [] }, { values: [] }, { values: [] }],
typeToColumnsPlaceholder: {}, typeToColumnsPlaceholder: {}
}, },
mounted() { mounted() {
@ -109,7 +109,7 @@ VantComponent({
this.$emit('change', { this.$emit('change', {
picker, picker,
values: this.parseOutputValues(picker.getValues()), values: this.parseOutputValues(picker.getValues()),
index, index
}); });
}); });
}, },
@ -127,9 +127,9 @@ VantComponent({
} }
const list = this.getConfig(type); const list = this.getConfig(type);
result = Object.keys(list).map((code) => ({ result = Object.keys(list).map(code => ({
code, code,
name: list[code], name: list[code]
})); }));
if (code) { if (code) {
@ -138,7 +138,7 @@ VantComponent({
code = '9'; code = '9';
} }
result = result.filter((item) => item.code.indexOf(code) === 0); result = result.filter(item => item.code.indexOf(code) === 0);
} }
if (typeToColumnsPlaceholder[type] && result.length) { if (typeToColumnsPlaceholder[type] && result.length) {
@ -151,7 +151,7 @@ VantComponent({
: COLUMNSPLACEHOLDERCODE.slice(4, 6); : COLUMNSPLACEHOLDERCODE.slice(4, 6);
result.unshift({ result.unshift({
code: `${code}${codeFill}`, code: `${code}${codeFill}`,
name: typeToColumnsPlaceholder[type], name: typeToColumnsPlaceholder[type]
}); });
} }
@ -202,21 +202,22 @@ VantComponent({
const stack = []; const stack = [];
const indexes = []; const indexes = [];
const { columnsNum } = this.data;
if (this.data.columnsNum >= 1) { if (columnsNum >= 1) {
stack.push(picker.setColumnValues(0, province, false)); stack.push(picker.setColumnValues(0, province, false));
indexes.push(this.getIndex('province', code)); indexes.push(this.getIndex('province', code));
} }
if (this.data.columnsNum >= 2) { if (columnsNum >= 2) {
stack.push(picker.setColumnValues(1, city, false)); stack.push(picker.setColumnValues(1, city, false));
indexes.push(this.getIndex('province', code)); indexes.push(this.getIndex('city', code));
if (city.length && code.slice(2, 4) === '00') { if (city.length && code.slice(2, 4) === '00') {
[{ code }] = city; [{ code }] = city;
} }
} }
if (this.data.columnsNum === 3) { if (columnsNum === 3) {
stack.push( stack.push(
picker.setColumnValues( picker.setColumnValues(
2, 2,
@ -224,6 +225,7 @@ VantComponent({
false false
) )
); );
indexes.push(this.getIndex('county', code));
} }
return Promise.all(stack) return Promise.all(stack)
@ -234,7 +236,7 @@ VantComponent({
getValues() { getValues() {
const picker = this.getPicker(); const picker = this.getPicker();
return picker ? picker.getValues().filter((value) => !!value) : []; return picker ? picker.getValues().filter(value => !!value) : [];
}, },
getDetail() { getDetail() {
@ -244,7 +246,7 @@ VantComponent({
country: '', country: '',
province: '', province: '',
city: '', city: '',
county: '', county: ''
}; };
if (!values.length) { if (!values.length) {
@ -268,6 +270,6 @@ VantComponent({
reset(code) { reset(code) {
this.code = code || ''; this.code = code || '';
return this.setValues(); return this.setValues();
}, }
}, }
}); });