From 0336b6a964314730a6405cf0843d2af268b21c50 Mon Sep 17 00:00:00 2001 From: Yvan Date: Wed, 23 Sep 2020 11:29:22 +0800 Subject: [PATCH 1/6] =?UTF-8?q?REPORT-40458=20=E3=80=90=E5=9B=9E=E5=BD=92?= =?UTF-8?q?=E3=80=91=E8=AE=BE=E8=AE=A1=E5=99=A8=E9=87=8D=E5=90=AF=E4=BB=A5?= =?UTF-8?q?=E5=90=8E=E4=BC=9A=E5=8D=A1=E4=BD=8F=EF=BC=8C=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E9=99=A4=E4=BA=86=E8=8F=9C=E5=8D=95=E6=A0=8F=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E9=83=BD=E5=8A=A8=E4=B8=8D=E4=BA=86=20=E3=80=90=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=8E=9F=E5=9B=A0=E3=80=91editingTemplate=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=88=A4=E7=A9=BA=EF=BC=8C=E5=BD=93=E6=97=B6=E8=87=AA?= =?UTF-8?q?=E5=B7=B1=E6=B5=8B=E8=AF=95=E5=8F=91=E7=8E=B0=E6=98=AF=E4=B8=8D?= =?UTF-8?q?=E4=BC=9A=E5=87=BA=E7=8E=B0null=E6=83=85=E5=86=B5=E7=9A=84?= =?UTF-8?q?=EF=BC=8C=E8=BF=99=E4=B8=AA=E9=97=AE=E9=A2=98=E6=98=AF=E5=9B=A0?= =?UTF-8?q?=E4=B8=BA=E5=AE=89=E8=A3=85=E4=BA=86=E4=B8=80=E4=B8=AA=E6=96=B0?= =?UTF-8?q?=E5=BC=95=E6=93=8E=E6=8F=92=E4=BB=B6=E5=90=8E=EF=BC=8C=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E9=82=A3=E8=BE=B9=E6=9F=90=E4=B8=AA=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E5=8F=AF=E8=83=BD=E4=BC=9A=E5=9C=A8setCurrentEditingTemplate?= =?UTF-8?q?=E4=B9=8B=E5=89=8D=EF=BC=8C=E8=B0=83=E7=94=A8checkCombineUp?= =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8C=E6=AD=A4=E6=97=B6getCurrentEditingT?= =?UTF-8?q?emplate=E4=BC=9A=E6=8B=BF=E5=88=B0null=E5=80=BC=EF=BC=8C?= =?UTF-8?q?=E7=84=B6=E5=90=8E=E5=87=BA=E7=8E=B0npe=20=E3=80=90=E6=94=B9?= =?UTF-8?q?=E5=8A=A8=E6=80=9D=E8=B7=AF=E3=80=91=E5=A2=9E=E5=8A=A0=E5=88=A4?= =?UTF-8?q?=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/data/datapane/connect/JDBCDefPane.java | 1 + .../ipasswordfield/UIPasswordFieldWithFixedLength.java | 2 +- .../main/java/com/fr/design/mainframe/DesignerFrame.java | 8 +++++--- .../main/java/com/fr/design/mainframe/TopXCreators.java | 1 + 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java index 683b38e01..8f26ec8c3 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java @@ -8,6 +8,7 @@ import com.fr.design.border.UITitledBorder; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.ilable.UILabel; +import com.fr.design.gui.ipasswordfield.UIPassWordField; import com.fr.design.gui.ipasswordfield.UIPasswordFieldWithFixedLength; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.gui.ilable.ActionLabel; diff --git a/designer-base/src/main/java/com/fr/design/gui/ipasswordfield/UIPasswordFieldWithFixedLength.java b/designer-base/src/main/java/com/fr/design/gui/ipasswordfield/UIPasswordFieldWithFixedLength.java index c1cb98ca3..6fdace66a 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ipasswordfield/UIPasswordFieldWithFixedLength.java +++ b/designer-base/src/main/java/com/fr/design/gui/ipasswordfield/UIPasswordFieldWithFixedLength.java @@ -77,7 +77,7 @@ public class UIPasswordFieldWithFixedLength extends UIPassWordField { if (clearPassword) { UIPasswordFieldWithFixedLength.this.setText(StringUtils.EMPTY); UIPasswordFieldWithFixedLength.this.clearPassword = false; - UIPasswordFieldWithFixedLength.this.updateUI(); + //UIPasswordFieldWithFixedLength.this.updateUI(); } } }); 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 fe0276b38..92d06d0b5 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 @@ -746,10 +746,12 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta */ public void checkCombineUp(boolean flag, ArrayList al) { //Yvan: 检查当前是否为WORK_SHEET状态，因为只有WORK_SHEET中含有格式刷组件，此时是不需要进行checkComponentsByNames的 - if (HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getMenuState() == DesignState.WORK_SHEET) { - return; + JTemplate jTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); + if (jTemplate != null) { + if (jTemplate.getMenuState() != DesignState.WORK_SHEET) { + combineUp.checkComponentsByNames(flag, al); + } } - combineUp.checkComponentsByNames(flag, al); } /** diff --git a/designer-form/src/main/java/com/fr/design/mainframe/TopXCreators.java b/designer-form/src/main/java/com/fr/design/mainframe/TopXCreators.java index 89b261bb9..eef16f80b 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/TopXCreators.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/TopXCreators.java @@ -78,5 +78,6 @@ public class TopXCreators extends JComponent { TopXCreator topXCreator = (TopXCreator) getComponent(i); topXCreator.resizeTopXCreator(); } + //repaint(); } } From 380c24445044f36e754e0dc3e7582adc3667c753 Mon Sep 17 00:00:00 2001 From: Yvan Date: Wed, 23 Sep 2020 11:41:18 +0800 Subject: [PATCH 2/6] =?UTF-8?q?REPORT-40458=20=E3=80=90=E5=9B=9E=E5=BD=92?= =?UTF-8?q?=E3=80=91=E8=AE=BE=E8=AE=A1=E5=99=A8=E9=87=8D=E5=90=AF=E4=BB=A5?= =?UTF-8?q?=E5=90=8E=E4=BC=9A=E5=8D=A1=E4=BD=8F=EF=BC=8C=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E9=99=A4=E4=BA=86=E8=8F=9C=E5=8D=95=E6=A0=8F=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E9=83=BD=E5=8A=A8=E4=B8=8D=E4=BA=86=20=E3=80=90=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=8E=9F=E5=9B=A0=E3=80=91editingTemplate=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=88=A4=E7=A9=BA=EF=BC=8C=E5=BD=93=E6=97=B6=E8=87=AA?= =?UTF-8?q?=E5=B7=B1=E6=B5=8B=E8=AF=95=E5=8F=91=E7=8E=B0=E6=98=AF=E4=B8=8D?= =?UTF-8?q?=E4=BC=9A=E5=87=BA=E7=8E=B0null=E6=83=85=E5=86=B5=E7=9A=84?= =?UTF-8?q?=EF=BC=8C=E8=BF=99=E4=B8=AA=E9=97=AE=E9=A2=98=E6=98=AF=E5=9B=A0?= =?UTF-8?q?=E4=B8=BA=E5=AE=89=E8=A3=85=E4=BA=86=E4=B8=80=E4=B8=AA=E6=96=B0?= =?UTF-8?q?=E5=BC=95=E6=93=8E=E6=8F=92=E4=BB=B6=E5=90=8E=EF=BC=8C=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E9=82=A3=E8=BE=B9=E6=9F=90=E4=B8=AA=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E5=8F=AF=E8=83=BD=E4=BC=9A=E5=9C=A8setCurrentEditingTemplate?= =?UTF-8?q?=E4=B9=8B=E5=89=8D=EF=BC=8C=E8=B0=83=E7=94=A8checkCombineUp?= =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8C=E6=AD=A4=E6=97=B6getCurrentEditingT?= =?UTF-8?q?emplate=E4=BC=9A=E6=8B=BF=E5=88=B0null=E5=80=BC=EF=BC=8C?= =?UTF-8?q?=E7=84=B6=E5=90=8E=E5=87=BA=E7=8E=B0npe=20=E3=80=90=E6=94=B9?= =?UTF-8?q?=E5=8A=A8=E6=80=9D=E8=B7=AF=E3=80=91=E5=A2=9E=E5=8A=A0=E5=88=A4?= =?UTF-8?q?=E7=A9=BA"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/mainframe/DesignerFrame.java | 8 +++----- 1 file changed, 3 insertions(+), 5 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 92d06d0b5..fe0276b38 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 @@ -746,12 +746,10 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta */ public void checkCombineUp(boolean flag, ArrayList al) { //Yvan: 检查当前是否为WORK_SHEET状态，因为只有WORK_SHEET中含有格式刷组件，此时是不需要进行checkComponentsByNames的 - JTemplate jTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); - if (jTemplate != null) { - if (jTemplate.getMenuState() != DesignState.WORK_SHEET) { - combineUp.checkComponentsByNames(flag, al); - } + if (HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getMenuState() == DesignState.WORK_SHEET) { + return; } + combineUp.checkComponentsByNames(flag, al); } /** From e33f5214efdbcd3f2d204cd43466920b92169283 Mon Sep 17 00:00:00 2001 From: Yvan Date: Wed, 23 Sep 2020 11:52:40 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=B9=8B=E5=89=8D=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=A4=9A=E4=BA=86=EF=BC=8C=E6=92=A4=E9=94=80=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/data/datapane/connect/JDBCDefPane.java | 1 - .../gui/ipasswordfield/UIPasswordFieldWithFixedLength.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java index 8f26ec8c3..683b38e01 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java @@ -8,7 +8,6 @@ import com.fr.design.border.UITitledBorder; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.ilable.UILabel; -import com.fr.design.gui.ipasswordfield.UIPassWordField; import com.fr.design.gui.ipasswordfield.UIPasswordFieldWithFixedLength; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.gui.ilable.ActionLabel; diff --git a/designer-base/src/main/java/com/fr/design/gui/ipasswordfield/UIPasswordFieldWithFixedLength.java b/designer-base/src/main/java/com/fr/design/gui/ipasswordfield/UIPasswordFieldWithFixedLength.java index 6fdace66a..c1cb98ca3 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ipasswordfield/UIPasswordFieldWithFixedLength.java +++ b/designer-base/src/main/java/com/fr/design/gui/ipasswordfield/UIPasswordFieldWithFixedLength.java @@ -77,7 +77,7 @@ public class UIPasswordFieldWithFixedLength extends UIPassWordField { if (clearPassword) { UIPasswordFieldWithFixedLength.this.setText(StringUtils.EMPTY); UIPasswordFieldWithFixedLength.this.clearPassword = false; - //UIPasswordFieldWithFixedLength.this.updateUI(); + UIPasswordFieldWithFixedLength.this.updateUI(); } } }); From e410f10bf07156a502ac7a763790c0dc85322183 Mon Sep 17 00:00:00 2001 From: Yvan Date: Wed, 23 Sep 2020 11:53:19 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=A4=9A=E4=BA=86?= =?UTF-8?q?=EF=BC=8C=E6=92=A4=E9=94=80=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/mainframe/TopXCreators.java | 1 - 1 file changed, 1 deletion(-) diff --git a/designer-form/src/main/java/com/fr/design/mainframe/TopXCreators.java b/designer-form/src/main/java/com/fr/design/mainframe/TopXCreators.java index eef16f80b..89b261bb9 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/TopXCreators.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/TopXCreators.java @@ -78,6 +78,5 @@ public class TopXCreators extends JComponent { TopXCreator topXCreator = (TopXCreator) getComponent(i); topXCreator.resizeTopXCreator(); } - //repaint(); } } From 67d94534628c0c90aceed4badcf4b6db75c1b79e Mon Sep 17 00:00:00 2001 From: Yvan Date: Wed, 23 Sep 2020 12:31:53 +0800 Subject: [PATCH 5/6] =?UTF-8?q?REPORT-40458=20=E3=80=90=E5=9B=9E=E5=BD=92?= =?UTF-8?q?=E3=80=91=E8=AE=BE=E8=AE=A1=E5=99=A8=E9=87=8D=E5=90=AF=E4=BB=A5?= =?UTF-8?q?=E5=90=8E=E4=BC=9A=E5=8D=A1=E4=BD=8F=EF=BC=8C=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E9=99=A4=E4=BA=86=E8=8F=9C=E5=8D=95=E6=A0=8F=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E9=83=BD=E5=8A=A8=E4=B8=8D=E4=BA=86=20=E3=80=90=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=8E=9F=E5=9B=A0=E3=80=91editingTemplate=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=88=A4=E7=A9=BA=EF=BC=8C=E5=BD=93=E6=97=B6=E8=87=AA?= =?UTF-8?q?=E5=B7=B1=E6=B5=8B=E8=AF=95=E5=8F=91=E7=8E=B0=E6=98=AF=E4=B8=8D?= =?UTF-8?q?=E4=BC=9A=E5=87=BA=E7=8E=B0null=E6=83=85=E5=86=B5=E7=9A=84?= =?UTF-8?q?=EF=BC=8C=E8=BF=99=E4=B8=AA=E9=97=AE=E9=A2=98=E6=98=AF=E5=9B=A0?= =?UTF-8?q?=E4=B8=BA=E5=AE=89=E8=A3=85=E4=BA=86=E4=B8=80=E4=B8=AA=E6=96=B0?= =?UTF-8?q?=E5=BC=95=E6=93=8E=E6=8F=92=E4=BB=B6=E5=90=8E=EF=BC=8C=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E9=82=A3=E8=BE=B9=E6=9F=90=E4=B8=AA=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E5=8F=AF=E8=83=BD=E4=BC=9A=E5=9C=A8setCurrentEditingTemplate?= =?UTF-8?q?=E4=B9=8B=E5=89=8D=EF=BC=8C=E8=B0=83=E7=94=A8checkCombineUp?= =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8C=E6=AD=A4=E6=97=B6getCurrentEditingT?= =?UTF-8?q?emplate=E4=BC=9A=E6=8B=BF=E5=88=B0null=E5=80=BC=EF=BC=8C?= =?UTF-8?q?=E7=84=B6=E5=90=8E=E5=87=BA=E7=8E=B0npe=20=E3=80=90=E6=94=B9?= =?UTF-8?q?=E5=8A=A8=E6=80=9D=E8=B7=AF=E3=80=91=E5=A2=9E=E5=8A=A0=E5=88=A4?= =?UTF-8?q?=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/mainframe/DesignerFrame.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 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 fe0276b38..92d06d0b5 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 @@ -746,10 +746,12 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta */ public void checkCombineUp(boolean flag, ArrayList al) { //Yvan: 检查当前是否为WORK_SHEET状态，因为只有WORK_SHEET中含有格式刷组件，此时是不需要进行checkComponentsByNames的 - if (HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getMenuState() == DesignState.WORK_SHEET) { - return; + JTemplate jTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); + if (jTemplate != null) { + if (jTemplate.getMenuState() != DesignState.WORK_SHEET) { + combineUp.checkComponentsByNames(flag, al); + } } - combineUp.checkComponentsByNames(flag, al); } /** From e2decdc840721e838a83cd3180635f6bbe035437 Mon Sep 17 00:00:00 2001 From: Yvan Date: Wed, 23 Sep 2020 16:40:42 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=9A=E4=B9=8B=E5=89=8D=E5=9C=A8=E6=94=B9REPORT-38534?= =?UTF-8?q?=E8=BF=99=E4=B8=AAbug=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C?= =?UTF-8?q?=E7=9C=8B=E5=88=B0DesignState=E9=87=8C=E9=9D=A2=E6=9C=89?= =?UTF-8?q?=E4=B8=AA=E5=8F=82=E6=95=B0=E9=9D=A2=E6=9D=BF=E7=8A=B6=E6=80=81?= =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E4=B8=BA=E4=B8=8D=E4=BC=9A=E5=B9=B2=E6=89=B0?= =?UTF-8?q?=E5=88=A4=E6=96=AD=EF=BC=8C=E5=88=9A=E6=89=8D=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=8F=A6=E4=B8=80=E4=B8=AAbug=E5=8F=91=E7=8E=B0=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E9=9D=A2=E6=9D=BF=E8=BF=99=E8=BE=B9=EF=BC=8C=E5=89=AA?= =?UTF-8?q?=E5=88=87=E5=A4=8D=E5=88=B6=E6=8C=89=E9=92=AE=E4=B9=9F=E6=98=AF?= =?UTF-8?q?=E4=BF=9D=E6=8C=81=E4=B8=80=E7=9B=B4=E5=8F=AF=E7=94=A8=E7=9A=84?= =?UTF-8?q?=EF=BC=8C=E6=89=80=E4=BB=A5=E8=A6=81=E5=A2=9E=E5=8A=A0=E4=B8=80?= =?UTF-8?q?=E5=B1=82=E5=88=A4=E6=96=AD=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=AD=A4?= =?UTF-8?q?=E6=97=B6=E6=98=AFWORK=5FSHEET=E7=8A=B6=E6=80=81=EF=BC=8C?= =?UTF-8?q?=E8=BF=98=E9=9C=80=E8=A6=81=E5=88=A4=E6=96=AD=E6=98=AF=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E6=8A=A5=E8=A1=A8=E5=9D=97=E8=BF=98=E6=98=AF=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=8F=82=E6=95=B0=E9=9D=A2=E6=9D=BF=EF=BC=8C=E4=BB=85?= =?UTF-8?q?=E5=BD=93=E7=BC=96=E8=BE=91=E6=8A=A5=E8=A1=A8=E5=9D=97=E6=97=B6?= =?UTF-8?q?=E6=8C=89=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 92d06d0b5..2f65fca0a 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); } }