From f8693b522ce6fc608f8487cbccf733852f507134 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Sat, 9 Oct 2021 17:16:37 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E6=BB=9A?=
 =?UTF-8?q?=E5=8A=A8=E6=9D=A1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/DeDrag/index.vue      |  6 +-
 .../canvas/components/Editor/PGrid.vue        |  1 +
 .../canvas/components/Editor/index.vue        | 65 +++++--------------
 frontend/src/views/panel/edit/index.vue       | 23 +++++++
 4 files changed, 43 insertions(+), 52 deletions(-)

diff --git a/frontend/src/components/DeDrag/index.vue b/frontend/src/components/DeDrag/index.vue
index 588490abb0..b3d676c66c 100644
--- a/frontend/src/components/DeDrag/index.vue
+++ b/frontend/src/components/DeDrag/index.vue
@@ -595,7 +595,7 @@ export default {
       this.maxH = val
     },
     w(val) {
-      console.log('changeWidthCK：' + this.resizing)
+      // console.log('changeWidthCK：' + this.resizing)
 
       if (this.resizing || this.dragging) {
         return
@@ -603,7 +603,7 @@ export default {
       if (this.parent) {
         this.bounds = this.calcResizeLimits()
       }
-      console.log('changeWidth：' + val)
+      // console.log('changeWidth：' + val)
       this.changeWidth(val)
     },
     h(val) {
@@ -1192,7 +1192,7 @@ export default {
       this.right = right
       this.bottom = bottom
       this.width = width
-      console.log('width3:' + this.width)
+      // console.log('width3:' + this.width)
       this.height = height
     },
     changeHeight(val) {
diff --git a/frontend/src/components/canvas/components/Editor/PGrid.vue b/frontend/src/components/canvas/components/Editor/PGrid.vue
index 8568377811..dab615d575 100644
--- a/frontend/src/components/canvas/components/Editor/PGrid.vue
+++ b/frontend/src/components/canvas/components/Editor/PGrid.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="grid">
     <!--    positionBox:{{ positionBox.length }}-->
+<!--    <div v-for="(yItem, index) in positionBox" v-if="index<positionBox.length-5" :key="index+'y'" style="float: left; width: 105%">-->
     <div v-for="(yItem, index) in positionBox" :key="index+'y'" style="float: left; width: 105%">
       <div v-for="(xItem, index) in yItem" :key="index+'x'" :style="classInfo" style="float: left; border: 0.2px solid #b3d4fc ">
         {{ xItem.el?1:0 }}
diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue
index 2c9b2cd540..0f6400f098 100644
--- a/frontend/src/components/canvas/components/Editor/index.vue
+++ b/frontend/src/components/canvas/components/Editor/index.vue
@@ -1,7 +1,6 @@
 <template>
   <div
     id="editor"
-    ref="container"
     class="editor"
     :class="[
       {
@@ -9,15 +8,14 @@
         ['parent_transform']:!chartDetailsVisible
       }
     ]"
-    :style="customStyle"
     @dragover="handleDragOver"
     @mousedown="handleMouseDown"
     @scroll="canvasScroll"
   >
     <!-- 网格线 -->
-<!--        <Grid v-if="canvasStyleData.auxiliaryMatrix&&!linkageSettingStatus" :matrix-style="matrixStyle" />-->
+    <!--    <Grid v-if="canvasStyleData.auxiliaryMatrix&&!linkageSettingStatus" :matrix-style="matrixStyle" />-->
     <!--    positionBox:{{positionBoxInfo}}-->
-<!--        <PGrid :position-box="positionBoxInfoArray" :matrix-style="matrixStyle" />-->
+    <!--    <PGrid :position-box="positionBoxInfoArray" :matrix-style="matrixStyle" />-->
 
     <!-- 仪表板联动清除按钮-->
     <canvas-opt-bar />
@@ -223,9 +221,11 @@ function debounce(func, time) {
 
 function scrollScreen(e) {
   if (e.clientY + 50 >= window.innerHeight) {
+    console.log('scrollScreen+')
     const body = $(document.body)
     body.scrollTop(body.scrollTop() + 20)
   } else if (e.clientY <= 150) {
+    console.log('scrollScreen-')
     const body = $(document.body)
     body.scrollTop(body.scrollTop() - 20)
   }
@@ -238,7 +238,7 @@ function scrollScreen(e) {
 function resetPositionBox() {
   // 根据当前容器的宽度来决定多少列
   itemMaxX = this.maxCell
-  const rows = 20 // 初始100行，后面根据需求会自动增加
+  const rows = this.matrixCount.y // 初始100行，后面根据需求会自动增加
   for (let i = 0; i < rows; i++) {
     const row = []
 
@@ -274,7 +274,7 @@ function addItemToPositionBox(item) {
 
 function fillPositionBox(maxY) {
   const pb = positionBox
-  maxY += 2
+  maxY += 1
   for (let j = 0; j < maxY; j++) {
     if (pb[j] === undefined) {
       const row = []
@@ -288,8 +288,8 @@ function fillPositionBox(maxY) {
   }
 
   itemMaxY = maxY
-
-  $(this.$el).css('height', ((itemMaxY + 2) * this.cellHeight) + 'px')
+  console.log('height:' + ((itemMaxY) * this.cellHeight) + 'px')
+  // $(this.$el).css('height', ((itemMaxY) * this.cellHeight) + 'px')
 }
 
 function removeItemFromPositionBox(item) {
@@ -312,10 +312,10 @@ function removeItemFromPositionBox(item) {
 function recalcCellWidth() {
   // const containerNode = this.$refs['container']
   // this.outStyle.width && this.outStyle.height
-  const containerWidth = this.outStyle.width
+  // const containerWidth = this.outStyle.width
 
-  const cells = Math.round(containerWidth / this.cellWidth)
-  this.maxCell = cells
+  // const cells = Math.round(containerWidth / this.cellWidth)
+  this.maxCell = this.matrixCount.x
 
   // if (containerWidth % this.cellWidth !=== 0) {
   //     this.cellWidth += containerWidth % this.cellWidth / cells;
@@ -1181,39 +1181,6 @@ export default {
       return result
     },
 
-    handleContextMenu(e) {
-      e.stopPropagation()
-      e.preventDefault()
-      let target = e.target
-      while (target instanceof SVGElement) {
-        target = target.parentNode
-      }
-      let top = 0
-      let left = 0
-      // 如果档期有计划的组件 坐标取当前组件的加上偏移量
-      if (this.curComponent && !target.className.includes('editor')) {
-        if (this.canvasStyleData.selfAdaption) {
-          top = this.curComponent.style.top * this.scaleHeight / 100 + e.offsetY
-          left = this.curComponent.style.left * this.scaleWidth / 100 + e.offsetX
-        } else {
-          top = this.curComponent.style.top + e.offsetY
-          left = this.curComponent.style.left + e.offsetX
-        }
-      } else {
-        // 计算菜单相对于编辑器的位移
-        top = e.offsetY
-        left = e.offsetX
-
-        while (!target.className.includes('editor')) {
-          left += target.offsetLeft
-          top += target.offsetTop
-          target = target.parentNode
-        }
-      }
-
-      this.$store.commit('showContextMenu', { top, left })
-    },
-
     getShapeStyle(style) {
       const result = {};
       ['width', 'left'].forEach(attr => {
@@ -1612,9 +1579,9 @@ export default {
 
       debounce((function(newX, oldX, newY, oldY) {
         return function() {
-          console.log('move1')
+          // console.log('move1')
           if (newX !== oldX || oldY !== newY) {
-            console.log('move2')
+            // console.log('move2')
             movePlayer.call(vm, moveItem, {
               x: newX,
               y: newY
@@ -1674,7 +1641,7 @@ export default {
      * @returns
      */
     getMaxCell() {
-      console.log('getMaxCell:')
+      // console.log('getMaxCell:')
 
       return this.maxCell
     },
@@ -1684,7 +1651,7 @@ export default {
      * @returns
      */
     getRenderState() {
-      console.log('getRenderState:')
+      // console.log('getRenderState:')
 
       return this.moveAnimate
     },
@@ -1708,7 +1675,7 @@ export default {
     startMoveIn() {
       const moveInItemInfo = this.$store.state.dragComponentInfo
       this.addItemBox(moveInItemInfo)
-      console.log('startMoveIn:')
+      // console.log('startMoveIn:')
       const vm = this
       // e.preventDefault();
       if (!this.infoBox) {
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 9b1b56660a..8fa1b213f3 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -97,6 +97,7 @@
         <div
           id="canvasInfo"
           class="this_canvas"
+          :style="customCanvasStyle"
           @drop="handleDrop"
           @mousedown="handleMouseDown"
           @mouseup="deselectCurComponent"
@@ -280,6 +281,26 @@ export default {
   },
 
   computed: {
+    customCanvasStyle() {
+      let style = {}
+
+      if (this.canvasStyleData.openCommonStyle) {
+        if (this.canvasStyleData.panel.backgroundType === 'image' && this.canvasStyleData.panel.imageUrl) {
+          style = {
+            background: `url(${this.canvasStyleData.panel.imageUrl}) no-repeat`,
+            ...style
+          }
+        } else if (this.canvasStyleData.panel.backgroundType === 'color') {
+          style = {
+            background: this.canvasStyleData.panel.color,
+            ...style
+          }
+        }
+      }
+      // console.log('customStyle=>' + JSON.stringify(style) + JSON.stringify(this.canvasStyleData))
+
+      return style
+    },
     panelInfo() {
       return this.$store.state.panel.panelInfo
     },
@@ -826,6 +847,8 @@ export default {
   height: calc(100vh - 91px);
   overflow-x: hidden;
   overflow-y: auto;
+  background-size:100% 100% !important;
+
 }
 .el-main{
   height: calc(100vh - 91px);