Merge pull request #6211 from msidolphin/fix/#6209

fix: 解决了checkbox-group多层嵌套数据相互干扰的问题
iview · Sep 4, 2019 · 56ed584 · 56ed584
2 parents 9199cee + 9e694e9
commit 56ed584
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/components/checkbox/checkbox-group.vue b/src/components/checkbox/checkbox-group.vue
@@ -49,7 +49,7 @@
         },
         methods: {
             updateModel (update) {
-                this.childrens = findComponentsDownward(this, 'Checkbox');
+                this.childrens = findComponentsDownward(this, 'Checkbox', 'CheckboxGroup');
                 if (this.childrens) {
                     const { value } = this;
                     this.childrens.forEach(child => {

diff --git a/src/utils/assist.js b/src/utils/assist.js
@@ -212,11 +212,18 @@ export function findComponentDownward (context, componentName) {
 }
 
 // Find components downward
-export function findComponentsDownward (context, componentName) {
+export function findComponentsDownward (context, componentName, ignoreComponentNames = []) {
+    if (!Array.isArray(ignoreComponentNames)) {
+        ignoreComponentNames = [ignoreComponentNames]
+    }
     return context.$children.reduce((components, child) => {
         if (child.$options.name === componentName) components.push(child);
-        const foundChilds = findComponentsDownward(child, componentName);
-        return components.concat(foundChilds);
+        if (ignoreComponentNames.indexOf(child.$options.name) < 0) {
+            const foundChilds = findComponentsDownward(child, componentName);
+            return components.concat(foundChilds);
+        } else {
+            return components
+        }
     }, []);
 }