From 00b3f520e02ffe84535c24a6fe9bbdbe3bbd0d47 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 11 Jan 2024 17:42:49 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E4=BB=AA?=
 =?UTF-8?q?=E8=A1=A8=E6=9D=BF=E7=82=B9=E5=87=BB=E7=BB=84=E4=BB=B6=E5=8F=AF?=
 =?UTF-8?q?=E8=BF=9E=E7=BB=AD=E6=A8=AA=E5=90=91=E8=87=AA=E5=8A=A8=E5=8D=A0?=
 =?UTF-8?q?=E4=BD=8D=E6=8E=92=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data-visualization/canvas/CanvasCore.vue  | 47 ++++++++++++++++++-
 .../src/views/canvas/DeCanvas.vue             |  1 +
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue
index 6111d2cb07..951f781876 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue
@@ -601,6 +601,50 @@ function resetPositionBox() {
   }
 }
 
+/**
+ * 查找位置盒子
+ */
+function findPositionX(item) {
+  const width = item.sizeX
+  let resultX = 1
+  let checkPointYIndex = -1 // -1 没有占用任何Y方向画布
+  // 组件宽度
+  let pb = positionBox.value
+  if (width <= 0) return
+  // 查找组件最高位置索引 component 规则 y最新为1
+  componentData.value.forEach((component, index) => {
+    const componentYIndex = component.y + component.sizeY - 2
+    if (checkPointYIndex < componentYIndex) {
+      checkPointYIndex = componentYIndex
+    }
+  })
+
+  if (checkPointYIndex < 0) {
+    return 1
+  } else {
+    // 获取最后一列X方向数组
+    const pbX = pb[checkPointYIndex]
+    // 从X i位置索引开始检查 ；
+    // 检查宽度为组件宽度width 检查索引终点为checkEndIndex = i + width - 1 ；
+    // 退出检查条件为索引终点checkEndIndex 越界 pbX终点索引；
+    for (let i = 0, checkEndIndex = width - 1; checkEndIndex < pbX.length; i++, checkEndIndex++) {
+      let adaptorCount = 0
+      // 定位最后一列占位位置
+      for (let k = 0; k < width; k++) {
+        // pbX[i + k].el === false 表示当前矩阵点位未被占用，当连续未被占用的矩阵点位宽度为width时 表示改起始点位i可用
+        if (!pbX[i + k].el) {
+          adaptorCount++
+        }
+      }
+      if (adaptorCount === width) {
+        resultX = i + 1
+        break
+      }
+    }
+    return resultX
+  }
+}
+
 /**
  * 填充位置盒子
  */
@@ -1321,7 +1365,8 @@ defineExpose({
   handleDragOver,
   getMoveItem,
   handleMouseUp,
-  handleMouseDown
+  handleMouseDown,
+  findPositionX
 })
 </script>
 
diff --git a/core/core-frontend/src/views/canvas/DeCanvas.vue b/core/core-frontend/src/views/canvas/DeCanvas.vue
index c7db334f85..ea0b638099 100644
--- a/core/core-frontend/src/views/canvas/DeCanvas.vue
+++ b/core/core-frontend/src/views/canvas/DeCanvas.vue
@@ -80,6 +80,7 @@ const handleNewFromCanvasMain = newComponentInfo => {
     syncShapeItemStyle(component, baseWidth.value, baseHeight.value)
     component.id = guid()
     component.y = 200
+    component.x = cyGridster.value.findPositionX(component)
     dvMainStore.addComponent({
       component: component,
       index: undefined,