From fa4fdd12b5f69b5f5f0ca48e83ceb0a42e8b2d52 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Mon, 12 Apr 2021 17:43:51 +0800
Subject: [PATCH] feat(frontend):UI fix

---
 .../icons/svg/{custom.svg => ds-custom.svg}   |  0
 frontend/src/icons/svg/{db.svg => ds-db.svg}  |  0
 .../src/icons/svg/{excel.svg => ds-excel.svg} |  0
 .../src/icons/svg/{sql.svg => ds-sql.svg}     |  0
 frontend/src/views/dataset/group/Group.vue    | 35 +++++++++++++++----
 5 files changed, 29 insertions(+), 6 deletions(-)
 rename frontend/src/icons/svg/{custom.svg => ds-custom.svg} (100%)
 rename frontend/src/icons/svg/{db.svg => ds-db.svg} (100%)
 rename frontend/src/icons/svg/{excel.svg => ds-excel.svg} (100%)
 rename frontend/src/icons/svg/{sql.svg => ds-sql.svg} (100%)

diff --git a/frontend/src/icons/svg/custom.svg b/frontend/src/icons/svg/ds-custom.svg
similarity index 100%
rename from frontend/src/icons/svg/custom.svg
rename to frontend/src/icons/svg/ds-custom.svg
diff --git a/frontend/src/icons/svg/db.svg b/frontend/src/icons/svg/ds-db.svg
similarity index 100%
rename from frontend/src/icons/svg/db.svg
rename to frontend/src/icons/svg/ds-db.svg
diff --git a/frontend/src/icons/svg/excel.svg b/frontend/src/icons/svg/ds-excel.svg
similarity index 100%
rename from frontend/src/icons/svg/excel.svg
rename to frontend/src/icons/svg/ds-excel.svg
diff --git a/frontend/src/icons/svg/sql.svg b/frontend/src/icons/svg/ds-sql.svg
similarity index 100%
rename from frontend/src/icons/svg/sql.svg
rename to frontend/src/icons/svg/ds-sql.svg
diff --git a/frontend/src/views/dataset/group/Group.vue b/frontend/src/views/dataset/group/Group.vue
index ddbe8133fe..08e83496fc 100644
--- a/frontend/src/views/dataset/group/Group.vue
+++ b/frontend/src/views/dataset/group/Group.vue
@@ -132,19 +132,19 @@
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item :command="beforeClickAddData('db')">
-              <svg-icon icon-class="db" class="icon" />
+              <svg-icon icon-class="ds-db" class="ds-icon-db" />
               {{ $t('dataset.db_data') }}
             </el-dropdown-item>
             <el-dropdown-item :command="beforeClickAddData('sql')">
-              <svg-icon icon-class="sql" class="icon" />
+              <svg-icon icon-class="ds-sql" class="ds-icon-sql" />
               {{ $t('dataset.sql_data') }}
             </el-dropdown-item>
             <el-dropdown-item :command="beforeClickAddData('excel')">
-              <svg-icon icon-class="excel" class="icon" />
+              <svg-icon icon-class="ds-excel" class="ds-icon-excel" />
               {{ $t('dataset.excel_data') }}
             </el-dropdown-item>
             <el-dropdown-item :command="beforeClickAddData('custom')">
-              <svg-icon icon-class="custom" class="icon" />
+              <svg-icon icon-class="ds-custom" class="ds-icon-custom" />
               {{ $t('dataset.custom_data') }}
             </el-dropdown-item>
           </el-dropdown-menu>
@@ -180,7 +180,10 @@
         <span slot-scope="{ node, data }" class="custom-tree-node-list">
           <span>
             <span>
-              <svg-icon :icon-class="data.type" class="icon" />
+              <svg-icon v-if="data.type === 'db'" icon-class="ds-db" class="ds-icon-db" />
+              <svg-icon v-if="data.type === 'sql'" icon-class="ds-sql" class="ds-icon-sql" />
+              <svg-icon v-if="data.type === 'excel'" icon-class="ds-excel" class="ds-icon-excel" />
+              <svg-icon v-if="data.type === 'custom'" icon-class="ds-custom" class="ds-icon-custom" />
             </span>
             <span>
               <span v-if="data.mode === 0" style="margin-left: 6px"><i class="el-icon-s-operation" /></span>
@@ -582,9 +585,29 @@ export default {
 </script>
 
 <style scoped>
-  .icon{
+  .ds-icon-db{
     width: 14px;
     height: 14px;
+    color: #3685f2;
+    margin: 0 2px 0 0;
+  }
+  .ds-icon-sql{
+    width: 14px;
+    height: 14px;
+    color: #faaa39;
+    margin: 0 2px 0 0;
+  }
+  .ds-icon-excel{
+    width: 14px;
+    height: 14px;
+    color: #13cd66;
+    margin: 0 2px 0 0;
+  }
+  .ds-icon-custom{
+    width: 14px;
+    height: 14px;
+    color: #23beef;
+    margin: 0 2px 0 0;
   }
 
   .el-divider--horizontal {