Просмотр исходного кода

Merge branch 'fix/展望报告边距调整' of jyx/dcjxb.microservice into master

金逸霄 2 недель назад
Родитель
Сommit
8dd93575d0

+ 3 - 3
abilities/exam-sprint/infrastructure/src/main/resources/templates/outlook-exam-sprint-report-template.html

@@ -6,13 +6,13 @@
     <style>
         @page {
             size: A4;
-            margin: 14mm 12mm;
+            margin: 0;
         }
 
         body {
             margin: 0;
             background-color: #f5f7fa;
-            padding: 30px 20px;
+            padding: 0;
             color: #333;
             font-family: ReportFont, "Microsoft YaHei", sans-serif;
             font-size: 14px;
@@ -23,7 +23,7 @@
             max-width: 1200px;
             margin: 0 auto;
             background: #fff;
-            padding: 40px;
+            padding: 32px;
             border-radius: 12px;
             border: 1px solid #e7edf5;
         }

+ 3 - 3
abilities/exam-sprint/infrastructure/src/test/java/cn/yunzhixue/ability/center/examsprint/infrastructure/report/rendering/outlook/OutlookExamSprintReportTemplateCompatibilityTest.java

@@ -17,7 +17,7 @@ class OutlookExamSprintReportTemplateCompatibilityTest {
         assertThat(normalizedTemplate)
                 .contains("body")
                 .contains("background-color: #f5f7fa")
-                .contains("padding: 30px 20px")
+                .contains("padding: 0")
                 .contains("color: #333")
                 .contains("font-family: ReportFont, \"Microsoft YaHei\", sans-serif")
                 .contains("ReportFont")
@@ -26,7 +26,7 @@ class OutlookExamSprintReportTemplateCompatibilityTest {
                 .contains("max-width: 1200px")
                 .contains("margin: 0 auto")
                 .contains("background: #fff")
-                .contains("padding: 40px")
+                .contains("padding: 32px")
                 .contains("border-radius: 12px")
                 .contains("border: 1px solid #e7edf5")
                 .contains(".section")
@@ -96,7 +96,7 @@ class OutlookExamSprintReportTemplateCompatibilityTest {
         String normalizedTemplate = normalizeWhitespace(loadTemplate());
 
         assertThat(normalizedTemplate)
-                .containsPattern("@page\\s*\\{[^}]*size\\s*:\\s*A4\\s*;[^}]*}")
+                .containsPattern("@page\\s*\\{[^}]*size\\s*:\\s*A4\\s*;[^}]*margin\\s*:\\s*0\\s*;[^}]*}")
                 .contains("h1.report-title")
                 .contains("font-size: 26px")
                 .contains("color: #2b4c8a")