From e2decdc840721e838a83cd3180635f6bbe035437 Mon Sep 17 00:00:00 2001
From: Yvan <Yvan@fanruan.com>
Date: Wed, 23 Sep 2020 16:40:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BF=AE=E6=94=B9=EF=BC=9A?=
 =?UTF-8?q?=E4=B9=8B=E5=89=8D=E5=9C=A8=E6=94=B9REPORT-38534=E8=BF=99?=
 =?UTF-8?q?=E4=B8=AAbug=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E7=9C=8B?=
 =?UTF-8?q?=E5=88=B0DesignState=E9=87=8C=E9=9D=A2=E6=9C=89=E4=B8=AA?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=9D=A2=E6=9D=BF=E7=8A=B6=E6=80=81=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=A5=E4=B8=BA=E4=B8=8D=E4=BC=9A=E5=B9=B2=E6=89=B0=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=EF=BC=8C=E5=88=9A=E6=89=8D=E6=B5=8B=E8=AF=95=E5=8F=A6?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AAbug=E5=8F=91=E7=8E=B0=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E8=BF=99=E8=BE=B9=EF=BC=8C=E5=89=AA=E5=88=87?=
 =?UTF-8?q?=E5=A4=8D=E5=88=B6=E6=8C=89=E9=92=AE=E4=B9=9F=E6=98=AF=E4=BF=9D?=
 =?UTF-8?q?=E6=8C=81=E4=B8=80=E7=9B=B4=E5=8F=AF=E7=94=A8=E7=9A=84=EF=BC=8C?=
 =?UTF-8?q?=E6=89=80=E4=BB=A5=E8=A6=81=E5=A2=9E=E5=8A=A0=E4=B8=80=E5=B1=82?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=AD=A4=E6=97=B6?=
 =?UTF-8?q?=E6=98=AFWORK=5FSHEET=E7=8A=B6=E6=80=81=EF=BC=8C=E8=BF=98?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=88=A4=E6=96=AD=E6=98=AF=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=9D=97=E8=BF=98=E6=98=AF=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=9D=A2=E6=9D=BF=EF=BC=8C=E4=BB=85=E5=BD=93?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=8A=A5=E8=A1=A8=E5=9D=97=E6=97=B6=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E4=B8=8D=E8=83=BD=E7=BD=AE=E7=81=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/fr/design/mainframe/DesignerFrame.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
index 92d06d0b5e..2f65fca0a8 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
@@ -748,9 +748,11 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
         //Yvan: 检查当前是否为WORK_SHEET状态，因为只有WORK_SHEET中含有格式刷组件，此时是不需要进行checkComponentsByNames的
         JTemplate<?, ?> jTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
         if (jTemplate != null) {
-            if (jTemplate.getMenuState() != DesignState.WORK_SHEET) {
-                combineUp.checkComponentsByNames(flag, al);
+            // 第一个条件满足后还需要添加一重判断，判断是编辑报表块还是参数面板，编辑报表块时则直接return
+            if (jTemplate.getMenuState() == DesignState.WORK_SHEET && !jTemplate.isUpMode()) {
+                return;
             }
+            combineUp.checkComponentsByNames(flag, al);
         }
     }