From d5bf5d75bee2ee6ef6a34fc2edfd51a02339b667 Mon Sep 17 00:00:00 2001
From: wisonic <shaochuan.wu@fit2cloud.com>
Date: Wed, 18 Dec 2024 15:45:42 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=9B=BD=E9=99=85=E5=8C=96?=
 =?UTF-8?q?=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/locales/en.ts          | 14 ++++-
 core/core-frontend/src/locales/tw.ts          | 12 +++-
 core/core-frontend/src/locales/zh-CN.ts       | 12 +++-
 .../views/system/parameter/map/Geometry.vue   | 55 ++++++++++---------
 4 files changed, 65 insertions(+), 28 deletions(-)

diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts
index c7f67decc9..43c45040e9 100644
--- a/core/core-frontend/src/locales/en.ts
+++ b/core/core-frontend/src/locales/en.ts
@@ -640,7 +640,19 @@ export default {
     the_maximum_date: 'Please select the maximum date',
     on_the_left_p: 'Please select the left variable',
     edit_variable_value: 'Edit variable value',
-    secret_length: 'Secret length'
+    secret_length: 'Secret length',
+    custom_area: 'Custom area',
+    custom_area_tip:
+      'Only supports custom geographic areas for provinces and municipalities in China',
+    add_area: 'Add area',
+    area_name: 'Area name',
+    area_scope: 'Area scope',
+    operation: 'Operation',
+    sub_area_tip: 'Please select a province or municipality',
+    delete_custom_area_tip:
+      'This operation will cause the map using the custom area to fail to display normally, are you sure to delete?',
+    please_select_area: 'Please select an area',
+    delete_custom_sub_area_tip: 'Are you sure you want to delete this custom area?'
   },
   components: {
     dashboard_style: 'Dashboard style',
diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts
index fec3af0c58..63c95a973b 100644
--- a/core/core-frontend/src/locales/tw.ts
+++ b/core/core-frontend/src/locales/tw.ts
@@ -624,7 +624,17 @@ export default {
     the_maximum_date: '請選擇最大日期',
     on_the_left_p: '請選擇左側變數',
     edit_variable_value: '編輯變數值',
-    secret_length: '密鑰長度'
+    secret_length: '密鑰長度',
+    custom_area: '自定義區域',
+    custom_area_tip: '僅對中國的省份、直轄市，支持自定義地理區域',
+    add_area: '添加區域',
+    area_name: '區域名稱',
+    area_scope: '區域範圍',
+    operation: '操作',
+    sub_area_tip: '請選擇省份或直轄市',
+    delete_custom_area_tip: '該操作會導致使用了自定義區域的地圖無法正常展示，確定刪除？',
+    please_select_area: '請選擇區域',
+    delete_custom_sub_area_tip: '確定刪除該自定義區域？'
   },
   components: {
     effective_during_link: '公共連結生效',
diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts
index 598098cd65..18628767f1 100644
--- a/core/core-frontend/src/locales/zh-CN.ts
+++ b/core/core-frontend/src/locales/zh-CN.ts
@@ -627,7 +627,17 @@ export default {
     the_maximum_date: '请选择最大日期',
     on_the_left_p: '请选择左侧变量',
     edit_variable_value: '编辑变量值',
-    secret_length: '密钥长度'
+    secret_length: '密钥长度',
+    custom_area: '自定义区域',
+    custom_area_tip: '仅对中国的省份、直辖市，支持自定义地理区域',
+    add_area: '添加区域',
+    area_name: '区域名称',
+    area_scope: '区域范围',
+    operation: '操作',
+    sub_area_tip: '请选择省份或直辖市',
+    delete_custom_area_tip: '该操作会导致使用了自定义区域的地图无法正常展示，确定删除？',
+    please_select_area: '请选择区域',
+    delete_custom_sub_area_tip: '确定删除该自定义区域？'
   },
   components: {
     dashboard_style: '仪表板风格',
diff --git a/core/core-frontend/src/views/system/parameter/map/Geometry.vue b/core/core-frontend/src/views/system/parameter/map/Geometry.vue
index 386db155ff..5704ba6944 100644
--- a/core/core-frontend/src/views/system/parameter/map/Geometry.vue
+++ b/core/core-frontend/src/views/system/parameter/map/Geometry.vue
@@ -92,14 +92,17 @@
                   </span>
                   <template #dropdown>
                     <el-dropdown-menu>
-                      <el-dropdown-item @click="editCustomArea(data)">重命名</el-dropdown-item>
-                      <el-dropdown-item @click.stop="deleteCustomArea(data)">删除</el-dropdown-item>
+                      <el-dropdown-item @click="editCustomArea(data)">
+                        {{ t('chart.rename') }}
+                      </el-dropdown-item>
+                      <el-dropdown-item @click.stop="deleteCustomArea(data)">
+                        {{ t('common.delete') }}
+                      </el-dropdown-item>
                     </el-dropdown-menu>
                   </template>
                 </el-dropdown>
               </span>
             </template>
-            <template #empty> 空的列表 </template>
           </el-tree>
         </el-scrollbar>
       </div>
@@ -154,18 +157,18 @@
             <el-divider />
             <span class="header">
               <span class="label">
-                <span>自定义区域</span>
-                <span>(仅对中国的省份、直辖市，支持自定义地理区域)</span>
+                <span>{{ t('system.custom_area') }} </span>
+                <span>({{ t('system.custom_area_tip') }})</span>
               </span>
               <span class="add-btn" @click="editCustomSubArea()">
                 <el-icon>
                   <Icon name="icon_add_outlined"><icon_add_outlined /></Icon>
                 </el-icon>
-                <span>添加区域</span>
+                <span>{{ t('system.add_area') }}</span>
               </span>
             </span>
             <el-table :data="subAreaList" stripe style="width: 100%" :height="300">
-              <el-table-column prop="name" label="区域名称">
+              <el-table-column prop="name" :label="t('system.area_name')">
                 <template #default="{ row, $index }">
                   <span
                     class="area-color-symbol"
@@ -174,8 +177,8 @@
                   <span>{{ row.name }}</span>
                 </template>
               </el-table-column>
-              <el-table-column prop="scopeName" label="区域范围" />
-              <el-table-column fixed="right" label="操作" min-width="120">
+              <el-table-column prop="scopeName" :label="t('system.area_scope')" />
+              <el-table-column fixed="right" :label="t('system.operation')" min-width="120">
                 <template #default="{ row }">
                   <div class="area-edit-btn">
                     <span @click="editCustomSubArea(row)">
@@ -200,7 +203,7 @@
   <geometry-edit ref="editor" @saved="loadTreeData(false)" />
   <el-dialog
     v-model="customAreaDialog"
-    :title="`${editedCustomArea.id ? '编辑' : '新建'}自定义地理区域`"
+    :title="`${editedCustomArea.id ? t('common.edit') : t('common.add') + t('system.custom_area')}`"
     width="500"
     destroy-on-close
   >
@@ -217,14 +220,14 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button @click="customAreaDialog = false">取消</el-button>
-        <el-button type="primary" @click="saveGeoArea()"> 确定 </el-button>
+        <el-button @click="customAreaDialog = false">{{ t('common.cancel') }}</el-button>
+        <el-button type="primary" @click="saveGeoArea()"> {{ t('common.sure') }} </el-button>
       </div>
     </template>
   </el-dialog>
   <el-dialog
     v-model="customSubAreaDialog"
-    :title="`${customSubArea.id ? '编辑' : '新建'}自定义区域`"
+    :title="`${(customSubArea.id ? t('common.edit') : t('common.add')) + t('system.custom_area')}`"
     width="500"
     destroy-on-close
   >
@@ -235,10 +238,10 @@
       label-width="auto"
       :rules="areaRules"
     >
-      <el-form-item label="区域名称" label-position="top" prop="name">
+      <el-form-item :label="t('system.area_name')" label-position="top" prop="name">
         <el-input v-model="customSubArea.name" :minlenegth="1" :maxlength="50" />
       </el-form-item>
-      <el-form-item label="请选择省份或直辖市" label-position="top" prop="scopeArr">
+      <el-form-item :label="t('system.sub_area_tip')" label-position="top" prop="scopeArr">
         <el-select v-model="customSubArea.scopeArr" multiple style="width: 100%" filterable>
           <el-option
             v-for="item in subAreaOptions"
@@ -251,8 +254,8 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button @click="customSubAreaDialog = false">取消</el-button>
-        <el-button type="primary" @click="saveGeoSubArea()"> 确定 </el-button>
+        <el-button @click="customSubAreaDialog = false">{{ t('common.cancel') }}</el-button>
+        <el-button type="primary" @click="saveGeoSubArea()"> {{ t('common.sure') }} </el-button>
       </div>
     </template>
   </el-dialog>
@@ -380,7 +383,7 @@ loadTreeData(true)
 const customTreeData = ref([
   {
     id: '000',
-    name: '自定义地理区域'
+    name: t('system.custom_area')
   }
 ])
 const customAreaDialog = ref(false)
@@ -428,11 +431,12 @@ const editCustomArea = (data?) => {
   customAreaDialog.value = true
 }
 const deleteCustomArea = data => {
-  ElMessageBox.confirm('该操作会导致使用了自定义区域的地图无法正常展示，确定删除？', '', {
+  ElMessageBox.confirm(t('system.delete_custom_area_tip'), '', {
     type: 'warning',
     confirmButtonType: 'danger',
     customClass: 'area-delete-dialog',
-    autofocus: false
+    autofocus: false,
+    confirmButtonText: t('common.delete')
   })
     .then(async () => {
       await deleteCustomGeoArea(data.id)
@@ -506,14 +510,14 @@ const subAreaList = ref([])
 const subAreaFormRef = ref()
 const areaRules = reactive<FormRules>({
   name: [
-    { type: 'string', required: true, message: '请输入名称', trigger: 'change' },
-    { min: 1, max: 50, message: '名称长度为 1~50 格字符', trigger: 'blur' }
+    { type: 'string', required: true, message: t('common.input_name'), trigger: 'change' },
+    { min: 1, max: 50, message: t('common.input_limit', [1, 50]), trigger: 'blur' }
   ],
   scopeArr: [
     {
       type: 'array',
       required: true,
-      message: '请选择区域',
+      message: t('system.please_select_area'),
       trigger: 'change'
     }
   ]
@@ -545,11 +549,12 @@ const saveGeoSubArea = async () => {
   })
 }
 const deleteCustomSubArea = async data => {
-  ElMessageBox.confirm('确定删除该自定义区域？', '', {
+  ElMessageBox.confirm(t('system.delete_custom_sub_area_tip'), '', {
     type: 'warning',
     confirmButtonType: 'danger',
     customClass: 'area-delete-dialog',
-    autofocus: false
+    autofocus: false,
+    confirmButtonText: t('common.delete')
   })
     .then(async () => {
       await deleteCustomGeoSubArea(data.id)