From ae79015d1060b51ca986f11924f228bb9011c30e Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Wed, 14 Jun 2023 13:55:07 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E8=B0=83=E6=95=B4=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=BE=B9=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../page/dashboard/explore/explore.scss       |  21 +-
 .../page/dashboard/explore/exploreItem.vue    |   4 +-
 .../dashboard/explore/exploreItemHtml.vue     | 207 +++++++++---------
 nezha-fronted/src/entrance/exportHtml/App.vue |   5 +-
 4 files changed, 119 insertions(+), 118 deletions(-)

diff --git a/nezha-fronted/src/assets/css/components/page/dashboard/explore/explore.scss b/nezha-fronted/src/assets/css/components/page/dashboard/explore/explore.scss
index 9e771899b..fba99e61b 100644
--- a/nezha-fronted/src/assets/css/components/page/dashboard/explore/explore.scss
+++ b/nezha-fronted/src/assets/css/components/page/dashboard/explore/explore.scss
@@ -1,18 +1,17 @@
 .explores {
   display: flex;
-  padding: 0px 0 10px 0px;
   background-color: $--background-color-base;
   box-sizing: border-box;
-  .main-list::after{
-    content: '';
-    display: block;
-    position: absolute;
-    bottom: -10px;
-    left: 0;
-    right: 14px;
-    height: 10px;
-    background-color: $--background-color-empty;
-  }
+  // .main-list::after{
+  //   content: '';
+  //   display: block;
+  //   position: absolute;
+  //   bottom: -10px;
+  //   left: 0;
+  //   right: 14px;
+  //   height: 10px;
+  //   background-color: $--background-color-empty;
+  // }
   pre {
     border: 1px solid $--border-color-base;
     border-left: 4px solid #e6522c;
diff --git a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
index 677a5b2fd..d6cad2bc4 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
@@ -113,7 +113,7 @@
             ></promql-input>
           </template>
         </div>
-        <div ref="scrollWrap" style="position: relative;z-index: 1;height: auto; padding: 0 20px 4px;">
+        <div style="position: relative;z-index: 1;height: auto;padding: 0px 20px 10px;">
           <el-collapse v-show="!showIntroduce" v-model="collapseValue" class="explore-collapse" @change="logsCollapseChange">
             <!--metric-->
             <template v-if="showMetrics">
@@ -3452,7 +3452,7 @@ level=info ts=2020-10-23T20:32:18.068866235Z caller=metrics.go:81 org_id=29 trac
         </div>
       </div>
     </div>
-    <button :class="{'to-top-is-hover': tableHover}" @click="toTop(scrollbarWrap)" class="to-top" style="position:absolute;bottom: -20px;" v-show="showTopBtn" :title="$t('overall.backToTop')"><i class="nz-icon nz-icon-top"></i></button>
+    <button :class="{'to-top-is-hover': tableHover}" @click="toTop(scrollbarWrap)" class="to-top" style="position:absolute;bottom: -10px;" v-show="showTopBtn" :title="$t('overall.backToTop')"><i class="nz-icon nz-icon-top"></i></button>
     <transition name="right-box">
       <chartRightBox v-if="rightBox.show" ref="addChartModal" :chart="chartData" :from="$CONSTANTS.fromRoute.explore" :panel-data="panelData" :show-panel="{id: -1, name: '', type: 'explore'}" @close="handleBox(false)" @on-create-success="createSuccess"></chartRightBox>
     </transition>
diff --git a/nezha-fronted/src/components/page/dashboard/explore/exploreItemHtml.vue b/nezha-fronted/src/components/page/dashboard/explore/exploreItemHtml.vue
index 77109e705..803f233cd 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/exploreItemHtml.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/exploreItemHtml.vue
@@ -1,107 +1,109 @@
 <template>
-  <div  class="explore list-page" style="background: #fffffe;padding: 10px 15px;">
-    <div style="display: flex;justify-content: space-between;align-items: center;margin-bottom: 10px;">
-      <span>{{dataJson.type == 1 ? 'Metric expression' : 'Log expression'}}</span>
-      <span>
-       <chart-unit v-if="showMetrics" v-model="chartUnitType" ref="chartUnit" class="margin-r-10"></chart-unit>
-      </span>
-    </div>
-    <div v-for="(item, index) in dataJson.data" :key = 'index' style="display: flex;margin-bottom: 10px">
-      <div style="flex: 1;margin-right: 10px;border: 1px solid #ddd;border-radius: 2px;padding: 0 8px;line-height: 30px;width: calc(100% - 30px);word-break: break-word;">{{item.expression}}</div>
-      <button
-        class="top-tool-btn"
-        :title="item.state?$t('overall.enabled'):$t('profile.close')"
-        @click="stateChange(index)"
-      >
-        <i  v-if="item.state" class="nz-icon nz-icon-mimakejian"></i>
-        <i v-else class="nz-icon nz-icon-mimabukejian" style="fontSize:16px"></i>
-      </button>
-    </div>
-    <el-collapse v-model="collapseValue" class="explore-collapse" @change="logsCollapseChange">
-      <!--metric-->
-      <template v-if="showMetrics">
-        <el-collapse-item name="1" :title="$t('explore.graph')" class="el-collapse-item__height">
-          <div class="chart-room">
-            <chart ref="exploreChart" :unit="chartUnitType" :timeRange="filterTime"></chart>
-          </div>
-        </el-collapse-item>
-        <el-collapse-item class="el-collapse-item__height" name="2" title="Table">
-          <div slot="title" class="explore-table-title">
-            {{$t('dashboard.dashboard.chartForm.typeVal.table.label')}}
-            <i
-              class="nz-icon-gear nz-icon"
-              style="position: absolute;right: 10px;top: 8px"
-              @click.stop="tools.showCustomTableTitle = true"
-              :title="$t('overall.selectColumns')"
-            >
-            </i>
-            <!-- 自定义table列 -->
-            <transition name="el-zoom-in-top">
-              <element-set
-                @click.stop
-                v-if="tools.showCustomTableTitle"
-                :tableId="tableId"
-                ref="customTableTitle"
-                :custom-table-title="tools.customTableTitle"
-                :original-table-title="tableTitle"
-                :operation-true="true"
-                @close="tools.showCustomTableTitle = false"
-                @update="updateCustomTableTitle"
-              ></element-set>
-            </transition>
-          </div>
-          <!-- 自定义table列 -->
-          <div class="nz-table-list explore-table">
-            <el-table
-              ref="exploreTable"
-              v-my-loading="tools.loading"
-              class="metric-table"
-              :data="tableData"
-              border
-              :header-cell-class-name="({ column }) => column.property === 'gear' ? 'explore-table-gear' : ''"
-              tooltip-effect="light">
-              <el-table-column
-                v-for="(item, index) in tools.customTableTitle"
-                v-if="item.show"
-                :key="`col-${index}`"
-                :label="item.label"
-                :prop="item.prop"
-                :resizable="false"
-                min-width="110px"
-                show-overflow-tooltip
+  <div style="height:100%;position:relative;">
+    <div class="explore list-page" style="background: #fffffe;padding: 10px 15px;overflow-x: hidden;overflow-y: auto;">
+      <div style="display: flex;justify-content: space-between;align-items: center;margin-bottom: 10px;">
+        <span>{{dataJson.type == 1 ? 'Metric expression' : 'Log expression'}}</span>
+        <span>
+        <chart-unit v-if="showMetrics" v-model="chartUnitType" ref="chartUnit" class="margin-r-10"></chart-unit>
+        </span>
+      </div>
+      <div v-for="(item, index) in dataJson.data" :key = 'index' style="display: flex;margin-bottom: 10px">
+        <div style="flex: 1;margin-right: 10px;border: 1px solid #ddd;border-radius: 2px;padding: 0 8px;line-height: 30px;width: calc(100% - 30px);word-break: break-word;">{{item.expression}}</div>
+        <button
+          class="top-tool-btn"
+          :title="item.state?$t('overall.enabled'):$t('profile.close')"
+          @click="stateChange(index)"
+        >
+          <i  v-if="item.state" class="nz-icon nz-icon-mimakejian"></i>
+          <i v-else class="nz-icon nz-icon-mimabukejian" style="fontSize:16px"></i>
+        </button>
+      </div>
+      <el-collapse v-model="collapseValue" class="explore-collapse" @change="logsCollapseChange">
+        <!--metric-->
+        <template v-if="showMetrics">
+          <el-collapse-item name="1" :title="$t('explore.graph')" class="el-collapse-item__height">
+            <div class="chart-room">
+              <chart ref="exploreChart" :unit="chartUnitType" :timeRange="filterTime"></chart>
+            </div>
+          </el-collapse-item>
+          <el-collapse-item class="el-collapse-item__height" name="2" title="Table">
+            <div slot="title" class="explore-table-title">
+              {{$t('dashboard.dashboard.chartForm.typeVal.table.label')}}
+              <i
+                class="nz-icon-gear nz-icon"
+                style="position: absolute;right: 10px;top: 8px"
+                @click.stop="tools.showCustomTableTitle = true"
+                :title="$t('overall.selectColumns')"
               >
-                <template slot-scope="scope" :column="item">
-                  <template v-if="item.prop === 'time'">{{timeFormate(scope.row.time)}}</template>
-                  <span v-else-if="scope.row[item.prop]">{{scope.row[item.prop]}}</span>
-                  <template v-else>-</template>
+              </i>
+              <!-- 自定义table列 -->
+              <transition name="el-zoom-in-top">
+                <element-set
+                  @click.stop
+                  v-if="tools.showCustomTableTitle"
+                  :tableId="tableId"
+                  ref="customTableTitle"
+                  :custom-table-title="tools.customTableTitle"
+                  :original-table-title="tableTitle"
+                  :operation-true="true"
+                  @close="tools.showCustomTableTitle = false"
+                  @update="updateCustomTableTitle"
+                ></element-set>
+              </transition>
+            </div>
+            <!-- 自定义table列 -->
+            <div class="nz-table-list explore-table">
+              <el-table
+                ref="exploreTable"
+                v-my-loading="tools.loading"
+                class="metric-table"
+                :data="tableData"
+                border
+                :header-cell-class-name="({ column }) => column.property === 'gear' ? 'explore-table-gear' : ''"
+                tooltip-effect="light">
+                <el-table-column
+                  v-for="(item, index) in tools.customTableTitle"
+                  v-if="item.show"
+                  :key="`col-${index}`"
+                  :label="item.label"
+                  :prop="item.prop"
+                  :resizable="false"
+                  min-width="110px"
+                  show-overflow-tooltip
+                >
+                  <template slot-scope="scope" :column="item">
+                    <template v-if="item.prop === 'time'">{{timeFormate(scope.row.time)}}</template>
+                    <span v-else-if="scope.row[item.prop]">{{scope.row[item.prop]}}</span>
+                    <template v-else>-</template>
+                  </template>
+                </el-table-column>
+                <template slot="empty">
+                  <div v-if="!tools.loading" class="table-no-data">
+                    <svg class="icon" aria-hidden="true">
+                      <use xlink:href="#nz-icon-no-data-list"></use>
+                    </svg>
+                    <div class="table-no-data__title">No results found</div>
+                  </div>
+                  <div v-else>&nbsp;</div>
                 </template>
-              </el-table-column>
-              <template slot="empty">
-                <div v-if="!tools.loading" class="table-no-data">
-                  <svg class="icon" aria-hidden="true">
-                    <use xlink:href="#nz-icon-no-data-list"></use>
-                  </svg>
-                  <div class="table-no-data__title">No results found</div>
-                </div>
-                <div v-else>&nbsp;</div>
-              </template>
-            </el-table>
-          </div>
-          <pagination ref="Pagination" :page-obj="pageObj" @pageNo='pageNo' @pageSize='pageSize'></pagination>
-        </el-collapse-item>
-      </template>
-      <!--log-->
-      <template v-else>
-        <el-collapse-item v-if="showTab.indexOf('1') > -1" name="1" :title="$t('explore.graph')" class="el-collapse-item__height">
-          <div class="chart-room">
-            <chart ref="logChart" :unit="chartUnitType" v-my-loading="chartLoading" :timeRange="filterTime"></chart>
-          </div>
-        </el-collapse-item>
-        <el-collapse-item v-if="showTab.indexOf('2') > -1" name="2" title="Logs">
-          <log-tab ref="logDetail" :timeRange="filterTime" :log-data="logData" :explore-log-table="logTabNoData" :explore-item="true" :tab-index="0" v-my-loading="chartLoading"></log-tab>
-        </el-collapse-item>
-      </template>
-    </el-collapse>
+              </el-table>
+            </div>
+            <pagination ref="Pagination" :page-obj="pageObj" @pageNo='pageNo' @pageSize='pageSize'></pagination>
+          </el-collapse-item>
+        </template>
+        <!--log-->
+        <template v-else>
+          <el-collapse-item v-if="showTab.indexOf('1') > -1" name="1" :title="$t('explore.graph')" class="el-collapse-item__height">
+            <div class="chart-room">
+              <chart ref="logChart" :unit="chartUnitType" v-my-loading="chartLoading" :timeRange="filterTime"></chart>
+            </div>
+          </el-collapse-item>
+          <el-collapse-item v-if="showTab.indexOf('2') > -1" name="2" title="Logs">
+            <log-tab ref="logDetail" :timeRange="filterTime" :log-data="logData" :explore-log-table="logTabNoData" :explore-item="true" :tab-index="0" v-my-loading="chartLoading"></log-tab>
+          </el-collapse-item>
+        </template>
+      </el-collapse>
+    </div>
   </div>
 </template>
 
@@ -119,7 +121,8 @@ export default {
     triggerButtonClass: { // 触发下拉事件的按钮的class
       type: String,
       default: 'top-tool-btn'
-    }
+    },
+    tabIndex: Number
   },
   components: {
     chart,
diff --git a/nezha-fronted/src/entrance/exportHtml/App.vue b/nezha-fronted/src/entrance/exportHtml/App.vue
index 5ace336a8..d4cf6c448 100644
--- a/nezha-fronted/src/entrance/exportHtml/App.vue
+++ b/nezha-fronted/src/entrance/exportHtml/App.vue
@@ -18,7 +18,7 @@
               <span>  {{dateFormat(dataJson.start * 1000)}} - {{dateFormat(dataJson.end * 1000)}} ({{dataJson.timezone}})</span>
             </div>
           </div>
-          <div v-if="!dataJson.type" id="dashboardScrollbar" class="box-content"  ref="dashboardScrollbar" style='overflow:hidden; overflow-y: auto;height: calc(100% - 60px);display: flex;flex-direction: column'>
+          <div v-if="!dataJson.type" id="dashboardScrollbar" class="box-content"  ref="dashboardScrollbar" style='overflow:hidden; overflow-y: auto;height: calc(100% - 72px);display: flex;flex-direction: column'>
             <chartList
               ref="chartList"
               name="dashboard"
@@ -38,7 +38,7 @@
               :loading="chartListLoading"
             />
           </div>
-          <div v-if="dataJson.type" id="explore" class="explores" style='overflow:hidden;background: #fffffe; overflow-y: auto;height: calc(100% - 60px);display: flex;flex-direction: column'>
+          <div v-if="dataJson.type" id="explore" class="explores" style='overflow:hidden;background: #fffffe; height: calc(100% - 72px);display: flex;flex-direction: column'>
             <exploreItem
               ref="exploreItem"
               :key="dataJson.type"
@@ -137,6 +137,5 @@ export default {
     text-align: left;
     color: #2c3e50;
     margin-top: 10px;
-    padding-bottom: 20px;
   }
 </style>