Browse Source

Pull request #5371: REPORT-57147 设计器模版默认预览方式不生效

Merge in DESIGN/design from ~HENRY.WANG/design:release/11.0 to release/11.0

* commit '1415f85b9f7218793db645f7890748fe148f81fa':
  撤销
  REPORT-57147 设计器模版默认预览方式不生效
  REPORT-55481 模板Web属性的顶部和底部工具栏在权限编辑时,顶部工具栏被底部工具栏覆盖
fix-lag
Henry.Wang 3 years ago
parent
commit
a06551e24d
  1. 3
      designer-form/src/main/java/com/fr/design/fit/common/TemplateTool.java

3
designer-form/src/main/java/com/fr/design/fit/common/TemplateTool.java

@ -38,6 +38,9 @@ public class TemplateTool {
private static Listener<JTemplate> switchListener = new Listener<JTemplate>() { private static Listener<JTemplate> switchListener = new Listener<JTemplate>() {
@Override @Override
public void on(Event event, JTemplate jTemplate) { public void on(Event event, JTemplate jTemplate) {
if (!(jTemplate instanceof JForm)) {
return;
}
JFormType currentType = JFormType.OLD_TYPE; JFormType currentType = JFormType.OLD_TYPE;
if (AdaptiveSwitchUtil.isSwitchJFromIng()) { if (AdaptiveSwitchUtil.isSwitchJFromIng()) {
currentType = DesignerUIModeConfig.getInstance().newUIMode() ? JFormType.NEW_TYPE : JFormType.OLD_TYPE; currentType = DesignerUIModeConfig.getInstance().newUIMode() ? JFormType.NEW_TYPE : JFormType.OLD_TYPE;

Loading…
Cancel
Save