update

src/modules/editor/components/CompUI/basicUI/Transfer/select.tsx

@@ -37,7 +37,7 @@ export const SelectTransfer = defineComponent({
       
       let comp: any = null;
       if (controls.selectCtrl.gizmo.selected.length == 1) {
-        comp = controls.selectCtrl.gizmo.selected[0]
+        comp = controls.selectCtrl.gizmo.selected[0].comp
       }
 
       const w :any = selectCtrl.objContainer.getBound();

src/modules/editor/components/CompUI/defines/align.tsx

@@ -12,7 +12,7 @@ export default defineComponent({
   setup(props) {
     const editor = useEditor();
     const comp = editor.helper.findComp(props.value as string) as DesignComp;
-    console.log("align id=>", props.value, comp);
+    
     return () => {
       return (
         <div class={AlignToolsStyle}>

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

@@ -26,11 +26,16 @@ export class PageCtrl extends ModuleControl<EditorModule> {
         this.rootPage.children.default.forEach(cid=>{
             const card = this.compMap[cid];
             let first = true;
-            card.children.onDefaultChanged(()=>{
+            this.setCompPid(cid, this.rootPage.id);
+
+            card.children.onDefaultChanged((childs)=>{
                 if (first) {
                     first = false;
                     return;
                 }
+                childs.forEach(c=>{
+                  this.setCompPid(c, card.id);
+                })
                 this.helper.extendStreamCard(cid);
             })
         })
@@ -62,7 +67,7 @@ export class PageCtrl extends ModuleControl<EditorModule> {
 
         return out;
     }
-    
+
     setCompPid(compId: string, pid: string) {
         this.compPids[compId] = pid;
     }
@@ -81,11 +86,24 @@ export class PageCtrl extends ModuleControl<EditorModule> {
     }
 
     setDesignData(data: Partial<DesignTemp>) {     
-       this.controls.pageCtrl.designData = new DesignTemp(data);
-       this.state.rootId = "root";
-       this.state.currStreamCardId = this.streamCardIds[0];
-       this.initEvent();
-       this.controls.propsCtrl.state.propId = "root";
+       this.designData = new DesignTemp(data);
+        //设置组件父子关系
+        const ite = (root:any)=> {
+          const cards = root.children?.default || [];
+          cards.forEach((c:string)=>{
+            this.setCompPid(c, root.id);
+              const r = this.compMap[c];
+              if (r) {
+                ite(r);
+              }
+          })
+        }
+        ite(this.designData.compMap.root);
+
+        this.state.rootId = "root";
+        this.state.currStreamCardId = this.streamCardIds[0];
+        this.initEvent();
+        this.controls.propsCtrl.state.propId = "root";
 
        setTimeout(() => {
             history.enable = true;
@@ -111,8 +129,13 @@ export class PageCtrl extends ModuleControl<EditorModule> {
         this.state.setCurrStreamCardId(cardId);
     }
 
+    findParentComp(compId: string): DesignComp | undefined {
+      const comp = this.compMap[compId];
+      if (comp) return this.compMap[this.compPids[compId]];
+    }
+
     deleteComp(compId: string) {
-        const parentComp = this.helper.findParentComp(compId);
+        const parentComp = this.findParentComp(compId);
         let deleteOK = false;
         if (parentComp) {
           const ids = [...(parentComp.children.default || [])];
@@ -121,7 +144,7 @@ export class PageCtrl extends ModuleControl<EditorModule> {
             const index = ids.findIndex((id) => id === compId);
             if (index >= 0) {
               ids.splice(index, 1);
-              parentComp.children.default = ids;
+              parentComp.children.setDefault(ids);
               deleteOK = true;
             }
           }

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

@@ -453,15 +453,16 @@ export class SelectCtrl extends ModuleControl<EditorModule> {
       this._state = MODE_NONE;
       if ((!e.shiftKey && !e.ctrlKey) ) {
           this.controls.editorCtrl.clickPickComp(this._downClickedCompId);
-          if (gizmo.lastSelChanged) {
-            history.submit();
-          }
+          
       } else {
         const paths = this.helper.getCompTrees(this._downClickedCompId)
         if (paths[2]) {
           this._selectObjs([paths[2].id], e)
         }
       }
+      if (gizmo.lastSelChanged) {
+        history.submit();
+      }
     }
 
     if (this._state == MODE_SEL_RECT && !isClick) {
@@ -481,7 +482,6 @@ export class SelectCtrl extends ModuleControl<EditorModule> {
       if (gizmo.lastSelChanged) {
         history.submit();
       }
-      
     }
 
     if (this._state == MODE_ROTATE) {
@@ -563,7 +563,8 @@ export class SelectCtrl extends ModuleControl<EditorModule> {
       lastId = selected[selected.length-1] || "";
     }
     if (lastId) {
-        this.controls.editorCtrl.clickPickComp(lastId); 
+        this.controls.propsCtrl.showProp(lastId); 
+        this.controls.pageCtrl.setCurrComp(lastId);
     }
     if (selected.length < 1) {
       this.controls.propsCtrl.showProp(this.store.currStreamCardId);

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

@@ -485,9 +485,9 @@ export const editActions = EditorModule.action({
   },
 
   // 删除组件
-  removeComp(compId: string) {
+  removeComp(compId: string, submitHistory= false) {
     const ctrl = this.controls.pageCtrl;
-
+    
     const paths = this.helper.getCompTrees(compId);
     if (!paths[2]) {
       if (this.helper.isStreamCard(compId)) {
@@ -513,6 +513,10 @@ export const editActions = EditorModule.action({
 
       this.controls.editorCtrl.clickPickComp("");
     }
+
+    if (submitHistory) {
+      history.submit();
+    }
   },
 
   async removeStreamCard(compId: string) {
@@ -711,7 +715,10 @@ export const editActions = EditorModule.action({
   },
   // 设置组件层级
   setCompLayer(comp: DesignComp, offset: number) {
-    const cards = this.store.currStreamCard.children.default || [];
+
+    const currCard = this.controls.pageCtrl.currStreamCard
+    const cards = currCard.children.default.slice(0);
+
     const i = cards.indexOf(comp.id);
     if (i == -1) return;
 
@@ -721,6 +728,8 @@ export const editActions = EditorModule.action({
       const temp = cards[i - 1];
       cards[i - 1] = comp.id;
       cards[i] = temp;
+      currCard.children.setDefault(cards);
+      history.submit();
       return;
     }
 
@@ -728,11 +737,8 @@ export const editActions = EditorModule.action({
     const temp = cards[i + 1];
     cards[i + 1] = comp.id;
     cards[i] = temp;
-
-    // comp.layout.zIndex = Math.min(
-    //   Math.max((comp.layout.zIndex || 0) + offset, 0),
-    //   99
-    // );
+    currCard.children.setDefault(cards);
+    history.submit();
   },
   //横向对齐
   setAlignX(flag: 0 | 1 | 2 | 3, isGroup = false) {

src/modules/editor/module/actions/init.ts

@@ -35,20 +35,6 @@ export const initActions = EditorModule.action({
     const page = this.controls.pageCtrl;
     page.setDesignData(ret.result);
     
-
-    //设置组件父子关系
-    const ite = (root:any)=> {
-      const cards = root.children?.default || [];
-      cards.forEach((c:string)=>{
-        page.setCompPid(c, root.id);
-          const r = this.helper.findComp(c);
-          if (r) {
-            ite(r);
-          }
-      })
-    }
-    ite(page.rootPage);
-
     const root = this.helper.findRootComp() as DesignComp;
     this.controls.screenCtrl.state.screen.useFor= root.value.useFor || "mobile"
     this.controls.screenCtrl.state.screen.pageMode = root.value.pageMode || "long"  

src/modules/editor/objects/Toolbars/default.ts

@@ -4,6 +4,7 @@ import { EditorModule } from "../../module";
 import { ICompKeys } from "../../typings";
 import { DesignComp } from "../DesignTemp/DesignComp";
 import { upperFirst } from "lodash";
+// import { history } from "../DesignTemp/factory";
 
 function getVisible(this: EditorModule, comp: DesignComp) {
   return !!comp;
@@ -126,7 +127,6 @@ export const toolbars = createToolbars({
         this.controls.selectCtrl.gizmo.selectedIds.length > 0 ||
         (!!comp && this.helper.isCompCanDelete(comp.id))
       );
-      console.log("deleting icon=>", ret);
       return ret;
     },
 
@@ -135,7 +135,8 @@ export const toolbars = createToolbars({
         this.actions.removeSelectComps();
         return;
       }
-      this.actions.removeComp(comp.id);
+      this.actions.removeComp(comp.id, true);
+  
     },
   },