From e6beaed195cf84b7bc2d1abca13f035fdd2a9cfc Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 30 Jul 2021 11:39:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?refactor:=E4=BB=AA=E8=A1=A8=E6=9D=BF?=
 =?UTF-8?q?=E8=87=AA=E9=80=82=E5=BA=94=E6=A8=A1=E5=BC=8F=E4=B8=8B=EF=BC=8C?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=BB=9A=E5=8A=A8=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/canvas/components/Editor/Preview.vue | 1 +
 frontend/src/views/panel/edit/index.vue                      | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue
index 70cdab8bc6..5b8fcbd1c9 100644
--- a/frontend/src/components/canvas/components/Editor/Preview.vue
+++ b/frontend/src/components/canvas/components/Editor/Preview.vue
@@ -215,6 +215,7 @@ export default {
     min-height: 300px;
     width: 100%;
     height: 100%;
+    overflow-x: hidden;
     /*border: 1px solid #E6E6E6;*/
     background-size: 100% 100% !important;
     .canvas-container {
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 2e86229107..ca6848ee07 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -96,6 +96,7 @@
 
         <div
           id="canvasInfo"
+          :class="{'style-hidden':canvasStyleData.selfAdaption}"
           class="content this_canvas"
           :class="{'border-hidden':canvasStyleData.selfAdaption}"
           @drop="handleDrop"
@@ -826,6 +827,9 @@ export default {
     padding: 1px 15px !important;
   }
 }
+  .style-hidden{
+    overflow: hidden;
+  }
 
 .border-hidden {
   overflow: hidden;

From 6cc9cc14e421574c8550b6b3ab0da35beb6d2974 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Fri, 30 Jul 2021 11:54:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=E8=A7=86=E5=9B=BE=E6=9B=B4?=
 =?UTF-8?q?=E6=8D=A2=E6=95=B0=E6=8D=AE=E9=9B=86=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/view/ChartEdit.vue     | 10 ++++++----
 frontend/src/views/chart/view/TableSelector.vue |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 208d59c7a6..b657d2fc5c 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -1245,10 +1245,12 @@ export default {
     },
 
     changeChart() {
-      this.view.tableId = this.changeTable.id
-      this.view.xaxis = []
-      this.view.yaxis = []
-      this.view.customFilter = []
+      if (this.view.tableId !== this.changeTable.id) {
+        this.view.tableId = this.changeTable.id
+        this.view.xaxis = []
+        this.view.yaxis = []
+        this.view.customFilter = []
+      }
       this.save(true, 'chart', false)
     },
 
diff --git a/frontend/src/views/chart/view/TableSelector.vue b/frontend/src/views/chart/view/TableSelector.vue
index 53ac2d5629..0741875729 100644
--- a/frontend/src/views/chart/view/TableSelector.vue
+++ b/frontend/src/views/chart/view/TableSelector.vue
@@ -1,7 +1,7 @@
 <template>
   <de-container>
     <de-aside-container>
-      <dataset-group-selector-tree @getTable="getTable" :privileges=privileges :mode=mode :type=type :customType=customType :showMode=showMode />
+      <dataset-group-selector-tree :privileges="privileges" :mode="mode" :type="type" :custom-type="customType" :show-mode="showMode" @getTable="getTable" />
     </de-aside-container>
     <de-main-container>
       <dataset-table-data :table="table" />