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

Merge branch 'fix/展望报告模块二页边距' of jyx/dcjxb.microservice into master

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

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

@@ -325,7 +325,7 @@
 
         @media print {
             .module-section-two {
-                margin-top: 0;
+                margin-top: 32px;
             }
 
             .page-break-before-module2 {

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

@@ -77,7 +77,7 @@ class OutlookExamSprintReportTemplateCompatibilityTest {
                 .contains(".case-info-cell")
                 .containsPattern("\\.student-case\\s*\\{[^}]*page-break-inside\\s*:\\s*avoid\\s*;[^}]*}")
                 .containsPattern("<div\\s+class=\"(?=[^\"]*\\bsection\\b)(?=[^\"]*\\bmodule-section-two\\b)[^\"]*\">\\s*<h2 class=\"section-title\">模块二:科学备考建议</h2>")
-                .containsPattern("@media print\\s*\\{[^}]*\\.module-section-two\\s*\\{[^}]*margin-top\\s*:\\s*0\\s*;[^}]*}[^}]*\\.page-break-before-module2\\s*\\{[^}]*page-break-before\\s*:\\s*always\\s*;[^}]*height\\s*:\\s*0\\s*;[^}]*margin\\s*:\\s*0\\s*;[^}]*padding\\s*:\\s*0\\s*;[^}]*line-height\\s*:\\s*0\\s*;[^}]*font-size\\s*:\\s*0\\s*;[^}]*}")
+                .containsPattern("@media print\\s*\\{[^}]*\\.module-section-two\\s*\\{[^}]*margin-top\\s*:\\s*32px\\s*;[^}]*}[^}]*\\.page-break-before-module2\\s*\\{[^}]*page-break-before\\s*:\\s*always\\s*;[^}]*height\\s*:\\s*0\\s*;[^}]*margin\\s*:\\s*0\\s*;[^}]*padding\\s*:\\s*0\\s*;[^}]*line-height\\s*:\\s*0\\s*;[^}]*font-size\\s*:\\s*0\\s*;[^}]*}")
                 .doesNotContainPattern("(?i):nth-of-type\\s*\\(")
                 .doesNotContainPattern("(?i)(^|[\\s{;])break-before\\s*:")
                 .doesNotContainPattern("\\.analysis-grid\\s*\\{[^}]*display\\s*:\\s*grid\\s*;")