From 3a43ecc44b76a27721b9f02da827bf2369adf5db Mon Sep 17 00:00:00 2001
From: kerry <kerry@fanruan.com>
Date: Tue, 19 Oct 2021 13:49:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?REPORT-60674=20FR11=E8=80=81=E8=87=AA?=
 =?UTF-8?q?=E9=80=82=E5=BA=94-=E6=8A=A5=E8=A1=A8=E5=9D=97=E5=8F=B3?=
 =?UTF-8?q?=E4=BE=A7=E9=80=89=E6=8B=A9=E8=87=AA=E5=AE=9A=E4=B9=89=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=B2=A1=E6=9C=89=E6=89=8B=E5=8A=A8=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?pc=E6=B5=8F=E8=A7=88=E5=99=A8=E8=87=AA=E9=80=82=E5=BA=94?=
 =?UTF-8?q?=E7=9A=84=E8=AE=BE=E7=BD=AE=EF=BC=8C=E5=BA=94=E8=AF=A5=E6=98=AF?=
 =?UTF-8?q?=E9=9A=8F=E7=9D=80=E5=B7=A5=E5=85=B7=E6=A0=8FPC=E7=AB=AF?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=9D=97=E8=87=AA=E9=80=82=E5=BA=94=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E7=9A=84=E8=AE=BE=E7=BD=AE=E5=90=A7=EF=BC=8C=E4=BD=86?=
 =?UTF-8?q?=E6=98=AF=E5=87=BA=E7=8E=B0=E4=BA=86=E4=B8=8D=E4=B8=80=E8=87=B4?=
 =?UTF-8?q?=E7=8E=B0=E8=B1=A1=EF=BC=9B10.0=E6=98=AF=E6=AD=A3=E5=B8=B8?=
 =?UTF-8?q?=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../widget/ui/designer/layout/ElementEditorDefinePane.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/ElementEditorDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/ElementEditorDefinePane.java
index e32bc9b07..92a12f30e 100644
--- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/ElementEditorDefinePane.java
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/ElementEditorDefinePane.java
@@ -102,8 +102,10 @@ public class ElementEditorDefinePane extends WTitleLayoutDefinePane<ElementCaseE
             paddingBoundPane.update(elementCaseEditor);
         }
         elementCaseEditor.setToolBars((FormToolBarManager[]) elementCaseToolBarEditor.getValue());
-        ReportFitAttr fitAttr = pcFitExpandablePane.update();
-        elementCaseEditor.setReportFitAttr(fitAttr);
+        if (DesignerUIModeConfig.getInstance().newUIMode()) {
+            ReportFitAttr fitAttr = pcFitExpandablePane.update();
+            elementCaseEditor.setReportFitAttr(fitAttr);
+        }
         return elementCaseEditor;
     }
 

From 55031a4fd22c3819db5432e2b6150413c4c99fe0 Mon Sep 17 00:00:00 2001
From: kerry <kerry@fanruan.com>
Date: Tue, 19 Oct 2021 13:50:33 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../widget/ui/designer/layout/ElementEditorDefinePane.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/ElementEditorDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/ElementEditorDefinePane.java
index 92a12f30e..9507248df 100644
--- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/ElementEditorDefinePane.java
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/ElementEditorDefinePane.java
@@ -114,6 +114,8 @@ public class ElementEditorDefinePane extends WTitleLayoutDefinePane<ElementCaseE
         paddingBoundPane.populate(ob);
         elementCaseToolBarEditor.setValue(ob.getToolBars());
         extraPropertyGroupPane.populate(ob);
-        pcFitExpandablePane.populate(ob.getReportFitAttr());
+        if (DesignerUIModeConfig.getInstance().newUIMode()) {
+            pcFitExpandablePane.populate(ob.getReportFitAttr());
+        }
     }
 }