From 8988eab268a62cfc5123fb1fa88ac341af3cf15e Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 12 Dec 2022 15:59:12 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E7=8A=B6=E6=80=81=E6=8B=96=E6=8B=BD=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E5=93=8D=E5=BA=94=E5=8C=BA=E5=9F=9F=E5=8F=98=E6=9B=B4=E4=B8=BA?=
 =?UTF-8?q?=E8=BE=B9=E7=BC=98=E9=83=A8=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/api/chart/chart.js          |  6 ++-
 frontend/src/components/deDrag/index.vue | 60 ++++++++++++++++++++++--
 2 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/frontend/src/api/chart/chart.js b/frontend/src/api/chart/chart.js
index a10bb2534a..c58409d9cc 100644
--- a/frontend/src/api/chart/chart.js
+++ b/frontend/src/api/chart/chart.js
@@ -8,11 +8,12 @@ export function post(url, data, loading = false) {
     data
   })
 }
+
 export function tableField(id) {
   return request({
     url: '/dataset/table/getWithPermission/' + id,
     method: 'post',
-    loading: true,
+    loading: false,
     hideMsg: true,
     timeout: 60000
   })
@@ -34,6 +35,7 @@ export function chartCopy(id, panelId) {
     loading: false
   })
 }
+
 export function chartBatchCopy(params, panelId) {
   return request({
     url: '/chart/view/chartBatchCopy/' + panelId,
@@ -42,6 +44,7 @@ export function chartBatchCopy(params, panelId) {
     loading: false
   })
 }
+
 export function chartGroupTree(data) {
   return request({
     url: '/chart/group/tree',
@@ -116,6 +119,7 @@ export function resetViewCacheCallBack(viewId, panelId, callback) {
     callback(rep)
   })
 }
+
 export function resetViewCache(viewId, panelId) {
   return request({
     url: '/chart/view/resetViewCache/' + viewId + '/' + panelId,
diff --git a/frontend/src/components/deDrag/index.vue b/frontend/src/components/deDrag/index.vue
index 3ec4ea4362..44cd7a11b2 100644
--- a/frontend/src/components/deDrag/index.vue
+++ b/frontend/src/components/deDrag/index.vue
@@ -17,8 +17,8 @@
       },
       className
     ]"
-    @mousedown="elementMouseDown"
     @touchstart="elementTouchDown"
+    @mousedown="outerElementMouseDown"
     @mouseenter="enter"
     @mouseleave="leave"
   >
@@ -66,20 +66,24 @@
         @mousedown.stop.prevent="handleDown(handlei, $event)"
         @touchstart.stop.prevent="handleTouchDown(handlei, $event)"
       >
-        <slot :name="handlei" />
+        <slot :name="handlei"/>
       </div>
       <div
         :id="componentCanvasId"
         :style="mainSlotStyleInner"
         class="main-background"
       >
+        <div @mousedown="elementMouseDown" class="de-drag-area de-drag-top"></div>
+        <div @mousedown="elementMouseDown" class="de-drag-area de-drag-right"></div>
+        <div @mousedown="elementMouseDown" class="de-drag-area de-drag-bottom"></div>
+        <div @mousedown="elementMouseDown" class="de-drag-area de-drag-left"></div>
         <svg-icon
           v-if="svgInnerEnable"
           :style="{'color':element.commonBackground.innerImageColor}"
           class="svg-background"
           :icon-class="mainSlotSvgInner"
         />
-        <slot />
+        <slot/>
       </div>
     </div>
   </div>
@@ -863,6 +867,18 @@ export default {
       eventsFor = events.touch
       this.elementDown(e)
     },
+    outerElementMouseDown(e) {
+      // private 设置当前组件数据及状态
+      this.$store.commit('setClickComponentStatus', true)
+      if (this.element.component !== 'user-view' && this.element.component !== 'de-frame' && this.element.component !== 'v-text' && this.element.component !== 'de-rich-text' && this.element.component !== 'rect-shape' && this.element.component !== 'de-input-search' && this.element.component !== 'de-select-grid' && this.element.component !== 'de-number-range' && this.element.component !== 'de-date') {
+        e.preventDefault()
+      }
+      // 阻止冒泡事件
+      e.stopPropagation()
+      this.$nextTick(() => {
+        this.$store.commit('setCurComponent', { component: this.element, index: this.index })
+      })
+    },
     elementMouseDown(e) {
       // private 设置当前组件数据及状态
       this.$store.commit('setClickComponentStatus', true)
@@ -2131,4 +2147,42 @@ export default {
 .drag-on-tab-collision {
   z-index: 1000 !important;
 }
+
+.de-drag-area {
+  position: absolute;
+  z-index: 10;
+}
+
+.de-drag-area:hover {
+  cursor: move;
+}
+
+.de-drag-top {
+  left: 0;
+  top: 0;
+  height: 12px;
+  width: 100%;
+}
+
+.de-drag-right {
+  right: 0;
+  top: 0;
+  width: 16px;
+  height: 100%;
+}
+
+.de-drag-bottom {
+  left: 0;
+  bottom: 0;
+  height: 12px;
+  width: 100%;
+}
+
+.de-drag-left {
+  left: 0;
+  top: 0;
+  width: 16px;
+  height: 100%;
+}
+
 </style>