|
@@ -31,10 +31,10 @@ export class GroupActionCtrl extends ModuleControl<EditorModule> {
|
|
|
string,
|
|
|
{ t: number; l: number; r: number; b: number }
|
|
|
> = {};
|
|
|
- const parentComp = helper.findParentComp(groupIds[0]) as DesignComp;
|
|
|
+ const parentComp = helper.findParentComp(groupIds[0]) as any;
|
|
|
const parentRect = parentComp.$el.getBoundingClientRect();
|
|
|
groupIds.forEach((id) => {
|
|
|
- const comp = helper.findComp(id) as DesignComp;
|
|
|
+ const comp = helper.findComp(id);
|
|
|
const itemRect = comp.$el.getBoundingClientRect();
|
|
|
compsRect[id] = {
|
|
|
t: itemRect.top - parentRect.top,
|
|
@@ -54,36 +54,36 @@ export class GroupActionCtrl extends ModuleControl<EditorModule> {
|
|
|
|
|
|
const groupId = await this.store.insertCompContainer("Group", parentComp);
|
|
|
|
|
|
- const groupComp = helper.findComp(groupId) as DesignComp;
|
|
|
-
|
|
|
- groupComp.layout = {
|
|
|
- size: [
|
|
|
- helper.pxToDesignSize(groupConf.r - groupConf.l),
|
|
|
- helper.pxToDesignSize(groupConf.b - groupConf.t),
|
|
|
- ],
|
|
|
- position: "absolute",
|
|
|
- transform: {
|
|
|
- x: helper.pxToDesignSize(groupConf.l),
|
|
|
- y: helper.pxToDesignSize(groupConf.t),
|
|
|
- },
|
|
|
- };
|
|
|
-
|
|
|
- groupIds.forEach((id) => {
|
|
|
- const comp = helper.findComp(id) as DesignComp;
|
|
|
- comp.layout.transform || (comp.layout.transform = {});
|
|
|
- comp.layout.transform.x =
|
|
|
- (comp.layout.transform.x || 0) - (groupComp.layout.transform?.x || 0);
|
|
|
-
|
|
|
- comp.layout.transform.y =
|
|
|
- (comp.layout.transform.y || 0) - (groupComp.layout.transform?.y || 0);
|
|
|
- });
|
|
|
-
|
|
|
- groupComp.children.default = parentComp.children.default?.filter((d) =>
|
|
|
- groupIds.includes(d)
|
|
|
- );
|
|
|
- parentComp.children.default = parentComp.children.default?.filter(
|
|
|
- (d) => !groupIds.includes(d)
|
|
|
- );
|
|
|
+ const groupComp = helper.findComp(groupId);
|
|
|
+
|
|
|
+ // groupComp.layout = {
|
|
|
+ // size: [
|
|
|
+ // helper.pxToDesignSize(groupConf.r - groupConf.l),
|
|
|
+ // helper.pxToDesignSize(groupConf.b - groupConf.t),
|
|
|
+ // ],
|
|
|
+ // position: "absolute",
|
|
|
+ // transform: {
|
|
|
+ // x: helper.pxToDesignSize(groupConf.l),
|
|
|
+ // y: helper.pxToDesignSize(groupConf.t),
|
|
|
+ // },
|
|
|
+ // };
|
|
|
+
|
|
|
+ // groupIds.forEach((id) => {
|
|
|
+ // const comp = helper.findComp(id);
|
|
|
+ // comp.layout.transform || (comp.layout.transform = {});
|
|
|
+ // comp.layout.transform.x =
|
|
|
+ // (comp.layout.transform.x || 0) - (groupComp.layout.transform?.x || 0);
|
|
|
+
|
|
|
+ // comp.layout.transform.y =
|
|
|
+ // (comp.layout.transform.y || 0) - (groupComp.layout.transform?.y || 0);
|
|
|
+ // });
|
|
|
+
|
|
|
+ // groupComp.children.default = parentComp.children.default?.filter((d) =>
|
|
|
+ // groupIds.includes(d)
|
|
|
+ // );
|
|
|
+ // parentComp.children.default = parentComp.children.default?.filter(
|
|
|
+ // (d) => !groupIds.includes(d)
|
|
|
+ // );
|
|
|
|
|
|
return groupId;
|
|
|
}
|
|
@@ -92,12 +92,12 @@ export class GroupActionCtrl extends ModuleControl<EditorModule> {
|
|
|
const { helper } = this;
|
|
|
const groupChildIds = groupComp.children.default as string[];
|
|
|
|
|
|
- const parentComp = helper.findParentComp(groupComp.id) as DesignComp;
|
|
|
+ const parentComp = helper.findParentComp(groupComp.id);
|
|
|
|
|
|
const parentMatrix = new Matrix();
|
|
|
|
|
|
groupChildIds.forEach((id) => {
|
|
|
- const comp = helper.findComp(id) as DesignComp;
|
|
|
+ const comp = helper.findComp(id);
|
|
|
|
|
|
parentMatrix.setFormDiv(groupComp.$el);
|
|
|
const originArr = window
|
|
@@ -129,18 +129,18 @@ export class GroupActionCtrl extends ModuleControl<EditorModule> {
|
|
|
.multipy(corigin)
|
|
|
.multipy(childMatrix);
|
|
|
|
|
|
- comp.layout.transform || (comp.layout.transform = {});
|
|
|
- comp.layout.transform.x = helper.pxToDesignSize(result.getX());
|
|
|
- comp.layout.transform.y = helper.pxToDesignSize(result.getY());
|
|
|
- comp.layout.transform.s = result.getScale();
|
|
|
- comp.layout.transform.r = result.getRotate();
|
|
|
+ // comp.layout.transform || (comp.layout.transform = {});
|
|
|
+ // comp.layout.transform.x = helper.pxToDesignSize(result.getX());
|
|
|
+ // comp.layout.transform.y = helper.pxToDesignSize(result.getY());
|
|
|
+ // comp.layout.transform.s = result.getScale();
|
|
|
+ // comp.layout.transform.r = result.getRotate();
|
|
|
});
|
|
|
|
|
|
- const childIds = [...(parentComp.children.default as string[])];
|
|
|
+ // const childIds = [...(parentComp.children.default as string[])];
|
|
|
|
|
|
- const groupIndex = childIds.findIndex((id) => groupComp.id === id);
|
|
|
- childIds.splice(groupIndex, 1, ...groupChildIds);
|
|
|
+ // const groupIndex = childIds.findIndex((id) => groupComp.id === id);
|
|
|
+ // childIds.splice(groupIndex, 1, ...groupChildIds);
|
|
|
|
|
|
- parentComp.children.default = childIds;
|
|
|
+ // parentComp.children.default = childIds;
|
|
|
}
|
|
|
}
|