From d4ed4219554fc18760f79d7a6696301f1eaa1c4f Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Wed, 31 Aug 2022 21:28:42 +0800
Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/system/task/DatasetTaskList.vue | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/frontend/src/views/system/task/DatasetTaskList.vue b/frontend/src/views/system/task/DatasetTaskList.vue
index ec265a7755..c71a903ed5 100644
--- a/frontend/src/views/system/task/DatasetTaskList.vue
+++ b/frontend/src/views/system/task/DatasetTaskList.vue
@@ -115,7 +115,6 @@
           <template slot-scope="scope">
             <span>
               <el-link
-                style="font-size: 12px"
                 @click="jumpTaskRecord(scope.row)"
                 >{{ scope.row.name }}</el-link
               >
@@ -124,7 +123,6 @@
         </el-table-column>
         <el-table-column
           min-width="178"
-          class-name="f14"
           key="datasetName"
           prop="datasetName"
           :label="$t('dataset.task.dataset')"
@@ -665,10 +663,6 @@ export default {
   word-wrap: break-word;
   overflow: hidden;
 }
-
-span {
-  font-size: 12px;
-}
 </style>
 <style lang="scss" scoped>
 .dataset-on-time {
@@ -918,9 +912,4 @@ span {
     cursor: pointer;
   }
 }
-.f14:not(.is-leaf) {
-  .cell {
-    font-size: 12px !important;
-  }
-}
 </style>
\ No newline at end of file

From 807a78bec06e4db7e1510236fee5197d6bb9f57c Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Wed, 31 Aug 2022 21:29:42 +0800
Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=20=E8=83=8C=E6=99=AF=E8=89=B2=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/system/user/userEditer.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/system/user/userEditer.vue b/frontend/src/views/system/user/userEditer.vue
index 596cf9926c..ee5840c1e2 100644
--- a/frontend/src/views/system/user/userEditer.vue
+++ b/frontend/src/views/system/user/userEditer.vue
@@ -580,7 +580,7 @@ export default {
   display: none !important;
 }
 .user-popper {
-  background: transparent;
+  background: #fff;
   padding: 0;
   .popper__arrow {
     display: none;

From f5bdc4aa29a4e78decbcc606da11b3aad2624303 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Wed, 31 Aug 2022 21:30:18 +0800
Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E6=A8=A1=E7=89=88=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=20=E5=88=A0=E9=99=A4bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/panel/template/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/panel/template/index.vue b/frontend/src/views/panel/template/index.vue
index 49d7028e63..18b5a0d33a 100644
--- a/frontend/src/views/panel/template/index.vue
+++ b/frontend/src/views/panel/template/index.vue
@@ -257,7 +257,7 @@ export default {
       if (id) {
         templateDelete(id).then((response) => {
           this.openMessageSuccess("commons.delete_success");
-          this.getTree();
+          this.showCurrentTemplate(this.currentTemplateId, this.currentTemplateLabel);
         });
       }
     },
@@ -343,7 +343,7 @@ export default {
             this.$refs.templateList.nodeClick(obj);
           });
         } else {
-          this.showCurrentTemplate(this.currentTemplateId);
+          this.showCurrentTemplate(this.currentTemplateId, this.currentTemplateLabel);
         }
       } else {
         this.currentTemplateShowList = [];

From 841eaf148918fd73b9960f6e51a6b7cf006b7d73 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Wed, 31 Aug 2022 21:31:01 +0800
Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E9=BB=98=E8=AE=A4=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=BB=E9=A2=98=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/widget/DeWidget/DeDate.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/widget/DeWidget/DeDate.vue b/frontend/src/components/widget/DeWidget/DeDate.vue
index cec51a1614..8bda125c45 100644
--- a/frontend/src/components/widget/DeWidget/DeDate.vue
+++ b/frontend/src/components/widget/DeWidget/DeDate.vue
@@ -325,7 +325,7 @@ export default {
   }
 
   .el-picker-panel__link-btn:nth-child(2) {
-    color: #FFFFFF;
+    color: var(--DateColor, #409eff);
     background: var(--BgDateColor, #FFFFFF) !important;
     border:1px solid var(--BrDateColor, #dfe4ed) !important;
   }

From e0b4c668d6ffa5158acc183aed4b9c84212440b2 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Wed, 31 Aug 2022 21:31:48 +0800
Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=20=E7=AD=9B=E9=80=89bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/system/task/filterUser.vue | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/frontend/src/views/system/task/filterUser.vue b/frontend/src/views/system/task/filterUser.vue
index 57755faafa..3304d503f2 100644
--- a/frontend/src/views/system/task/filterUser.vue
+++ b/frontend/src/views/system/task/filterUser.vue
@@ -232,12 +232,6 @@ export default {
       const datasetIdx = this.selectDatasets.findIndex((ele) => ele.id === id);
       if (datasetIdx !== -1) {
         this.selectDatasets.splice(datasetIdx, 1);
-        this.selectDatasetsCahe = this.selectDatasetsCahe.filter(
-          (ele) => ele.id !== id
-        );
-        this.datasetCahe = this.datasetCahe.filter((ele) => ele.id !== id);
-        this.$refs.datasetTreeRef.filter(id);
-        return;
       }
       this.activeDataset.push(id);
       this.selectDatasetsCahe.push({ id, name });
@@ -248,9 +242,13 @@ export default {
       const dataset = this.datasetCahe.find((ele) => ele.id === id);
       this.selectDatasets.push(dataset);
       this.activeDataset = this.activeDataset.filter((ele) => ele !== id);
+      this.datasetCahe = this.datasetCahe.filter(
+        (ele) => ele.id !== id
+      );
       this.selectDatasetsCahe = this.selectDatasetsCahe.filter(
         (ele) => ele.id !== id
       );
+      this.$refs.datasetTreeRef.filter(true);
     },
     search() {
       this.userDrawer = false;