update

src/modules/editor/components/CompUI/basicUI/Rectage/component.tsx

@@ -14,7 +14,7 @@ export const Component = defineComponent({
     const data = useCompData<CompRectObj>(props.compId);
 
     onMounted(()=>{
-        // draw();
+        draw();
         effect(draw);
     })
 
@@ -25,6 +25,7 @@ export const Component = defineComponent({
         const canvas = canvasRef.value as HTMLCanvasElement;
         if (!canvas) return;
 
+        console.log("drawing rect")
         const ctx = canvasRef.value?.getContext("2d") as CanvasRenderingContext2D;
 
         const width = data.layout.size[0];

src/modules/editor/controllers/PageCtrl/index.ts

@@ -25,11 +25,19 @@ export class PageCtrl extends ModuleControl<EditorModule> {
 
     initEvent() {
 
+        const updatePid = (pid:string)=>{
+           const comps = this.compMap[pid].children.default;
+           comps.forEach(c=>{
+               this.setCompPid(c, pid)
+               updatePid(c);
+           })
+        }
+
         this.rootPage.children.default.forEach(cid=>{
             const card = this.compMap[cid];
             let first = true;
             this.setCompPid(cid, this.rootPage.id);
-
+            updatePid(this.rootPage.id)
             card.children.onDefaultChanged((childs)=>{
                 if (first) {
                     first = false;
@@ -37,6 +45,7 @@ export class PageCtrl extends ModuleControl<EditorModule> {
                 }
                 childs.forEach(c=>{
                   this.setCompPid(c, card.id);
+                  updatePid(c)
                 })
                 this.helper.extendStreamCard(cid);
             })

src/modules/editor/controllers/ReactCtrl/rxValue.ts

@@ -128,7 +128,6 @@ class RxValue {
                     out[name] = obj[name].toJson();
                     return;
                 }
-                if ( obj[name] )
                 out[name] = obj._rxs[name].getValue().value;
             })
             return out;

src/modules/editor/module/actions/edit.tsx

@@ -476,12 +476,13 @@ export const editActions = EditorModule.action({
 
   // 删除组件
   removeSelectComps() {
-    this.controls.editorCtrl.clickPickComp("");
     const selected = this.controls.selectCtrl.gizmo.selected.slice(0);
+    this.controls.editorCtrl.clickPickComp("");
     let n = selected.length;
     while (n--) {
       this.actions.removeComp(selected[n].comp.id);
     }
+    history.submit();
   },
 
   // 删除组件
@@ -948,26 +949,31 @@ export const editActions = EditorModule.action({
 
   // 取消打组
   cancelGroupComps(groupComp: DesignComp) {
-    const childs = groupComp.children.default || [];
-    const objC = this.controls.selectCtrl.objContainer;
-    const parentMtrx = objC.parent.worldTransform.clone();
+    const childs = groupComp.children.default;
+    const gizmo = this.controls.selectCtrl.gizmo;
+
+    const parentMtrx = gizmo.parent.worldTransform.clone();
+    gizmo.selectObjs([]);//取消选择
+
     childs.forEach((o) => {
       const obj = this.helper.findComp(o) as DesignComp;
       const mxt = Matrix.createFromMatrixStr(
         obj.layout.transformMatrix as string
       );
       mxt.prepend(parentMtrx);
-      obj.layout.transformMatrix = mxt.getMatrixStr();
+      obj.layout.setTransformMatrix(mxt.getMatrixStr());
     });
+
     const paths = this.helper.getCompTrees(groupComp.id);
     const card = paths[1];
     const parentChilds = (card.children.default || []).filter(
       (item) => item != groupComp.id
     );
     parentChilds.push(...childs);
-    card.children.default = parentChilds;
-
+    card.children.setDefault(parentChilds);
     this.controls.editorCtrl.clickPickComp(childs[0]);
+
+    history.submit();
   },
 
   createGroupComps() {
@@ -977,38 +983,42 @@ export const editActions = EditorModule.action({
 
     const sels = gizmo.selected.map(item=>item.comp.id);
     const id = this.controls.compUICtrl.createCompId("Group");
-    
     const comp = this.helper.findComp(id) as DesignComp;
     const chils = this.controls.pageCtrl.currStreamCard.children.default || [];
     const newChilds: any = [];
-    const groupChilds: any = [];
+    const groupChilds: string[] = [];
     chils.forEach((c) => {
       if (sels.indexOf(c) == -1) newChilds.push(c);
       else {
         groupChilds.push(c);
       }
     });
-
     newChilds.push(id);
-    page.currStreamCard.children.setDefault(newChilds);
-    page.setCompPid(id, page.currStreamCard.id);
 
     //更新节点的新位置
+    const newMatrixMap:any= {};
     gizmo.parent.children.forEach((obj) => {
       const cobj = obj as CompObject;
       const comp = cobj.comp;
-      comp.layout.transformMatrix = cobj.localTransform.getMatrixStr();
+      newMatrixMap[comp.id] = cobj.localTransform.getMatrixStr();
     });
-
+    page.currStreamCard.children.setDefault(newChilds);
+ 
     //再添加新的节点
-    comp.layout.size = [
+    comp.layout.setSize([
       this.helper.pxToDesignSize(gizmo.width),
       this.helper.pxToDesignSize(gizmo.height),
-    ];
+    ]);
+    comp.layout.setTransformMatrix(gizmo.parent.worldTransform.getMatrixStr());
 
-    comp.layout.transformMatrix = gizmo.parent.worldTransform.getMatrixStr();
+    this.controls.selectCtrl.gizmo.selectObjs([]);
 
-    comp.children.default = groupChilds;
+    groupChilds.forEach((c)=> {
+        const comp = this.helper.findComp(c) as DesignComp;
+        comp.layout.setTransformMatrix(newMatrixMap[c]);
+        page.setCompPid(c, id);
+    });
+    comp.children.setDefault(groupChilds);
 
     this.controls.propsCtrl.showProp(comp.id);