Merge remote-tracking branch 'origin/dev' into dev

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') {

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)

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,18 @@
 
     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 +199,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) {