From 180998daebfe6eea18a1f88d617df4cfe8811810 Mon Sep 17 00:00:00 2001 From: "Bruce.Deng" Date: Thu, 29 Apr 2021 17:16:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?REPORT-51309=20=E5=AF=BC=E5=87=BA-=E5=AD=97?= =?UTF-8?q?=E4=BD=93=E6=A3=80=E6=B5=8B-=E6=A3=80=E6=B5=8B=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E6=8F=90=E7=A4=BA=E7=9A=84=E6=96=87=E5=AD=97=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainframe/check/CheckFontInfoDialog.java | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/check/CheckFontInfoDialog.java b/designer-base/src/main/java/com/fr/design/mainframe/check/CheckFontInfoDialog.java index 837d48b288..0d5771a494 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/check/CheckFontInfoDialog.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/check/CheckFontInfoDialog.java @@ -17,7 +17,6 @@ import javax.swing.JScrollPane; import javax.swing.JTextArea; import javax.swing.UIManager; import java.awt.BorderLayout; -import java.awt.Cursor; import java.awt.Dimension; import java.awt.Frame; import java.awt.event.ActionEvent; @@ -100,26 +99,14 @@ public class CheckFontInfoDialog extends JDialog implements ActionListener { directUiLabel.setIcon(UIManager.getIcon("OptionPane.narrow.down")); } } - - @Override - public void mouseEntered(MouseEvent e) { - detailLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); - } - - @Override - public void mouseExited(MouseEvent e) { - detailLabel.setCursor(Cursor.getDefaultCursor()); - } }); //底部的按钮面板 UIButton okButton = new UIButton(Toolkit.i18nText("Fine-Design_Report_OK")); - JPanel buttonPanel = FRGUIPaneFactory.createBorderLayout_L_Pane(); - buttonPanel.setBorder(BorderFactory.createEmptyBorder(0,10,10,10)); - buttonPanel.add(okButton, BorderLayout.EAST); okButton.addActionListener(this); bottomPanel = FRGUIPaneFactory.createBorderLayout_L_Pane(); - bottomPanel.add(buttonPanel); + bottomPanel.setBorder(BorderFactory.createEmptyBorder(10,10,10,10)); + bottomPanel.add(okButton, BorderLayout.EAST); this.setTitle(Toolkit.i18nText("Fine_Designer_Check_Font")); this.setResizable(false); From 4e4e1132d012c28fac74310ff57c4b70c7586810 Mon Sep 17 00:00:00 2001 From: "Bruce.Deng" Date: Thu, 29 Apr 2021 17:18:50 +0800 Subject: [PATCH 2/3] =?UTF-8?q?REPORT-51281=20&=20=09REPORT-51378=20&=20RE?= =?UTF-8?q?PORT-51490=20=E5=AF=BC=E5=87=BA-=E5=AD=97=E4=BD=93=E6=A3=80?= =?UTF-8?q?=E6=B5=8B-=E6=A8=A1=E6=9D=BF=E4=BF=9D=E5=AD=98=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/mainframe/check/CheckButton.java | 77 ++++++++++++++----- 1 file changed, 59 insertions(+), 18 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/check/CheckButton.java b/designer-base/src/main/java/com/fr/design/mainframe/check/CheckButton.java index f42d18d404..e55f9a4817 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/check/CheckButton.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/check/CheckButton.java @@ -7,6 +7,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.JTemplate; +import com.fr.design.worker.save.CallbackSaveWorker; import com.fr.file.FILE; import com.fr.file.FileNodeFILE; import com.fr.log.FineLoggerFactory; @@ -29,6 +30,7 @@ import java.awt.event.WindowEvent; import java.util.Set; import java.util.concurrent.ExecutionException; +import static com.fr.design.dialog.FineJOptionPane.showConfirmDialog; import static javax.swing.JOptionPane.OK_CANCEL_OPTION; import static javax.swing.JOptionPane.OK_OPTION; import static javax.swing.JOptionPane.WARNING_MESSAGE; @@ -67,12 +69,14 @@ public class CheckButton extends UIButton { if (set == null) { return; } - if(set.isEmpty()) { + if (set.isEmpty()) { okButton.setEnabled(true); uiLabel.setIcon(BaseUtils.readIcon("com/fr/design/images/correct.png")); message.setText("" + Toolkit.i18nText("Fine_Designer_Check_Font_Success") + ""); } else { - dialog.dispose(); + if (dialog != null) { + dialog.dispose(); + } StringBuilder textBuilder = new StringBuilder(); textBuilder.append(Toolkit.i18nText("Fine_Designer_Check_Font_Missing_Font")).append("\n"); for (String font : set) { @@ -88,14 +92,46 @@ public class CheckButton extends UIButton { } }; - JTemplate jtemplate = DesignerContext.getDesignerFrame().getSelectedJTemplate(); + JTemplate jtemplate = DesignerContext.getDesignerFrame().getSelectedJTemplate(); if (jtemplate == null || jtemplate.getEditingFILE() == null) { return; } FILE currentTemplate = jtemplate.getEditingFILE(); - if(currentTemplate instanceof FileNodeFILE){ - checkThread.execute(); - }else { + if (currentTemplate instanceof FileNodeFILE) { + // 判断下模板是否存在 不存在先提示 + if (!currentTemplate.exists()) { + int selVal = showConfirmDialog( + DesignerContext.getDesignerFrame(), + Toolkit.i18nText("Fine-Design_Basic_Web_Preview_Message"), + Toolkit.i18nText("Fine_Designer_Check_Font"), + OK_CANCEL_OPTION, + WARNING_MESSAGE + ); + if (OK_OPTION == selVal) { + CallbackSaveWorker worker = jtemplate.saveAs(); + worker.addSuccessCallback(new Runnable() { + @Override + public void run() { + startCheck(checkThread); + } + }); + worker.start(jtemplate.getTarget().getTemplateID()); + } + } else { + if (!jtemplate.isSaved()) { + CallbackSaveWorker worker = jtemplate.save(); + worker.addSuccessCallback(new Runnable() { + @Override + public void run() { + startCheck(checkThread); + } + }); + worker.start(jtemplate.getTarget().getTemplateID()); + } else { + startCheck(checkThread); + } + } + } else { //模板不在报表环境下，提示保存 int selVal = FineJOptionPane.showConfirmDialog( DesignerContext.getDesignerFrame(), @@ -103,27 +139,27 @@ public class CheckButton extends UIButton { Toolkit.i18nText("Fine_Designer_Check_Font"), OK_CANCEL_OPTION, WARNING_MESSAGE); - if (OK_OPTION == selVal) { - //保存成功才执行检测 - if (jtemplate.saveAsTemplate2Env()) { - checkThread.execute(); - } + CallbackSaveWorker worker = jtemplate.saveAs2Env(); + worker.addSuccessCallback(new Runnable() { + @Override + public void run() { + startCheck(checkThread); + } + }); + worker.start(jtemplate.getTarget().getTemplateID()); } } - initDialogPane(); - okButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - dialog.dispose(); - } - }); + } + private void startCheck(SwingWorker, Void> checkThread) { + initDialogPane(); dialog.addWindowListener(new WindowAdapter() { public void windowClosed(WindowEvent e) { checkThread.cancel(true); } }); - + checkThread.execute(); dialog.setVisible(true); dialog.dispose(); } @@ -150,6 +186,11 @@ public class CheckButton extends UIButton { uiLabel = new UILabel(); okButton = new UIButton(Toolkit.i18nText("Fine-Design_Report_OK")); okButton.setEnabled(false); + okButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + dialog.dispose(); + } + }); dialog = new JDialog(); dialog.setTitle(Toolkit.i18nText("Fine_Designer_Check_Font")); dialog.setModal(true); From bf16dad6e4ed1b725815339e0148e5e17f4d7985 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com> Date: Thu, 29 Apr 2021 17:50:08 +0800 Subject: [PATCH 3/3] =?UTF-8?q?CHART-19104=20=E9=BC=A0=E6=A0=87=E7=9A=84cl?= =?UTF-8?q?ick=E4=BA=8B=E4=BB=B6=E4=B8=8D=E8=83=BD=E7=A8=B3=E5=AE=9A?= =?UTF-8?q?=E8=A7=A6=E5=8F=91=EF=BC=8C=E6=94=B9=E4=B8=BAchange=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../VanChartFormatPaneWithCheckBox.java | 32 ++----------------- 1 file changed, 3 insertions(+), 29 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java index 6f5fc270ac..38ae4a08ce 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java @@ -12,13 +12,12 @@ import com.fr.plugin.chart.base.format.AttrTooltipFormat; import com.fr.stable.Constants; import javax.swing.JPanel; +import java.text.Format; +import java.util.Map; import java.awt.BorderLayout; import java.awt.Point; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; -import java.text.Format; -import java.util.Map; /** * Created by Mitisky on 16/2/23. @@ -54,32 +53,7 @@ public abstract class VanChartFormatPaneWithCheckBox extends JPanel{ this.add(formatButton, BorderLayout.EAST); initFormatListener(); - isSelectedBox.addMouseListener(new MouseListener() { - @Override - public void mouseClicked(MouseEvent e) { - isDirty = true; - } - - @Override - public void mousePressed(MouseEvent e) { - - } - - @Override - public void mouseReleased(MouseEvent e) { - - } - - @Override - public void mouseEntered(MouseEvent e) { - - } - - @Override - public void mouseExited(MouseEvent e) { - - } - }); + isSelectedBox.addChangeListener((e)-> isDirty = true); } protected abstract String getCheckBoxText();