diff --git a/designer-form/src/main/java/com/fr/design/fit/NewJForm.java b/designer-form/src/main/java/com/fr/design/fit/NewJForm.java index 74737f8ce6..fe192b59b9 100644 --- a/designer-form/src/main/java/com/fr/design/fit/NewJForm.java +++ b/designer-form/src/main/java/com/fr/design/fit/NewJForm.java @@ -73,8 +73,6 @@ public class NewJForm extends JForm { * @date: 2020/9/13 23:23 */ private void changePaneSize() { - if (mobileForm()) - return; NewFormMarkAttr newFormMarkAttr = this.getTarget().getAttrMark(NewFormMarkAttr.XML_TAG); if (newFormMarkAttr.isNotSetOriginSize()) { newFormMarkAttr.setBodyHeight(LayoutTool.getBodyHeight(this)); @@ -284,10 +282,7 @@ public class NewJForm extends JForm { private UIButton[] addAdaptiveSwitchButton(UIButton[] extraButtons) { switchAction = new SwitchAction(); - if (!mobileForm()) { - return ArrayUtils.addAll(extraButtons, new UIButton[]{switchAction.getToolBarButton()}); - } - return extraButtons; + return ArrayUtils.addAll(extraButtons, new UIButton[]{switchAction.getToolBarButton()}); } public boolean isNewJFrom() { diff --git a/designer-form/src/main/java/com/fr/design/fit/common/TemplateTool.java b/designer-form/src/main/java/com/fr/design/fit/common/TemplateTool.java index 323a28ad04..b8954d5f7e 100644 --- a/designer-form/src/main/java/com/fr/design/fit/common/TemplateTool.java +++ b/designer-form/src/main/java/com/fr/design/fit/common/TemplateTool.java @@ -48,9 +48,7 @@ public class TemplateTool { } else { if (jTemplate instanceof NewJForm) { NewJForm newJForm = (NewJForm) jTemplate; - if (newJForm.mobileForm()) { - currentType = JFormType.OLD_TYPE; - } else if (LightTool.containNewFormFlag(newJForm.getTarget()) || newJForm.getTarget().getTemplateID() == null) { + if (LightTool.containNewFormFlag(newJForm.getTarget()) || newJForm.getTarget().getTemplateID() == null) { currentType = JFormType.NEW_TYPE; } }