Merge pull request #383 from DebugIsFalse/checkbox-feature

fix: 兼容checkbox默认值是null的报错问题
view-design · Aug 7, 2024 · bea3f8d · bea3f8d
2 parents 2ba3c29 + a011b5f
commit bea3f8d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/examples/routers/checkbox.vue b/examples/routers/checkbox.vue
@@ -88,7 +88,7 @@
         data () {
             return {
                 social: ['facebook', 'github'],
-                fruit: ['苹果'],
+                fruit: null,
                 tags: [],
                 testValue1: null,
                 testValue2: null,

diff --git a/src/components/checkbox/checkbox.vue b/src/components/checkbox/checkbox.vue
@@ -128,7 +128,9 @@
             },
             currentValue () {
                 if (this.CheckboxGroupInstance) {
-                    return this.CheckboxGroupInstance.modelValue.indexOf(this.label) >= 0;
+                    let modelValue = this.CheckboxGroupInstance.modelValue;
+                    modelValue = Array.isArray(modelValue) ? modelValue : []
+                    return modelValue.indexOf(this.label) >= 0;
                 } else {
                     return this.modelValue === this.trueValue;
                 }