Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3

# Conflicts:
#	.gitlab-ci.yml

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

@@ -123,7 +123,8 @@ export default {
         alias += chartInfo.elements[expressionIndex].expression
       }
       // proj_status_
-      const name = alias + '-' + dataIndex
+      const legendIndex = expressionIndex + 'and' + dataIndex
+      const name = alias + '-' + legendIndex
 
       // 若需要统计，处理统计数据
       const statisticsTypes = chartInfo.param.legend ? chartInfo.param.legend.values : ''

nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue

@@ -181,6 +181,7 @@ export default {
     return {
       fromRoute,
       pdfId: 'pdfDom',
+      htmlTitle: 'panel',
       panelTabLoading: false,
       showTopBtn: false, // top按钮
       visible: false,

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

@@ -77,9 +77,9 @@
                   <el-dropdown-item v-has="'main_add'">
                     <div id="chart-htmltopdf" @click="htmlToPdf"><i class="nz-icon nz-icon-export-pdf"></i>{{ $t('overall.downloadToPdf') }}</div>
                   </el-dropdown-item>
-                  <el-dropdown-item v-has="'main_add'">
-                    <div id="chart-htmltoData" @click="exportData"><i class="nz-icon nz-icon-download1"></i>{{ $t('overall.downloadToPdf') }}</div>
-                  </el-dropdown-item>
+<!--                  <el-dropdown-item v-has="'main_add'">-->
+<!--                    <div id="chart-htmltoData" @click="exportData"><i class="nz-icon nz-icon-download1"></i>{{ $t('overall.downloadToPdf') }}</div>-->
+<!--                  </el-dropdown-item>-->
                 </template>
               </top-tool-more-options>
             </div>
@@ -823,7 +823,7 @@ export default {
       const dom = document.getElementsByClassName(this.pdfId)[0]
       if (dom) {
         // dom = dom.getElementsByClassName('vue-grid-layout')[0]
-        this.htmlTitle = this.panel.name
+        this.htmlTitle = this.showPanel.name
         this.scrollbarWrap.scrollTop = this.scrollbarWrap.scrollHeight
         this.$refs.chartList.onScroll(this.scrollbarWrap.scrollTop)
         // const div = document.createElement('div')