From d4daade0d30ea9ccf220f731f2a5696f612cb427 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Thu, 27 May 2021 12:04:11 +0800
Subject: [PATCH] =?UTF-8?q?feat(frontend):1.=E6=93=8D=E4=BD=9Cbutton?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9=EF=BC=9B2.=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=BA=90=E6=96=87=E5=AD=97fix=EF=BC=9B3.=E4=BB=AA?=
 =?UTF-8?q?=E8=A1=A8=E7=9B=98=E6=A0=B7=E5=BC=8Ffix=EF=BC=8C=E5=85=88?=
 =?UTF-8?q?=E7=9C=8B=E7=9C=8B=EF=BC=8C=E5=86=8D=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/lang/tw.js                         |  2 +-
 frontend/src/lang/zh.js                         | 10 +++++-----
 frontend/src/styles/index.scss                  |  5 +++--
 frontend/src/views/panel/list/PanelList.vue     |  6 ++++--
 frontend/src/views/panel/list/PanelMain.vue     | 16 +++++++++++++++-
 frontend/src/views/panel/list/PanelViewShow.vue |  2 +-
 frontend/src/views/system/datasource/index.vue  |  2 +-
 frontend/src/views/system/dept/index.vue        |  2 +-
 frontend/src/views/system/menu/index.vue        |  2 +-
 frontend/src/views/system/role/index.vue        |  2 +-
 frontend/src/views/system/user/index.vue        |  4 ++--
 11 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 321ce72041..f4217c1f0c 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -704,7 +704,7 @@ export default {
     custom_data: '自助數據集',
     pls_slc_tbl_left: '請從左側選擇表',
     add_db_table: '添加數據庫表',
-    pls_slc_data_source: '選擇數據源鏈接',
+    pls_slc_data_source: '請選擇數據源',
     table: '表',
     edit: '編輯',
     create_view: '創建視圖',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index ec31d7d3e9..03bb4f8c7b 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -277,7 +277,7 @@ export default {
       select_module: '选择模块',
       default_module: '默认模块'
     },
-    datasource: '数据连接',
+    datasource: '数据源',
     char_can_not_more_50: '名称不能超过50字符',
     share_success: '分享成功'
   },
@@ -531,7 +531,7 @@ export default {
     custom_data: '自助数据集',
     pls_slc_tbl_left: '请从左侧选视图',
     add_db_table: '添加数据库表',
-    pls_slc_data_source: '请选择数据库连接',
+    pls_slc_data_source: '请选择数据源',
     table: '表',
     edit: '编辑',
     create_view: '创建试图',
@@ -705,7 +705,7 @@ export default {
     custom_data: '自助数据集',
     pls_slc_tbl_left: '请从左侧选择表',
     add_db_table: '添加数据库表',
-    pls_slc_data_source: '请选择数据库连接',
+    pls_slc_data_source: '请选择数据源',
     table: '表',
     edit: '编辑',
     create_view: '创建视图',
@@ -795,7 +795,7 @@ export default {
   },
   datasource: {
     datasource: '数据源',
-    create: '新建数据连接',
+    create: '新建数据源',
     type: '类型',
     please_choose_type: '请选择数据源类型',
     data_base: '数据库名称',
@@ -808,7 +808,7 @@ export default {
     please_input_password: '请输入密码',
     please_input_host: '请输入主机',
     please_input_port: '请输入端口',
-    modify: '编辑数据连接',
+    modify: '编辑数据源',
     validate_success: '校验成功',
     validate: '校验',
     search_by_name: '根据名称搜索',
diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss
index c7cae09c04..41d843c9bc 100644
--- a/frontend/src/styles/index.scss
+++ b/frontend/src/styles/index.scss
@@ -205,8 +205,9 @@ div:focus {
   color: #37b4aa;
 }
 .ds-icon-scene{
-  width: 14px;
-  height: 14px;
+  width: 13px;
+  height: 13px;
+  margin-right: 5px;
   color: #0a7be0;
 }
 .ds-icon-db{
diff --git a/frontend/src/views/panel/list/PanelList.vue b/frontend/src/views/panel/list/PanelList.vue
index f628a2793c..6b61ff9d27 100644
--- a/frontend/src/views/panel/list/PanelList.vue
+++ b/frontend/src/views/panel/list/PanelList.vue
@@ -85,10 +85,12 @@
                     </span>
                     <el-dropdown-menu slot="dropdown">
                       <el-dropdown-item :command="beforeClickEdit('folder','new',data,node)">
-                        <i class="el-icon-folder" /> &nbsp; <span>{{ $t('panel.groupAdd') }}</span>
+                        <i class="el-icon-folder" />
+                        <span>{{ $t('panel.groupAdd') }}</span>
                       </el-dropdown-item>
                       <el-dropdown-item :command="beforeClickEdit('panel','new',data,node)">
-                        <svg-icon icon-class="panel" class="ds-icon-scene" /> &nbsp; <span>{{ $t('panel.panelAdd') }}</span>
+                        <svg-icon icon-class="panel" class="ds-icon-scene" />
+                        <span>{{ $t('panel.panelAdd') }}</span>
                       </el-dropdown-item>
                     </el-dropdown-menu>
                   </el-dropdown>
diff --git a/frontend/src/views/panel/list/PanelMain.vue b/frontend/src/views/panel/list/PanelMain.vue
index 185287882e..46bf670826 100644
--- a/frontend/src/views/panel/list/PanelMain.vue
+++ b/frontend/src/views/panel/list/PanelMain.vue
@@ -1,7 +1,7 @@
 <template>
   <de-container>
     <de-aside-container>
-      <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tabs v-model="activeName" class="tab-header" @tab-click="handleClick" type="card" :stretch="true">
         <el-tab-pane name="PanelList">
           <span slot="label"><i class="el-icon-document" />{{ $t('panel.panel_list') }}</span>
           <panel-list />
@@ -83,4 +83,18 @@ export default {
     padding: 0px;
   }
 
+  .tab-header>>>.el-tabs__item{
+    font-size: 13px;
+    background-color: #E8EAED;
+    padding: 0 15px;
+  }
+
+  .tab-header>>>.is-active{
+    background-color: #ffffff;
+    border-bottom-color: #ffffff!important;
+  }
+  .tab-header>>>.el-tabs__nav-scroll{
+    padding-left: 0!important;
+  }
+
 </style>
diff --git a/frontend/src/views/panel/list/PanelViewShow.vue b/frontend/src/views/panel/list/PanelViewShow.vue
index 97470bc007..b1360921a3 100644
--- a/frontend/src/views/panel/list/PanelViewShow.vue
+++ b/frontend/src/views/panel/list/PanelViewShow.vue
@@ -3,7 +3,7 @@
     <el-col v-if="panelInfo.name.length>0" class="panel-design">
       <el-row class="panel-design-head">
         <!--TODO 仪表盘头部区域-->
-        <el-col :span="12" style="text-overflow:ellipsis;overflow: hidden;white-space: nowrap;color: #606266;font-size: 16px">
+        <el-col :span="12" style="text-overflow:ellipsis;overflow: hidden;white-space: nowrap;font-size: 14px">
           <span>{{ panelInfo.name || '测试仪表板' }}</span>
         </el-col>
         <el-col :span="12">
diff --git a/frontend/src/views/system/datasource/index.vue b/frontend/src/views/system/datasource/index.vue
index 404d3b8a5e..a756d12b1a 100644
--- a/frontend/src/views/system/datasource/index.vue
+++ b/frontend/src/views/system/datasource/index.vue
@@ -123,7 +123,7 @@ export default {
       columns: [],
       buttons: [
         {
-          label: this.$t('commons.edit'), icon: 'el-icon-edit', click: this.edit,
+          label: this.$t('commons.edit'), icon: 'el-icon-edit', type: 'primary', click: this.edit,
           show: checkPermission(['datasource:edit'])
         }, {
           label: this.$t('commons.delete'), icon: 'el-icon-delete', type: 'danger', click: this._handleDelete,
diff --git a/frontend/src/views/system/dept/index.vue b/frontend/src/views/system/dept/index.vue
index cf93cdd55f..73fe8cb947 100644
--- a/frontend/src/views/system/dept/index.vue
+++ b/frontend/src/views/system/dept/index.vue
@@ -140,7 +140,7 @@ export default {
       columns: [],
       buttons: [
         {
-          label: this.$t('commons.edit'), icon: 'el-icon-edit', click: this.edit,
+          label: this.$t('commons.edit'), icon: 'el-icon-edit', type: 'primary', click: this.edit,
           show: checkPermission(['dept:edit'])
         }, {
           label: this.$t('commons.delete'), icon: 'el-icon-delete', type: 'danger', click: this._handleDelete,
diff --git a/frontend/src/views/system/menu/index.vue b/frontend/src/views/system/menu/index.vue
index a6d70eb0b2..97a92a271a 100644
--- a/frontend/src/views/system/menu/index.vue
+++ b/frontend/src/views/system/menu/index.vue
@@ -159,7 +159,7 @@ export default {
       columns: [],
       buttons: [
         {
-          label: this.$t('commons.edit'), icon: 'el-icon-edit', click: this.edit,
+          label: this.$t('commons.edit'), icon: 'el-icon-edit', type: 'primary', click: this.edit,
           show: checkPermission(['menu:edit'])
         }, {
           label: this.$t('commons.delete'), icon: 'el-icon-delete', type: 'danger', click: this._handleDelete,
diff --git a/frontend/src/views/system/role/index.vue b/frontend/src/views/system/role/index.vue
index 8a973cc5ae..a4c7d7c521 100644
--- a/frontend/src/views/system/role/index.vue
+++ b/frontend/src/views/system/role/index.vue
@@ -118,7 +118,7 @@ export default {
       columns: [],
       buttons: [
         {
-          label: this.$t('commons.edit'), icon: 'el-icon-edit', click: this.edit
+          label: this.$t('commons.edit'), icon: 'el-icon-edit', type: 'primary', click: this.edit
         }, {
           label: this.$t('commons.delete'), icon: 'el-icon-delete', type: 'danger', click: this.handleDelete
         }
diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/system/user/index.vue
index b9cf9605d1..6b5b9204d6 100644
--- a/frontend/src/views/system/user/index.vue
+++ b/frontend/src/views/system/user/index.vue
@@ -164,13 +164,13 @@ export default {
       columns: [],
       buttons: [
         {
-          label: this.$t('commons.edit'), icon: 'el-icon-edit', click: this.edit,
+          label: this.$t('commons.edit'), icon: 'el-icon-edit', type: 'primary', click: this.edit,
           show: checkPermission(['user:edit'])
         }, {
           label: this.$t('commons.delete'), icon: 'el-icon-delete', type: 'danger', click: this.del,
           show: checkPermission(['user:del'])
         }, {
-          label: this.$t('member.edit_password'), icon: 'el-icon-s-tools', type: 'danger', click: this.editPassword,
+          label: this.$t('member.edit_password'), icon: 'el-icon-s-tools', type: 'success', click: this.editPassword,
           show: checkPermission(['user:editPwd'])
         }
       ],