#1699 Clear entity filters

wecube-portal/src/pages/collaboration/components/plugin-register.vue

@@ -188,7 +188,7 @@
                                 v-model="param.mappingEntityExpression"
                                 :disabled="currentPluginObj.status === 'ENABLED'"
                                 :allDataModelsWithAttrs="allEntityType"
-                                :rootEntity="selectedEntityType"
+                                :rootEntity="clearedEntityType"
                                 :needNativeAttr="true"
                                 :needAttr="true"
                               ></FilterRules>
@@ -277,7 +277,7 @@
                                 v-model="outPut.mappingEntityExpression"
                                 :disabled="currentPluginObj.status === 'ENABLED'"
                                 :allDataModelsWithAttrs="allEntityType"
-                                :rootEntity="selectedEntityType"
+                                :rootEntity="clearedEntityType"
                                 :needNativeAttr="true"
                                 :needAttr="true"
                               ></FilterRules>
@@ -457,6 +457,9 @@ export default {
     },
     allPluginConfigs () {
       return [].concat(...this.plugins.map(p => p.pluginConfigDtoList))
+    },
+    clearedEntityType () {
+      return this.selectedEntityType.split('{')[0]
     }
   },
   props: {

wecube-portal/src/pages/components/filter-rules.vue

@@ -354,6 +354,7 @@ export default {
       this.formatNextCurrentOptions(this.currentNode)
     },
     addFilterRuleForCurrentNode () {
+      if (!this.currentNode) return
       this.currentNodeEntityAttrs = this.allEntity.find(_ => _.name === this.currentNode.entity).attributes
       const rules = this.currentNode.pathExp.match(/[^{]+(?=})/g)
       if (rules) {