fix(Area): allow to reset modelValue

This commit is contained in:
chenjiahan 2022-01-24 16:43:40 +08:00
parent 5900affe37
commit 8d49b88748
2 changed files with 16 additions and 12 deletions

View File

@ -66,16 +66,20 @@ export default defineComponent({
watch( watch(
() => props.modelValue, () => props.modelValue,
(newCode) => { (newCode) => {
if (newCode) {
const lastCode = codes.value.length const lastCode = codes.value.length
? codes.value[codes.value.length - 1] ? codes.value[codes.value.length - 1]
: ''; : '';
if (newCode && newCode !== lastCode) { if (newCode !== lastCode) {
codes.value = [ codes.value = [
`${newCode.slice(0, 2)}0000`, `${newCode.slice(0, 2)}0000`,
`${newCode.slice(0, 4)}00`, `${newCode.slice(0, 4)}00`,
newCode, newCode,
].slice(0, +props.columnsNum); ].slice(0, +props.columnsNum);
} }
} else {
codes.value = [];
}
}, },
{ immediate: true } { immediate: true }
); );

View File

@ -38,9 +38,9 @@ export function formatDataForCascade({
columnsPlaceholder: placeholder, columnsPlaceholder: placeholder,
}: AreaProps) { }: AreaProps) {
const { const {
city_list: city, city_list: city = {},
county_list: county, county_list: county = {},
province_list: province, province_list: province = {},
} = areaList; } = areaList;
const showCity = columnsNum > 1; const showCity = columnsNum > 1;
const showCounty = columnsNum > 2; const showCounty = columnsNum > 2;