From 016654cf740b9c9540b17ffa78da9d1873a8c328 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Tue, 16 Mar 2021 14:48:06 +0800
Subject: [PATCH] =?UTF-8?q?refactor(frontend):=20=E8=A7=86=E5=9B=BE=20?=
 =?UTF-8?q?=E6=8C=87=E6=A0=87=E4=B8=8B=E6=8B=89=E8=8F=9C=E5=8D=95=E6=89=A9?=
 =?UTF-8?q?=E5=B1=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/lang/zh.js                               | 3 ++-
 frontend/src/views/chart/components/DimensionItem.vue | 2 +-
 frontend/src/views/chart/components/QuotaItem.vue     | 8 ++++----
 frontend/src/views/chart/view/ChartEdit.vue           | 2 +-
 frontend/src/views/dataset/add/AddDB.vue              | 6 ++++--
 frontend/src/views/dataset/add/AddSQL.vue             | 6 ++++--
 6 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 13cfc66257..ee800775bc 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -670,7 +670,8 @@ export default {
     input_content: '请输入内容',
     add_sql_table: '添加SQL',
     preview: '预览',
-    pls_input_name: '请输入名称'
+    pls_input_name: '请输入名称',
+    connect_mode: '连接模式'
   },
   datasource: {
     create: '新建数据连接',
diff --git a/frontend/src/views/chart/components/DimensionItem.vue b/frontend/src/views/chart/components/DimensionItem.vue
index e9812f5c10..8eea1a7926 100644
--- a/frontend/src/views/chart/components/DimensionItem.vue
+++ b/frontend/src/views/chart/components/DimensionItem.vue
@@ -1,6 +1,6 @@
 <template>
   <span>
-    <el-dropdown trigger="click" size="small">
+    <el-dropdown trigger="click" size="mini">
       <span class="el-dropdown-link">
         <el-tag size="small" class="item-axis">
           {{ item.name }}<i class="el-icon-arrow-down el-icon--right" />
diff --git a/frontend/src/views/chart/components/QuotaItem.vue b/frontend/src/views/chart/components/QuotaItem.vue
index 0ee7658c4c..1efa6c5ced 100644
--- a/frontend/src/views/chart/components/QuotaItem.vue
+++ b/frontend/src/views/chart/components/QuotaItem.vue
@@ -1,13 +1,13 @@
 <template>
   <span>
-    <el-dropdown trigger="click" size="small" @command="clickItem">
+    <el-dropdown trigger="click" size="mini" @command="clickItem">
       <span class="el-dropdown-link">
         <el-tag size="small" class="item-axis">
           {{ item.name }}<span v-if="item.summary" class="summary-span">{{ $t('chart.'+item.summary) }}</span><i class="el-icon-arrow-down el-icon--right" />
         </el-tag>
         <el-dropdown-menu slot="dropdown">
           <el-dropdown-item icon="el-icon-notebook-2">
-            <el-dropdown placement="right-start" size="small" @command="summary">
+            <el-dropdown placement="right-start" size="mini" @command="summary">
               <span class="el-dropdown-link">
                 {{ $t('chart.summary') }}<span class="summary-span">({{ $t('chart.'+item.summary) }})</span><i class="el-icon-arrow-right el-icon--right" />
               </span>
@@ -22,7 +22,7 @@
             </el-dropdown>
           </el-dropdown-item>
           <el-dropdown-item icon="el-icon-s-grid">
-            <el-dropdown placement="right-start" size="small" @command="quickCalc">
+            <el-dropdown placement="right-start" size="mini" @command="quickCalc">
               <span class="el-dropdown-link">
                 {{ $t('chart.quick_calc') }}<span class="summary-span">(test)</span><i class="el-icon-arrow-right el-icon--right" />
               </span>
@@ -41,7 +41,7 @@
     <el-dialog :title="$t('chart.show_name_set')" :visible="renameItem" :show-close="false" width="30%">
       <el-form ref="itemForm" :model="itemForm" :rules="itemFormRules">
         <el-form-item :label="$t('commons.name')" prop="name">
-          <el-input v-model="itemForm.name" />
+          <el-input v-model="itemForm.name" size="mini"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 519802869b..ba202edd03 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -79,8 +79,8 @@
           <el-row>
             <div class="chart-type">
               <!--TODO 这里要替换好看点的图标-->
+              <el-radio v-model="view.type" label="bar"><i class="el-icon-platform-eleme" style="font-size: 20px"/></el-radio>
               <el-radio v-model="view.type" label="line">折线图</el-radio>
-              <el-radio v-model="view.type" label="bar">柱状图</el-radio>
             </div>
           </el-row>
         </div>
diff --git a/frontend/src/views/dataset/add/AddDB.vue b/frontend/src/views/dataset/add/AddDB.vue
index 99313ac5b0..b19f47353c 100644
--- a/frontend/src/views/dataset/add/AddDB.vue
+++ b/frontend/src/views/dataset/add/AddDB.vue
@@ -28,8 +28,10 @@
             </el-select>
           </el-form-item>
           <el-form-item class="form-item">
-            <el-radio v-model="mode" label="0">{{ $t('dataset.direct_connect') }}</el-radio>
-            <el-radio v-model="mode" label="1">{{ $t('dataset.sync_data') }}</el-radio>
+            <el-select v-model="mode" filterable :placeholder="$t('dataset.connect_mode')" size="mini">
+              <el-option :label="$t('dataset.direct_connect')" value="0" />
+              <el-option :label="$t('dataset.sync_data')" value="1" />
+            </el-select>
           </el-form-item>
           <el-form-item class="form-item" style="float: right;">
             <el-input
diff --git a/frontend/src/views/dataset/add/AddSQL.vue b/frontend/src/views/dataset/add/AddSQL.vue
index c2d087b12b..d2001b884b 100644
--- a/frontend/src/views/dataset/add/AddSQL.vue
+++ b/frontend/src/views/dataset/add/AddSQL.vue
@@ -31,8 +31,10 @@
             <el-input v-model="name" size="mini" :placeholder="$t('commons.name')" />
           </el-form-item>
           <el-form-item class="form-item">
-            <el-radio v-model="mode" label="0">{{ $t('dataset.direct_connect') }}</el-radio>
-            <el-radio v-model="mode" label="1">{{ $t('dataset.sync_data') }}</el-radio>
+            <el-select v-model="mode" filterable :placeholder="$t('dataset.connect_mode')" size="mini">
+              <el-option :label="$t('dataset.direct_connect')" value="0" />
+              <el-option :label="$t('dataset.sync_data')" value="1" />
+            </el-select>
           </el-form-item>
         </el-form>
       </el-row>