From d16cd853ca6bb38e9755e1b27a5c2f5ca734032d Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 8 Mar 2021 12:29:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:eslint=E6=A0=BC=E5=BC=8F=20scss=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/business/complex-table/index.vue    |  4 ++++
 frontend/src/icons/svg/doc.svg                         |  2 +-
 frontend/src/layout/components/Topbar.vue              |  2 +-
 frontend/src/styles/topbar.scss                        |  5 +++--
 frontend/src/styles/variables.scss                     |  2 +-
 frontend/src/views/dataset/add/AddSQL.vue              |  4 ++--
 frontend/src/views/dataset/data/UpdateInfo.vue         | 10 +++++-----
 frontend/src/views/dataset/index.vue                   |  4 ++--
 8 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/frontend/src/components/business/complex-table/index.vue b/frontend/src/components/business/complex-table/index.vue
index 864f584e5c..fe330ee3a0 100644
--- a/frontend/src/components/business/complex-table/index.vue
+++ b/frontend/src/components/business/complex-table/index.vue
@@ -41,9 +41,13 @@ export default {
       type: Array,
       default: () => []
     },
+    // eslint-disable-next-line vue/require-default-prop
     localKey: String, // 如果需要记住选择的列，则这里添加一个唯一的Key
+    // eslint-disable-next-line vue/require-default-prop
     header: String,
+    // eslint-disable-next-line vue/require-default-prop
     searchConfig: Object,
+    // eslint-disable-next-line vue/require-default-prop
     paginationConfig: Object
   },
   data() {
diff --git a/frontend/src/icons/svg/doc.svg b/frontend/src/icons/svg/doc.svg
index 9160de8c90..c34965c48a 100644
--- a/frontend/src/icons/svg/doc.svg
+++ b/frontend/src/icons/svg/doc.svg
@@ -1 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1583752001956" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9290" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M891.8 320H608V39.2L891.8 320zM704 384v260c0 133.6-73 200.2-226.6 200.2H288V169.6h189.4c24 0 46.2 1.6 66.2 5v-168C521.8 2.2 498.8 0 474.4 0H96v1024h378.4C755.4 1024 896 894.8 896 636.2V384h-192z" fill="#707070" p-id="9291"></path></svg>
\ No newline at end of file
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1583752001956" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9290" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M891.8 320H608V39.2L891.8 320zM704 384v260c0 133.6-73 200.2-226.6 200.2H288V169.6h189.4c24 0 46.2 1.6 66.2 5v-168C521.8 2.2 498.8 0 474.4 0H96v1024h378.4C755.4 1024 896 894.8 896 636.2V384h-192z" p-id="9291"></path></svg>
\ No newline at end of file
diff --git a/frontend/src/layout/components/Topbar.vue b/frontend/src/layout/components/Topbar.vue
index 58923623a4..d04c1d6e32 100644
--- a/frontend/src/layout/components/Topbar.vue
+++ b/frontend/src/layout/components/Topbar.vue
@@ -21,7 +21,7 @@
     <div class="right-menu">
       <template>
         <el-tooltip content="项目文档" effect="dark" placement="bottom">
-          <Doc class="right-menu-item hover-effect" />
+          <doc class="right-menu-item hover-effect" />
         </el-tooltip>
 
         <el-tooltip content="全屏缩放" effect="dark" placement="bottom">
diff --git a/frontend/src/styles/topbar.scss b/frontend/src/styles/topbar.scss
index 3f9c3568e9..c15cbd00e6 100644
--- a/frontend/src/styles/topbar.scss
+++ b/frontend/src/styles/topbar.scss
@@ -59,7 +59,8 @@
         padding: 10px 8px;
         height: 100%;
         font-size: 18px;
-        color: #5a5e66;
+        // color: #5a5e66;
+        color: $menuText;
         vertical-align: text-bottom;
 
         &.hover-effect {
@@ -67,7 +68,7 @@
           transition: background .3s;
 
           &:hover {
-            background: rgba(0, 0, 0, .025)
+            background-color: rgba(0, 0, 0, .025)
           }
         }
       }
diff --git a/frontend/src/styles/variables.scss b/frontend/src/styles/variables.scss
index e884d2bd6e..6ab717a6bc 100644
--- a/frontend/src/styles/variables.scss
+++ b/frontend/src/styles/variables.scss
@@ -26,7 +26,7 @@ $--font-path: "~element-ui/lib/theme-chalk/fonts";
 @import "~fit2cloud-ui/src/styles/common/variables";
 
 // sidebar
-$menuText:#bfcbd9;
+$menuText:rgba(255,255,255,0.87);
 $menuActiveText:#409EFF;
 $topMenuActiveText:#f4f4f5;
 $subMenuActiveText:#f4f4f5; //https://github.com/ElemeFE/element/issues/12951
diff --git a/frontend/src/views/dataset/add/AddSQL.vue b/frontend/src/views/dataset/add/AddSQL.vue
index 4f44cbe0d7..4d716fd4a4 100644
--- a/frontend/src/views/dataset/add/AddSQL.vue
+++ b/frontend/src/views/dataset/add/AddSQL.vue
@@ -14,7 +14,7 @@
           </el-button>
         </el-row>
       </el-row>
-      <el-divider/>
+      <el-divider />
       <el-row>
         <el-form :inline="true">
           <el-form-item class="form-item">
@@ -47,10 +47,10 @@ export default {
       options: []
     }
   },
+  watch: {},
   mounted() {
     this.initDataSource()
   },
-  watch: {},
   methods: {
     initDataSource() {
       listDatasource().then(response => {
diff --git a/frontend/src/views/dataset/data/UpdateInfo.vue b/frontend/src/views/dataset/data/UpdateInfo.vue
index 931b57336e..c99205089b 100644
--- a/frontend/src/views/dataset/data/UpdateInfo.vue
+++ b/frontend/src/views/dataset/data/UpdateInfo.vue
@@ -31,14 +31,14 @@
       </el-table>
       <el-row style="margin-top: 10px;text-align: right;">
         <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
           :current-page="currentPage"
           :page-sizes="[100, 200, 300, 400]"
           :page-size="100"
           layout="total, sizes, prev, pager, next, jumper"
-          :total="1000">
-        </el-pagination>
+          :total="1000"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        />
       </el-row>
     </el-row>
 
@@ -101,7 +101,7 @@
               </el-select>
             </el-form-item>
             <el-form-item v-if="taskForm.rate === '1'" label="">
-              <el-input v-model="taskForm.cron" size="mini" style="width: 50%"/>
+              <el-input v-model="taskForm.cron" size="mini" style="width: 50%" />
             </el-form-item>
             <el-form-item :label="$t('dataset.end_time')" prop="end">
               <el-select v-model="taskForm.end" size="mini" :disabled="taskForm.rate === '0'">
diff --git a/frontend/src/views/dataset/index.vue b/frontend/src/views/dataset/index.vue
index 38a2a24e95..bb0ea6df94 100644
--- a/frontend/src/views/dataset/index.vue
+++ b/frontend/src/views/dataset/index.vue
@@ -2,12 +2,12 @@
   <ms-container v-loading="$store.getters.loadingMap[$store.getters.currentPath]">
 
     <ms-aside-container>
-      <group @switchComponent="switchComponent"/>
+      <group @switchComponent="switchComponent" />
     </ms-aside-container>
 
     <ms-main-container>
       <!--<router-view/>-->
-      <component :is="component" :param="param" @switchComponent="switchComponent"/>
+      <component :is="component" :param="param" @switchComponent="switchComponent" />
     </ms-main-container>
   </ms-container>
 </template>