From 9d192b554610b2e74a6f79f1e338a53dea8c2493 Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Tue, 31 Aug 2021 10:08:14 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-954=20feat:=20setting=202FA=20=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/language/cn.js   |  3 ++-
 nezha-fronted/src/components/common/language/en.js   |  3 ++-
 .../components/common/table/alert/alertRuleTable.vue |  2 +-
 nezha-fronted/src/components/page/config/system.vue  | 12 +++++++++---
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js
index 48ccd2c58..09cc14501 100644
--- a/nezha-fronted/src/components/common/language/cn.js
+++ b/nezha-fronted/src/components/common/language/cn.js
@@ -1011,7 +1011,8 @@ const cn = {
         scrapeTimeout: '指标抓取超时',
         snmpTrapPort: 'SNMP trap端口',
         logoTip: 'Logo支持格式为jpg、jpeg、png且大小小于2M的图片',
-        mfa: 'Mfa auth enable'
+        mfa: '双因素身份认证',
+        TwoFactorAuthentication: '要求所有用户设置双因素身份验证'
       },
       monitor: {
         monitor: '监控',
diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index ab109b70c..3d1cb418a 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -1004,7 +1004,8 @@ const en = {
         scrapeTimeout: 'Scrape timeout',
         snmpTrapPort: 'SNMP trap port',
         logoTip: 'Logo format only can be jpg、jpeg、png,and less than 2M',
-        mfa: 'Mfa auth enable'
+        mfa: 'Two-Factor Authentication',
+        TwoFactorAuthentication: 'Require all users to set up Two-factor authentication'
       },
       monitor: {
         monitor: 'Monitor',
diff --git a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
index 1a863e99c..740db42cb 100644
--- a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
@@ -82,7 +82,7 @@
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item v-if="!scope.row.buildIn" v-has="'alertRule_edit'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
             <el-dropdown-item v-if="!scope.row.buildIn" v-has="'alertRule_delete'" :command="['delete', scope.row]"><i class="nz-icon nz-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item>
-            <el-dropdown-item  v-if="!scope.row.buildIn"v-has="'alertRule_edit'" :command="['copy', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
+            <el-dropdown-item v-if="!scope.row.buildIn" v-has="'alertRule_edit'" :command="['copy', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
             <el-dropdown-item v-has="'alertSilence_add'" :command="['fastSilence', scope.row, 'alertRule']"><i class="nz-icon nz-icon-fast-silence"></i><span class="operation-dropdown-text">{{$t('overall.silenceAlert')}}</span></el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
diff --git a/nezha-fronted/src/components/page/config/system.vue b/nezha-fronted/src/components/page/config/system.vue
index 63da25ccb..58cc0425f 100644
--- a/nezha-fronted/src/components/page/config/system.vue
+++ b/nezha-fronted/src/components/page/config/system.vue
@@ -3,7 +3,7 @@
     <el-tabs style="overflow: auto" type="border-card" @tab-click="selectTab" v-model="activeTab" class="system-tabs" :class="{'full-table':activeTab == 'notification'||activeTab == 'link'||activeTab == 'apiKey'}">
       <el-tab-pane :label="$t('config.system.basic.basic')" name="basic">
         <div class="system-config-form basicForm" v-if="activeTab === 'basic'">
-          <el-form :model="basic"  label-width="180px" size="small" ref="basicForm" :rules="basicRules" :validate-on-rule-change="false">
+          <el-form :model="basic"  label-width="260px" size="small" ref="basicForm" :rules="basicRules" :validate-on-rule-change="false">
             <div class="system-title">{{$t('config.system.basic.title')}}</div>
 <!--            <el-form-item :label="$t('config.system.basic.sysLogo')" prop="system_logo">-->
 <!--              <el-upload-->
@@ -54,13 +54,14 @@
             <el-form-item :label="$t('config.system.basic.mfa')" prop="mfa_auth_enable">
               <el-switch v-model="basic.mfa_auth_enable" active-color="rgb(238, 157, 63)"  :active-value='"1"' :inactive-value='"0"' id="system-baisc-mfs_change">
               </el-switch>
+              <div class="el-form-item__tip">{{$t('config.system.basic.TwoFactorAuthentication')}}</div>
             </el-form-item>
-            <el-form-item>
+            <el-form-item class="el-form-item__btn">
 <!--              <button-->
 <!--                @click="resetForm('basicForm','basic')" class="nz-btn nz-btn-size-normal-new nz-btn-style-light-new" type="button" id="system-basic-reset"-->
 <!--                :disabled="prevent_opt.save" :class="{'nz-btn-disabled':prevent_opt.save}"-->
 <!--              >{{$t('overall.reset')}}</button>-->
-              <button id="system-basic-save" @click="saveSetInfo('basic','basicForm')" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" type="button" v-has="'system_basic_save'"  :disabled="prevent_opt.save" :class="{'nz-btn-disabled':prevent_opt.save}">{{$t('overall.submit')}}</button>
+              <button style="margin-top: 8px;" id="system-basic-save" @click="saveSetInfo('basic','basicForm')" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" type="button" v-has="'system_basic_save'"  :disabled="prevent_opt.save" :class="{'nz-btn-disabled':prevent_opt.save}">{{$t('overall.submit')}}</button>
             </el-form-item>
           </el-form>
         </div >
@@ -1132,6 +1133,11 @@ export default {
     .el-tabs__nav-scroll,.el-tabs__header,。el-tabs__nav-wrap{
       border-bottom: 0;
     }
+    .el-form-item.el-form-item__btn.el-form-item--small {
+      .el-form-item__content {
+        margin-left: 41px !important;
+      }
+    }
     .el-form-item:last-of-type {
 
       .el-form-item__content {