fix：解决冲突

nezha-fronted/src/assets/css/common/tableCommon.scss

@@ -153,10 +153,19 @@
     background-color: $--background-color-empty;
     padding: 0 70px 0 15px;
     height: 44px;
+    width: 100%;
+    box-sizing: border-box;
   }
   .top-tools--sub {
+    flex-direction: row-reverse;
+    overflow: hidden;
     .top-tool-left {
       height: 100%;
+      width: 0; // 避免计算错误
+      flex: 1;
+      display: block;
+      text-align: left;
+      flex-direction: row;
     }
     .sub-list-title {
       width: 200px;
@@ -166,12 +175,18 @@
       text-overflow: ellipsis;
       overflow: hidden;
       white-space: nowrap;
+      flex-shrink: 0;
+      display: inline-block;
     }
     .sub-list-tabs {
       height: 100%;
-      display: flex;
+      flex: 1;
+      width: calc(100% - 220px);
+      min-width: 120px;
+      margin: 0 10px 0 0;
+      display: inline-block;
+      overflow: hidden;
       align-items: center;
-
       .sub-list-tab {
         height: 100%;
         width: 120px;
@@ -186,7 +201,28 @@
           color: $--color-primary;
         }
       }
-
+      .sub-list-tabs-nz-tabs {
+        .el-tabs__header{
+          margin: 0;
+          transform: translateY(3px);
+          .el-tabs__item {
+            height: 100%;
+            width: 120px;
+            font-size: 14px;
+            text-align: center;
+            -webkit-box-sizing: border-box;
+            box-sizing: border-box;
+            line-height: 40px;
+            cursor: pointer;
+          }
+        }
+        .el-tabs__nav-wrap::after{
+          display: none;
+        }
+        .el-tabs__active-bar {
+          transition: none;
+        }
+      }
     }
   }
   /* 上滑resize工具条 */

nezha-fronted/src/assets/css/components/common/popBox/selectDashboard.scss

@@ -247,6 +247,18 @@
   }
 }
 
+.selectDashboard{
+  .selectDashboard-select{
+    display: flex;
+    align-items: center;
+    i.el-icon-arrow-down{
+      font-size: 16px;
+      margin-left: 5px;
+      color: $--color-text-regular;
+    }
+  }
+}
+
 .right-box-playlist{
   .el-input-group__append{
     background-color: $--right-box-sub-title-background-color;

nezha-fronted/src/assets/css/components/page/dashboard/panel.scss

@@ -151,7 +151,7 @@
 }
 .show-panel-name{
   display: inline-block;
-  padding: 0 5px;
+  padding: 0 8px;
   font-weight: bold;
   max-width: 310px;
   overflow:hidden;

nezha-fronted/src/assets/css/index.scss

@@ -13,7 +13,7 @@ $--font-path: '~element-ui/lib/theme-chalk/fonts'; // 避免ele原字体加载
 }
 body {
   height: 100%;
-  min-width: 1400px;
+  min-width: 1024px;
   margin:0 !important;
   padding: 0 !important;
   cursor: default;

nezha-fronted/src/components/chart/chart/options/chartTimeSeries.js

@@ -16,6 +16,7 @@ export const chartTimeSeriesLineOption = {
     showTitle: true,
     feature: {
       dataZoom: {
+        show: false,
         yAxisIndex: false,
         title: {
           zoom: i18n.t('overall.toolBox.zoom'),
@@ -24,7 +25,7 @@ export const chartTimeSeriesLineOption = {
       },
       // stack使用自定义按钮
       myStack: {
-        show: true,
+        show: false,
         title: i18n.t('overall.toolBox.stack'),
         icon: stackIconSvg,
         iconStyle: {}
@@ -51,7 +52,7 @@ export const chartTimeSeriesLineOption = {
   grid: {
     left: 20,
     right: 35,
-    top: 42,
+    top: 20,
     bottom: 15,
     containLabel: true
   },

nezha-fronted/src/components/chart/chartMixin.js

@@ -114,6 +114,10 @@ export default {
             s.yAxisIndex = 1
           }
 
+          if (!this.dataLink.length) {
+            s.cursor = 'default'
+          }
+
           if (s.param && s.param.nullType) {
             s.connectNulls = s.param.nullType !== 'null'
           } else {

nezha-fronted/src/components/common/bottomBox/nzBottomDataList.vue

@@ -1,11 +1,8 @@
 <template>
   <div class="bottom-data-list">
     <div class="top-tools top-tools--sub">
-      <div class="top-tool-left">
+      <div v-if="customTool" class="top-tool-right">
-        <div class="sub-list-title" v-if="showTitle">{{bottomHeaderTitle}}：<slot name="title"></slot></div>
+        <slot name="top-tool-right"></slot>
-        <div class="sub-list-tabs" v-if="!hideHeader">
-          <div v-for="tab in tabs" :key="tab.prop" :class="{'sub-list-tab--active': tab.active || tab.prop == targetTab }" :title='tab.name' class="sub-list-tab" @click="changeTab(tab.prop)">{{tab.name}}</div>
-        </div>
       </div>
       <div class="top-tool-right" v-if="!customTool">
         <div v-if="layout.indexOf('searchInput') > -1" class="top-tool-search margin-r-20">
@@ -18,8 +15,14 @@
           <i class="nz-icon-gear nz-icon"></i>
         </button>
       </div>
-      <div v-else class="top-tool-right">
+      <div class="top-tool-left">
-        <slot name="top-tool-right"></slot>
+        <div class="sub-list-title" v-if="showTitle">{{bottomHeaderTitle}}：<slot name="title"></slot></div>
+        <div class="sub-list-tabs">
+          <!--          <div v-for="tab in tabs" :key="tab.prop" :class="{'sub-list-tab&#45;&#45;active': tab.active || tab.prop == targetTab }" :title='tab.name' class="sub-list-tab" @click="changeTab(tab.prop)">{{tab.name}}</div>-->
+          <el-tabs v-model="activeTargetTab" @tab-click="changeTab" class="sub-list-tabs-nz-tabs">
+            <el-tab-pane v-for="tab in tabs" :label="tab.name" :name="tab.prop" :key="tab.prop"  class="sub-list-tab"></el-tab-pane>
+          </el-tabs>
+        </div>
       </div>
     </div>
     <!-- 自定义table列 -->
@@ -135,7 +138,8 @@ export default {
         toTopBtnTop: this.$tableHeight.toTopBtnTop, // to-top按钮的top属性
         tableHover: false, // 控制滚动条和top按钮同时出现
         showCustomTableTitle: false // 自定义列弹框是否显示
-      }
+      },
+      activeTargetTab: ''
     }
   },
   watch: {
@@ -145,11 +149,16 @@ export default {
         this.searchInputShow = true
       }, 100)
     },
-    targetTab (n) {
+    targetTab: {
-      this.searchInputShow = false
+      immediate: true,
-      setTimeout(() => {
+      handler (n) {
-        this.searchInputShow = true
+        this.searchInputShow = false
-      }, 100)
+        this.activeTargetTab = n
+        console.log(n)
+        setTimeout(() => {
+          this.searchInputShow = true
+        }, 100)
+      }
     },
     showDeleteTableRel (n) {
       if (!n) {
@@ -165,8 +174,9 @@ export default {
       this.$emit('search', searchObj)
     },
     // 切换tab
-    changeTab (tab) {
+    changeTab (tab, event) {
-      this.$emit('changeTab', tab)
+      console.log(tab, event)
+      this.$emit('changeTab', tab.name)
     }
   }
 }

nezha-fronted/src/components/page/dashboard/dashboard.vue

@@ -19,17 +19,20 @@
                 :panel-lock="panelLock"
                 :placement="'bottom-start'"
                 :show-panel="showPanel"
-                style="display: inline-block;padding: 0"
+                class="selectDashboard"
                 @deletePanel="del"
                 @editPanel="edit"
                 @selectDashboard="panelChange"
                 @startPlay="startPlay"
                 >
                 <template v-slot:trigger>
-                  <i style="color: #BEBEBE" class="el-icon-menu"></i>
+                  <div class="selectDashboard-select">
-                  <span :title="showPanel.name  + ' (' + (showPanel.chartNum || 0) +' charts)' " class="show-panel-name">{{showPanel.name||$t('overall.notFound')}}</span>
+                    <i style="color: #BEBEBE" class="el-icon-menu"></i>
-                  <i @click.stop="delStarred(showPanel)" v-if="showPanel.starred===1" class="nz-icon nz-icon-a-xingzhuang2" :title ="$t('overall.starred')"></i>
+                    <span :title="showPanel.name  + ' (' + (showPanel.chartNum || 0) +' charts)' " class="show-panel-name">{{showPanel.name||$t('overall.notFound')}}</span>
-                  <i @click.stop="addStarred(showPanel)" v-else class="nz-icon nz-icon-xingzhuang" :title ="$t('overall.unstarred')"></i>
+                    <i @click.stop="delStarred(showPanel)" v-if="showPanel.starred===1" class="nz-icon nz-icon-a-xingzhuang2" :title ="$t('overall.starred')"></i>
+                    <i @click.stop="addStarred(showPanel)" v-else class="nz-icon nz-icon-xingzhuang" :title ="$t('overall.unstarred')"></i>
+                    <i class="el-icon-arrow-down"></i>
+                  </div>
                 </template>
                 <!-- 按钮插槽 -->
                 <template slot="button">