update

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

@@ -57,6 +57,9 @@ export const TextToolForm = defineComponent({
             const h = helper.pxToDesignSize(element.clientHeight);
             const size :any = store.currComp.layout.size.slice(0);
             size[1] = h;
+
+            console.log("xxxxxxxxxxxxxxxxx");
+
             store.currComp.layout.setSize(size);
             helper.extendStreamCard(controls.pageCtrl.currStreamCardId);
           });

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

@@ -73,6 +73,7 @@ const EditorComp = defineComponent({
     const comp = useCompData<CompTextObj>(props.compId);
     const { store, actions, helper, controls } = useEditor();
     const page = controls.pageCtrl;
+    const gizmo = controls.selectCtrl.gizmo;
 
     let blurCanceler: any = null;
 
@@ -192,8 +193,7 @@ const EditorComp = defineComponent({
 
             if (isChange) {
               const size: any =  comp.layout.size.slice(0);
-              size[1] = h;
-              comp.layout.size = size;
+              gizmo.selected[0].setSize(helper.designSizeToPx(size[0]), helper.designSizeToPx(h))
               helper.extendStreamCard(page.currStreamCardId);
             }
           });

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

@@ -5,6 +5,7 @@ import { Matrix } from "./matrix";
 import { DisplayObject } from "./objects/displayObject";
 import { isRectInter } from "./objects/mathUtils";
 import { Rectangle } from "./objects/rectangle";
+import { Transform } from "./objects/transform";
 
 function designSizeToPx(value: number) {
     return value / 2.0;
@@ -31,11 +32,7 @@ export class CompObject extends DisplayObject {
     constructor(c:DesignComp, usHistory = false) {
         super();
         this.comp = c;
-
-        // this.transform.setFromMatrix(Matrix.createFromMatrixStr(c.layout.transformMatrix || "matrix(1,0,0,1,0,0)"));
-        // return;
-        // console.log("xxxxxxxxxxxxx2222222222xxxxxxxxxxxxxx");
-
+        
         const wmtx = Matrix.createFromMatrixStr(c.layout.transformMatrix || "matrix(1,0,0,1,0,0)")
         const s = wmtx.getScale();
 
@@ -52,15 +49,13 @@ export class CompObject extends DisplayObject {
         let inited = true;
 
         this.state.onTransformChanged((tsf)=>{
-            const m = new Matrix();
-            m.setTransform(tsf.x, tsf.y, 0, 0, tsf.sx, tsf.sy, tsf.r, 0, 0);
-            this.transform.setFromMatrix(m);
-            this._boundsID++;
+            this.setTransform(tsf.x, tsf.y, tsf.sx, tsf.sy, tsf.r, 0, 0, 0, 0);
             this.updateTransform();
+            
             if (!inited) {
                 const s:any = [pxToDesignSize(tsf.w), pxToDesignSize(tsf.h)];
                 this.comp.layout.setSize(s);
-                this.comp.layout.setTransformMatrix(m.getMatrixStr())
+                this.comp.layout.setTransformMatrix(this.worldTransform.getMatrixStr())
             }
             inited = false;
         })
@@ -107,6 +102,16 @@ export class CompObject extends DisplayObject {
         this.state.setTransform(t);
     }
     
+    setMatrix(m:Matrix) {
+        const t = {...this.state.transform};
+        const s = m.getScale();
+        t.x = m.tx;
+        t.y = m.ty;
+        t.sx = s.x;
+        t.sy = s.y;
+        t.r = m.getRotate();
+        this.state.setTransform(t);
+    }
 
     getRect(){
         let p1 = {x:0,y:0} as any;

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

@@ -86,6 +86,16 @@ export class Gizemo extends Events {
 
     childSubs = [] as any[];
 
+    addChildWorldNoChange(child: CompObject) {
+        const m = this.parent.worldTransform.clone();
+        m.invert();
+        const wm = child.worldTransform.clone();
+        wm.prepend(m);
+        child.setMatrix(wm);
+        this.parent.addChild(child);
+        child.updateTransform();
+    }
+
     initGizmoEvent() {
         
         this.state.onTransformChanged((t, ot)=>{
@@ -106,7 +116,7 @@ export class Gizemo extends Events {
               this.aabb.addBounds(box);
               
               objs.push(obj);
-              this.parent.addChildWorldNoChange(obj);
+              this.addChildWorldNoChange(obj);
 
               let first = true;
               const s= obj.state.onTransformChanged(()=>{
@@ -114,17 +124,6 @@ export class Gizemo extends Events {
                 first = false;
               })
               this.childSubs.push(s);
-
-              let first1 = true;
-              const s2 = obj.comp.layout.onSizeChanged((size)=>{
-                if (!first1)  {
-                    obj.state.transform.w =  designSizeToPx(size[0]);
-                    obj.state.transform.h = designSizeToPx(size[1]);
-                    this.updateSize();
-                }
-                first1 = false;
-              })
-              this.childSubs.push(s2);
             });
 
             this.selected = objs;
@@ -216,6 +215,7 @@ export class Gizemo extends Events {
                 let box = obj.calculateBounds();
                 bound.addBounds(box);
             }
+
             //构建当前对象的转换矩阵
             let rect = new Rectangle();
             bound.getRectangle(rect);
@@ -476,16 +476,27 @@ export class Gizemo extends Events {
           this.aabb.addBounds(box);
         });
         this.aabb.getRectangle(this.rect);
-        const x = this.rect.x, y = this.rect.y, sx = n == 1? selected[0].scale.x : 1, sy= n == 1? selected[0].scale.y :  1;
+
+        let x = this.rect.x, y = this.rect.y, sx = 1, sy= 1;
+        if ( n == 1) {
+            const s = selected[0].worldTransform.getScale();
+            sx = s.x;
+            sy = s.y;
+        }
         const r = n == 1 ?selected[0].rotation : 0;
 
         this.parent.setTransform(x, y, sx, sy, r, 0, 0, 0, 0);
         this.parent.updateTransform();
-        
-        console.log("wwwwwwwwwwwww=>", this.height);
+    
+        const w = n == 1 ? selected[0].width  :  this.rect.width;
 
-        this.state.transform.w = this.rect.width;
-        this.state.transform.h = this.rect.height;
+
+        const h = n == 1 ? selected[0].height : this.rect.height;
+        this.rect.width = w;
+        this.rect.height = h;
+
+        this.state.transform.w = w
+        this.state.transform.h = h;
         this.state.transform.x = x;
         this.state.transform.y = y;
         this.state.transform.sx = sx;
@@ -493,7 +504,6 @@ export class Gizemo extends Events {
         this.state.transform.r = r;
         this.state.transform.px = 0;
         this.state.transform.py = 0;
-
         this.emit("change");
     }
 }

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

@@ -860,6 +860,8 @@ export class SelectCtrl extends ModuleControl<EditorModule> {
       const scaleIndex = dirIndexs.indexOf(dir);
       let pivot = objContainer.setPivot(scaleIndex);
 
+      console.log("scaleIndex=>", scaleIndex, pivot)
+      
       this.scaleIndex = scaleIndex;
       this.scalePivot = pivot;
 
@@ -905,6 +907,9 @@ export class SelectCtrl extends ModuleControl<EditorModule> {
         this.lastScale.x = dtaScale * this.initScale.x;
         this.lastScale.y = dtaScale * this.initScale.y;
         gizmo.scale(this.lastScale.x, this.lastScale.y);
+
+        console.log("this.lastScale.y-->", this.lastScale.y);
+
       } else if (i == 6 || i == 8) {
         this.lastScale.x = dtaScale * this.initScale.x;
         gizmo.scaleX(this.lastScale.x);

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

@@ -35,7 +35,7 @@ export class Container extends DisplayObject {
     const wm = child.worldTransform.clone();
     wm.prepend(m);
     // m.append( child.worldTransform );
-
+ 
     child.transform.setFromMatrix(wm);
 
     this.addChild(child);