From 6e38a0b0ebb5da5a300d888f411d20db5a74df98 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Wed, 30 Nov 2022 19:25:51 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BD=E9=99=85=E5=8C=96):=20=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

完善国际化，修改部分提示样式
---
 .../canvas/components/editor/Preview.vue      |  4 +--
 frontend/src/lang/en.js                       | 26 +++++++++++++++----
 frontend/src/lang/tw.js                       | 22 +++++++++++++---
 frontend/src/lang/zh.js                       | 22 +++++++++++++---
 frontend/src/styles/index.scss                |  6 ++++-
 frontend/src/views/background/index.vue       |  6 ++---
 .../chart/components/senior/MapMapping.vue    |  2 +-
 .../chart/components/senior/ScrollCfg.vue     |  2 +-
 .../senior/dialog/TableThresholdEdit.vue      |  2 +-
 .../components/shapeAttr/SizeSelectorAntV.vue |  5 ++--
 .../views/chart/view/CalcChartFieldEdit.vue   |  7 ++---
 frontend/src/views/chart/view/ChartEdit.vue   |  8 +++---
 .../src/views/dataset/data/CalcFieldEdit.vue  |  7 ++---
 frontend/src/views/link/generate/index.vue    |  8 +++---
 .../src/views/panel/linkJumpSet/index.vue     |  7 ++---
 frontend/src/views/panel/list/PanelList.vue   |  7 +++--
 .../src/views/panel/list/PanelViewShow.vue    |  9 +++----
 .../panelStyle/ComponentStyle.vue             |  6 ++---
 .../src/views/system/user/PrivateForm.vue     |  6 ++---
 19 files changed, 101 insertions(+), 61 deletions(-)

diff --git a/frontend/src/components/canvas/components/editor/Preview.vue b/frontend/src/components/canvas/components/editor/Preview.vue
index f731bbfa89..453227c1a2 100644
--- a/frontend/src/components/canvas/components/editor/Preview.vue
+++ b/frontend/src/components/canvas/components/editor/Preview.vue
@@ -63,7 +63,7 @@
     </div>
     <el-dialog
       v-if="pdfExportShow"
-      :title="'['+panelInfo.name+']'+'PDF导出'"
+      :title="'['+panelInfo.name+']'+$t('panel.pdf_export')"
       :visible.sync="pdfExportShow"
       width="80%"
       :top="'8vh'"
@@ -77,7 +77,7 @@
         />
         <el-select
           v-model="pdfTemplateSelectedIndex"
-          :placeholder="'切换PDF模板'"
+          :placeholder="$t('panel.switch_pdf_template')"
           @change="changePdfTemplate()"
         >
           <el-option
diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index 8ff6d4a01d..64c029b044 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -151,7 +151,7 @@ export default {
     params_value: 'Param Value',
     input_role_name: 'Enter a role name',
     publish: 'publish',
-    unpublished: 'unpublished',
+    unpublished: 'Unpublished',
     default_pwd: 'Default Pwd',
     stop: 'Stop',
     first_login_tips: 'Please change the initial password',
@@ -311,6 +311,7 @@ export default {
     validate: 'Validate',
     batch_add: 'Batch Add',
     tag_tip: 'Enter add label',
+    search_keywords: 'Enter keywords to search',
     table: {
       select_tip: '{0} data selected'
     },
@@ -322,7 +323,10 @@ export default {
       start_date_time: 'Start date time',
       end_date_time: 'End date time',
       range_separator: 'to',
-      data_time_error: 'The start date cannot be greater than the end date.'
+      data_time_error: 'The start date cannot be greater than the end date.',
+      one_day: 'One day',
+      one_week: 'One week',
+      one_month: 'One month'
     },
     adv_search: {
       title: 'Advanced search',
@@ -1460,7 +1464,15 @@ export default {
     empty_data_strategy: 'Empty Data Strategy',
     break_line: 'Disconnection',
     set_zero: 'Set Zero',
-    ignore_data: 'Ignore Data'
+    ignore_data: 'Ignore Data',
+    sub_dimension_tip: 'This field is required, and cannot be included in the type axis, you should choose non-group chart if you don\'t need it, or you will get unexpected chart.',
+    drill_dimension_tip: 'Only fields in the dataset can be drilled',
+    table_scroll_tip: 'The detail table is only effective when the pagination mode is "Drop-down".',
+    table_threshold_tip: 'Tip: Do not select fields repeatedly. If the same field is configured repeatedly, only the last field will take effect.',
+    table_column_width_tip: 'Column width do not always work. The priority of the container width is higher than the column width, which means if the result of dividing the width of the table container by the number of columns is greater than specified column width, the former will take effect.',
+    reference_field_tip: 'Reference fields start with "[" and end with "]". Do not modify the reference content, otherwise the reference will fail. If you enter content in the same format as the reference field, it will be treated as a reference field.',
+    scatter_tip: 'When this indicator is in effect, the bubble size attribute in the style size will be invalid',
+    place_name_mapping: 'Place name mapping'
   },
   dataset: {
     spend_time: 'Spend',
@@ -1981,7 +1993,7 @@ export default {
     inner_padding: 'Inner Padding',
     board_radio: 'Board Radio',
     background: 'Background',
-    component_style: 'component Style',
+    component_style: 'Component Style',
     web_set_tips: 'Some Websites Cannot Be Displayed Because Of Not Allow Embedded ',
     repeat_params: 'Repeat Params Exist',
     enable_outer_param_set: 'Enable Outer Param Set',
@@ -2224,7 +2236,11 @@ export default {
     select_view: 'Please select a view...',
     visual: 'Visual',
     prohibit_multiple: 'Prohibit multiple fields in the same dataset',
-    be_empty_dir: 'is empty dir'
+    be_empty_dir: 'is empty dir',
+    fold: 'Fold',
+    expand: 'Expand',
+    pdf_export: 'PDF Export',
+    switch_pdf_template: 'Switch PDF Template'
   },
   plugin: {
     local_install: 'Local installation',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index e4ce6b8e57..56848b5533 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -311,6 +311,7 @@ export default {
     validate: '校驗',
     batch_add: '批量添加',
     tag_tip: '輸入回車添加標簽',
+    search_keywords: '輸入關鍵字搜索',
     table: {
       select_tip: '已選中 {0} 條數據'
     },
@@ -322,7 +323,10 @@ export default {
       start_date_time: '開始日期時間',
       end_date_time: '結束日期時間',
       range_separator: '至',
-      data_time_error: '開始日期不能大於結束日期'
+      data_time_error: '開始日期不能大於結束日期',
+      one_day: '一天',
+      one_week: '一周',
+      one_month: '一個月'
     },
     adv_search: {
       title: '高級搜索',
@@ -1460,7 +1464,15 @@ export default {
     empty_data_strategy: '空值處理',
     break_line: '線條斷開',
     set_zero: '置為0，線條不斷開',
-    ignore_data: '跳過空值，不展示'
+    ignore_data: '跳過空值，不展示',
+    sub_dimension_tip: '該字段為必填項，且不應使用類別軸中的字段，若無需該字段，請選擇基礎圖表進行展示，否則展示效果不理想',
+    drill_dimension_tip: '鑽取字段僅支持數據集中的字段',
+    table_scroll_tip: '明細表僅在分頁模式為"下拉"時生效。',
+    table_threshold_tip: '提示：請勿重複選擇字段，若同一字段重複配置，則只有最後的字段配置生效。',
+    table_column_width_tip: '列寬並非任何時候都能生效。容器寬度優先級高於列寬。即(表格容器寬度 / 列數 > 指定列寬)，則列寬優先取(容器寬度 / 列數)',
+    reference_field_tip: '引用字段以 "[" 開始，"]" 結束。請勿修改引用內容，否則將引用失敗。若輸入與引用字段相同格式的內容，將被當做引用字段處理。',
+    scatter_tip: '該指標生效時，樣式大小中的氣泡大小屬性將失效',
+    place_name_mapping: '地名映射'
   },
   dataset: {
     spend_time: '耗時',
@@ -2225,7 +2237,11 @@ export default {
     select_view: '請選擇視圖...',
     visual: '虛擬化',
     prohibit_multiple: '禁止同數據集多字段',
-    be_empty_dir: '是空目錄'
+    be_empty_dir: '是空目錄',
+    fold: '收起',
+    expand: '展開',
+    pdf_export: 'PDF 導出',
+    switch_pdf_template: '切換 PDF 模板'
   },
   plugin: {
     local_install: '本地安裝',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 5ed1e27d35..f956e26ebc 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -310,6 +310,7 @@ export default {
     validate: '校验',
     batch_add: '批量添加',
     tag_tip: '输入回车添加标签',
+    search_keywords: '输入关键字搜索',
     table: {
       select_tip: '已选中 {0} 条数据'
     },
@@ -321,7 +322,10 @@ export default {
       start_date_time: '开始日期时间',
       end_date_time: '结束日期时间',
       range_separator: '至',
-      data_time_error: '开始日期不能大于结束日期'
+      data_time_error: '开始日期不能大于结束日期',
+      one_day: '一天',
+      one_week: '一周',
+      one_month: '一个月'
     },
     adv_search: {
       title: '高级搜索',
@@ -1459,7 +1463,15 @@ export default {
     empty_data_strategy: '空值处理',
     break_line: '线条断开',
     set_zero: '置为0,线条不断开',
-    ignore_data: '跳过空值,不展示'
+    ignore_data: '跳过空值,不展示',
+    sub_dimension_tip: '该字段为必填项，且不应使用类别轴中的字段，若无需该字段，请选择基础图表进行展示，否则展示效果不理想。',
+    drill_dimension_tip: '钻取字段仅支持数据集中的字段',
+    table_scroll_tip: '明细表仅在分页模式为"下拉"时生效。',
+    table_threshold_tip: '提示：请勿重复选择字段，若同一字段重复配置，则只有最后的字段配置生效',
+    table_column_width_tip: '列宽并非任何时候都能生效。容器宽度优先级高于列宽，即(表格容器宽度 / 列数 > 指定列宽)，则列宽优先取(容器宽度 / 列数)。',
+    reference_field_tip: '引用字段以 "[" 开始， "]" 结束。请勿修改引用内容，否则将引用失败。若输入与引用字段相同格式的内容，将被当作引用字段处理',
+    scatter_tip: '该指标生效时，样式大小中的气泡大小属性将失效',
+    place_name_mapping: '地名映射'
   },
   dataset: {
     spend_time: '耗时',
@@ -2225,7 +2237,11 @@ export default {
     select_view: '请选择视图...',
     visual: '虚拟化',
     prohibit_multiple: '禁止同数据集多字段',
-    be_empty_dir: '是空目录！'
+    be_empty_dir: '是空目录！',
+    fold: '收起',
+    expand: '展开',
+    pdf_export: 'PDF 导出',
+    switch_pdf_template: '切换 PDF 模板'
   },
   plugin: {
     local_install: '本地安装',
diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss
index 6cebef7bc6..28e25c9341 100644
--- a/frontend/src/styles/index.scss
+++ b/frontend/src/styles/index.scss
@@ -1703,4 +1703,8 @@ div:focus {
     margin-bottom: 8px;
     display: inline-block;
   }
-}
\ No newline at end of file
+}
+
+.popper-tip{
+  width: 20%;
+}
diff --git a/frontend/src/views/background/index.vue b/frontend/src/views/background/index.vue
index c3b0652f71..bcb72f375f 100644
--- a/frontend/src/views/background/index.vue
+++ b/frontend/src/views/background/index.vue
@@ -43,7 +43,7 @@
           :span="3"
           style="padding-left: 10px;padding-top: 5px"
         >
-          <el-checkbox v-model="curComponent.commonBackground.backgroundColorSelect">颜色</el-checkbox>
+          <el-checkbox v-model="curComponent.commonBackground.backgroundColorSelect">{{ $t('chart.color') }}</el-checkbox>
         </el-col>
         <el-col
           :span="1"
@@ -58,7 +58,7 @@
           />
         </el-col>
         <el-col :span="3">
-          <span class="params-title-small">不透明度：</span>
+          <span class="params-title-small">{{ $t('chart.not_alpha') }}</span>
         </el-col>
         <el-col :span="11">
           <el-slider
@@ -137,7 +137,7 @@
               v-model="curComponent.commonBackground.backgroundType"
               label="innerImage"
               @change="onChangeType"
-            >边框
+            >{{ $t('panel.board') }}
             </el-radio>
             <el-color-picker
               v-model="curComponent.commonBackground.innerImageColor"
diff --git a/frontend/src/views/chart/components/senior/MapMapping.vue b/frontend/src/views/chart/components/senior/MapMapping.vue
index 154ec7094c..37eaeae6d9 100644
--- a/frontend/src/views/chart/components/senior/MapMapping.vue
+++ b/frontend/src/views/chart/components/senior/MapMapping.vue
@@ -56,7 +56,7 @@
             :id="scope.$index"
             v-model="keyWord"
             size="mini"
-            placeholder="输入关键字搜索"
+            :placeholder="$t('commons.search_keywords')"
           />
         </template>
 
diff --git a/frontend/src/views/chart/components/senior/ScrollCfg.vue b/frontend/src/views/chart/components/senior/ScrollCfg.vue
index af513e6587..1fc74415b3 100644
--- a/frontend/src/views/chart/components/senior/ScrollCfg.vue
+++ b/frontend/src/views/chart/components/senior/ScrollCfg.vue
@@ -21,7 +21,7 @@
             placement="bottom"
           >
             <div slot="content">
-              明细表仅在分页模式为"下拉"时生效。
+              {{ $t('chart.table_scroll_tip') }}
             </div>
             <i
               class="el-icon-info"
diff --git a/frontend/src/views/chart/components/senior/dialog/TableThresholdEdit.vue b/frontend/src/views/chart/components/senior/dialog/TableThresholdEdit.vue
index 9e0a3b62cd..04abfc2d65 100644
--- a/frontend/src/views/chart/components/senior/dialog/TableThresholdEdit.vue
+++ b/frontend/src/views/chart/components/senior/dialog/TableThresholdEdit.vue
@@ -164,7 +164,7 @@
         </el-row>
       </div>
     </div>
-    <div class="tip">提示：请勿重复选择字段，若同一字段重复配置，则只有最后的字段配置生效</div>
+    <div class="tip">{{ $t('chart.table_threshold_tip') }}</div>
   </el-col>
 </template>
 
diff --git a/frontend/src/views/chart/components/shapeAttr/SizeSelectorAntV.vue b/frontend/src/views/chart/components/shapeAttr/SizeSelectorAntV.vue
index 7ec7f704f5..70b0df0c99 100644
--- a/frontend/src/views/chart/components/shapeAttr/SizeSelectorAntV.vue
+++ b/frontend/src/views/chart/components/shapeAttr/SizeSelectorAntV.vue
@@ -330,11 +330,10 @@
             class="item"
             effect="dark"
             placement="bottom"
+            popper-class="popper-tip"
           >
             <div slot="content">
-              列宽并非任何时候都能生效。
-              <br>
-              容器宽度优先级高于列宽，即(表格容器宽度 / 列数 > 指定列宽)，则列宽优先取(容器宽度 / 列数)。
+              {{ $t('chart.table_column_width_tip') }}
             </div>
             <i
               class="el-icon-info"
diff --git a/frontend/src/views/chart/view/CalcChartFieldEdit.vue b/frontend/src/views/chart/view/CalcChartFieldEdit.vue
index 8e4320845a..8628dcedd7 100644
--- a/frontend/src/views/chart/view/CalcChartFieldEdit.vue
+++ b/frontend/src/views/chart/view/CalcChartFieldEdit.vue
@@ -110,13 +110,10 @@
             class="item"
             effect="dark"
             placement="bottom"
+            popper-class="popper-tip"
           >
             <div slot="content">
-              引用字段以 "[" 开始， "]" 结束
-              <br>
-              请勿修改引用内容，否则将引用失败
-              <br>
-              若输入与引用字段相同格式的内容，将被当作引用字段处理
+              {{ $t('chart.reference_field_tip') }}
             </div>
             <i
               class="el-icon-info"
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index a0f02eac61..b0c8b067ac 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -581,7 +581,7 @@
                           placement="bottom"
                         >
                           <div slot="content">
-                            该字段为必填项，且不应使用类别轴中字段，若无需该字段，请选择基础柱状图展示；否则展示结果不理想
+                            {{ $t('chart.sub_dimension_tip') }}
                           </div>
                           <i
                             class="el-icon-info"
@@ -820,7 +820,7 @@
                           placement="bottom"
                         >
                           <div slot="content">
-                            该指标生效时，样式大小中的气泡大小属性将失效
+                            {{ $t('chart.scatter_tip') }}
                           </div>
                           <i
                             class="el-icon-info"
@@ -914,7 +914,7 @@
                           placement="bottom"
                         >
                           <div slot="content">
-                            钻取字段仅支持数据集中的字段
+                            {{ $t('chart.drill_dimension_tip') }}
                           </div>
                           <i
                             class="el-icon-info"
@@ -1084,7 +1084,7 @@
                 >
 
                   <el-collapse-item
-                    title="地名映射"
+                    :title="$t('chart.place_name_mapping')"
                     name="map-mapping"
                   >
                     <map-mapping
diff --git a/frontend/src/views/dataset/data/CalcFieldEdit.vue b/frontend/src/views/dataset/data/CalcFieldEdit.vue
index ee6dba8cef..61d4d96772 100644
--- a/frontend/src/views/dataset/data/CalcFieldEdit.vue
+++ b/frontend/src/views/dataset/data/CalcFieldEdit.vue
@@ -88,13 +88,10 @@
             class="item"
             effect="dark"
             placement="bottom"
+            popper-class="popper-tip"
           >
             <div slot="content">
-              引用字段以 "[" 开始， "]" 结束
-              <br>
-              请勿修改引用内容，否则将引用失败
-              <br>
-              若输入与引用字段相同格式的内容，将被当作引用字段处理
+              {{ $t('chart.reference_field_tip') }}
             </div>
             <i
               class="el-icon-info"
diff --git a/frontend/src/views/link/generate/index.vue b/frontend/src/views/link/generate/index.vue
index 0bdc5ae536..c46803c35e 100644
--- a/frontend/src/views/link/generate/index.vue
+++ b/frontend/src/views/link/generate/index.vue
@@ -44,7 +44,7 @@
         <el-date-picker
           v-model="form.overTime"
           type="datetime"
-          placeholder="选择日期时间"
+          :placeholder="$t('commons.date.select_date_time')"
           align="right"
           value-format="timestamp"
           :picker-options="pickerOptions"
@@ -148,17 +148,17 @@ export default {
         },
 
         shortcuts: [{
-          text: '一天',
+          text: this.$t('commons.date.one_day'),
           onClick: function(picker) {
             picker.$emit('pick', this.limitDate('day'))
           }.bind(this)
         }, {
-          text: '一周',
+          text: this.$t('commons.date.one_week'),
           onClick: (picker) => {
             picker.$emit('pick', this.limitDate('week'))
           }
         }, {
-          text: '一月',
+          text: this.$t('commons.date.one_month'),
           onClick: (picker) => {
             picker.$emit('pick', this.limitDate('month'))
           }
diff --git a/frontend/src/views/panel/linkJumpSet/index.vue b/frontend/src/views/panel/linkJumpSet/index.vue
index b8caf5df85..542f724b30 100644
--- a/frontend/src/views/panel/linkJumpSet/index.vue
+++ b/frontend/src/views/panel/linkJumpSet/index.vue
@@ -282,13 +282,10 @@
                         class="item"
                         effect="dark"
                         placement="bottom"
+                        popper-class="popper-tip"
                       >
                         <div slot="content">
-                          引用字段以 "[" 开始， "]" 结束
-                          <br>
-                          请勿修改引用内容，否则将引用失败
-                          <br>
-                          若输入与引用字段相同格式的内容，将被当作引用字段处理
+                          {{ $t('chart.reference_field_tip') }}
                         </div>
                         <i
                           class="el-icon-info"
diff --git a/frontend/src/views/panel/list/PanelList.vue b/frontend/src/views/panel/list/PanelList.vue
index b3f5812ab6..39b3c5aab0 100644
--- a/frontend/src/views/panel/list/PanelList.vue
+++ b/frontend/src/views/panel/list/PanelList.vue
@@ -69,7 +69,7 @@
               </span>
               <span
                 v-if="hasDataPermission('manage', data.privileges)"
-                :title="'置顶'"
+                :title="$t('panel.to_top')"
                 class="child"
                 @click.stop
               >
@@ -121,7 +121,7 @@
             class="default-expansion"
             @click="defaultExpansion = !defaultExpansion"
           >
-            {{ defaultExpansion ? '收起' : '展开' }}
+            {{ defaultExpansion ? $t('panel.fold') : $t('panel.expand') }}
             <i
               :class="[
                 defaultExpansion ? 'el-icon-arrow-up' : 'el-icon-arrow-down'
@@ -373,7 +373,7 @@
 
       <el-dialog
         v-dialogDrag
-        :title="linkTitle"
+        :title="$t('panel.link_share')"
         :visible.sync="linkVisible"
         width="500px"
         @closed="removeLink"
@@ -512,7 +512,6 @@ export default {
         node: {},
         optType: 'newFirstFolder'
       },
-      linkTitle: '链接分享',
       linkVisible: false,
       linkResourceId: null,
       authTitle: null,
diff --git a/frontend/src/views/panel/list/PanelViewShow.vue b/frontend/src/views/panel/list/PanelViewShow.vue
index cef98fca05..48118c3784 100644
--- a/frontend/src/views/panel/list/PanelViewShow.vue
+++ b/frontend/src/views/panel/list/PanelViewShow.vue
@@ -235,7 +235,7 @@
 
     <el-dialog
       v-if="templateSaveShow"
-      :title="templateSaveTitle"
+      :title="$t('panel.save_to_panel')"
       :visible.sync="templateSaveShow"
       width="500px"
     >
@@ -246,7 +246,7 @@
     </el-dialog>
     <el-dialog
       v-if="pdfExportShow"
-      :title="'['+panelInfo.name+']'+'PDF导出'"
+      :title="'['+panelInfo.name+']'+$t('panel.pdf_export')"
       :visible.sync="pdfExportShow"
       width="80%"
       :top="'8vh'"
@@ -260,7 +260,7 @@
         />
         <el-select
           v-model="pdfTemplateSelectedIndex"
-          :placeholder="'切换PDF模板'"
+          :placeholder="$t('panel.switch_pdf_template')"
           @change="changePdfTemplate()"
         >
           <el-option
@@ -295,7 +295,7 @@
         />
         <el-select
           v-model="pdfTemplateSelectedIndex"
-          :placeholder="'切换PDF模板'"
+          :placeholder="$t('panel.switch_pdf_template')"
           @change="changePdfTemplate()"
         >
           <el-option
@@ -359,7 +359,6 @@ export default {
       pdfTemplateContent: '',
       templateInfo: {},
       pdfTemplateAll: [],
-      templateSaveTitle: '保存为模板',
       templateSaveShow: false,
       hasStar: false,
       fullscreen: false,
diff --git a/frontend/src/views/panel/subjectSetting/panelStyle/ComponentStyle.vue b/frontend/src/views/panel/subjectSetting/panelStyle/ComponentStyle.vue
index f69f7d9746..62f078f79c 100644
--- a/frontend/src/views/panel/subjectSetting/panelStyle/ComponentStyle.vue
+++ b/frontend/src/views/panel/subjectSetting/panelStyle/ComponentStyle.vue
@@ -1,7 +1,7 @@
 <template>
   <div style="width: 100%">
-    <el-row>
-      <el-col class="custom-item el-form-item">
+    <el-row type="flex">
+      <el-col class="el-form-item">
         <el-checkbox
           v-model="componentStyleForm.backgroundColorSelect"
           style="margin-right: 10px;float: right"
@@ -10,7 +10,7 @@
           <span style="font-size: 12px">{{ $t('chart.chart_background') }}</span>
         </el-checkbox>
       </el-col>
-      <el-col :span="10">
+      <el-col>
         <el-color-picker
           v-model="componentStyleForm.color"
           :disabled="!componentStyleForm.backgroundColorSelect"
diff --git a/frontend/src/views/system/user/PrivateForm.vue b/frontend/src/views/system/user/PrivateForm.vue
index 23fb58b43c..a7f4a7bbe7 100644
--- a/frontend/src/views/system/user/PrivateForm.vue
+++ b/frontend/src/views/system/user/PrivateForm.vue
@@ -109,18 +109,18 @@
 
           <!--提供修改个人电话，邮箱和昵称的功能-->
           <el-form-item v-if="formType!=='modify'">
-            <el-button @click="formType = 'modify'">修改个人信息</el-button>
+            <el-button @click="formType = 'modify'">{{ $t('member.modify_personal_info') }}</el-button>
           </el-form-item>
           <el-form-item v-else>
             <el-button
               v-if="formType==='modify'"
               type="primary"
               @click="save"
-            >保存</el-button>
+            >{{ $t('commons.save') }}</el-button>
             <el-button
               v-if="formType==='modify'"
               @click="reset"
-            >取消</el-button>
+            >{{ $t('commons.cancel') }}</el-button>
           </el-form-item>
         </el-form>