From 9546d512cf7d268b2d2f8acdbe32e684cb582221 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Wed, 28 Sep 2022 10:25:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=8D=E5=90=8C=E7=9A=84sql=20?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E5=8F=82=E6=95=B0=E5=90=8C=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../panel/filter/filterMain/FilterControl.vue | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/frontend/src/views/panel/filter/filterMain/FilterControl.vue b/frontend/src/views/panel/filter/filterMain/FilterControl.vue
index 2d6d8ecd2e..149922bd3a 100644
--- a/frontend/src/views/panel/filter/filterMain/FilterControl.vue
+++ b/frontend/src/views/panel/filter/filterMain/FilterControl.vue
@@ -107,8 +107,8 @@
               <el-checkbox-group v-model="attrs.parameters">
                 <el-checkbox
                   v-for="(item ) in childViews.datasetParams"
-                  :key="item.variableName"
-                  :label="item.variableName"
+                  :key="item.id"
+                  :label="item.id"
                   class="de-checkbox"
                 >
                   <div class="span-div">
@@ -174,12 +174,27 @@ export default {
         { id: 'HH', name: 'HH' },
         { id: 'HH:mm', name: 'HH:mm' },
         { id: 'HH:mm:ss', name: 'HH:mm:ss' }
-
       ]
-
     }
   },
   computed: {},
+  watch: {
+    'childViews.datasetParams': {
+      handler(newName, oldName) {
+        if (this.attrs.parameters.length > 0) {
+          const parameters = []
+          for (var i = 0; i < this.attrs.parameters.length; i++) {
+            for (var j = 0; j < this.childViews.datasetParams.length; j++) {
+              if (this.childViews.datasetParams[j].id.split('|DE|')[1] === this.attrs.parameters[i]) {
+                parameters.push(this.childViews.datasetParams[j].id)
+              }
+            }
+          }
+          this.attrs.parameters = parameters
+        }
+      }
+    }
+  },
 
   created() {
     this.attrs = this.controlAttrs
@@ -213,6 +228,7 @@ export default {
     },
     showTitleChange(value) {
       if (!value) {
+        this.attrs.title = ''
         this.element.style.backgroundColor = ''
       }
       this.fillAttrs2Filter()