diff --git a/frontend/src/views/panel/filter/FilterDialog.vue b/frontend/src/views/panel/filter/FilterDialog.vue index 4944e9e7ca..1e201bb583 100644 --- a/frontend/src/views/panel/filter/FilterDialog.vue +++ b/frontend/src/views/panel/filter/FilterDialog.vue @@ -275,6 +275,7 @@ :control-attrs="myAttrs" :child-views="childViews" :dataset-params="datasetParams" + :activeName="activeName" /> diff --git a/frontend/src/views/panel/filter/filterMain/FilterControl.vue b/frontend/src/views/panel/filter/filterMain/FilterControl.vue index 288168622f..352138253b 100644 --- a/frontend/src/views/panel/filter/filterMain/FilterControl.vue +++ b/frontend/src/views/panel/filter/filterMain/FilterControl.vue @@ -215,12 +215,12 @@ v-model="attrs.parameters" > -
+
[] + }, + activeName:{ + } }, data() { @@ -327,16 +330,41 @@ export default { } this.attrs.parameters = parameters } - this.allParams = this.childViews.datasetParams + this.allParams = JSON.parse(JSON.stringify(this.childViews.datasetParams)) } }, 'datasetParams': { handler(newName, oldName) { + this.allParams = JSON.parse(JSON.stringify(this.childViews.datasetParams)) if (this.datasetParams.length > 0) { - this.allParams = this.childViews.datasetParams for (var j = 0; j < this.datasetParams.length; j++) { + var hasParam = false for (var i = 0; i < this.childViews.datasetParams.length; i++) { - if (this.childViews.datasetParams[i].id.split('|DE|')[0] !== this.datasetParams[j].id.split('|DE|')[0]) { + if (this.childViews.datasetParams[i].id === this.datasetParams[j].id) { + hasParam = true + } + } + if(!hasParam){ + this.allParams.push(this.datasetParams[j]) + } + } + } + } + }, + 'activeName':{ + handler(newName, oldName) { + if(this.activeName === 'assembly'){ + this.allParams = JSON.parse(JSON.stringify(this.childViews.datasetParams)) + }else { + if (this.datasetParams.length > 0) { + for (var j = 0; j < this.datasetParams.length; j++) { + var hasParam = false + for (var i = 0; i < this.childViews.datasetParams.length; i++) { + if (this.childViews.datasetParams[i].id === this.datasetParams[j].id) { + hasParam = true + } + } + if(!hasParam){ this.allParams.push(this.datasetParams[j]) } } @@ -475,6 +503,13 @@ export default { overflow: hidden; } +.span-div2 { + width: 350px; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; +} + .de-ul li { margin: 5px 2px; cursor: pointer;