Merge branch 'dev' of http://124.70.149.18:10880/lianghj/queenshow into spu3d

src/modules/editor/components/Viewport/Slider/SliderLeft/Templates/index.tsx

@@ -70,7 +70,7 @@ export default defineUI({
                     class="draggable-item relative"
                     key={item._id}
                     title={item.title}
-                    style={{ aspectRatio: 1 }}
+                    // style={{ aspectRatio: 1 }}
                     onClick={() => editor.actions.clickTplToDesign(item)}
                   >
                     <Image

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

@@ -1206,20 +1206,20 @@ export const editActions = EditorModule.action({
     const frameData = await this.https.getDesignDetail(record._id, {
       isSys: true,
     });
-    const { compMap, content, desc, thumbnail, title, _id } = frameData.result;
+    const result = new DesignTemp(frameData.result);
+    const { _id, ...rest } = result;
 
     const designData = {
-      _id: ctrl.designData._id,
+      ...ctrl.designData,
       version: ctrl.designData.version,
-      compMap,
-      content,
-      desc,
-      thumbnail,
-      title,
+      ...rest,
     };
 
     this.controls.editorCtrl.clickPickComp("root");
     ctrl.setDesignData(designData);
+    setTimeout(() => {
+      this.controls.editorCtrl.autoInScreen();
+    }, 0);
 
     ctrl.state.setDesignId(_id as string);
   },