From 32584054c8ba0b6e3beb7c33a4e9bd72d2953e59 Mon Sep 17 00:00:00 2001 From: "Henry.Wang" Date: Sun, 12 Sep 2021 21:50:03 +0800 Subject: [PATCH 1/3] =?UTF-8?q?REPORT-59143=20=E3=80=90=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8=E9=80=82=E9=85=8D=E3=80=91=E6=A8=A1=E7=89=88=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E4=B8=BA=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=A8=A1=E7=89=88?= =?UTF-8?q?=E4=B9=9F=E8=A6=81=E6=94=AF=E6=8C=81=E6=96=B0=E6=97=A7=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/fit/NewJForm.java | 7 +------ .../main/java/com/fr/design/fit/common/TemplateTool.java | 4 +--- 2 files changed, 2 insertions(+), 9 deletions(-) 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 74737f8ce..fe192b59b 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 323a28ad0..b8954d5f7 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; } } From dafa536ba26733086ed34ff453903ed4a770e4c0 Mon Sep 17 00:00:00 2001 From: "Henry.Wang" Date: Mon, 13 Sep 2021 09:51:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?REPORT-59143=20=E3=80=90=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8=E9=80=82=E9=85=8D=E3=80=91=E6=A8=A1=E7=89=88=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E4=B8=BA=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=A8=A1=E7=89=88?= =?UTF-8?q?=E4=B9=9F=E8=A6=81=E6=94=AF=E6=8C=81=E6=96=B0=E6=97=A7=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/fit/common/TemplateTool.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) 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 b8954d5f7..ae1e98f88 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 @@ -46,11 +46,8 @@ public class TemplateTool { if (AdaptiveSwitchUtil.isSwitchJFromIng()) { currentType = DesignerUIModeConfig.getInstance().newUIMode() ? JFormType.NEW_TYPE : JFormType.OLD_TYPE; } else { - if (jTemplate instanceof NewJForm) { - NewJForm newJForm = (NewJForm) jTemplate; - if (LightTool.containNewFormFlag(newJForm.getTarget()) || newJForm.getTarget().getTemplateID() == null) { - currentType = JFormType.NEW_TYPE; - } + if (isNewJForm(jTemplate)) { + currentType = JFormType.NEW_TYPE; } } //UI转换 @@ -62,6 +59,16 @@ public class TemplateTool { } }; + private static boolean isNewJForm(JTemplate jTemplate) { + if (jTemplate instanceof NewJForm) { + NewJForm newJForm = (NewJForm) jTemplate; + if (LightTool.containNewFormFlag(newJForm.getTarget()) || newJForm.getTarget().getTemplateID() == null) { + return true; + } + } + return false; + } + public static Listener getSwitchListener() { return switchListener; } From 26dcb553cee3bbf896236dcde33a6befe60cef4d Mon Sep 17 00:00:00 2001 From: "Henry.Wang" Date: Mon, 13 Sep 2021 09:55:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?REPORT-59143=20=E3=80=90=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8=E9=80=82=E9=85=8D=E3=80=91=E6=A8=A1=E7=89=88=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E4=B8=BA=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=A8=A1=E7=89=88?= =?UTF-8?q?=E4=B9=9F=E8=A6=81=E6=94=AF=E6=8C=81=E6=96=B0=E6=97=A7=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/fit/common/TemplateTool.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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 ae1e98f88..cb415df59 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 @@ -45,10 +45,8 @@ public class TemplateTool { JFormType currentType = JFormType.OLD_TYPE; if (AdaptiveSwitchUtil.isSwitchJFromIng()) { currentType = DesignerUIModeConfig.getInstance().newUIMode() ? JFormType.NEW_TYPE : JFormType.OLD_TYPE; - } else { - if (isNewJForm(jTemplate)) { - currentType = JFormType.NEW_TYPE; - } + } else if (isNewJForm(jTemplate)) { + currentType = JFormType.NEW_TYPE; } //UI转换 currentType.switchUIMode();