Browse Source

Pull request #6260: REPORT-60674 FR11老自适应-报表块右侧选择自定义时,没有手动修改pc浏览器自适应的设置,应该是随着工具栏PC端报表块自适应属性的设置吧,但是出现了不一致现象;10.0是正常的

Merge in DESIGN/design from ~KERRY/design_10.0:release/11.0 to release/11.0

* commit '55031a4fd22c3819db5432e2b6150413c4c99fe0':
  代码修改
  REPORT-60674 FR11老自适应-报表块右侧选择自定义时,没有手动修改pc浏览器自适应的设置,应该是随着工具栏PC端报表块自适应属性的设置吧,但是出现了不一致现象;10.0是正常的
bugfix/11.0
kerry 3 years ago
parent
commit
c13728fae6
  1. 10
      designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/ElementEditorDefinePane.java

10
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); paddingBoundPane.update(elementCaseEditor);
} }
elementCaseEditor.setToolBars((FormToolBarManager[]) elementCaseToolBarEditor.getValue()); elementCaseEditor.setToolBars((FormToolBarManager[]) elementCaseToolBarEditor.getValue());
ReportFitAttr fitAttr = pcFitExpandablePane.update(); if (DesignerUIModeConfig.getInstance().newUIMode()) {
elementCaseEditor.setReportFitAttr(fitAttr); ReportFitAttr fitAttr = pcFitExpandablePane.update();
elementCaseEditor.setReportFitAttr(fitAttr);
}
return elementCaseEditor; return elementCaseEditor;
} }
@ -112,6 +114,8 @@ public class ElementEditorDefinePane extends WTitleLayoutDefinePane<ElementCaseE
paddingBoundPane.populate(ob); paddingBoundPane.populate(ob);
elementCaseToolBarEditor.setValue(ob.getToolBars()); elementCaseToolBarEditor.setValue(ob.getToolBars());
extraPropertyGroupPane.populate(ob); extraPropertyGroupPane.populate(ob);
pcFitExpandablePane.populate(ob.getReportFitAttr()); if (DesignerUIModeConfig.getInstance().newUIMode()) {
pcFitExpandablePane.populate(ob.getReportFitAttr());
}
} }
} }

Loading…
Cancel
Save