update

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

@@ -91,7 +91,7 @@ export const Component = defineComponent({
   setup(props) {
     const comp = useCompData<TextValue>(props.compId) as CompText;
 
-    const { store, actions } = useEditor();
+    const { store, actions, controls } = useEditor();
 
     const state = reactive({
       editableId: "",
@@ -106,8 +106,13 @@ export const Component = defineComponent({
         }
         state.editableId = "";
       });
+      
+      if (controls.compCtrl.currCompId == props.compId) {
+          state.editableId = "" + Date.now();
+      }
     }
 
+
     return () => (
       <View
         class={[textStyle]}
@@ -165,9 +170,9 @@ const EditorComp = defineComponent({
       const isChange = Math.abs(preHeight.value - h) > 1;
       preHeight.value = h;
       
-      comp.state.size[1] = h;
-      helper.extendStreamCard(store.currStreamCardId);
-
+      if (h != comp.state.size[1]) {
+         comp.state.size = [comp.state.size[0], h];
+      }
 
       if (isChange) {
         actions.selectObjs([]);
@@ -224,9 +229,8 @@ const EditorComp = defineComponent({
               const h = helper.pxToDesignSize(inputRef.value?.$el.clientHeight);
               const isChange = Math.abs(preHeight.value - h) > 1;
               preHeight.value = h;
-
               comp.state.setSize([comp.state.size[0], h]);
-              helper.extendStreamCard(store.currStreamCardId);
+    
               if (isChange) {
                 console.log("changing=>", isChange);
                 actions.selectObjs([]);

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

@@ -29,6 +29,13 @@ export class CompCtrl extends ModuleControl<EditorModule> {
     return this.getObj<CompBase<object>>(this.state.currCompId);
   }
 
+  get currCompId() {
+    return this.state.currCompId;
+  }
+  get currCardId() {
+    return this.state.currCardId;
+  }
+
   pickComp(compId: string) {
     this.state.setCurrCompId(compId);
   }
@@ -139,15 +146,9 @@ export class CompCtrl extends ModuleControl<EditorModule> {
 
     this.pickComp( addedObj.id );
     
-    const compId = addedObj.id;
-
-    if (compKey == "Text") {
-      this.actions.textFocus(compId, true);
-    }
     this.controls.cropCtrl.close();
 
     this.history.submit();
   }
-
 }
 

src/modules/editor/controllers/SelectCtrl/objects/displayObject.ts

@@ -3,8 +3,9 @@ import { Bounds } from "./bounds";
 import { Point } from "./point";
 import { Transform } from "./transform";
 import { Rectangle } from "./rectangle";
+import { Events } from "queenjs";
 
-export class DisplayObject {
+export class DisplayObject extends Events {
 
   tempDisplayObjectParent?:DisplayObject;
 

src/modules/editor/objects/Elements/base.ts

@@ -114,22 +114,29 @@ class CompBase<T extends object> extends Container {
         this.state.onChildrenChanged(()=>{
             this._updateChildObjs();
         })
+
         this.state.onSizeChanged((size)=>{
             this.width = size[0];
             this.height = size[1];
+
+            this.emit("transformChange");
         })
+        
         this.state.onPosChanged((pos)=>{
             this.position.x = pos[0]
             this.position.y = pos[1]
+            this.emit("transformChange");
         })
 
         this.state.onScaleChanged((scales)=>{
             this.scale.x = scales[0]
             this.scale.y = scales[1]
+            this.emit("transformChange");
         })
 
         this.state.onRotationChanged((r)=>{
             this.rotation = r;
+            this.emit("transformChange");
         })
     }
 

src/modules/editor/objects/Elements/page.ts

@@ -1,94 +1,105 @@
-
 import { CompBase } from "./base";
 import { HistoryController } from "./history";
 import { utils } from "./utils";
 
 export type PageValue = {
-    music:string
-}
+  music: string;
+};
 
 export type CardValue = {
-    test:number
-}
-
-export class CompCard extends CompBase<CardValue>  {
+  test: number;
+};
 
+export class CompCard extends CompBase<CardValue> {
   override onCreated(): void {
     this.compKey = "StreamCard";
     this.state.size = [750, 300];
     this.state.position = "relative";
   }
 
-  addComp( comp: CompBase<any>) {
-     const childrens = this.state.children.slice(0)
-     childrens.push(comp);
+  override init(): void {
+    super.init();
 
-     let maxH = 0, n = childrens.length;
-     while (n--) {
-       const c = childrens[n];
-       const aabb = c.getLocalBounds();
-       maxH = Math.max(maxH, aabb.y + aabb.height);
-     }
-     if (childrens.length < 1 ) {
-       maxH = 200
-     }
-     this.state.setSize([this.state.size[0], maxH])
-     this.state.setChildren(childrens);
+    this.state.children.forEach((c) => {
+      c.on("transformChange", () => {
+        this.extendHeight();
+      });
+    });
   }
-}
-
 
-export class CompPage extends CompBase<PageValue> {
-    override onCreated(): void {
-        this.state.position = "relative";
-        this.state.bgColor = "#ffffff";
-        this.compKey = "Page";
-        this.state.size = [750,  -1];//默认设置一页的高度
+  addComp(comp: CompBase<any>) {
+    const childrens = this.state.children.slice(0);
+    childrens.push(comp);
+    this.state.setChildren(childrens);
+    this.extendHeight();
+    comp.on("transformChange", ()=>{
+        this.extendHeight();
+    })
+  }
+  
+  extendHeight() {
+    const childrens = this.state.children;
+    let maxH = 0,
+      n = childrens.length;
+    while (n--) {
+      const c = childrens[n];
+      const aabb = c.getLocalBounds();
+      maxH = Math.max(maxH, aabb.y + aabb.height);
     }
-
-
-    insertCard(srcCardId: string,  card:CompCard) {
-        const state = this.state
-        const children = state.children.slice(0);
-        let childs = children.map(item=>item.id);
-        const index = childs.indexOf(srcCardId) + 1;
-        children.splice(index, 0, card);
-        state.setChildren(children);
-        return index;
+    if (childrens.length < 1) {
+      maxH = 200;
     }
+    this.state.setSize([this.state.size[0], maxH]);
+  }
+}
 
-    removeCard(srcCardId: string) {
-        const state = this.state
-        const children = state.children.slice(0);
-        let childs = children.map(item=>item.id);
-        const index = childs.indexOf(srcCardId);
-        children.splice(index, 1);
-        state.setChildren(children);
-        return index;
-    }
+export class CompPage extends CompBase<PageValue> {
+  override onCreated(): void {
+    this.state.position = "relative";
+    this.state.bgColor = "#ffffff";
+    this.compKey = "Page";
+    this.state.size = [750, -1]; //默认设置一页的高度
+  }
+
+  insertCard(srcCardId: string, card: CompCard) {
+    const state = this.state;
+    const children = state.children.slice(0);
+    let childs = children.map((item) => item.id);
+    const index = childs.indexOf(srcCardId) + 1;
+    children.splice(index, 0, card);
+    state.setChildren(children);
+    return index;
+  }
 
+  removeCard(srcCardId: string) {
+    const state = this.state;
+    const children = state.children.slice(0);
+    let childs = children.map((item) => item.id);
+    const index = childs.indexOf(srcCardId);
+    children.splice(index, 1);
+    state.setChildren(children);
+    return index;
+  }
 
-    switchCard(fromIndex:number, toIndex:number) {
-        console.log("switch")
-    }
+  switchCard(fromIndex: number, toIndex: number) {
+    console.log("switch");
+  }
 }
 
 export function createPage(histry: HistoryController) {
+  const obj = new CompPage({ music: "" });
+  obj.state.children.push(createCard(histry)); //默认有一页卡片
+  obj.init();
 
-    const obj = new CompPage({ music:""});
-    obj.state.children.push( createCard(histry) );  //默认有一页卡片
-    obj.init();
-
-    obj.setHistory(histry);
+  obj.setHistory(histry);
 
-    return obj;
+  return obj;
 }
 
 export function createCard(histry: HistoryController) {
-    const obj = new CompCard({test: 1})
-    obj.init();
+  const obj = new CompCard({ test: 1 });
+  obj.init();
 
-    obj.setHistory(histry);
-    return obj;
+  obj.setHistory(histry);
+  return obj;
 }
-