|
@@ -816,8 +816,6 @@ export const editActions = EditorModule.action({
|
|
},
|
|
},
|
|
// 取消打组
|
|
// 取消打组
|
|
cancelGroupComps(groupComp: DesignComp) {
|
|
cancelGroupComps(groupComp: DesignComp) {
|
|
- console.log("cancel group");
|
|
|
|
-
|
|
|
|
const childs = groupComp.children.default || [];
|
|
const childs = groupComp.children.default || [];
|
|
const objC = this.controls.selectCtrl.objContainer as ObjsContainer;
|
|
const objC = this.controls.selectCtrl.objContainer as ObjsContainer;
|
|
const parentMtrx = objC.parent.worldTransform.clone();
|
|
const parentMtrx = objC.parent.worldTransform.clone();
|
|
@@ -831,7 +829,7 @@ export const editActions = EditorModule.action({
|
|
const card = paths[1];
|
|
const card = paths[1];
|
|
const parentChilds = (card.children.default || []).filter(item=>item != groupComp.id);
|
|
const parentChilds = (card.children.default || []).filter(item=>item != groupComp.id);
|
|
parentChilds.push(...childs);
|
|
parentChilds.push(...childs);
|
|
- card.children.default = childs;
|
|
|
|
|
|
+ card.children.default = parentChilds;
|
|
|
|
|
|
this.actions.selectObjs([childs[0]]);
|
|
this.actions.selectObjs([childs[0]]);
|
|
},
|
|
},
|