From 3482006d5ecb13e27905cfc643796a65f0843c20 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Tue, 5 Mar 2024 18:37:37 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E4=BB=AA?=
 =?UTF-8?q?=E8=A1=A8=E6=9D=BF=E5=A4=8D=E7=94=A8=E7=BC=A9=E6=94=BE=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/dataease/DeAsideContainer.vue         | 9 ++++++++-
 core/frontend/src/views/chart/index.vue                  | 2 +-
 core/frontend/src/views/chart/view/TableSelector.vue     | 2 +-
 core/frontend/src/views/dataset/data/AuthConfig.vue      | 2 +-
 core/frontend/src/views/panel/edit/index.vue             | 2 +-
 core/frontend/src/views/panel/filter/FilterDialog.vue    | 1 +
 .../frontend/src/views/panel/viewSelect/Multiplexing.vue | 1 +
 .../src/views/system/sysParam/MapSetting/Geometry.vue    | 1 +
 8 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/core/frontend/src/components/dataease/DeAsideContainer.vue b/core/frontend/src/components/dataease/DeAsideContainer.vue
index 41e591cfc5..9077691123 100644
--- a/core/frontend/src/components/dataease/DeAsideContainer.vue
+++ b/core/frontend/src/components/dataease/DeAsideContainer.vue
@@ -7,7 +7,7 @@
     :class="{ retract: !sideTreeStatus }"
     :style="{'margin-left': !asideHidden ? 0 : '-' + currentWidth}"
   >
-    <DeArrowSide @changeSideTreeStatus="changeSideTreeStatus" :style="{ left: (sideTreeStatus ? parseInt(currentWidth) - 12 : 0) + 'px' }" :isInside="!sideTreeStatus"></DeArrowSide>
+    <DeArrowSide v-if="!close" @changeSideTreeStatus="changeSideTreeStatus" :style="sideStyle" :isInside="!sideTreeStatus"></DeArrowSide>
     <keep-alive>
       <slot v-if="sideTreeStatus"/>
     </keep-alive>
@@ -30,6 +30,10 @@ export default {
       type: String,
       default: '260px'
     },
+    close: {
+      type: Boolean,
+      default: false
+    },
     isCollapseWidth: {
       type: String,
       default: ''
@@ -62,6 +66,9 @@ export default {
     isSystem() {
       // 系统管理不需要拖拽菜单
       return this.isTemplate || (!this.$route.fullPath.includes('system') && this.showDragBar)
+    },
+    sideStyle () {
+      return this.sideTreeStatus ? { right: '-12px' } : { left: 0 }
     }
   },
   mounted() {
diff --git a/core/frontend/src/views/chart/index.vue b/core/frontend/src/views/chart/index.vue
index ec3059a4c2..322c72adeb 100644
--- a/core/frontend/src/views/chart/index.vue
+++ b/core/frontend/src/views/chart/index.vue
@@ -1,7 +1,7 @@
 <template>
   <de-container v-loading="$store.getters.loadingMap[$store.getters.currentPath]">
 
-    <de-aside-container>
+    <de-aside-container close>
       <group
         ref="group"
         :save-status="saveStatus"
diff --git a/core/frontend/src/views/chart/view/TableSelector.vue b/core/frontend/src/views/chart/view/TableSelector.vue
index c2209d05ba..fc11618b55 100644
--- a/core/frontend/src/views/chart/view/TableSelector.vue
+++ b/core/frontend/src/views/chart/view/TableSelector.vue
@@ -1,6 +1,6 @@
 <template>
   <de-container>
-    <de-aside-container>
+    <de-aside-container close>
       <dataset-group-selector-tree
         :checked-table="checkedTable"
         :privileges="privileges"
diff --git a/core/frontend/src/views/dataset/data/AuthConfig.vue b/core/frontend/src/views/dataset/data/AuthConfig.vue
index bb6157aff2..2d711bbeea 100644
--- a/core/frontend/src/views/dataset/data/AuthConfig.vue
+++ b/core/frontend/src/views/dataset/data/AuthConfig.vue
@@ -1,6 +1,6 @@
 <template>
   <de-container style="height: auto">
-    <de-aside-container style="height: auto">
+    <de-aside-container close style="height: auto">
       <el-button
         v-show="!showTargetSearchInput"
         class="de-icon"
diff --git a/core/frontend/src/views/panel/edit/index.vue b/core/frontend/src/views/panel/edit/index.vue
index cb0a2f3624..6075cd6850 100644
--- a/core/frontend/src/views/panel/edit/index.vue
+++ b/core/frontend/src/views/panel/edit/index.vue
@@ -15,7 +15,7 @@
       </el-col>
     </el-header>
     <de-container>
-      <de-aside-container class="ms-aside-container">
+      <de-aside-container close class="ms-aside-container">
         <div
           v-show="showAside"
           style="width: 60px; left: 0px; top: 0px; bottom: 0px;  position: absolute"
diff --git a/core/frontend/src/views/panel/filter/FilterDialog.vue b/core/frontend/src/views/panel/filter/FilterDialog.vue
index d1189bfc58..3b2f398fcb 100644
--- a/core/frontend/src/views/panel/filter/FilterDialog.vue
+++ b/core/frontend/src/views/panel/filter/FilterDialog.vue
@@ -6,6 +6,7 @@
   >
     <de-aside-container
       :show-drag-bar="false"
+      close
       class="ms-aside-container"
     >
       <el-tabs
diff --git a/core/frontend/src/views/panel/viewSelect/Multiplexing.vue b/core/frontend/src/views/panel/viewSelect/Multiplexing.vue
index 3a5bf51381..3b647d5e6a 100644
--- a/core/frontend/src/views/panel/viewSelect/Multiplexing.vue
+++ b/core/frontend/src/views/panel/viewSelect/Multiplexing.vue
@@ -5,6 +5,7 @@
   >
     <de-aside-container
       v-loading="viewLoading"
+      close
       class="aside-class"
       type="panel"
     >
diff --git a/core/frontend/src/views/system/sysParam/MapSetting/Geometry.vue b/core/frontend/src/views/system/sysParam/MapSetting/Geometry.vue
index bc0c68a29a..d0bc10f371 100644
--- a/core/frontend/src/views/system/sysParam/MapSetting/Geometry.vue
+++ b/core/frontend/src/views/system/sysParam/MapSetting/Geometry.vue
@@ -14,6 +14,7 @@
     </div>
     <de-aside-container
       type="mapset"
+      close
       class="map-setting-aside"
     >
       <map-setting-left