From b26d8f71f693f54526c25bc4302e40c091d5af5b Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 26 Jan 2022 15:58:01 +0800
Subject: [PATCH 1/2] 27027

---
 packages/bigscreen/designer/AppDesigner.vue   |  4 ----
 .../bigscreen/designer/components/Add.vue     |  4 ++++
 project/dv/apps/AppGridDV.vue                 | 22 ++++++++++++-------
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/packages/bigscreen/designer/AppDesigner.vue b/packages/bigscreen/designer/AppDesigner.vue
index cb266584..a81009d1 100644
--- a/packages/bigscreen/designer/AppDesigner.vue
+++ b/packages/bigscreen/designer/AppDesigner.vue
@@ -69,10 +69,6 @@ export default {
         this.componentName = 'List'
         this.isShowDetail = false
         this.params = data.params
-
-        if (data.isQuote) {
-          this.currIndex = 0
-        }
       }
 
       if (data.type === 'add') {
diff --git a/packages/bigscreen/designer/components/Add.vue b/packages/bigscreen/designer/components/Add.vue
index 89c394cb..650e05e2 100644
--- a/packages/bigscreen/designer/components/Add.vue
+++ b/packages/bigscreen/designer/components/Add.vue
@@ -100,6 +100,8 @@ export default {
     urlPrefix: String
   },
 
+  inject: ['home'],
+
   components: {
     Layout,
     AppGigscreenViewer
@@ -240,6 +242,8 @@ export default {
           }).then(res => {
             if (res.code == 0) {
               this.$message.success('提交成功')
+              
+              this.home?.refreshDvOptions()
               setTimeout(() => {
                 this.cancel(true)
               }, 600)
diff --git a/project/dv/apps/AppGridDV.vue b/project/dv/apps/AppGridDV.vue
index c38f0d2d..5e415b76 100644
--- a/project/dv/apps/AppGridDV.vue
+++ b/project/dv/apps/AppGridDV.vue
@@ -22,9 +22,6 @@
         ref="middleTree"
         id="tree"
         class="tree"
-        @mousedown="onMousedown"
-        @mousemove="onMouseMove"
-        @mouseup="onMouseUp"
         :style="{left: x, top: y, transform: `scale(${scale}) translate(-50%, -50%) `, 'transform-origin': `${0} ${0}`}">
         <VueOkrTree
           ref="VueOkrTree"
@@ -172,11 +169,17 @@
 
     destroyed () {
       document.querySelector('body').removeEventListener('mousewheel', this.onMousewheel)
+      document.querySelector('body').removeEventListener('mouseup', this.onMouseUp)
+      document.querySelector('body').removeEventListener('mousedown', this.onMousedown)
+      document.querySelector('body').removeEventListener('mousemove', this.onMouseMove)
     },
 
     methods: {
       bindEvent () {
         document.querySelector('body').addEventListener('mousewheel', this.onMousewheel, true)
+        document.querySelector('body').addEventListener('mouseup', this.onMouseUp, true)
+        document.querySelector('body').addEventListener('mousedown', this.onMousedown, true)
+        document.querySelector('body').addEventListener('mousemove', this.onMouseMove, true)
       },
 
       onMousewheel (event) {
@@ -195,11 +198,14 @@
       },
 
       onMousedown (e) {
-        const left = document.querySelector('#tree').offsetLeft
-        const top = document.querySelector('#tree').offsetTop
-        this.isMove = true
-        this.offsetX = e.clientX - left
-        this.offsetY = e.clientY - top
+        const elClass = e.target.className
+        if ((elClass && (elClass.indexOf('chart') > -1 || elClass.indexOf('user') > -1))) {
+          const left = document.querySelector('#tree').offsetLeft
+          const top = document.querySelector('#tree').offsetTop
+          this.isMove = true
+          this.offsetX = e.clientX - left
+          this.offsetY = e.clientY - top
+        }
       },
 
       onMouseMove (e) {

From f701080b711bf365f4cef6ba997f01fbd91ba799 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 26 Jan 2022 16:03:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/dv/apps/AppGridDV.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/project/dv/apps/AppGridDV.vue b/project/dv/apps/AppGridDV.vue
index 5e415b76..507b40a7 100644
--- a/project/dv/apps/AppGridDV.vue
+++ b/project/dv/apps/AppGridDV.vue
@@ -177,6 +177,7 @@
     methods: {
       bindEvent () {
         document.querySelector('body').addEventListener('mousewheel', this.onMousewheel, true)
+
         document.querySelector('body').addEventListener('mouseup', this.onMouseUp, true)
         document.querySelector('body').addEventListener('mousedown', this.onMousedown, true)
         document.querySelector('body').addEventListener('mousemove', this.onMouseMove, true)