From afe2d0dba5d6e42d7999b62836ed5e4bea75391a Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Mon, 14 Nov 2022 16:00:18 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat=EF=BC=9ANEZ-2383=20chart=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E9=A1=B5=E9=9D=A2=E6=94=AF=E6=8C=81=20repeat=20?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/rightBox/chart/chartRightBox.vue   |  5 ++
 .../rightBox/chart/otherChartConfig.vue       | 46 ++++++++++++++++++-
 .../src/components/page/dashboard/panel.vue   |  2 +-
 3 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
index 04a3e10b7..bf2945f95 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
@@ -580,6 +580,11 @@ export default {
               result: ''
             }
           }
+          if (obj.type === 'group' && !obj.param.repeat) {
+            obj.param.repeat = {
+              variable: ''
+            }
+          }
           // this.editChart.varType = 1
           if (obj.param.enable.legend && !obj.param.legend) {
             obj.param.legend = { placement: 'bottom', values: [], show: true }
diff --git a/nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue
index 159ebc567..3ed9642d7 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue
@@ -247,6 +247,46 @@
           </div>
         </transition>
       </div>
+      <!-- repeat -->
+      <div v-if="params.type === 'group'">
+        <div class="form__sub-title">
+          <span>{{$t('dashboard.repeat')}}</span>
+          <el-switch
+            v-model="chartConfig.param.enable.repeat"
+            size="small"
+            @change="change"
+          ></el-switch>
+        </div>
+        <transition name="el-zoom-in-top">
+          <div
+            v-if="chartConfig.param.enable.repeat"
+            class="form-items--half-width-group"
+          >
+            <!-- variable -->
+            <el-form-item
+              :label="$t('dashboard.panel.variableName')"
+              class="form-item--half-width"
+              prop="param.repeat.variable"
+              :rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}"
+            >
+              <el-select
+                v-model="chartConfig.param.repeat.variable"
+                :placeholder="$t('el.select.placeholder')"
+                popper-class="right-box-select-top prevent-clickoutside"
+                size="small"
+                @change="change"
+              >
+                <el-option
+                  v-for="item in variables"
+                  :key="item.name"
+                  :label="$t(item.name)"
+                  :value="item.name"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </div>
+        </transition>
+      </div>
 
     </el-form>
   </div>
@@ -320,7 +360,8 @@ export default {
             link: this.chartConfig.param.link,
             collapse: true,
             enable: {
-              visibility: false
+              visibility: false,
+              repeat: false
             },
             showHeader: this.chartConfig.param.showHeader,
             visibility: {
@@ -328,6 +369,9 @@ export default {
               operator: 'equal',
               varValue: '',
               result: 'show'
+            },
+            repeat: {
+              variable: ''
             }
           }
           break
diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index 77dabbace..32af35f83 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -42,7 +42,7 @@
               <pick-time id="panel" ref="pickTime" v-model="searchTime" :refresh-data-func="dateChange" :use-chart-unit="false" class="margin-r-10" :sign="showPanel.id"></pick-time>
 
               <!-- 切换查看模式 -->
-              <button slot="reference" class="top-tool-btn view-mode" :title="$t('overall.viewMode')" @click="cycle">
+              <button class="top-tool-btn view-mode" :title="$t('overall.viewMode')" @click="cycle">
                 <i class="nz-icon nz-icon-moshiqiehuan"></i>
               </button>
 

From b12d36c1fc7c3ef1a5f408e93474442b8778484d Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Tue, 15 Nov 2022 13:36:09 +0800
Subject: [PATCH 2/3] =?UTF-8?q?NEZ-2392=20fix=20:=20dashboard=20=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E9=A1=B5=E9=9D=A2=20receivers=20=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/rightBox/panelBox.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nezha-fronted/src/components/common/rightBox/panelBox.vue b/nezha-fronted/src/components/common/rightBox/panelBox.vue
index ccc35e332..d0ebc6476 100644
--- a/nezha-fronted/src/components/common/rightBox/panelBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/panelBox.vue
@@ -309,6 +309,7 @@
                     <el-select v-model="editPanel.param.report.receivers" clearable multiple placeholder="" popper-class="right-box-select-top prevent-clickoutside" size="small" value-key="chartType">
                       <el-option v-for="item in userData" :key="item.id" :label="item.name" :value="item.id">
                       <span class="panel-dropdown-label-txt" >{{item.name}}</span>
+                      <span class="user-username" :title="item.username">@{{item.username}}</span>
                       </el-option>
                     </el-select>
                   </el-form-item>

From 8ffb9365b7cfe28a9045f25a2222c4af912bc225 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Tue, 15 Nov 2022 13:40:00 +0800
Subject: [PATCH 3/3] =?UTF-8?q?NEZ-2388=20feat=20:=20backup=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=A2=9E=E5=8A=A0=E4=B8=8B=E8=BD=BD=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/table/settings/backupsTable.vue    | 102 +++++++++++-------
 1 file changed, 66 insertions(+), 36 deletions(-)

diff --git a/nezha-fronted/src/components/common/table/settings/backupsTable.vue b/nezha-fronted/src/components/common/table/settings/backupsTable.vue
index dcf9554b7..8029ee419 100644
--- a/nezha-fronted/src/components/common/table/settings/backupsTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/backupsTable.vue
@@ -50,26 +50,30 @@
         </button>
       </div>
 
-      <div slot-scope="scope" v-else class="table-operation-items">
-        <button class="table-operation-button" @click="Restore(scope.row)" v-if="scope.row" :title="$t('backup.RestoreNow')">
-         <i class="nz-icon-shujubeifenhuifu nz-icon"></i>
-        </button>
-        <div v-if="scope.row" @click="tableOperation(scope.row)">
-           <delete-button
-            ref="deleteButton"
-            :forceDeleteShow="false"
-            id="backup-delete"
-            :from="'backup'"
-            :type="'btn'"
-            :api="'/sys/backup'"
-            :single="true"
-            :delete-objs="singleDelete"
-            @before="delFlag=true"
-            ></delete-button>
+       <div slot-scope="scope" class="table-operation-items" v-else>
+        <button class="table-operation-item" :title="$t('overall.download')" v-has="'backup_download'" @click="downloadBackup(scope.row)"><i class="nz-icon nz-icon-download"></i></button>
+        <el-dropdown size="medium" v-has="['backup_restore','backup_del']" trigger="click" @command="tableOperation">
+          <div class="table-operation-item table-operation-item--more" :title="$t('overall.moreOperations')">
+            <i class="nz-icon nz-icon-more3"></i>
           </div>
-        <!-- <button class="table-operation-edit" @click="del(scope.row)" v-if="scope.row" :title="$t('overall.delete')">
-          <i class="nz-icon nz-icon-delete" style="font-size='12px'"></i>
-        </button> -->
+          <el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top">
+            <el-dropdown-item v-has="'backup_restore'" :command="['restore', scope.row]" disabled><i class="nz-icon-shujubeifenhuifu nz-icon"></i><span>{{$t('backup.RestoreNow')}}</span></el-dropdown-item>
+            <el-dropdown-item v-has="'backup_del'" :command="['delete', scope.row]">
+                  <delete-button
+                    ref="deleteButton"
+                    :forceDeleteShow="false"
+                    id="backup-delete"
+                    :from="'backup'"
+                    :type="'link'"
+                    :title="$t('overall.delete')"
+                    :api="'/sys/backup'"
+                    :single="true"
+                    :delete-objs="singleDelete"
+                    @before="delFlag=true"
+                    ></delete-button>
+              </el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
       </div>
     </el-table-column>
      <template slot="empty">
@@ -87,7 +91,7 @@
 
 <script>
 import { post, put } from '@/http'
-import lodash from 'lodash'
+import axios from 'axios'
 import bus from '@/libs/bus'
 import deleteButton from '@/components/common/deleteButton'
 
@@ -157,15 +161,6 @@ export default {
         }, 400)
       }
     },
-    // del (row) {
-    //   this.$delete('/sys/backup?filename=' + row.fileName).then(res => {
-    //     if (res.code == 200) {
-    //       this.$emit('getTableData', 'recent')
-    //     } else {
-    //       this.$message.error(res.msg)
-    //     }
-    //   })
-    // },
     changeDate (item) {
       const time = this.utcTimeToTimezoneStr(item)
       const time1 = this.timeFormate(time)
@@ -187,14 +182,49 @@ export default {
     edit () {
       this.$emit('edit', this.tableData[0])
     },
-    tableOperation (row) {
-      this.$set(row, 'name', row.fileName)
-      if (this.singleDelete.length === 0) {
-        this.singleDelete.push(row)
-      } else {
-        this.singleDelete = []
-        this.singleDelete.push(row)
+    tableOperation ([command, row]) {
+      switch (command) {
+        case 'delete': {
+          this.$set(row, 'name', row.fileName)
+          if (this.singleDelete.length === 0) {
+            this.singleDelete.push(row)
+          } else {
+            this.singleDelete = []
+            this.singleDelete.push(row)
+          }
+          break
+        }
+        case 'restore': {
+          this.Restore(row)
+          break
+        }
+        default:
+          break
       }
+    },
+    downloadBackup (backup) {
+      axios.get('/sys/backup/download?filename=' + backup.fileName, { responseType: 'blob' }).then(data => {
+        let fileName = new Date().getTime() + '.txt'
+        const disposition = data.headers['content-disposition']
+        if (disposition) {
+          fileName = disposition.split(';')[1].split('filename=')[1]
+        }
+        // 由于ie不支持download属性，故需要做兼容判断
+        if (navigator.appVersion.toString().indexOf('.NET') > 0) {
+          // ie独有的msSaveBlob属性，data.data为Blob文件流
+          window.navigator.msSaveBlob(data.data, fileName)
+        } else {
+          // 以下流程即为文章开始的下载流程
+          const url = window.URL.createObjectURL(data.data)
+          const link = document.createElement('a')
+          link.style.display = 'none'
+          link.href = url
+          link.download = fileName
+          document.body.appendChild(link)
+          link.click()
+          window.URL.revokeObjectURL(link.href)
+        }
+      })
     }
   },