From 716cefa6a4b080541e439607b99674f6f8f34ac4 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 28 Aug 2024 14:24:45 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=86=E7=BB=84=E6=9C=AA=E5=8F=82=E4=B8=8E?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E8=AE=BE=E7=BD=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data-visualization/canvas/CanvasCore.vue  | 19 +------------------
 .../src/custom-component/component-list.ts    | 12 ++++++++++++
 2 files changed, 13 insertions(+), 18 deletions(-)

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 95be965a74..5df55f1fdc 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue
@@ -422,7 +422,7 @@ const createGroup = () => {
     let style = { left: 0, top: 0, right: 0, bottom: 0 }
     if (component.component == 'Group') {
       component.propValue.forEach(item => {
-        const rectInfo = _$(`#component${item.id}`).getBoundingClientRect()
+        const rectInfo = _$(`#shape-id-${item.id}`).getBoundingClientRect()
         style.left = rectInfo.left - editorX.value
         style.top = rectInfo.top - editorY.value
         style.right = rectInfo.right - editorX.value
@@ -1545,23 +1545,6 @@ defineExpose({
         :dv-info="dvInfo"
         :canvas-active="canvasActive"
       />
-      <component
-        v-else-if="item.component.includes('Svg')"
-        :is="findComponent(item.component)"
-        :id="'component' + item.id"
-        :scale="curBaseScale"
-        class="component"
-        :is-edit="true"
-        :style="getSvgComponentStyle(item.style)"
-        :prop-value="item.propValue"
-        :element="item"
-        :request="item.request"
-        :canvas-style-data="canvasStyleData"
-        :canvas-view-info="canvasViewInfo"
-        :dv-info="dvInfo"
-        :active="item.id === curComponentId"
-        :canvas-active="canvasActive"
-      />
       <component
         v-else
         :is="findComponent(item.component)"
diff --git a/core/core-frontend/src/custom-component/component-list.ts b/core/core-frontend/src/custom-component/component-list.ts
index 9868416c47..9529213948 100644
--- a/core/core-frontend/src/custom-component/component-list.ts
+++ b/core/core-frontend/src/custom-component/component-list.ts
@@ -249,6 +249,18 @@ export const commonAttr = {
 
 // 编辑器左侧组件列表
 const list = [
+  {
+    component: 'Group',
+    name: '组合',
+    label: '组合',
+    propValue: '&nbsp;',
+    icon: 'icon_graphical',
+    innerType: 'Group',
+    style: {
+      width: 200,
+      height: 200
+    }
+  },
   {
     id: 100000001,
     component: 'GroupArea',