From 522537a0b294bd0a1b3e98fd02c75c0a153d7805 Mon Sep 17 00:00:00 2001 From: "Bruce.Deng" Date: Mon, 17 May 2021 15:34:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-52406=20=E5=AF=BC=E5=87=BA-=E5=AD=97?= =?UTF-8?q?=E4=BD=93=E6=A3=80=E6=B5=8B-=E6=9D=83=E9=99=90=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E6=97=B6=E6=A3=80=E6=B5=8B=E6=8C=89=E9=92=AE=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E7=81=B0=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/mainframe/DesignerFrame.java | 5 ++--- 1 file changed, 2 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 debbaf14c..3d7fb8c48 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 @@ -12,7 +12,6 @@ import com.fr.design.ExtraDesignClassManager; import com.fr.design.actions.core.ActionFactory; import com.fr.design.base.mode.DesignModeContext; import com.fr.design.constants.UIConstants; -import com.fr.design.data.BasicTableDataTreePane; import com.fr.design.data.DesignTableDataManager; import com.fr.design.data.datapane.TableDataTreePane; import com.fr.design.dialog.FineJOptionPane; @@ -706,9 +705,9 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta combineUp.add(jComponent); } } + //添加检测按钮 + addCheckButton(); } - //添加检测按钮 - addCheckButton(); //添加分享按钮 addShareButton(); //添加插件中的按钮 From 9c9a301a971462c7aebd2fc326a689036897b80e Mon Sep 17 00:00:00 2001 From: hades Date: Tue, 18 May 2021 18:06:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-52462=20=E4=BF=9D=E5=AD=98=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E6=97=B6=EF=BC=8C=E5=B0=86=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E6=9C=80=E5=B0=8F=E5=8C=96=E5=88=B0=E5=90=8E=E5=8F=B0=EF=BC=8C?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=BF=9D=E5=AD=98=E5=A4=B1=E8=B4=A5=E7=9A=84?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=88=B0=E4=BA=86=E5=B1=8F=E5=B9=95=E5=B7=A6?= =?UTF-8?q?=E4=B8=8A=E8=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/worker/save/SaveWorker.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/worker/save/SaveWorker.java b/designer-base/src/main/java/com/fr/design/worker/save/SaveWorker.java index cc60f2dc8..f47a4f88e 100644 --- a/designer-base/src/main/java/com/fr/design/worker/save/SaveWorker.java +++ b/designer-base/src/main/java/com/fr/design/worker/save/SaveWorker.java @@ -10,6 +10,7 @@ import com.fr.design.mainframe.JTemplate; import com.fr.design.worker.WorkerManager; import com.fr.general.ComparatorUtils; import com.fr.log.FineLoggerFactory; +import java.awt.Frame; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; @@ -54,8 +55,9 @@ public class SaveWorker extends SwingWorker { } catch (Exception e) { processResult(); FineLoggerFactory.getLogger().error(e.getMessage(), e); + boolean minimized = (DesignerContext.getDesignerFrame().getExtendedState() & Frame.ICONIFIED ) != 0; FineJOptionPane.showMessageDialog( - DesignerContext.getDesignerFrame(), + minimized ? null : DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design-Basic_Save_Failure"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), JOptionPane.ERROR_MESSAGE);