Merge remote-tracking branch 'origin/knowledgePlat' into test

src/components/knowledgeExtra/AddNewRule.vue

@@ -226,7 +226,8 @@
                         it.dataType='2';
                     }
                     arr[it.groupType].push(it);
-                })
+                });
+                arr = arr.filter((it)=>{if(it)return it});
                 return arr;
             },
             searchConcept(val){