From 349610f17888c1d7330b6b6f0188c1a53f25d455 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Fri, 1 Jul 2022 17:34:51 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-1993=20feat=20:=20I18N=20=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?/=E7=BC=96=E8=BE=91=20=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=20de?=
 =?UTF-8?q?scription?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/rightBox/setting/globalizationBox.vue     |  6 +++---
 .../common/table/settings/globalizationTable.vue     | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/nezha-fronted/src/components/common/rightBox/setting/globalizationBox.vue b/nezha-fronted/src/components/common/rightBox/setting/globalizationBox.vue
index 027c42816..3d5cb27eb 100644
--- a/nezha-fronted/src/components/common/rightBox/setting/globalizationBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/setting/globalizationBox.vue
@@ -32,9 +32,9 @@
           <el-form-item :label='$t("overall.value")' prop="value">
             <el-input placeholder="" maxlength="128" show-word-limit v-model="editGlobalization.value" size="small" id="dc-box-input-value"></el-input>
           </el-form-item>
-<!--          <el-form-item :label='$t("i18n.remark")' prop="remark">-->
-<!--            <el-input placeholder="" maxlength="64" show-word-limit v-model="editGlobalization.value" size="small" id="dc-box-input-value"></el-input>-->
-<!--          </el-form-item>-->
+         <el-form-item :label='$t("overall.remark")' prop="remark">
+          <el-input placeholder="" maxlength="256" type="textarea" show-word-limit v-model="editGlobalization.remark" size="small" :rows="2" id="dc-box-input-value"></el-input>
+         </el-form-item>
         </el-form>
       </div>
     </div>
diff --git a/nezha-fronted/src/components/common/table/settings/globalizationTable.vue b/nezha-fronted/src/components/common/table/settings/globalizationTable.vue
index 7d978bbab..7d9d9e002 100644
--- a/nezha-fronted/src/components/common/table/settings/globalizationTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/globalizationTable.vue
@@ -112,13 +112,13 @@ export default {
           prop: 'value',
           minWidth: 150,
           show: true
+        }, {
+          label: this.$t('overall.remark'),
+          prop: 'remark',
+          show: true,
+          minWidth: 150,
+          sortable: 'custom'
         }
-        // , {
-        //   label: this.$t('i18n.remark'),
-        //   prop: 'remark',
-        //   show: true,
-        //   sortable: 'custom'
-        // }
       ]
     }
   }