fix checkbox dynamic init bug (ElemeFE#1511)

naifen00 · Dec 2, 2016 · 8ba89af · 8ba89af
1 parent 34dbb01
commit 8ba89af
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/packages/checkbox/src/checkbox-group.vue b/packages/checkbox/src/checkbox-group.vue
@@ -16,12 +16,7 @@
       value(value) {
         this.$emit('change', value);
         this.dispatch('ElFormItem', 'el.form.change', [value]);
-        this.broadcast('ElCheckbox', 'initData', [value]);
       }
-    },
-
-    mounted() {
-      this.broadcast('ElCheckbox', 'initData', [this.value]);
     }
   };
 </script>

diff --git a/packages/checkbox/src/checkbox.vue b/packages/checkbox/src/checkbox.vue
@@ -72,6 +72,23 @@
         } else if (this.model !== null && this.model !== undefined) {
           return this.model === this.trueLabel;
         }
+      },
+
+      isGroup() {
+        let parent = this.$parent;
+        while (parent) {
+          if (parent.$options.componentName !== 'ElCheckboxGroup') {
+            parent = parent.$parent;
+          } else {
+            this._checkboxGroup = parent;
+            return true;
+          }
+        }
+        return false;
+      },
+
+      store() {
+        return this._checkboxGroup.value;
       }
     },
 
@@ -88,7 +105,6 @@
 
     data() {
       return {
-        store: [],
         isGroup: false
       };
     },
@@ -105,11 +121,6 @@
 
     created() {
       this.checked && this.addToStore();
-      this.$on('initData', data => {
-        this.store = data;
-        this.isGroup = true;
-        this.checked && this.addToStore();
-      });
     }
   };
 </script>