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

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

@@ -59,10 +59,13 @@ export const Component = defineComponent({
       const containerStyles = getContainerStyles();
       const containerScale = createScale();
 
+      const rootPage = controls.pageCtrl.rootPage;
+
       return (
         <div
           class={cx(rootStyles, showSwiper && "swiper-slide")}
           style={containerStyles}
+          key={rootPage.children.default.indexOf(props.compId) + props.compId}
         >
           <View
             class="JS_viewRoot"

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

@@ -24,7 +24,7 @@ export const layoutColumns: ColumnItem[] = [
     component: Align,
     dataIndex: "id",
     isVisible: (value, data) =>
-    ["Page", "Container"].includes(data.compKey) ? false : true,
+      ["Page", "Container"].includes(data.compKey) ? false : true,
   },
   // {
   //   label: "对齐",
@@ -128,6 +128,10 @@ export const bdColumns: ColumnItem[] = [
     label: "边框样式",
     dataIndex: "layout.border.style",
     component: "Select",
+    getValue(v) {
+      if (!v) return "none";
+      return v;
+    },
     props: {
       bordered: false,
       style: { backgroundColor: "#303030" },
@@ -264,21 +268,25 @@ export function createAttrsForm(valueColumns: ColumnItem[], columnsUI?: any) {
       component: any<DesignComp>().isRequired,
     },
     setup(props) {
-      const { controls} = useEditor();
+      const { controls } = useEditor();
       function changeVal(e: { dataIndex: string; value: any }) {
-
         let setterpath = "";
         if (!setterpath) {
-            const dataIndex = e.dataIndex;
-            const paths = dataIndex.split(".")
-            const prop = paths[paths.length-1];
-            paths[paths.length-1] = "set" + prop.slice(0, 1).toUpperCase() + prop.slice(1);
-            setterpath = paths.join(".");
+          const dataIndex = e.dataIndex;
+          const paths = dataIndex.split(".");
+          const prop = paths[paths.length - 1];
+          paths[paths.length - 1] =
+            "set" + prop.slice(0, 1).toUpperCase() + prop.slice(1);
+          setterpath = paths.join(".");
         }
-        _.invoke(props.component, setterpath, e.value)
+        _.invoke(props.component, setterpath, e.value);
       }
 
-      function changeValEnd(e: { dataIndex: string; value: any , setterIndex:string}) {
+      function changeValEnd(e: {
+        dataIndex: string;
+        value: any;
+        setterIndex: string;
+      }) {
         changeVal(e);
         history.submit();
         console.log("changing end");
@@ -287,7 +295,8 @@ export function createAttrsForm(valueColumns: ColumnItem[], columnsUI?: any) {
       return () => {
         const { component } = props;
 
-        if (controls.selectCtrl.gizmo.state.transform.selected.length > 1) return <AlignMulti />;
+        if (controls.selectCtrl.gizmo.state.transform.selected.length > 1)
+          return <AlignMulti />;
 
         return (
           <div class={formStyle}>

src/modules/editor/components/Viewport/Header/index.tsx

@@ -12,6 +12,12 @@ export default defineUI({
     const { store, actions, controls, jumpIndexHtml } = editor;
 
     function showPreviewModal() {
+      controls.screenCtrl.saveScreenPage();
+      const rootPage = controls.pageCtrl.rootPage;
+      rootPage.value.pageMode = controls.screenCtrl.state.screen.pageMode;
+      rootPage.value.pageSizeType =
+        controls.screenCtrl.state.screen.pageSizeType;
+
       queenApi.dialog(
         <PreviewDesignModal data={controls.pageCtrl.designData} />,
         {