From a1ca417813c28f5654e156f219b88de8be81aec4 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Mon, 27 Jun 2022 15:47:44 +0800
Subject: [PATCH 1/6] =?UTF-8?q?perf=20:=20panelBox=20report=20=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E6=97=B6=E9=97=B4=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/rightBox/panelBox.vue   | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/common/rightBox/panelBox.vue b/nezha-fronted/src/components/common/rightBox/panelBox.vue
index 4223c23fb..e43089c53 100644
--- a/nezha-fronted/src/components/common/rightBox/panelBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/panelBox.vue
@@ -59,6 +59,7 @@
                               :format="timeFormatStrToDatePickFormat(dateFormatStr)"
                               popper-class="panel-time-picker-popper right-box-select-top"
                               prefix-icon=" "
+                              @change="changeData(true)"
                               size="mini"
                               type="datetime">
                       </my-date-picker>
@@ -73,6 +74,7 @@
                             :format="timeFormatStrToDatePickFormat(dateFormatStr)"
                             popper-class="panel-time-picker-popper right-box-select-top"
                             prefix-icon=" "
+                            @change="changeData(false)"
                             size="mini"
                             type="datetime">
                          </my-date-picker>
@@ -379,7 +381,24 @@ export default {
       }).catch(() => {
         this.prevent_opt.save = false
       })
-    }
+    },
+    changeData (flag) {
+	      if (flag) {
+	        if (this.editPanel.param.report.schedule.etime) {
+	          if (this.editPanel.param.report.schedule.stime > this.editPanel.param.report.schedule.etime) {
+	            this.editPanel.param.report.schedule.stime = ''
+            this.$message.error(this.$t('alert.silence.timeError'))
+	          }
+	        }
+	      } else {
+	        if (this.editPanel.param.report.schedule.stime) {
+	          if (this.editPanel.param.report.schedule.stime > this.editPanel.param.report.schedule.etime) {
+            this.editPanel.param.report.schedule.etime = ''
+	            this.$message.error(this.$t('alert.silence.timeError'))
+	          }
+	        }
+	      }
+	    }
   },
   watch: {
     obj: {

From e64d593b39134d89676dcd987afcf86ea15d8cad Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Tue, 28 Jun 2022 11:02:52 +0800
Subject: [PATCH 2/6] =?UTF-8?q?fix=20:=20chartRightBox=20Metric=20?=
 =?UTF-8?q?=E8=81=9A=E7=84=A6=E6=97=B6=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assets/css/components/page/dashboard/panel.scss   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss b/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss
index f6603134c..9643a75be 100644
--- a/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss
+++ b/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss
@@ -149,3 +149,14 @@
   vertical-align: bottom;
   color: $--color-text-primary;
 }
+.panel{
+  .right-box-chart{
+    .ͼ2 .cm-content{
+      caret-color:$--color-text-regular;
+    }
+    .ͼ1.cm-editor.cm-focused{
+      outline: 1px solid $--border-color-light;
+      padding-left: 5px;
+    }
+  }
+}

From 3132b306d31831476570460fa5141e52af319c25 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 28 Jun 2022 13:48:13 +0800
Subject: [PATCH 3/6] =?UTF-8?q?style=EF=BC=9A=E9=BB=91=E8=89=B2=E4=B8=BB?=
 =?UTF-8?q?=E9=A2=98=20=E6=A0=B7=E5=BC=8F=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/assets/css/common/tableCommon.scss          | 4 ++++
 .../src/components/common/rightBox/asset/assetBox.vue         | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/nezha-fronted/src/assets/css/common/tableCommon.scss b/nezha-fronted/src/assets/css/common/tableCommon.scss
index 7d70ffce7..77b185d95 100644
--- a/nezha-fronted/src/assets/css/common/tableCommon.scss
+++ b/nezha-fronted/src/assets/css/common/tableCommon.scss
@@ -564,3 +564,7 @@
     }
   }
 }
+.el-table__body-wrapper {
+  overflow: auto;
+  background-color: $--table-body-background-color;
+}
diff --git a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
index ec1a9f676..6b1292755 100644
--- a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
@@ -195,7 +195,7 @@
             <div v-if="editAsset.showSSH">
               <el-form-item :label="$t('asset.authType')" prop="authType">
                 <el-select v-model="editAsset.authType" class="right-box__select" :placeholder="$t('el.select.placeholder')" popper-class="right-box-select-top prevent-clickoutside" size="small" value-key="value" clearable>
-                  <el-option v-for="type in assetConstants.authTypeOptions" :key="type.value" :label="type.label" :value="type.value"/>
+                  <el-option v-for="type in assetConstants.authTypeOptions" :key="type.value" :label="$t(type.label)" :value="type.value"/>
                 </el-select>
               </el-form-item>
               <el-form-item :label="$t('profile.username')" prop="authUsername">

From a38c67e1f654142cbd0fb911ea9e9d8d775a5ee7 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 29 Jun 2022 09:40:46 +0800
Subject: [PATCH 4/6] =?UTF-8?q?feat=EF=BC=9A=E6=B7=BB=E5=8A=A0panel?=
 =?UTF-8?q?=E5=81=87=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/page/dashboard/panel.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index 9d7d23fe3..258507703 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -92,6 +92,7 @@
         <div id="tableList" class="table-list" style='overflow-y: unset'>
           <div class="table-list-box">
             <div  id="dashboardScrollbar" class="box-content" v-my-loading="chartListLoading"  ref="dashboardScrollbar" style='overflow-y: auto'>
+<!--              <panel-variables :arr="this.showPanel.variables"></panel-variables>-->
               <chart-list
                 ref="chartList"
                 name="panel"
@@ -778,6 +779,12 @@ export default {
             this.$message.error(response)
           }
         }
+        this.showPanel.param = {
+          report:
+          { enable: true, range: { type: 'previous', interval: 1, unit: 'day' }, schedule: { type: 2, repeat: 1, nums: [], stime: '2022-06-07 15:00:00', etime: '2022-06-19 15:00:00' }, receivers: [1] },
+          chartShare: 'none',
+          variables: [{ show: true, type: 'custom', multi: true, allOption: true, name: 'a', customOptions: 'z:1', expression: '', regex: '' }]
+        }
       }).catch((error) => {
         // console.log('error................'+JSON.stringify(error));
         if (error) {

From 21efc104b20f66fb677842de332ccb174992ab33 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Wed, 29 Jun 2022 13:41:44 +0800
Subject: [PATCH 5/6] =?UTF-8?q?feat=20:=20config.user.Theme=20=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/nezha-fronted/src/components/common/rightBox/profileBox.vue b/nezha-fronted/src/components/common/rightBox/profileBox.vue
index 7d9244bc9..93a76bc20 100644
--- a/nezha-fronted/src/components/common/rightBox/profileBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/profileBox.vue
@@ -37,7 +37,7 @@
               <el-option v-for="item in langList" :key="item.value" :label="item.name" :value="item.value"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="Theme" prop="theme">
+          <el-form-item :label="$t('config.user.Theme')" prop="theme">
             <el-select id="account-input-language"
                        class="right-box__select"
                        v-model="editProfile.theme"

From 21091355cfd7d5edd113aea203556e4796c83ce0 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Wed, 29 Jun 2022 14:00:16 +0800
Subject: [PATCH 6/6] =?UTF-8?q?fix=20:=20chartBox=20=20Metric=20=E8=81=9A?=
 =?UTF-8?q?=E7=84=A6=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/assets/css/components/page/dashboard/panel.scss         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss b/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss
index 9643a75be..486af40eb 100644
--- a/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss
+++ b/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss
@@ -155,7 +155,7 @@
       caret-color:$--color-text-regular;
     }
     .ͼ1.cm-editor.cm-focused{
-      outline: 1px solid $--border-color-light;
+      outline: 0px;
       padding-left: 5px;
     }
   }