From 8dc219bbf49aa6568030f4806813f78904559c8e Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Tue, 25 May 2021 17:28:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat(frontend):=E7=B3=BB=E7=BB=9F=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=B7=A6=E4=BE=A7=E8=8F=9C=E5=8D=95=E4=B8=8D=E6=94=B6?=
 =?UTF-8?q?=E7=BC=A9=EF=BC=8C=E6=98=BE=E7=A4=BA=E8=B7=9Ftopbar=E7=9A=84?=
 =?UTF-8?q?=E5=88=86=E5=89=B2=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/layout/components/Sidebar/index.vue | 2 +-
 frontend/src/layout/components/Topbar.vue        | 4 ++--
 frontend/src/layout/index.vue                    | 4 ++--
 frontend/src/styles/sidebar.scss                 | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/frontend/src/layout/components/Sidebar/index.vue b/frontend/src/layout/components/Sidebar/index.vue
index c057faf0dd..d937418561 100644
--- a/frontend/src/layout/components/Sidebar/index.vue
+++ b/frontend/src/layout/components/Sidebar/index.vue
@@ -50,7 +50,7 @@ export default {
       return variables
     },
     isCollapse() {
-      return !this.sidebar.opened
+      return false
     }
   }
 }
diff --git a/frontend/src/layout/components/Topbar.vue b/frontend/src/layout/components/Topbar.vue
index 80d6bba935..0f73ef356d 100644
--- a/frontend/src/layout/components/Topbar.vue
+++ b/frontend/src/layout/components/Topbar.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="top-nav" :style="{'background-color': '#f1f3f8'}">
     <div class="log">
-      <img v-if="!logoUrl" src="@/assets/DataEase-color.png" width="160" alt="" style="padding-top: 8px;">
-      <img v-else :src="logoUrl" width="160" alt="" style="padding-top: 8px;">
+      <img v-if="!logoUrl" src="@/assets/DataEase-color.png" width="140" alt="" style="padding-top: 10px;">
+      <img v-else :src="logoUrl" width="140" alt="" style="padding-top: 10px;">
     </div>
     <el-menu
       :active-text-color="variables.topMenuActiveText"
diff --git a/frontend/src/layout/index.vue b/frontend/src/layout/index.vue
index 594e075b83..ce02660731 100644
--- a/frontend/src/layout/index.vue
+++ b/frontend/src/layout/index.vue
@@ -48,7 +48,7 @@ export default {
     },
     classObj() {
       return {
-        hideSidebar: !this.sidebar.opened,
+        // hideSidebar: !this.sidebar.opened,
         openSidebar: this.sidebar.opened,
         withoutAnimation: this.sidebar.withoutAnimation,
         mobile: this.device === 'mobile'
@@ -98,7 +98,7 @@ export default {
   }
 
   .hideSidebar .fixed-header {
-    width: calc(100% - 54px)
+    width: calc(100% - 56px)
   }
 
   .mobile .fixed-header {
diff --git a/frontend/src/styles/sidebar.scss b/frontend/src/styles/sidebar.scss
index 08442bb8d6..73ee3e42b4 100644
--- a/frontend/src/styles/sidebar.scss
+++ b/frontend/src/styles/sidebar.scss
@@ -23,7 +23,7 @@
     top: $topBarHeight;
     bottom: 0;
     left: 0;
-    z-index: 1001;
+    z-index: 999;
     overflow: hidden;
     border-right: 1px solid rgba(0, 0, 0, 0.12);
 
@@ -68,7 +68,7 @@
       border: none;
       height: 100%;
       width: 100% !important;
-      
+
       .is-active {
         background-color: $menuHover;
       }

From 5ffe5d98eb597e630e1cb5497f867bc830a77234 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Tue, 25 May 2021 17:41:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat(frontend):=E6=95=B0=E6=8D=AE=E9=9B=86f?=
 =?UTF-8?q?ix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/dataset/data/ViewTable.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/frontend/src/views/dataset/data/ViewTable.vue b/frontend/src/views/dataset/data/ViewTable.vue
index 9244ff36a1..1e428ac84c 100644
--- a/frontend/src/views/dataset/data/ViewTable.vue
+++ b/frontend/src/views/dataset/data/ViewTable.vue
@@ -108,6 +108,14 @@ export default {
           this.fields = response.data.fields
           this.data = response.data.data
           this.page = response.data.page
+        }).catch(response => {
+          this.fields = []
+          this.data = []
+          this.page = {
+            page: 1,
+            pageSize: 100,
+            show: 0
+          }
         })
       }
     },