From e88de2094c5be0ce672e9b70ba23121fcd2d17ba Mon Sep 17 00:00:00 2001
From: "Henry.Wang" <Henry.Wang@fanruan.com>
Date: Sat, 14 Aug 2021 12:33:46 +0800
Subject: [PATCH 1/3] =?UTF-8?q?REPORT-55481=20=E6=A8=A1=E6=9D=BFWeb?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E7=9A=84=E9=A1=B6=E9=83=A8=E5=92=8C=E5=BA=95?=
 =?UTF-8?q?=E9=83=A8=E5=B7=A5=E5=85=B7=E6=A0=8F=E5=9C=A8=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=97=B6=EF=BC=8C=E9=A1=B6=E9=83=A8=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E6=A0=8F=E8=A2=AB=E5=BA=95=E9=83=A8=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E6=A0=8F=E8=A6=86=E7=9B=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/mainframe/AuthorityToolBarPane.java    | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/AuthorityToolBarPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/AuthorityToolBarPane.java
index 1fc891c8b..428a18a1a 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/AuthorityToolBarPane.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/AuthorityToolBarPane.java
@@ -185,7 +185,7 @@ public class AuthorityToolBarPane<T extends WebContent> extends BasicBeanPane<Re
      */
     private void checkToolBarPaneEnable() {
         List<ToolBarButton> toolBarButtons = toolBarPane.getToolBarButtons();
-        boolean isnotEnable = ComparatorUtils.equals(title.getText(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Server_Toolbar_Choose_Role"))&& !WorkContext.getCurrent().isRoot();
+        boolean isnotEnable = ComparatorUtils.equals(title.getText(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Server_Toolbar_Choose_Role")) && !WorkContext.getCurrent().isRoot();
         for (ToolBarButton button : toolBarButtons) {
             button.setEnabled(!isnotEnable);
         }
@@ -296,9 +296,15 @@ public class AuthorityToolBarPane<T extends WebContent> extends BasicBeanPane<Re
         if (toolBarManager.length == 0) {
             return;
         }
-        for (int i = 0; i < toolBarManager.length; i++) {
-            toolBarPane.populateBean(toolBarManager[i].getToolBar());
+        ToolBar resultToolbar = toolBarManager[0].getToolBar();
+        for (int i = 1; i < toolBarManager.length; i++) {
+            ToolBar toolBar = toolBarManager[i].getToolBar();
+            for (int j = 0; j < toolBar.getWidgetSize(); j++) {
+                Widget widget = toolBar.getWidget(j);
+                resultToolbar.addWidget(widget);
+            }
         }
+        toolBarPane.populateBean(resultToolbar);
     }
 
 

From e7400764b2e30e535d21e361accf10a950631285 Mon Sep 17 00:00:00 2001
From: "Henry.Wang" <Henry.Wang@fanruan.com>
Date: Mon, 16 Aug 2021 19:39:35 +0800
Subject: [PATCH 2/3] =?UTF-8?q?REPORT-57147=20=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=E6=A8=A1=E7=89=88=E9=BB=98=E8=AE=A4=E9=A2=84=E8=A7=88=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E4=B8=8D=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/fr/design/fit/common/TemplateTool.java   | 3 +++
 1 file changed, 3 insertions(+)

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

From 1415f85b9f7218793db645f7890748fe148f81fa Mon Sep 17 00:00:00 2001
From: "Henry.Wang" <Henry.Wang@fanruan.com>
Date: Mon, 16 Aug 2021 19:40:42 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=92=A4=E9=94=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/mainframe/AuthorityToolBarPane.java    | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/AuthorityToolBarPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/AuthorityToolBarPane.java
index 428a18a1a..1fc891c8b 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/AuthorityToolBarPane.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/AuthorityToolBarPane.java
@@ -185,7 +185,7 @@ public class AuthorityToolBarPane<T extends WebContent> extends BasicBeanPane<Re
      */
     private void checkToolBarPaneEnable() {
         List<ToolBarButton> toolBarButtons = toolBarPane.getToolBarButtons();
-        boolean isnotEnable = ComparatorUtils.equals(title.getText(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Server_Toolbar_Choose_Role")) && !WorkContext.getCurrent().isRoot();
+        boolean isnotEnable = ComparatorUtils.equals(title.getText(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Server_Toolbar_Choose_Role"))&& !WorkContext.getCurrent().isRoot();
         for (ToolBarButton button : toolBarButtons) {
             button.setEnabled(!isnotEnable);
         }
@@ -296,15 +296,9 @@ public class AuthorityToolBarPane<T extends WebContent> extends BasicBeanPane<Re
         if (toolBarManager.length == 0) {
             return;
         }
-        ToolBar resultToolbar = toolBarManager[0].getToolBar();
-        for (int i = 1; i < toolBarManager.length; i++) {
-            ToolBar toolBar = toolBarManager[i].getToolBar();
-            for (int j = 0; j < toolBar.getWidgetSize(); j++) {
-                Widget widget = toolBar.getWidget(j);
-                resultToolbar.addWidget(widget);
-            }
+        for (int i = 0; i < toolBarManager.length; i++) {
+            toolBarPane.populateBean(toolBarManager[i].getToolBar());
         }
-        toolBarPane.populateBean(resultToolbar);
     }