From faab7c03f0e9205349746c7ada5ab1cad3fae8db Mon Sep 17 00:00:00 2001 From: neverland Date: Wed, 10 Feb 2021 10:44:46 +0800 Subject: [PATCH] chore(Collapse): improve warning (#8119) --- src/collapse/index.js | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/collapse/index.js b/src/collapse/index.js index 35fff2527..00b23b879 100644 --- a/src/collapse/index.js +++ b/src/collapse/index.js @@ -41,15 +41,19 @@ export default createComponent({ const isExpanded = (name) => { const { accordion, modelValue } = props; - if ( - !accordion && - !Array.isArray(modelValue) && - process.env.NODE_ENV !== 'production' - ) { - console.error( - '[Vant] Collapse: type of prop "modelValue" should be Array' - ); - return; + if (process.env.NODE_ENV !== 'production') { + if (accordion && Array.isArray(modelValue)) { + console.error( + '[Vant] Collapse: "v-model" should not be Array in accordion mode' + ); + return false; + } + if (!accordion && !Array.isArray(modelValue)) { + console.error( + '[Vant] Collapse: "v-model" should be Array in non-accordion mode' + ); + return false; + } } return accordion ? modelValue === name : modelValue.indexOf(name) !== -1;