bugfix:修复Tag组件调用get_child获取combine组件错误的问题 (TencentBlueKing#176)

pagezz-canway · Apr 19, 2019 · ad6209a · ad6209a
1 parent 38ed33f
commit ad6209a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/frontend/desktop/src/components/common/RenderForm/FormGroup.vue b/frontend/desktop/src/components/common/RenderForm/FormGroup.vue
@@ -169,14 +169,16 @@
                 if (typeof tagCode === 'string' && tagCode !== '') {
                     this.$children.some(item => {
                         if (item.scheme && item.scheme.tag_code === tagCode) {
-                            childComponent = item.$children[0]
+                            // combine组件或tag组件
+                            childComponent = tagCode === 'combine' ? item : item.$refs.tagComponent
                             return true
                         }
                     })
                 } else {
-                    childComponent = this.$children
+                    childComponent = this.$children.map(item => {
+                        return item.scheme.tag_code === 'combine' ? item : item.$refs.tagComponent
+                    })
                 }
-
                 return childComponent
             },
             emit_event (name, type, data) {

diff --git a/frontend/desktop/src/components/common/RenderForm/RenderForm.vue b/frontend/desktop/src/components/common/RenderForm/RenderForm.vue
@@ -207,14 +207,16 @@
                 if (typeof tagCode === 'string' && tagCode !== '') {
                     this.$children.some(item => {
                         if (item.scheme && item.scheme.tag_code === tagCode) {
-                            childComponent = item.$children[0]
+                            // combine组件或tag组件
+                            childComponent = tagCode === 'combine' ? item : item.$refs.tagComponent
                             return true
                         }
                     })
                 } else {
-                    childComponent = this.$children
+                    childComponent = this.$children.map(item => {
+                        return item.scheme.tag_code === 'combine' ? item : item.$refs.tagComponent
+                    })
                 }
-
                 return childComponent
             },
             /**