Explorar el Código

8k页面支持

zhangjie hace 2 años
padre
commit
15933ea880

+ 10 - 8
src/modules/card/assets/styles/card-preview.scss

@@ -185,21 +185,21 @@
         .page-column-forbid-area {
           &::before {
             width: 2000px;
-            transform: rotate(34.326deg);
+            transform: rotate(34.43deg);
           }
           &::after {
             width: 2000px;
-            transform: rotate(-34.326deg);
+            transform: rotate(-34.43deg);
           }
         }
       }
       &-2 {
         .page-column-forbid-area {
           &::before {
-            transform: rotate(54.25deg);
+            transform: rotate(54.38deg);
           }
           &::after {
-            transform: rotate(-54.25deg);
+            transform: rotate(-54.38deg);
           }
         }
       }
@@ -207,20 +207,20 @@
       &-3 {
         .page-column-forbid-area {
           &::before {
-            transform: rotate(64.01deg);
+            transform: rotate(64.88deg);
           }
           &::after {
-            transform: rotate(-64.01deg);
+            transform: rotate(-64.88deg);
           }
         }
       }
       &-4 {
         .page-column-forbid-area {
           &::before {
-            transform: rotate(69.65deg);
+            transform: rotate(70.95deg);
           }
           &::after {
-            transform: rotate(-69.65deg);
+            transform: rotate(-70.95deg);
           }
         }
       }
@@ -1219,12 +1219,14 @@
 .elem-fill-field {
   white-space: normal;
   overflow: hidden;
+  font-size: 0;
 }
 .fill-field {
   &-item {
     display: inline-block;
     padding: 0 10px;
     width: 100%;
+    font-size: 14px;
   }
   &-content {
     height: 30px;

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 271 - 0
src/modules/card/assets/styles/card-temp.css


+ 4 - 1
src/modules/card/autoBuild/paperCard.js

@@ -32,7 +32,10 @@ const structTypeToCardElementType = {
 const elementModel = {
   FILL_QUESTION: (presetData) => {
     const model = createFillQuestion(presetData);
-    return getFillQuesitonElements(model, { pageSize: "A3", columnNumber: 2 });
+    return getFillQuesitonElements(model, {
+      pageSize: presetData.pageSize,
+      columnNumber: presetData.columnNumber,
+    });
   },
   FILL_LINE: (presetData) => {
     const model = createFillLine(presetData);

+ 3 - 3
src/modules/card/cardTemps.js

@@ -68,13 +68,13 @@ export const temp2 = {
       type: "GUTTER",
       direction: "left",
       x: 60,
-      w: 40,
+      w: 30,
     },
     {
       type: "FILL_FIELD",
       fieldCountPerLine: 2,
       w: 400,
-      h: 40,
+      h: 30,
       y: 870,
       x: 26,
       fields: [
@@ -91,7 +91,7 @@ export const temp2 = {
     {
       type: "FILL_FIELD",
       w: 220,
-      h: 40,
+      h: 30,
       y: 210,
       x: 26,
       fields: [

+ 10 - 1
src/modules/card/components/CardDesign.vue

@@ -313,7 +313,16 @@ export default {
     },
     initPageData() {
       if (this.paperSimpleStruct) {
-        const elements = buildCardFromPaperSimpleStruct(this.paperSimpleStruct);
+        const elementTypePreSetInfo = {
+          FILL_QUESTION: {
+            pageSize: this.cardConfig.pageSize,
+            columnNumber: this.cardConfig.columnNumber,
+          },
+        };
+        const elements = buildCardFromPaperSimpleStruct(
+          this.paperSimpleStruct,
+          elementTypePreSetInfo
+        );
         this.setTopics([...this.pageDefaultElems.elements, ...elements]);
       }
       this.resetTopicSeries();

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
src/modules/card/previewTemp.js


+ 7 - 1
src/modules/card/views/CardBuild.vue

@@ -91,7 +91,13 @@ export default {
       const pageDefaultElems = getPageInitElements(cardConfig);
       this.setPageDefaultElems(pageDefaultElems);
 
-      const elementTypePreSetInfo = { FILL_LINE: { fillCountPerLine: 1 } };
+      const elementTypePreSetInfo = {
+        FILL_LINE: { fillCountPerLine: 1 },
+        FILL_QUESTION: {
+          pageSize: cardConfig.pageSize,
+          columnNumber: cardConfig.columnNumber,
+        },
+      };
       const elements = buildCardFromPaperSimpleStruct(
         paperSimpleStruct,
         elementTypePreSetInfo

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio