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 @@
-
+
@@ -30,6 +32,10 @@ const props = defineProps({ item: { type: Object as PropType, required: true + }, + hiddenPoint: { + type: Boolean, + required: false } })