From 83fa095052bbb28fa40d55b4e399350978161a72 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Mon, 17 May 2021 17:23:29 +0800
Subject: [PATCH] =?UTF-8?q?feat(frontend):i8n=20fix=EF=BC=9Btop-bar=20?=
 =?UTF-8?q?=E5=8F=B3=E4=B8=8A=E8=A7=92=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=20i18n=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/LangSelect/index.vue |  2 +-
 frontend/src/lang/en.js                      | 32 ++++++++++++++------
 frontend/src/lang/tw.js                      | 18 +++++++++--
 frontend/src/lang/zh.js                      |  3 +-
 frontend/src/layout/components/Topbar.vue    | 20 ++++++------
 frontend/src/styles/topbar.scss              |  6 +++-
 frontend/src/views/chart/group/Group.vue     |  4 +--
 frontend/src/views/chart/view/ChartEdit.vue  | 10 +++---
 frontend/src/views/dataset/group/Group.vue   |  4 +--
 9 files changed, 67 insertions(+), 32 deletions(-)

diff --git a/frontend/src/components/LangSelect/index.vue b/frontend/src/components/LangSelect/index.vue
index 355e29fcac..f606735f2c 100644
--- a/frontend/src/components/LangSelect/index.vue
+++ b/frontend/src/components/LangSelect/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dropdown trigger="click" class="international" @command="handleSetLanguage">
+  <el-dropdown style="display: flex;align-items: center;" trigger="click" class="international" @command="handleSetLanguage">
     <div>
       <svg-icon class-name="international-icon" icon-class="language" />
     </div>
diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index 8a60c83bc8..d0b4cea339 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -525,8 +525,8 @@ export default {
     title: 'Title',
     show: 'Show',
     chart_type: 'Chart Type',
-    shape_attr: 'Chart properties',
-    module_style: 'Component Style',
+    shape_attr: 'Attribute',
+    module_style: 'Style',
     result_filter: 'Results Filter',
     x_axis: 'Horizontal axis',
     y_axis: 'Longitudinal axis',
@@ -645,7 +645,20 @@ export default {
     table_header_bg: 'Header Background',
     table_item_bg: 'Table Background',
     table_item_font_color: 'Font Color',
-    stripe: 'Zebra pattern'
+    stripe: 'Zebra pattern',
+    start_angle: 'Start Angle',
+    end_angle: 'End Angle',
+    style_priority: 'Style Priority',
+    dashboard: 'Dashboard',
+    dimension_color: 'Dimension Color',
+    quota_color: 'Quota Color',
+    dimension_font_size: 'Dimension FontSize',
+    quota_font_size: 'Quota FontSize',
+    space_split: 'Dimension/Quota Space',
+    only_one_quota: 'Only support 1 quota',
+    only_one_result: 'Only show first result',
+    dimension_show: 'Dimension Show',
+    quota_show: 'Quota Show'
   },
   dataset: {
     datalist: 'Data Set',
@@ -734,11 +747,11 @@ export default {
     create_by: 'Creator',
     create_time: 'Create_time',
     preview_show: 'Display',
-    preview_item: '条数据',
-    preview_total: '共',
-    pls_input_less_9: '请输入9位以内的正整数',
-    field_edit: '编辑字段',
-    table_already_add_to: '该表已添加至',
+    preview_item: 'items data',
+    preview_total: 'Total',
+    pls_input_less_9: 'Please input integer less 9',
+    field_edit: 'Edit Field',
+    table_already_add_to: 'This table is already add to',
     uploading: 'Uploading...',
     add_union: 'Add Associations',
     union_setting: 'Association Settings',
@@ -755,7 +768,8 @@ export default {
     can_not_union_self: 'The associated table cannot be the same as the associated table',
     float: 'Decimal',
     edit_custom_table: 'Edit self help dataset',
-    edit_field: 'Edit field'
+    edit_field: 'Edit Field',
+    preview_100_data: 'Show 100 lines data'
   },
   datasource: {
     datasource: 'Data Source',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 9cab0b15c5..da2f33b41d 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -645,7 +645,20 @@ export default {
     table_header_bg: '表頭背景',
     table_item_bg: '表格背景',
     table_item_font_color: '字體顏色',
-    stripe: '斑馬紋'
+    stripe: '斑馬紋',
+    start_angle: '起始角度',
+    end_angle: '結束角度',
+    style_priority: '樣式優先級',
+    dashboard: '儀表盤',
+    dimension_color: '維度顏色',
+    quota_color: '指標顏色',
+    dimension_font_size: '維度字體大小',
+    quota_font_size: '指標字體大小',
+    space_split: '維度/指標間隔',
+    only_one_quota: '僅支持1個指標',
+    only_one_result: '僅顯示第1個計算結果',
+    dimension_show: '維度顯示',
+    quota_show: '指標顯示'
   },
   dataset: {
     datalist: '數據集',
@@ -755,7 +768,8 @@ export default {
     can_not_union_self: '被關聯表不能與關聯表相同',
     float: '小數',
     edit_custom_table: '編輯自助數據集',
-    edit_field: '編輯自斷'
+    edit_field: '編輯自斷',
+    preview_100_data: '顯示前100行數據'
   },
   datasource: {
     datasource: '數據源',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 0de9c6c665..44fd07237c 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -768,7 +768,8 @@ export default {
     can_not_union_self: '被关联表不能与关联表相同',
     float: '小数',
     edit_custom_table: '编辑自助数据集',
-    edit_field: '编辑字段'
+    edit_field: '编辑字段',
+    preview_100_data: '显示前100行数据'
   },
   datasource: {
     datasource: '数据源',
diff --git a/frontend/src/layout/components/Topbar.vue b/frontend/src/layout/components/Topbar.vue
index ffe536ed24..3c11c823b6 100644
--- a/frontend/src/layout/components/Topbar.vue
+++ b/frontend/src/layout/components/Topbar.vue
@@ -23,13 +23,13 @@
 
     <div class="right-menu">
       <template>
-<!--        <el-tooltip content="项目文档" effect="dark" placement="bottom">-->
-<!--          <doc class="right-menu-item hover-effect" />-->
-<!--        </el-tooltip>-->
+        <!--        <el-tooltip content="项目文档" effect="dark" placement="bottom">-->
+        <!--          <doc class="right-menu-item hover-effect" />-->
+        <!--        </el-tooltip>-->
 
-<!--        <el-tooltip content="全屏缩放" effect="dark" placement="bottom">-->
-<!--          <screenfull id="screenfull" class="right-menu-item hover-effect" />-->
-<!--        </el-tooltip>-->
+        <!--        <el-tooltip content="全屏缩放" effect="dark" placement="bottom">-->
+        <!--          <screenfull id="screenfull" class="right-menu-item hover-effect" />-->
+        <!--        </el-tooltip>-->
 
         <!-- <el-tooltip :content="$t('navbar.size')" effect="dark" placement="bottom">
           <size-select id="size-select" class="right-menu-item hover-effect" />
@@ -38,8 +38,8 @@
         <lang-select class="right-menu-item hover-effect" />
       </template>
 
-      <el-dropdown class="top-dropdown">
-        <span class="el-dropdown-link">
+      <el-dropdown class="top-dropdown" style="display: flex;align-items: center;">
+        <span class="el-dropdown-link" style="font-size: 13px;">
           {{ name }}<i class="el-icon-arrow-down el-icon--right" />
         </span>
         <el-dropdown-menu slot="dropdown">
@@ -108,7 +108,7 @@ export default {
     AppLink,
     // Screenfull,
     // SizeSelect,
-    LangSelect,
+    LangSelect
     // Doc
   },
   data() {
@@ -270,6 +270,6 @@ export default {
     font-size: 16px;
     color: rgba(255,255,255,.87);
     vertical-align: text-bottom;
-    margin-right: 30px;
+    margin-right: 10px;
   }
 </style>
diff --git a/frontend/src/styles/topbar.scss b/frontend/src/styles/topbar.scss
index 7ec0df9ab1..7667eed2de 100644
--- a/frontend/src/styles/topbar.scss
+++ b/frontend/src/styles/topbar.scss
@@ -49,7 +49,11 @@
 
     .right-menu {
       float: right;
-      height: 100%;
+      height: 56px;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: center;
 
       &:focus {
         outline: none;
diff --git a/frontend/src/views/chart/group/Group.vue b/frontend/src/views/chart/group/Group.vue
index c7e687cee9..937b771a08 100644
--- a/frontend/src/views/chart/group/Group.vue
+++ b/frontend/src/views/chart/group/Group.vue
@@ -10,10 +10,10 @@
       <el-divider />
 
       <el-row>
-        <el-button icon="el-icon-circle-plus" type="primary" size="mini" @click="add('group')">
+        <el-button type="primary" size="mini" @click="add('group')">
           {{ $t('chart.add_group') }}
         </el-button>
-        <el-button icon="el-icon-folder-add" type="primary" size="mini" @click="add('scene')">
+        <el-button type="primary" size="mini" @click="add('scene')">
           {{ $t('chart.add_scene') }}
         </el-button>
       </el-row>
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 2068fc3c35..e57c39578d 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -141,10 +141,12 @@
         <div style="height: 40%;overflow:hidden;border-top: 1px solid #e6e6e6">
           <el-row class="padding-lr">
             <span>{{ $t('chart.style_priority') }}</span>
-            <el-radio-group v-model="view.stylePriority" size="mini" @change="save">
-              <el-radio style="margin-left: 20px" label="view"><span>{{ $t('chart.chart') }}</span></el-radio>
-              <el-radio label="panel"><span>{{ $t('chart.dashboard') }}</span></el-radio>
-            </el-radio-group>
+            <el-row>
+              <el-radio-group v-model="view.stylePriority" size="mini" @change="save">
+                <el-radio label="view"><span>{{ $t('chart.chart') }}</span></el-radio>
+                <el-radio label="panel"><span>{{ $t('chart.dashboard') }}</span></el-radio>
+              </el-radio-group>
+            </el-row>
           </el-row>
           <el-tabs type="card" :stretch="true" class="tab-header">
             <el-tab-pane :label="$t('chart.shape_attr')" class="padding-lr">
diff --git a/frontend/src/views/dataset/group/Group.vue b/frontend/src/views/dataset/group/Group.vue
index 0b0abe78fd..ac87345464 100644
--- a/frontend/src/views/dataset/group/Group.vue
+++ b/frontend/src/views/dataset/group/Group.vue
@@ -10,10 +10,10 @@
       <el-divider />
 
       <el-row>
-        <el-button icon="el-icon-circle-plus" type="primary" size="mini" @click="add('group')">
+        <el-button type="primary" size="mini" @click="add('group')">
           {{ $t('dataset.add_group') }}
         </el-button>
-        <el-button icon="el-icon-folder-add" type="primary" size="mini" @click="add('scene')">
+        <el-button type="primary" size="mini" @click="add('scene')">
           {{ $t('dataset.add_scene') }}
         </el-button>
       </el-row>