From 113f28a049c78c90921bf902124efe7dd0da4b4b Mon Sep 17 00:00:00 2001 From: hzzz Date: Fri, 13 Jul 2018 15:36:42 +0800 Subject: [PATCH 1/5] =?UTF-8?q?REPORT-9654=E3=80=9010.0=E4=BA=8C=E8=BD=AE?= =?UTF-8?q?=E5=9B=9E=E5=BD=92=E3=80=91=E5=AF=BC=E5=87=BAexcel=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=90=8D=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainframe/actions/EmbeddedFormExportExportAction.java | 2 +- .../com/fr/design/actions/file/export/AbstractExportAction.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/designer-form/src/main/java/com/fr/design/mainframe/actions/EmbeddedFormExportExportAction.java b/designer-form/src/main/java/com/fr/design/mainframe/actions/EmbeddedFormExportExportAction.java index 2d8698f35..e921429f7 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/actions/EmbeddedFormExportExportAction.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/actions/EmbeddedFormExportExportAction.java @@ -137,7 +137,7 @@ public class EmbeddedFormExportExportAction extends JTemplateAction{ FRContext.getLogger().info("\"" + fileGetName + "\"" + Inter.getLocText("FR-Designer_Finish_Export") + "!"); JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), - Inter.getLocText("FR-Designer_Exported_successfully") + "\n" + filePath); + Inter.getLocText("FR-Designer_Exported_successfully") + "\n" + fileGetName); } catch (Exception exp) { this.setProgress(100); FineLoggerFactory.getLogger().error(exp.getMessage(), exp); diff --git a/designer-realize/src/main/java/com/fr/design/actions/file/export/AbstractExportAction.java b/designer-realize/src/main/java/com/fr/design/actions/file/export/AbstractExportAction.java index 22059c35c..01cf46b8e 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/file/export/AbstractExportAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/file/export/AbstractExportAction.java @@ -130,7 +130,7 @@ public abstract class AbstractExportAction extends JWorkBookAction { FRContext.getLogger().info("\"" + fileGetName + "\"" + Inter.getLocText("FR-Designer_Finish_Export") + "!"); JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), - Inter.getLocText("FR-Designer_Exported_successfully") + "\n" + filePath); + Inter.getLocText("FR-Designer_Exported_successfully") + "\n" + fileGetName); } catch (Exception exp) { this.setProgress(100); FineLoggerFactory.getLogger().error(exp.getMessage(), exp); From ed8f2798c43fce06c5d4846e4049eed004119bc2 Mon Sep 17 00:00:00 2001 From: "Mata.Li" Date: Mon, 16 Jul 2018 11:06:27 +0800 Subject: [PATCH 2/5] REPORT-9377 --- .../com/fr/design/actions/help/AboutPane.java | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java b/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java index 40ee0902e..cfae95a42 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java @@ -26,6 +26,7 @@ import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.net.URI; +import java.text.MessageFormat; import java.util.Locale; public class AboutPane extends JPanel { @@ -34,6 +35,7 @@ public class AboutPane extends JPanel { private static final String COPYRIGHT_LABEL = "\u00A9 "; private static final String BUILD_PREFIX = " "; private static final String COMPANY_TELEPHONE = CloudCenter.getInstance().acquireUrlByKind("company_telephone"); + private static final String PRESIDENT_PHONE = CloudCenter.getInstance().acquireUrlByKind("president_phone"); public AboutPane() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); @@ -79,6 +81,9 @@ public class AboutPane extends JPanel { contentPane.add(urlActionPane); contentPane.add(emailPane); + + contentPane.add(getRemarkPane()); + if (shouldShowThanks()) { addThankPane(contentPane); } @@ -111,6 +116,43 @@ public class AboutPane extends JPanel { return true; } + private JPanel getRemarkPane(){ + String remark = Inter.getLocText("Fine-Designer_About_Remark_Info",PRESIDENT_PHONE); + UILabel label = new UILabel(); + label.setSize(new Dimension(580,30)); + + //用THML标签进行拼接，以实现自动换行 + StringBuilder builder = new StringBuilder(""); + char[] chars = remark.toCharArray(); + //获取字体计算大小 + FontMetrics fontMetrics = label.getFontMetrics(label.getFont()); + int start = 0; + int len = 0; + while (start + len < remark.length()) { + while (true) { + len++; + if (start + len > remark.length()) + break; + if (fontMetrics.charsWidth(chars, start, len) + > label.getWidth()) { + break; + } + } + builder.append(chars, start, len-1).append("
"); + start = start + len - 1; + len = 0; + } + //拼接剩余部分 + builder.append(chars, start, remark.length()-start); + builder.append(""); + + JPanel jPanel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); + label.setText(builder.toString()); + jPanel.add(label); + + return jPanel; + } + //添加鸣谢面板 private void addThankPane(JPanel contentPane) { BBSGuestPaneProvider pane = StableFactory.getMarkedInstanceObjectFromClass(BBSGuestPaneProvider.XML_TAG, BBSGuestPaneProvider.class); From 345f88864e18b2a9ce488f215fd74089833231ef Mon Sep 17 00:00:00 2001 From: "Mata.Li" Date: Mon, 16 Jul 2018 11:09:16 +0800 Subject: [PATCH 3/5] REPORT-9377 --- .../src/main/java/com/fr/design/actions/help/AboutPane.java | 1 - 1 file changed, 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java b/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java index cfae95a42..1e015ef8c 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java @@ -26,7 +26,6 @@ import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.net.URI; -import java.text.MessageFormat; import java.util.Locale; public class AboutPane extends JPanel { From 719cba16755c89e2668c44bd9e99e24430745d69 Mon Sep 17 00:00:00 2001 From: "Mata.Li" Date: Mon, 16 Jul 2018 11:13:57 +0800 Subject: [PATCH 4/5] REPORT-9377 --- .../src/main/java/com/fr/design/actions/help/AboutPane.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java b/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java index 1e015ef8c..d3f517a2f 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java @@ -33,8 +33,8 @@ public class AboutPane extends JPanel { private static final int DEFAULT_GAP = 12; private static final String COPYRIGHT_LABEL = "\u00A9 "; private static final String BUILD_PREFIX = " "; - private static final String COMPANY_TELEPHONE = CloudCenter.getInstance().acquireUrlByKind("company_telephone"); - private static final String PRESIDENT_PHONE = CloudCenter.getInstance().acquireUrlByKind("president_phone"); + private static final String COMPANY_TELEPHONE = CloudCenter.getInstance().acquireUrlByKind("help.compNo"); + private static final String PRESIDENT_PHONE = CloudCenter.getInstance().acquireUrlByKind("help.Pno"); public AboutPane() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); From f6bbe6e58625a7faabfa3540bd49d4ad781c15c9 Mon Sep 17 00:00:00 2001 From: "Mata.Li" Date: Mon, 16 Jul 2018 11:18:07 +0800 Subject: [PATCH 5/5] REPORT-9377 --- .../src/main/java/com/fr/design/actions/help/AboutPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java b/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java index d3f517a2f..5bc1465f7 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java @@ -34,7 +34,7 @@ public class AboutPane extends JPanel { private static final String COPYRIGHT_LABEL = "\u00A9 "; private static final String BUILD_PREFIX = " "; private static final String COMPANY_TELEPHONE = CloudCenter.getInstance().acquireUrlByKind("help.compNo"); - private static final String PRESIDENT_PHONE = CloudCenter.getInstance().acquireUrlByKind("help.Pno"); + private static final String PRESIDENT_PHONE = CloudCenter.getInstance().acquireUrlByKind("help.PNo"); public AboutPane() { this.setLayout(FRGUIPaneFactory.createBorderLayout());