From b07f8521a1093dc5c07829a96ae3f35f06bb6158 Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Mon, 10 Jan 2022 11:58:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DpanelTableNew=20?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=80=89=E6=8B=A9=E5=99=A8=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/assets/css/common/tableCommon.scss       | 2 +-
 .../css/components/common/bottomBox/panelTabNew.scss       | 1 -
 .../src/assets/css/components/common/timePicker.scss       | 2 +-
 nezha-fronted/src/components/common/pickTime.vue           | 2 +-
 .../src/components/page/config/template/chartTemp.vue      | 1 -
 .../src/components/page/config/template/exprTemp.vue       | 1 -
 .../src/components/page/config/template/index.vue          | 7 +++++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/nezha-fronted/src/assets/css/common/tableCommon.scss b/nezha-fronted/src/assets/css/common/tableCommon.scss
index 1cfb7fbb3..99834642a 100644
--- a/nezha-fronted/src/assets/css/common/tableCommon.scss
+++ b/nezha-fronted/src/assets/css/common/tableCommon.scss
@@ -65,7 +65,7 @@
       border-left: none;
     }
     .top-tool-btn {
-      background-color: $--button-icon-background-color;
+      background-color: $--background-color-empty;
     }
   }
   .top-tool-btn {
diff --git a/nezha-fronted/src/assets/css/components/common/bottomBox/panelTabNew.scss b/nezha-fronted/src/assets/css/components/common/bottomBox/panelTabNew.scss
index 70320c112..c7f7a921e 100644
--- a/nezha-fronted/src/assets/css/components/common/bottomBox/panelTabNew.scss
+++ b/nezha-fronted/src/assets/css/components/common/bottomBox/panelTabNew.scss
@@ -164,7 +164,6 @@
 
   .el-dropdown-link {
     cursor: pointer;
-    font-weight: bold;
   }
 
   .refresh {
diff --git a/nezha-fronted/src/assets/css/components/common/timePicker.scss b/nezha-fronted/src/assets/css/components/common/timePicker.scss
index 0b4b28b69..c2bf5e295 100644
--- a/nezha-fronted/src/assets/css/components/common/timePicker.scss
+++ b/nezha-fronted/src/assets/css/components/common/timePicker.scss
@@ -8,7 +8,7 @@
   line-height: 40px;
   height: 40px;
   box-sizing: border-box;
-  border: 1px solid $--border-color-light;
+  border: 1px solid $--border-color-base;
   border-radius: $--border-radius-small;
 }
 .calendar.calendar--small {
diff --git a/nezha-fronted/src/components/common/pickTime.vue b/nezha-fronted/src/components/common/pickTime.vue
index 49775c48b..8cfe0d54d 100644
--- a/nezha-fronted/src/components/common/pickTime.vue
+++ b/nezha-fronted/src/components/common/pickTime.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="interval-refresh">
+  <div class="interval-refresh margin-r-10">
     <time-picker v-if="showTimePicker" ref="timePicker" v-model="searchTime" :default-pick="defaultPick" :show-empty="showEmpty" class="time-picker margin-r-10" size="small" @change="dateChange"></time-picker>
     <multipleTime v-if="showMultiple" ref="multipleTime" :stepSearchTime="searchTime" class="multiple-time margin-r-10" @change="dateChange(searchTime)"/>
     <chart-unit v-if="useChartUnit" v-model="unit" class="margin-r-10"></chart-unit>
diff --git a/nezha-fronted/src/components/page/config/template/chartTemp.vue b/nezha-fronted/src/components/page/config/template/chartTemp.vue
index e734c0148..2deca60e3 100644
--- a/nezha-fronted/src/components/page/config/template/chartTemp.vue
+++ b/nezha-fronted/src/components/page/config/template/chartTemp.vue
@@ -3,7 +3,6 @@
     <nzDataList
       ref="dataList"
       :api="url"
-      v-if="switchTab === 'chartTemp'"
       :layout="['searchInput', 'elementSet', 'pagination']"
       :custom-table-title.sync="tools.customTableTitle"
       :from="fromRoute.chartTemp"
diff --git a/nezha-fronted/src/components/page/config/template/exprTemp.vue b/nezha-fronted/src/components/page/config/template/exprTemp.vue
index 1a9fd1879..9c62de422 100644
--- a/nezha-fronted/src/components/page/config/template/exprTemp.vue
+++ b/nezha-fronted/src/components/page/config/template/exprTemp.vue
@@ -3,7 +3,6 @@
     <nzDataList
       ref="dataList"
       :api="url"
-      v-if="switchTab === 'exprTemp'"
       :layout="['searchInput', 'elementSet', 'pagination']"
       :custom-table-title.sync="tools.customTableTitle"
       :from="fromRoute.expressionTemplate"
diff --git a/nezha-fronted/src/components/page/config/template/index.vue b/nezha-fronted/src/components/page/config/template/index.vue
index 86cfc8b6a..c7ba85bc4 100644
--- a/nezha-fronted/src/components/page/config/template/index.vue
+++ b/nezha-fronted/src/components/page/config/template/index.vue
@@ -4,7 +4,7 @@
       <div id="module-type-1" v-has="'expressionTemplate_view'" class="nz-tab-item-box" @click="templateSwitchTab('exprTemp')">
         <div class="nz-tab-item" :class="{'nz-tab-item-active': switchTab === 'exprTemp'}">{{$t("config.exprTemp.exprTemp")}}</div>
       </div>
-      <div id="module-type-2" v-has="''"  class="nz-tab-item-box" @click="templateSwitchTab('chartTemp')">
+      <div id="module-type-2" class="nz-tab-item-box" @click="templateSwitchTab('chartTemp')">
         <div class="nz-tab-item" :class="{'nz-tab-item-active': switchTab === 'chartTemp'}">{{$t("config.chartTemp.chartTemp")}}</div>
       </div>
     </div>
@@ -47,8 +47,11 @@ export default {
         if (e === 'expressionTemplate_view') {
           this.templateHasTabExprTemp = 'exprTemp'
           this.templateHasTab = this.templateHasTabExprTemp
-        } else {
+        } else if (e === 'chartTemplate_view') {
           this.templateHasTabExprTemp = 'chartTemp'
+          this.templateHasTab = this.templateHasTabExprTemp
+        } else {
+          this.templateHasTabExprTemp = 'exprTemp'
         }
       })
       if (this.templateHasTabExprTemp) {