From 72c34aee6ab2d67345972b0182a18aaa599cf1c4 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 28 Feb 2024 13:41:03 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E6=A0=91?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BE=A7=E8=BE=B9=E6=A0=8F=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=B1=95=E5=BC=80=E3=80=81=E6=94=B6=E8=B5=B7=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/dataease/DeArrowSide.vue   | 92 +++++++++++++++++++
 .../components/dataease/DeAsideContainer.vue  | 33 ++++++-
 core/frontend/src/store/modules/app.js        | 13 ++-
 3 files changed, 131 insertions(+), 7 deletions(-)
 create mode 100644 core/frontend/src/components/dataease/DeArrowSide.vue

diff --git a/core/frontend/src/components/dataease/DeArrowSide.vue b/core/frontend/src/components/dataease/DeArrowSide.vue
new file mode 100644
index 0000000000..8712e71382
--- /dev/null
+++ b/core/frontend/src/components/dataease/DeArrowSide.vue
@@ -0,0 +1,92 @@
+<template>
+  <div
+    @click="handleClick(false)"
+    v-if="arrowSide && !isInside"
+    class="arrow-side-tree arrow-side-tree-left"
+  >
+    <svg-icon
+      icon-class="icon_left_outlined"
+      class="icon16"
+    />
+  </div>
+  <div
+    @click="handleClick(true)"
+    v-else-if="!arrowSide && isInside"
+    class="arrow-side-tree arrow-side-tree-right"
+  >
+    <svg-icon
+      icon-class="icon_right_outlined"
+      class="icon16"
+    />
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+export default {
+  name: 'DeArrowSide',
+  props: {
+    isInside: {
+      type: Boolean,
+      default: false
+    },
+  },
+  computed: {
+    ...mapState('app', [
+      'arrowSide'
+    ])
+  },
+  methods: {
+    handleClick(val) {
+      this.$store.dispatch('app/setArrowSide', val)
+      this.$emit('changeSideTreeStatus', val)
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.arrow-side-tree-left {
+  top: 146px;
+  height: 24px;
+  width: 24px;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  box-shadow: 0px 5px 10px 0px #1f23291a;
+  z-index: 100;
+}
+
+.arrow-side-tree-right {
+  box-shadow: 0px 4px 8px 0px #0000001a;
+  top: 146px;
+  height: 24px;
+  width: 20px;
+  display: flex;
+  align-items: center;
+  padding-left: 2px;
+  border-top-right-radius: 12px;
+  border-bottom-right-radius: 12px;
+  &:hover {
+    padding-left: 4px;
+    width: 24px;
+  }
+}
+
+.arrow-side-tree {
+  position: absolute;
+  border: 1px solid #dee0e3;
+  background: #fff;
+  cursor: pointer;
+  z-index: 10;
+  &:hover {
+    .icon16 {
+      color: #3370ff;
+    }
+  }
+  .icon16 {
+    font-size: 12px;
+  }
+}
+</style>
diff --git a/core/frontend/src/components/dataease/DeAsideContainer.vue b/core/frontend/src/components/dataease/DeAsideContainer.vue
index 42c6d6a37b..41e591cfc5 100644
--- a/core/frontend/src/components/dataease/DeAsideContainer.vue
+++ b/core/frontend/src/components/dataease/DeAsideContainer.vue
@@ -1,10 +1,16 @@
 <template>
   <el-aside
     :width="currentWidth"
+    @mouseenter.native="mouseenter"
+    @mouseleave.native="mouseleave"
     class="ms-aside-container"
+    :class="{ retract: !sideTreeStatus }"
     :style="{'margin-left': !asideHidden ? 0 : '-' + currentWidth}"
   >
-    <slot />
+    <DeArrowSide @changeSideTreeStatus="changeSideTreeStatus" :style="{ left: (sideTreeStatus ? parseInt(currentWidth) - 12 : 0) + 'px' }" :isInside="!sideTreeStatus"></DeArrowSide>
+    <keep-alive>
+      <slot v-if="sideTreeStatus"/>
+    </keep-alive>
     <de-horizontal-drag-bar
       v-if="isSystem"
       :type="type"
@@ -15,9 +21,10 @@
 <script>
 import DeHorizontalDragBar from './dragbar/DeLeft2RightDragBar'
 import { getLayout } from '@/utils/LayoutUtil'
+import DeArrowSide from '@/components/dataease/DeArrowSide.vue'
 export default {
   name: 'DeAsideContainer',
-  components: { DeHorizontalDragBar },
+  components: { DeHorizontalDragBar, DeArrowSide },
   props: {
     width: {
       type: String,
@@ -47,7 +54,8 @@ export default {
   data() {
     return {
       asideHidden: false,
-      currentWidth: ''
+      currentWidth: '',
+      sideTreeStatus: true,
     }
   },
   computed: {
@@ -65,12 +73,23 @@ export default {
   methods: {
     setCurrentWidth() {
       this.currentWidth = this.isCollapseWidth || this.type && getLayout(this.type) || this.width
+    },
+    mouseenter() {
+      if(!this.sideTreeStatus) return
+      this.$store.dispatch('app/setArrowSide', true)
+    },
+    mouseleave() {
+      if(!this.sideTreeStatus) return
+      this.$store.dispatch('app/setArrowSide', false)
+    },
+    changeSideTreeStatus(val) {
+      this.sideTreeStatus = val
     }
   }
 }
 </script>
 
-<style scoped>
+<style lang="less" scoped>
 
   .ms-aside-container {
     /* border: 1px solid #E6E6E6; */
@@ -81,6 +100,12 @@ export default {
     border-right: 0px;
     position: relative;
     padding-bottom: 50px;
+    overflow: visible;
+    
+    &.retract {
+      width: 0 !important;
+      min-width: 0 !important;
+    }
   }
 
   /* .collapse-style {
diff --git a/core/frontend/src/store/modules/app.js b/core/frontend/src/store/modules/app.js
index 93eaba66fa..fbf4ac7db9 100644
--- a/core/frontend/src/store/modules/app.js
+++ b/core/frontend/src/store/modules/app.js
@@ -7,8 +7,9 @@ const state = {
     hide: false
   },
   device: 'desktop',
-
-  size: Cookies.get('size') || 'small'
+  
+  size: Cookies.get('size') || 'small',
+  arrowSide: false
 }
 
 const mutations = {
@@ -36,7 +37,10 @@ const mutations = {
   SET_SIZE: (state, size) => {
     state.size = size
     Cookies.set('size', size)
-  }
+  },
+  SET_ARROW_SIDE: (state, arrowSide) => {
+    state.arrowSide = arrowSide
+  },
 }
 
 const actions = {
@@ -54,6 +58,9 @@ const actions = {
   },
   setSize({ commit }, size) {
     commit('SET_SIZE', size)
+  },
+  setArrowSide({ commit }, arrowSide) {
+    commit('SET_ARROW_SIDE', arrowSide)
   }
 }