From 593a586c7b92630a743e2941042d9460e5000016 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Tue, 27 Feb 2024 18:50:02 +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

---
 core/core-frontend/src/store/modules/app.ts   | 10 +++++++++-
 .../src/views/common/DeResourceArrow.vue      | 20 ++++++++++++++-----
 .../views/dashboard/DashboardPreviewShow.vue  | 16 +++++++++++++++
 .../views/data-visualization/PreviewShow.vue  | 16 +++++++++++++++
 .../data/dataset/form/CalcFieldEdit.vue       |  3 ---
 .../views/visualized/data/dataset/index.vue   | 15 ++++++++++++++
 .../visualized/data/datasource/index.vue      | 16 +++++++++++++++
 7 files changed, 87 insertions(+), 9 deletions(-)

diff --git a/core/core-frontend/src/store/modules/app.ts b/core/core-frontend/src/store/modules/app.ts
index bcbc994db4..01af127df8 100644
--- a/core/core-frontend/src/store/modules/app.ts
+++ b/core/core-frontend/src/store/modules/app.ts
@@ -11,6 +11,7 @@ interface AppState {
   desktop: boolean
   isDataEaseBi: boolean
   isIframe: boolean
+  arrowSide: boolean
 }
 
 export const useAppStore = defineStore('app', {
@@ -22,13 +23,17 @@ export const useAppStore = defineStore('app', {
       dekey: 'DataEaseKey',
       isDataEaseBi: false,
       isIframe: false,
-      desktop: false
+      desktop: false,
+      arrowSide: false
     }
   },
   getters: {
     getSize(): boolean {
       return this.size
     },
+    getArrowSide(): boolean {
+      return this.arrowSide
+    },
     getPageLoading(): boolean {
       return this.pageLoading
     },
@@ -58,6 +63,9 @@ export const useAppStore = defineStore('app', {
     setSize(size: boolean) {
       this.size = size
     },
+    setArrowSide(ArrowSide: boolean) {
+      this.arrowSide = ArrowSide
+    },
     setIsDataEaseBi(isDataEaseBi: boolean) {
       this.isDataEaseBi = isDataEaseBi
     },
diff --git a/core/core-frontend/src/views/common/DeResourceArrow.vue b/core/core-frontend/src/views/common/DeResourceArrow.vue
index 584db15175..c60287cf44 100644
--- a/core/core-frontend/src/views/common/DeResourceArrow.vue
+++ b/core/core-frontend/src/views/common/DeResourceArrow.vue
@@ -1,24 +1,34 @@
 <script lang="ts" setup>
-import { ref } from 'vue'
-const sideTreeStatus = ref(true)
+import { useAppStoreWithOut } from '@/store/modules/app'
+const appStore = useAppStoreWithOut()
+defineProps({
+  isInside: {
+    type: Boolean,
+    default: false
+  }
+})
 const emits = defineEmits(['changeSideTreeStatus'])
 const handleClick = val => {
+  appStore.setArrowSide(val)
   emits('changeSideTreeStatus', val)
-  sideTreeStatus.value = val
 }
 </script>
 
 <template>
   <div
     @click="handleClick(false)"
-    v-if="sideTreeStatus"
+    v-if="appStore.getArrowSide && !isInside"
     class="arrow-side-tree arrow-side-tree-left"
   >
     <el-icon>
       <Icon name="icon_left_outlined" />
     </el-icon>
   </div>
-  <div @click="handleClick(true)" v-else class="arrow-side-tree arrow-side-tree-right">
+  <div
+    @click="handleClick(true)"
+    v-else-if="!appStore.getArrowSide && isInside"
+    class="arrow-side-tree arrow-side-tree-right"
+  >
     <el-icon>
       <Icon name="icon_right_outlined" />
     </el-icon>
diff --git a/core/core-frontend/src/views/dashboard/DashboardPreviewShow.vue b/core/core-frontend/src/views/dashboard/DashboardPreviewShow.vue
index a17bc72ac0..2de63f61e6 100644
--- a/core/core-frontend/src/views/dashboard/DashboardPreviewShow.vue
+++ b/core/core-frontend/src/views/dashboard/DashboardPreviewShow.vue
@@ -140,6 +140,14 @@ const changeSideTreeStatus = val => {
   sideTreeStatus.value = val
 }
 
+const mouseenter = () => {
+  appStore.setArrowSide(true)
+}
+
+const mouseleave = () => {
+  appStore.setArrowSide(false)
+}
+
 defineExpose({
   getPreviewStateInfo
 })
@@ -150,13 +158,21 @@ defineExpose({
     <ArrowSide
       :style="{ left: (sideTreeStatus ? width - 12 : 0) + 'px' }"
       @change-side-tree-status="changeSideTreeStatus"
+      :isInside="!sideTreeStatus"
     ></ArrowSide>
     <el-aside
+      @mouseenter="mouseenter"
+      @mouseleave="mouseleave"
       class="resource-area"
       :class="{ 'close-side': !slideShow, retract: !sideTreeStatus }"
       ref="node"
       :style="{ width: width + 'px' }"
     >
+      <ArrowSide
+        :isInside="!sideTreeStatus"
+        :style="{ left: (sideTreeStatus ? width - 12 : 0) + 'px' }"
+        @change-side-tree-status="changeSideTreeStatus"
+      ></ArrowSide>
       <de-resource-tree
         ref="resourceTreeRef"
         v-show="slideShow"
diff --git a/core/core-frontend/src/views/data-visualization/PreviewShow.vue b/core/core-frontend/src/views/data-visualization/PreviewShow.vue
index e20e05820c..cc016e7fb7 100644
--- a/core/core-frontend/src/views/data-visualization/PreviewShow.vue
+++ b/core/core-frontend/src/views/data-visualization/PreviewShow.vue
@@ -127,6 +127,14 @@ const changeSideTreeStatus = val => {
   sideTreeStatus.value = val
 }
 
+const mouseenter = () => {
+  appStore.setArrowSide(true)
+}
+
+const mouseleave = () => {
+  appStore.setArrowSide(false)
+}
+
 onBeforeMount(() => {
   dvMainStore.canvasDataInit()
 })
@@ -137,13 +145,21 @@ onBeforeMount(() => {
     <ArrowSide
       :style="{ left: (sideTreeStatus ? width - 12 : 0) + 'px' }"
       @change-side-tree-status="changeSideTreeStatus"
+      :isInside="!sideTreeStatus"
     ></ArrowSide>
     <el-aside
       class="resource-area"
+      @mouseenter="mouseenter"
+      @mouseleave="mouseleave"
       :class="{ 'close-side': !slideShow, retract: !sideTreeStatus }"
       ref="node"
       :style="{ width: width + 'px' }"
     >
+      <ArrowSide
+        :isInside="!sideTreeStatus"
+        :style="{ left: (sideTreeStatus ? width - 12 : 0) + 'px' }"
+        @change-side-tree-status="changeSideTreeStatus"
+      ></ArrowSide>
       <de-resource-tree
         ref="resourceTreeRef"
         v-show="slideShow"
diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/CalcFieldEdit.vue b/core/core-frontend/src/views/visualized/data/dataset/form/CalcFieldEdit.vue
index f4d7b53e24..3deefae7e0 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/form/CalcFieldEdit.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/CalcFieldEdit.vue
@@ -132,9 +132,6 @@ onBeforeUnmount(() => {
 })
 
 const insertParamToCodeMirror = (value: string) => {
-  mirror.value.dispatch({
-    changes: { from: 0, to: mirror.value.state.doc.toString().length, insert: '' }
-  })
   mirror.value.dispatch({
     changes: { from: mirror.value.viewState.state.selection.ranges[0].from, insert: value },
     selection: { anchor: mirror.value.viewState.state.selection.ranges[0].from }
diff --git a/core/core-frontend/src/views/visualized/data/dataset/index.vue b/core/core-frontend/src/views/visualized/data/dataset/index.vue
index 2b38f5caf6..1cc623bf9a 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/index.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/index.vue
@@ -460,6 +460,13 @@ const filterNode = (value: string, data: BusiTreeNode) => {
   if (!value) return true
   return data.name?.includes(value)
 }
+const mouseenter = () => {
+  appStore.setArrowSide(true)
+}
+
+const mouseleave = () => {
+  appStore.setArrowSide(false)
+}
 
 const getMenuList = (val: boolean) => {
   return !val || isDataEaseBi.value
@@ -479,13 +486,21 @@ const getMenuList = (val: boolean) => {
     <ArrowSide
       :style="{ left: (sideTreeStatus ? width - 12 : 0) + 'px' }"
       @change-side-tree-status="changeSideTreeStatus"
+      :isInside="!sideTreeStatus"
     ></ArrowSide>
     <el-aside
       class="resource-area"
+      @mouseenter="mouseenter"
+      @mouseleave="mouseleave"
       :class="{ retract: !sideTreeStatus }"
       ref="node"
       :style="{ width: width + 'px' }"
     >
+      <ArrowSide
+        :isInside="!sideTreeStatus"
+        :style="{ left: (sideTreeStatus ? width - 12 : 0) + 'px' }"
+        @change-side-tree-status="changeSideTreeStatus"
+      ></ArrowSide>
       <div class="resource-tree">
         <div class="tree-header">
           <div class="icon-methods">
diff --git a/core/core-frontend/src/views/visualized/data/datasource/index.vue b/core/core-frontend/src/views/visualized/data/datasource/index.vue
index 8727d7b300..09111b7698 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/index.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/index.vue
@@ -672,6 +672,14 @@ const changeSideTreeStatus = val => {
   sideTreeStatus.value = val
 }
 
+const mouseenter = () => {
+  appStore.setArrowSide(true)
+}
+
+const mouseleave = () => {
+  appStore.setArrowSide(false)
+}
+
 const getMenuList = (val: boolean) => {
   return !val || isDataEaseBi.value
     ? menuList
@@ -690,13 +698,21 @@ const getMenuList = (val: boolean) => {
     <ArrowSide
       :style="{ left: (sideTreeStatus ? width - 12 : 0) + 'px' }"
       @change-side-tree-status="changeSideTreeStatus"
+      :isInside="!sideTreeStatus"
     ></ArrowSide>
     <el-aside
+      @mouseenter="mouseenter"
+      @mouseleave="mouseleave"
       class="resource-area"
       :class="{ retract: !sideTreeStatus }"
       ref="node"
       :style="{ width: width + 'px' }"
     >
+      <ArrowSide
+        :isInside="!sideTreeStatus"
+        :style="{ left: (sideTreeStatus ? width - 12 : 0) + 'px' }"
+        @change-side-tree-status="changeSideTreeStatus"
+      ></ArrowSide>
       <div class="resource-tree">
         <div class="tree-header">
           <div class="icon-methods">