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

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

@@ -39,7 +39,8 @@ export const Component = defineComponent({
         }
       }
       console.log("curr card=>", store.currStreamCardId, store.currStreamCard?.children.default?.length);
-
+      style.transform = "matrix(1,0,0,1,0,0)";
+      
       return (
         <div
           ref={compRef}

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

@@ -158,7 +158,7 @@ export const bdColumns: ColumnItem[] = [
   },
   {
     label: "边框弧度",
-    dataIndex: "layout.border.radius",
+    dataIndex: "layout.border.radius2",
     component: Slider,
     getValue(v) {
       if (v == undefined) return 0;

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

@@ -180,7 +180,7 @@ export class ScreenCtrl extends ModuleControl<EditorModule> {
    isScreenExit(screenId:string) {
       return !!this.store.designData.compScreenMap[screenId] && 
             this.store.designData.compScreenMap[screenId].length > 0 &&
-            this.store.designData.compScreenMap[screenId][1].children.length > 0;
+            this.store.designData.compScreenMap[screenId][0].children.length > 0;
    }
 
    restorScreenPage(screenId = "") {

src/modules/editor/objects/DesignTemp/creates/createCompStyle.ts

@@ -10,7 +10,7 @@ export function createCompStyle(
   layout: Layout,
   comp: DesignComp
 ) {
-  const { designToNaturalSize, pxToDesignSize } = module.helper;
+  const { designToNaturalSize, pxToDesignSize , designSizeToPx} = module.helper;
   const style: any = {};
   const transform: any = {};
 
@@ -36,8 +36,12 @@ export function createCompStyle(
       style["border-radius"] = layout.border.radius / 2 + "%";
       style["overflow"] = "hidden";
     }
+    if (layout.border.radius2 !== undefined) {
+      style["border-radius"] = designSizeToPx(Math.min(layout.size[0], layout.size[1])) * layout.border.radius2 / 100.0 + "px";
+      style["overflow"] = "hidden";
+    }
   }
-
+  
   if (layout.radius !== undefined) {
     style["border-radius"] = layout.radius / 2 + "%";
     style["overflow"] = "hidden";

src/modules/editor/typings.ts

@@ -22,6 +22,7 @@ export type Layout = {
     width?: number;
     color?: string;
     radius?: number;
+    radius2?: number;
   };
   zIndex?: number;
   margin?: string;

src/pages/h5/share/Promotion.tsx

@@ -43,6 +43,9 @@ export default defineComponent(() => {
   // }).then(data=>{
   //   console.log(data);
   // })
+  if ( !isPc() ) {
+      return ()=><editor.components.Preview />
+  } 
 
   return () => (
     <div