Merge branch 'dev-3.4' of git.mesalab.cn:nezha/nezha-fronted into dev-3.4

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

@@ -567,3 +567,7 @@
     }
   }
 }
+.el-table__body-wrapper {
+  overflow: auto;
+  background-color: $--table-body-background-color;
+}

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: 0px;
+      padding-left: 5px;
+    }
+  }
+}

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">

nezha-fronted/src/components/common/rightBox/panelBox.vue

@@ -189,29 +189,31 @@
                     class="form-item--half-width"
                     prop="param.report.schedule.stime"
                   >
-                    <my-date-picker align="right" class=" "
+                  <my-date-picker align="right" class=" "
-                      v-model="editPanel.param.report.schedule.stime"
+                              v-model="editPanel.param.report.schedule.stime"
-                      :format="timeFormatStrToDatePickFormat(dateFormatStr)"
+                              :format="timeFormatStrToDatePickFormat(dateFormatStr)"
-                      popper-class="panel-time-picker-popper right-box-select-top"
+                              popper-class="panel-time-picker-popper right-box-select-top"
-                      prefix-icon=" "
+                              prefix-icon=" "
-                      size="mini"
+                              @change="changeData(true)"
-                      type="datetime">
+                              size="mini"
-                    </my-date-picker>
+                              type="datetime">
-                  </el-form-item>
+                      </my-date-picker>
+                    </el-form-item>
                   <el-form-item
-                    :label="$t('dashboard.panel.endAt')"
+                  :label="$t('dashboard.panel.endAt')"
-                    class="form-item--half-width"
+                  class="form-item--half-width"
-                    prop="param.report.schedule.etime"
+                  prop="param.report.schedule.etime"
-                    >
+                  >
-                    <my-date-picker align="right" class=" "
+                     <my-date-picker align="right" class=" "
-                      v-model="editPanel.param.report.schedule.etime"
+                            v-model="editPanel.param.report.schedule.etime"
-                      :format="timeFormatStrToDatePickFormat(dateFormatStr)"
+                            :format="timeFormatStrToDatePickFormat(dateFormatStr)"
-                      popper-class="panel-time-picker-popper right-box-select-top"
+                            popper-class="panel-time-picker-popper right-box-select-top"
-                      prefix-icon=" "
+                            prefix-icon=" "
-                      size="mini"
+                            @change="changeData(false)"
-                      type="datetime">
+                            size="mini"
-                    </my-date-picker>
+                            type="datetime">
-                  </el-form-item>
+                         </my-date-picker>
+                    </el-form-item>
                   <el-form-item :label='$t("dashboard.panel.period")' class="range-time" prop="param.report.range.unit">
                     <el-radio-group v-model="editPanel.param.report.range.unit" size="small">
                       <el-radio-button label="day">{{ $t("dashboard.panel.prevDay") }}</el-radio-button>
@@ -577,7 +579,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: {

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"

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) {