From fbc689b23572873452bceb33a883e5f53aa7ad35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?=
 <1262327911@qq.com>
Date: Mon, 8 Aug 2022 00:02:58 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E8=A7=A3=E9=99=A4?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E8=BF=98=E5=8E=9F=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/chartEditStore/chartEditStore.ts  |  4 ++++
 .../components/EditGroup/index.vue            |  2 ++
 .../components/EditShapeBox/index.vue         | 20 ++++++++++++-------
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/store/modules/chartEditStore/chartEditStore.ts b/src/store/modules/chartEditStore/chartEditStore.ts
index 84488af0..61947edf 100644
--- a/src/store/modules/chartEditStore/chartEditStore.ts
+++ b/src/store/modules/chartEditStore/chartEditStore.ts
@@ -650,7 +650,11 @@ export const useChartEditStore = defineStore({
         // 解组
         const unGroup = (targetIndex: number) => {
           const targetGroup = this.getComponentList[targetIndex] as CreateComponentGroupType
+
+          // 分离组件并还原位置属性
           targetGroup.groupList.forEach(item => {
+            item.attr.x = item.attr.x + targetGroup.attr.x
+            item.attr.y = item.attr.y + targetGroup.attr.y
             this.addComponentList(item)
           })
           this.setTargetSelectChart(targetGroup.id)
diff --git a/src/views/chart/ContentEdit/components/EditGroup/index.vue b/src/views/chart/ContentEdit/components/EditGroup/index.vue
index d12a2f3e..8bf8aaa7 100644
--- a/src/views/chart/ContentEdit/components/EditGroup/index.vue
+++ b/src/views/chart/ContentEdit/components/EditGroup/index.vue
@@ -5,6 +5,7 @@
       :data-id="groupData.id"
       :index="groupIndex"
       :item="groupData"
+      :hiddenPoint="true"
       :style="{
         ...useComponentStyle(groupData.attr, groupIndex),
         ...useSizeStyle(groupData.attr),
@@ -24,6 +25,7 @@
         :data-id="item.id"
         :index="groupIndex"
         :item="item"
+        :hiddenPoint="true"
         :style="{
           ...useComponentStyle(item.attr, groupIndex)
         }"
diff --git a/src/views/chart/ContentEdit/components/EditShapeBox/index.vue b/src/views/chart/ContentEdit/components/EditShapeBox/index.vue
index 6aa8f99f..69c38290 100644
--- a/src/views/chart/ContentEdit/components/EditShapeBox/index.vue
+++ b/src/views/chart/ContentEdit/components/EditShapeBox/index.vue
@@ -2,13 +2,15 @@
   <div class="go-shape-box">
     <slot></slot>
     <!-- 锚点 -->
-    <div
-      :class="`shape-point ${point}`"
-      v-for="(point, index) in select ? pointList : []"
-      :key="index"
-      :style="usePointStyle(point, index, item.attr, cursorResize)"
-      @mousedown="useMousePointHandle($event, point, item.attr)"
-    ></div>
+    <template v-if="!hiddenPoint">
+      <div
+        :class="`shape-point ${point}`"
+        v-for="(point, index) in select ? pointList : []"
+        :key="index"
+        :style="usePointStyle(point, index, item.attr, cursorResize)"
+        @mousedown="useMousePointHandle($event, point, item.attr)"
+      ></div>
+    </template>
 
     <!-- 选中 -->
     <div class="shape-modal" :style="useSizeStyle(item.attr)">
@@ -30,6 +32,10 @@ const props = defineProps({
   item: {
     type: Object as PropType<CreateComponentType | CreateComponentGroupType>,
     required: true
+  },
+  hiddenPoint: {
+    type: Boolean,
+    required: false
   }
 })