update

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

@@ -39,6 +39,30 @@ export class PageCtrl extends ModuleControl<EditorModule> {
     designData = {} as DesignTemp
     compPids = {} as Record<string, string>;
 
+    toJson() {
+        const out:any = {
+           _id: this.designData._id,
+           version: this.designData.version,
+         
+           title: this.designData.title,
+           desc: this.designData.desc,
+           pageStyle: this.designData.pageStyle,
+           content: this.designData.content,
+           thumbnail: this.designData.thumbnail,
+           compScreenMap: this.designData.compScreenMap,
+        }
+
+        const keys = Object.keys(this.designData.compMap);
+        const compMap :any = {};
+        keys.forEach(k=>{
+           compMap[k] = this.designData.compMap[k].toJson();
+        })
+        out.compMap = compMap;
+        console.log(out);
+
+        return out;
+    }
+    
     setCompPid(compId: string, pid: string) {
         this.compPids[compId] = pid;
     }
@@ -78,7 +102,7 @@ export class PageCtrl extends ModuleControl<EditorModule> {
         if (compId == "root") {
           return;
         }
-        
+
         const comps = this.helper.getCompTrees(compId);
         let cardId = comps[1]?.id || "";
         if (this.helper.isStreamCard(compId)) {
@@ -175,5 +199,7 @@ export class PageCtrl extends ModuleControl<EditorModule> {
         Object.assign(compMap, nextCompMap);
         return nextCompMap[idMap.get("root") as string];
     }
-  
+    setDesignThumbnail(url: string) {
+      this.designData.thumbnail = url;
+    }
 }

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

@@ -1,6 +1,6 @@
 import { HistoryController } from "./history";
 import {BehaviorSubject} from "rxjs";
-import { reactive, toRaw } from  "vue";
+import { reactive } from  "vue";
 
 export class ValueSnap {
     Id:string;
@@ -45,7 +45,7 @@ export function createValueSnap(value:any, oldValue:any, rx:BehaviorSubject<any>
 
 class RxValue {
    static create<T extends {[key:string]: any}>(_fields:T, histroy?: HistoryController ) {
-        let obj = {} as any;
+        let obj = {__rx:true} as any;
         
         obj._historySnap = {} as any;
         obj._historySub = {} as any;
@@ -57,8 +57,17 @@ class RxValue {
         const names = Object.keys(_fields);
         
         names.forEach(name=>{
+
+
                const currName = name;
                const initValue = _fields[currName]
+
+               const isRxField = typeof initValue == "object" && initValue.__rx
+               if (isRxField) {
+                    obj[currName] = initValue;
+                    return;
+               }
+
                 const f = createRxValue(initValue, !!histroy);
                 obj._rxs[name] = f;
 
@@ -111,7 +120,15 @@ class RxValue {
         obj["toJson"] = function() {
             const out:any = {};
             const names = Object.keys(_fields);
+
             names.forEach(name=>{
+                const initV = _fields[name]
+                const isRxField = typeof initV == "object" && initV.__rx
+                if (isRxField) {
+                    out[name] = obj[name].toJson();
+                    return;
+                }
+                if ( obj[name] )
                 out[name] = obj._rxs[name].getValue().value;
             })
             return out;
@@ -120,6 +137,12 @@ class RxValue {
             const out:any = {};
             const names = Object.keys(_fields);
             names.forEach(name=>{
+                const initV = _fields[name]
+                const isRxField = typeof initV == "object" && initV.__rx
+                if (isRxField) {
+                    out[name] = obj[name].fromJson( json[name] );
+                    return;
+                }
                 obj._rxs[name].next({value: json[name], _hstry: false})
             })
             return out;

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

@@ -4,7 +4,6 @@ import { Matrix } from "../SelectCtrl/matrix";
 export class ScreenshotCtrl {
   async snap(options: { element: HTMLElement; ratio?: number }): Promise<Blob> {
     const dom = options.element;
-
     // const transferEl = document.querySelector(".transfer") as
     //   | HTMLElement
     //   | undefined;

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

@@ -629,15 +629,17 @@ export const editActions = EditorModule.action({
       if (!ctrl.designData.thumbnail) {
         await this.actions.updateThumbnailByScreenshot();
       }
+
       queenApi.showLoading("保存中");
+      
       await this.controls.uploader.uploadBlobs(ctrl.designData);
       if (this.store.isWk) {
         await this.https[this.store.isEditPage ? "saveWkDesign" : "saveComp"](
-          ctrl.designData
+          ctrl.toJson()
         );
       } else {
         await this.https[this.store.isEditPage ? "saveDesign" : "saveComp"](
-          ctrl.designData
+          ctrl.toJson()
         );
       }
       queenApi.messageSuccess("保存成功");
@@ -651,9 +653,9 @@ export const editActions = EditorModule.action({
   // 截屏保存封面
   async updateThumbnailByScreenshot(autoSave?: boolean) {
     const ctrl = this.controls.pageCtrl;
-
+    
     try {
-      const rootComp = this.helper.findRootComp();
+      const rootComp = ctrl.rootPage;
       if (!rootComp) return;
       queenApi.showLoading("截屏中");
       const blob = await new ScreenshotCtrl().snap({
@@ -661,7 +663,7 @@ export const editActions = EditorModule.action({
         ratio: this.store.isEditComp ? 0 : 1,
       });
       const thumbnail = URL.createObjectURL(blob);
-      this.store.setDesignThumbnail(thumbnail);
+      ctrl.setDesignThumbnail(thumbnail);
 
       if (autoSave) {
         await this.controls.uploader.uploadBlobs(ctrl.designData);

src/modules/editor/module/helpers/index.ts

@@ -70,7 +70,7 @@ export const helpers = EditorModule.helper({
   },
 
   findRootComp(): DesignComp | undefined {
-    return this.controls.pageCtrl.designData.compMap?.["root"];
+    return this.controls.pageCtrl.rootPage;
   },
 
   findCardAllChildren(index:number) {

src/modules/editor/module/index.ts

@@ -94,7 +94,7 @@ export class EditorModule extends ModuleRoot {
     location.href = link;
   }
   get selected () {
-    return this.controls.selectCtrl.gizmo.selectObjs;
+    return this.controls.selectCtrl.gizmo.selected;
   }
   get gizmo() {
     return this.controls.selectCtrl.gizmo;

src/modules/editor/module/stores/index.ts

@@ -106,8 +106,5 @@ export const store = EditorModule.store({
     setTextEditingState(state: boolean) {
       this.store.textEditingState = state;
     },
-    setDesignThumbnail(url: string) {
-      this.controls.pageCtrl.designData.thumbnail = url;
-    },
   },
 });

src/modules/editor/objects/DesignTemp/DesignComp.ts

@@ -64,6 +64,8 @@ export class DesignCompObj<T extends {[key:string]: any}> extends Events {
     out.value = this.value.toJson();
     out.children = this.children.toJson();
     out.layout = this.layout.toJson();
+    
+    return out;
   }
 
   getChildIds() {