From cd3b268f4ade5d2d015530ce03fd358243d9c67c Mon Sep 17 00:00:00 2001 From: richie Date: Fri, 13 Apr 2018 15:49:55 +0800 Subject: [PATCH 1/3] =?UTF-8?q?CORE-72=20=E4=BB=A3=E7=A0=81=E8=B4=A8?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer/src/com/fr/design/mainframe/JWorkBook.java | 5 ++--- .../src/com/fr/design/actions/file/WebPreviewUtils.java | 6 +++--- .../com/fr/design/actions/server/PlatformManagerAction.java | 1 - 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/JWorkBook.java b/designer/src/com/fr/design/mainframe/JWorkBook.java index 82d796a30..fe66b65d6 100644 --- a/designer/src/com/fr/design/mainframe/JWorkBook.java +++ b/designer/src/com/fr/design/mainframe/JWorkBook.java @@ -51,7 +51,7 @@ import com.fr.file.filetree.FileNode; import com.fr.general.ComparatorUtils; import com.fr.general.Inter; import com.fr.general.ModuleContext; -import com.fr.general.web.ParameterConsts; +import com.fr.general.web.ParameterConstants; import com.fr.grid.Grid; import com.fr.grid.GridUtils; import com.fr.io.exporter.EmbeddedTableDataExporter; @@ -62,7 +62,6 @@ import com.fr.poly.PolyDesigner; import com.fr.poly.creator.BlockCreator; import com.fr.privilege.finegrain.WorkSheetPrivilegeControl; import com.fr.report.ReportHelper; -import com.fr.report.elementcase.ElementCase; import com.fr.report.elementcase.TemplateElementCase; import com.fr.report.poly.PolyWorkSheet; import com.fr.report.worksheet.WorkSheet; @@ -844,7 +843,7 @@ public class JWorkBook extends JTemplate { */ public void previewMenuActionPerformed(PreviewProvider provider) { setPreviewType(provider); - WebPreviewUtils.actionPerformed(this, provider.parametersForPreview(), ParameterConsts.REPORTLET); + WebPreviewUtils.actionPerformed(this, provider.parametersForPreview(), ParameterConstants.REPORTLET); } /** diff --git a/designer_base/src/com/fr/design/actions/file/WebPreviewUtils.java b/designer_base/src/com/fr/design/actions/file/WebPreviewUtils.java index 0947d4323..494a77cbc 100644 --- a/designer_base/src/com/fr/design/actions/file/WebPreviewUtils.java +++ b/designer_base/src/com/fr/design/actions/file/WebPreviewUtils.java @@ -7,7 +7,7 @@ import com.fr.file.FILE; import com.fr.file.FileNodeFILE; import com.fr.general.GeneralUtils; import com.fr.general.Inter; -import com.fr.general.web.ParameterConsts; +import com.fr.general.web.ParameterConstants; import com.fr.stable.project.ProjectConstants; import javax.swing.*; @@ -16,11 +16,11 @@ import java.util.Map; public final class WebPreviewUtils { public static void onWorkbookPreview(JTemplate jt) { - actionPerformed(jt, jt.getPreviewType().parametersForPreview(), ParameterConsts.REPORTLET); + actionPerformed(jt, jt.getPreviewType().parametersForPreview(), ParameterConstants.REPORTLET); } public static void onFormPreview(JTemplate jt) { - actionPerformed(jt, null, ParameterConsts.FORMLET); + actionPerformed(jt, null, ParameterConstants.FORMLET); } public static void actionPerformed(JTemplate jt, Map map, String actionType) { diff --git a/designer_base/src/com/fr/design/actions/server/PlatformManagerAction.java b/designer_base/src/com/fr/design/actions/server/PlatformManagerAction.java index a766e3531..08ba1e750 100644 --- a/designer_base/src/com/fr/design/actions/server/PlatformManagerAction.java +++ b/designer_base/src/com/fr/design/actions/server/PlatformManagerAction.java @@ -5,7 +5,6 @@ import com.fr.design.actions.UpdateAction; import com.fr.design.menu.MenuKeySet; import com.fr.design.utils.DesignUtils; import com.fr.general.Inter; -import com.fr.general.web.ParameterConsts; import javax.swing.*; import java.awt.event.ActionEvent; From e30cc7581b9cebe115c0f93cb3e9ce48453a3e7f Mon Sep 17 00:00:00 2001 From: kerry Date: Mon, 16 Apr 2018 14:42:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?REPORT-7500=20=E3=80=9010.0=E4=B8=80?= =?UTF-8?q?=E8=BD=AE=E8=BF=AD=E4=BB=A3=E3=80=9110.0=20exe=E5=86=85?= =?UTF-8?q?=E7=BD=AEtomcat=E7=BC=96=E7=A0=81=E6=96=B9=E5=BC=8F=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E4=BF=AE=E6=94=B9=E4=B8=BAUTF-8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/start/server/TomcatHost.java | 1 + 1 file changed, 1 insertion(+) diff --git a/designer_base/src/com/fr/start/server/TomcatHost.java b/designer_base/src/com/fr/start/server/TomcatHost.java index 288975104..c8a3c0a92 100644 --- a/designer_base/src/com/fr/start/server/TomcatHost.java +++ b/designer_base/src/com/fr/start/server/TomcatHost.java @@ -71,6 +71,7 @@ public class TomcatHost { this.listener = new AprLifecycleListener(); this.server.addLifecycleListener(listener); this.tomcat.getHost().setAppBase(StableUtils.getInstallHome() + File.separator + "."); + this.tomcat.getConnector().setURIEncoding("UTF-8"); } catch (Exception e) { //todo 最好加一个用server.xml FRContext.getLogger().error(e.getMessage(), e); From 48b0e25fbf0224edac1d0cb70fde4e746738b8da Mon Sep 17 00:00:00 2001 From: zack Date: Mon, 16 Apr 2018 15:44:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?REPORT-7689=20=E9=A2=84=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=B2=A1=E5=8A=9E=E6=B3=95=E6=8D=A2=E5=88=B0?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/style/FormatPane.java | 50 ++++++++++--------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/designer_base/src/com/fr/design/style/FormatPane.java b/designer_base/src/com/fr/design/style/FormatPane.java index 59e3cda2f..5b642bdb4 100644 --- a/designer_base/src/com/fr/design/style/FormatPane.java +++ b/designer_base/src/com/fr/design/style/FormatPane.java @@ -3,15 +3,20 @@ */ package com.fr.design.style; -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.FlowLayout; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.text.DecimalFormat; -import java.text.Format; -import java.text.SimpleDateFormat; -import java.util.Date; +import com.fr.base.FRContext; +import com.fr.base.TextFormat; +import com.fr.data.core.FormatField; +import com.fr.data.core.FormatField.FormatContents; +import com.fr.design.dialog.BasicPane; +import com.fr.design.gui.ibutton.UIRadioButton; +import com.fr.design.gui.ilable.UILabel; +import com.fr.design.gui.itextfield.UITextField; +import com.fr.design.layout.FRGUIPaneFactory; +import com.fr.design.utils.gui.GUICoreUtils; +import com.fr.general.ComparatorUtils; +import com.fr.general.Inter; +import com.fr.stable.ArrayUtils; +import com.fr.stable.StringUtils; import javax.swing.BorderFactory; import javax.swing.ButtonGroup; @@ -25,21 +30,15 @@ import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; - -import com.fr.base.FRContext; -import com.fr.base.TextFormat; -import com.fr.data.core.FormatField; -import com.fr.data.core.FormatField.FormatContents; -import com.fr.design.gui.ibutton.UIRadioButton; -import com.fr.design.gui.ilable.UILabel; -import com.fr.design.gui.itextfield.UITextField; -import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.dialog.BasicPane; -import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; -import com.fr.stable.ArrayUtils; -import com.fr.stable.StringUtils; -import com.fr.design.utils.gui.GUICoreUtils; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.FlowLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.text.DecimalFormat; +import java.text.Format; +import java.text.SimpleDateFormat; +import java.util.Date; /** * 属性界面中的格式面板 @@ -316,6 +315,9 @@ public class FormatPane extends BasicPane { */ public Format update() { String text = patternTextField.getText(); + if (getFormatContents() == FormatContents.TEXT) { + return FormatField.getInstance().getFormat(getFormatContents(), text); + } if(StringUtils.isEmpty(text)) { return null; }