From be2dd03213f8425e24f5a91b620a714780c4bf15 Mon Sep 17 00:00:00 2001
From: kerry <kerry@fanruan.com>
Date: Tue, 22 Feb 2022 15:04:59 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-67095=E3=80=90=E6=96=B0=E8=80=81?=
 =?UTF-8?q?=E8=87=AA=E9=80=82=E5=BA=94=E9=85=8D=E7=BD=AE=E9=9D=A2=E6=9D=BF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=91=E8=80=81=E6=A8=A1=E5=BC=8F-PC?=
 =?UTF-8?q?=E7=AB=AF=E8=87=AA=E9=80=82=E5=BA=94=E5=B1=9E=E6=80=A7=E9=80=89?=
 =?UTF-8?q?=E8=B7=9F=E9=9A=8F=E6=9C=8D=E5=8A=A1=E5=99=A8=EF=BC=8C=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=99=A8=E6=8A=A5=E8=A1=A8=E5=9D=97=E9=80=89=E2=80=9C?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E2=80=9D=EF=BC=8C=E6=AD=A4=E6=97=B6=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E7=94=BB=E5=B8=83=E9=87=8C=E7=9A=84=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E5=9D=97=E5=8F=B3=E4=BE=A7=E8=AE=BE=E7=BD=AE=E9=9D=A2=E6=9D=BF?=
 =?UTF-8?q?=E5=8D=B3=E6=8F=90=E7=A4=BA=E4=BA=86=E2=80=9C=E5=B7=B2=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E9=BB=98=E8=AE=A4=E8=87=AA=E9=80=82=E5=BA=94=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E2=80=9D=EF=BC=8C=E5=8F=88=E6=9C=89Pc=E6=B5=8F?=
 =?UTF-8?q?=E8=A7=88=E5=99=A8=E8=87=AA=E9=80=82=E5=BA=94=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B9=EF=BC=8C=E4=B8=94web=E9=A2=84=E8=A7=88=E7=9A=84?=
 =?UTF-8?q?=E6=95=88=E6=9E=9C=E7=9C=8B=E8=B5=B7=E6=9D=A5=E6=98=AF=E7=AC=A6?=
 =?UTF-8?q?=E5=90=88Pc=E6=B5=8F=E8=A7=88=E5=99=A8=E8=87=AA=E9=80=82?=
 =?UTF-8?q?=E5=BA=94=E8=AE=BE=E7=BD=AE=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/design/designer/creator/XElementCase.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XElementCase.java b/designer-form/src/main/java/com/fr/design/designer/creator/XElementCase.java
index bdaf40d226..2f4a699379 100644
--- a/designer-form/src/main/java/com/fr/design/designer/creator/XElementCase.java
+++ b/designer-form/src/main/java/com/fr/design/designer/creator/XElementCase.java
@@ -20,6 +20,7 @@ import com.fr.form.FormProvider;
 import com.fr.form.ui.ElementCaseEditor;
 import com.fr.form.ui.ElementCaseEditorProvider;
 import com.fr.report.fit.ReportFitAttr;
+import com.fr.report.fit.ReportFitConfig;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.CoreGraphHelper;
 import com.fr.stable.core.PropertyChangeAdapter;
@@ -127,7 +128,8 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
     private CRPropertyDescriptor getReportFitEditor() {
         this.designer = WidgetPropertyPane.getInstance().getEditingFormDesigner();
         FitProvider wbTpl = designer.getTarget();
-        ReportFitAttr fitAttr = wbTpl.getReportFitAttr();
+        //这边获取到的全局要考虑到服务器的配置
+        ReportFitAttr fitAttr = wbTpl.getReportFitAttr() == null ? ReportFitConfig.getInstance().getFrmFitAttr() : wbTpl.getReportFitAttr();
         ElementCaseEditor editor = this.toData();
         //兼容之前报表块（之前三个选项为：默认 横向 双向 现在是：横向 双向 不自适应)
         if (editor.getFitStateInPC() == 0) {