From 5cdf4a3788f7c9b4074d1a5b10a221fd01fdd7b6 Mon Sep 17 00:00:00 2001
From: MoMeak <MoMeak@fanruan.com>
Date: Mon, 21 Aug 2017 11:07:52 +0800
Subject: [PATCH 1/6] =?UTF-8?q?REPORT-2897=209.0=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=99=A8=E4=BF=AE=E6=94=B9=20=E6=8E=A7=E4=BB=B6=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E7=BD=91=E9=A1=B5=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/actions/insert/flot/ChartFloatAction.java | 1 -
 .../design/mainframe/cell/settingpane/CellExpandAttrPane.java   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/designer/src/com/fr/design/actions/insert/flot/ChartFloatAction.java b/designer/src/com/fr/design/actions/insert/flot/ChartFloatAction.java
index 80ce31525..afab2c69f 100644
--- a/designer/src/com/fr/design/actions/insert/flot/ChartFloatAction.java
+++ b/designer/src/com/fr/design/actions/insert/flot/ChartFloatAction.java
@@ -96,7 +96,6 @@ public class ChartFloatAction extends ElementCaseAction {
                     }
                     reportPane.getEditingElementCase().addFloatElement(newFloatElement);
                     reportPane.setSelection(new FloatSelection(newFloatElement.getName()));
-                    reportPane.fireTargetModified();
                     reportPane.fireSelectionChangeListener();
                 } catch (CloneNotSupportedException e) {
                     FRLogger.getLogger().error("Error in Float");
diff --git a/designer/src/com/fr/design/mainframe/cell/settingpane/CellExpandAttrPane.java b/designer/src/com/fr/design/mainframe/cell/settingpane/CellExpandAttrPane.java
index 79c224ea3..0901bb31b 100644
--- a/designer/src/com/fr/design/mainframe/cell/settingpane/CellExpandAttrPane.java
+++ b/designer/src/com/fr/design/mainframe/cell/settingpane/CellExpandAttrPane.java
@@ -199,7 +199,7 @@ public class CellExpandAttrPane extends AbstractCellAttrPane {
 
 
         // extendable
-        if (ComparatorUtils.equals(getGlobalName(), Inter.getLocText("FR-Designer_ExpandD-Expandable"))) {
+        if (ComparatorUtils.equals(getGlobalName(), Inter.getLocText("FR-Designer_ExpandD_Expandable"))) {
             if (horizontalExpandableCheckBox.isSelected()) {
                 if (verticalExpandableCheckBox.isSelected()) {
                     cellExpandAttr.setExtendable(CellExpandAttr.Both_EXTENDABLE);

From 8d61a5ef3d49568200642f3c0eb41df48f029598 Mon Sep 17 00:00:00 2001
From: MoMeak <MoMeak@fanruan.com>
Date: Mon, 21 Aug 2017 19:32:01 +0800
Subject: [PATCH 2/6] =?UTF-8?q?REPORT-3983=20[9.0=E4=B8=80=E8=BD=AE?=
 =?UTF-8?q?=E5=9B=9E=E5=BD=92]=E9=80=89=E4=B8=AD=E4=B8=80=E7=89=87?=
 =?UTF-8?q?=E5=8D=95=E5=85=83=E6=A0=BC=EF=BC=8C=E6=A0=B7=E5=BC=8F=E8=BE=B9?=
 =?UTF-8?q?=E6=A1=86=E5=A4=96=E8=BE=B9=E6=A1=86=E3=80=81=E5=86=85=E8=BE=B9?=
 =?UTF-8?q?=E6=A1=86=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mainframe/cell/settingpane/style/CustomStylePane.java     | 4 ++--
 designer_base/src/com/fr/design/gui/style/BorderPane.java     | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/designer/src/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java b/designer/src/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java
index b899071d6..d25788c87 100644
--- a/designer/src/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java
+++ b/designer/src/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java
@@ -111,7 +111,7 @@ public class CustomStylePane extends MultiTabPane<Style> {
 
 
     public boolean isBorderPaneSelected() {
-        return tabPane.getSelectedIndex() == TWO_INDEX;
+        return tabPane.getSelectedIndex() == ONE_INDEX;
     }
 
     /**
@@ -137,7 +137,7 @@ public class CustomStylePane extends MultiTabPane<Style> {
      *
      */
     public void updateBorder() {
-        BorderUtils.update(reportPane, ((BorderPane) paneList.get(TWO_INDEX)).update());
+        BorderUtils.update(reportPane, ((BorderPane) paneList.get(ONE_INDEX)).update());
     }
 
     /**
diff --git a/designer_base/src/com/fr/design/gui/style/BorderPane.java b/designer_base/src/com/fr/design/gui/style/BorderPane.java
index fd8013677..63d649502 100644
--- a/designer_base/src/com/fr/design/gui/style/BorderPane.java
+++ b/designer_base/src/com/fr/design/gui/style/BorderPane.java
@@ -184,7 +184,7 @@ public class BorderPane extends AbstractBasicStylePane {
     }
 
     public Style update(Style style) {
-        style = style.deriveBackground(backgroundPane.update());
+
         if (style == null) {
             style = Style.DEFAULT_STYLE;
         }
@@ -193,6 +193,7 @@ public class BorderPane extends AbstractBasicStylePane {
 
         style = style.deriveBorder(cellBorderStyle.getTopStyle(), cellBorderStyle.getTopColor(), cellBorderStyle.getBottomStyle(), cellBorderStyle.getBottomColor(),
                 cellBorderStyle.getLeftStyle(), cellBorderStyle.getLeftColor(), cellBorderStyle.getRightStyle(), cellBorderStyle.getRightColor());
+        style = style.deriveBackground(backgroundPane.update());
         return style;
     }
 

From 7a7e6052ef98778d99d4f2e344427a358cf6a562 Mon Sep 17 00:00:00 2001
From: MoMeak <MoMeak@fanruan.com>
Date: Tue, 22 Aug 2017 14:43:21 +0800
Subject: [PATCH 3/6] =?UTF-8?q?REPORT-3980=20[9.0=E4=B8=80=E8=BD=AE?=
 =?UTF-8?q?=E5=9B=9E=E5=BD=92]=E5=8D=95=E5=85=83=E6=A0=BC=E5=BD=A2?=
 =?UTF-8?q?=E6=80=81=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8=E5=85=AC=E5=BC=8F?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E4=BF=9D=E5=AD=98=20REPORT-3981=20[9.0?=
 =?UTF-8?q?=E4=B8=80=E8=BD=AE=E5=9B=9E=E5=BD=92]=E6=8F=92=E5=85=A5?=
 =?UTF-8?q?=E8=A1=8C=E7=AD=96=E7=95=A5=E9=BB=98=E8=AE=A4=E5=80=BC=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E5=90=8E=EF=BC=8C=E5=88=87=E6=8D=A2=E5=88=B0=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E5=8D=95=E5=85=83=E6=A0=BC=E9=80=89=E6=8B=A9=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=80=BC=E6=97=B6=E4=B8=8D=E4=B8=BA=E7=A9=BA=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E8=B4=A8=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mainframe/cell/CellElementEditPane.java      |  2 +-
 .../cell/settingpane/CellOtherSetPane.java       |  1 +
 .../cell/settingpane/style/CustomStylePane.java  | 16 ++++++++--------
 .../src/com/fr/design/gui/style/BorderPane.java  | 11 -----------
 .../fr/design/locale/designer_en_US.properties   |  2 +-
 .../fr/design/locale/designer_ja_JP.properties   |  2 +-
 .../fr/design/locale/designer_ko_KR.properties   |  2 +-
 .../fr/design/locale/designer_zh_CN.properties   |  2 +-
 .../fr/design/locale/designer_zh_TW.properties   |  2 +-
 .../fr/design/present/dict/FormulaDictPane.java  |  2 +-
 10 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/designer/src/com/fr/design/mainframe/cell/CellElementEditPane.java b/designer/src/com/fr/design/mainframe/cell/CellElementEditPane.java
index 5467ede28..e492253bd 100644
--- a/designer/src/com/fr/design/mainframe/cell/CellElementEditPane.java
+++ b/designer/src/com/fr/design/mainframe/cell/CellElementEditPane.java
@@ -76,7 +76,7 @@ public class CellElementEditPane extends BasicPane {
         downTitle = new JPanel();
         downTitle.setLayout(new BorderLayout());
         downTitle.add(tabsHeaderIconPane, BorderLayout.NORTH);
-        center.setBorder(BorderFactory.createEmptyBorder(0, LEFT_BORDER, 0, RIGHT_BORDER));
+        center.setBorder(BorderFactory.createEmptyBorder(0, LEFT_BORDER, 0, 0));
         downTitle.add(center, BorderLayout.CENTER);
 
         this.add(downTitle, BorderLayout.CENTER);
diff --git a/designer/src/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java b/designer/src/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java
index e8d82c510..ad5b0d077 100644
--- a/designer/src/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java
+++ b/designer/src/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java
@@ -342,6 +342,7 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
             this.valueEditor.populate(defaultValue);
         } else {
             insertRowPolicy.setSelectedIndex(0);
+            this.valueEditor.populate("");
         }
         if (insertRowPolicy.getSelectedIndex() == 1) {
             insertRowPane.setPreferredSize(new Dimension(100, 20));
diff --git a/designer/src/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java b/designer/src/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java
index d25788c87..e12e8dacd 100644
--- a/designer/src/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java
+++ b/designer/src/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java
@@ -45,14 +45,14 @@ public class CustomStylePane extends MultiTabPane<Style> {
     }
 
     public static void main(String[] args) {
-        JFrame jf = new JFrame("test");
-        jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-        JPanel content = (JPanel) jf.getContentPane();
-        content.setLayout(new BorderLayout());
-        content.add(new CustomStylePane(), BorderLayout.CENTER);
-        GUICoreUtils.centerWindow(jf);
-        jf.setSize(250, 400);
-        jf.setVisible(true);
+//        JFrame jf = new JFrame("test");
+//        jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+//        JPanel content = (JPanel) jf.getContentPane();
+//        content.setLayout(new BorderLayout());
+//        content.add(new CustomStylePane(), BorderLayout.CENTER);
+//        GUICoreUtils.centerWindow(jf);
+//        jf.setSize(250, 400);
+//        jf.setVisible(true);
     }
 
     /**
diff --git a/designer_base/src/com/fr/design/gui/style/BorderPane.java b/designer_base/src/com/fr/design/gui/style/BorderPane.java
index 63d649502..1390ee9cb 100644
--- a/designer_base/src/com/fr/design/gui/style/BorderPane.java
+++ b/designer_base/src/com/fr/design/gui/style/BorderPane.java
@@ -53,17 +53,6 @@ public class BorderPane extends AbstractBasicStylePane {
         this.initComponents();
     }
 
-    public static void main(String[] args) {
-        JFrame jf = new JFrame("test");
-        jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-        JPanel content = (JPanel) jf.getContentPane();
-        content.setLayout(new BorderLayout());
-        content.add(new BorderPane(), BorderLayout.CENTER);
-        GUICoreUtils.centerWindow(jf);
-        jf.setSize(290, 400);
-        jf.setVisible(true);
-    }
-
     protected void initComponents() {
         initButtonsWithIcon();
         this.setLayout(new BorderLayout(0, 6));
diff --git a/designer_base/src/com/fr/design/locale/designer_en_US.properties b/designer_base/src/com/fr/design/locale/designer_en_US.properties
index e92cb1119..06200301f 100644
--- a/designer_base/src/com/fr/design/locale/designer_en_US.properties
+++ b/designer_base/src/com/fr/design/locale/designer_en_US.properties
@@ -859,7 +859,7 @@ RP_Authority_Edit=Permission
 Warnning=Warning
 RoleName_Can_Not_Be_Null=Role name can not be null or duplicate
 Application=Applications
-Formula_Dictionary_Display_Examples_Html=<html>Real value range is \
+Formula_Dictionary_Display_Examples_Html=<html>the real value is \=range(100), the real value($$$)'s display value is \=0 - $$$, <br>the result is 1, 2, ..., 100 and -1, -2, ..., -100.<br></html>
 ECP-error_pwd=Password Error
 FR-Hyperlink_ChartHyperlink=Chart Hyperlink
 M_Edit-FormatBrush=Format Painter
diff --git a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties
index a6a3a7aa3..1452b2ab1 100644
--- a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties
+++ b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties
@@ -857,7 +857,7 @@ RP_Authority_Edit=\u6A29\u9650\u7DE8\u96C6
 Warnning=\u30EA\u30DE\u30A4\u30F3\u30C9
 RoleName_Can_Not_Be_Null=\u5F79\u5272\u540D\u306F\u7A7A\u6B04\u306B\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u305A\u3001\u91CD\u8907\u3059\u308B\u3053\u3068\u3082\u3067\u304D\u307E\u305B\u3093
 Application=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3
-Formula_Dictionary_Display_Examples_Html=<html>\u5B9F\u969B\u5024\u7BC4\u56F2\u306F\
+Formula_Dictionary_Display_Examples_Html=<html>\u5B9F\u969B\u306E\u5024\u304C \=range(100)\u306E\u3068\u304D\u3001\u5B9F\u969B\u306E\u5024($$$)\u306E\u8868\u793A\u3059\u308B\u5024\u306E\u6570\u5F0F\u304C \= 0 - $$$\u306E\u3068\u304D\u3001\n\u6700\u7D42\u7684\u306A\u5B9F\u969B\u306E\u5024\u306F\u30011, 2, ..., 100\u3067\u3042\u308A\u3001\n\u305D\u306E\u8868\u793A\u7D50\u679C\u306F-1, -2, ..., -100\u3068\u306A\u308B\u3002<br></html>
 ECP-error_pwd=\u30D1\u30B9\u30EF\u30FC\u30C9\u30A8\u30E9\u30FC
 FR-Hyperlink_ChartHyperlink=\u30B0\u30E9\u30D5\u30CF\u30A4\u30D1\u30FC\u30EA\u30F3\u30AF
 M_Edit-FormatBrush=\u66F8\u5F0F\u30D6\u30E9\u30B7(B)
diff --git a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties
index db819f430..21eb1fdf3 100644
--- a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties
+++ b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties
@@ -857,7 +857,7 @@ RP_Authority_Edit=\uAD8C\uD55C\uD3B8\uC9D1
 Warnning=\uC54C\uB9BC
 RoleName_Can_Not_Be_Null=\uC5ED\uD560\uC774\uB984\uC740\uBE44\uC5B4\uC788\uAC70\uB098\uC911\uBCF5\uB418\uC5B4\uC11C\uB294\uC548\uB429\uB2C8\uB2E4.
 Application=\uC560\uD50C\uB9AC\uCF00\uC774\uC158
-Formula_Dictionary_Display_Examples_Html=<html>\uC2E4\uC81C\uAC12\uBC94\uC704:\
+Formula_Dictionary_Display_Examples_Html=<html>\uC2E4\uC81C\uAC12\uBC94\uC704:\=0 - $$$\uFF0C<br>\uCD5C\uC885\uACB0\uACFC\uC758\uC2E4\uC81C\uAC12: 1, 2, ..., 100,\uD45C\uC2DC\uAC12: -1, -2, ... , -100. <br>&nbsp;</html>
 ECP-error_pwd=\uBE44\uBC00\uBC88\uD638\uC785\uB825\uC624\uB958
 FR-Hyperlink_ChartHyperlink=\uCC28\uD2B8\uD558\uC774\uD37C\uB9C1\uD06C
 M_Edit-FormatBrush=\uC11C\uC2DD\uD504\uB9B0\uD2B8(B)
diff --git a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties
index 19bfad99a..e3a7d80c0 100644
--- a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties
+++ b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties
@@ -859,7 +859,7 @@ RP_Authority_Edit=\u6743\u9650\u7F16\u8F91
 Warnning=\u63D0\u9192
 RoleName_Can_Not_Be_Null=\u89D2\u8272\u540D\u4E0D\u5141\u8BB8\u4E3A\u7A7A\u4E14\u4E0D\u80FD\u91CD\u590D
 Application=\u5E94\u7528\u7A0B\u5E8F
-Formula_Dictionary_Display_Examples_Html=<html>\u5B9E\u9645\u503C\u8303\u56F4\u4E3A \
+Formula_Dictionary_Display_Examples_Html=<html>\u5B9E\u9645\u503C\u8303\u56F4\u4E3A \=range(100),\u5BF9\u5B9E\u9645\u503C\u8303\u56F4\u5185\u7684\u6BCF\u4E2A$$$\u7684\u663E\u793A\u516C\u5F0F\u4E3A \=0 - $$$\uFF0C<br>\u5219\u6700\u7EC8\u7684\u7ED3\u679C\u5B9E\u9645\u503C\u4E3A1, 2, ..., 100,\u663E\u793A\u503C\u4E3A-1, -2, ... , -100\u3002<br>&nbsp;</html>
 ECP-error_pwd=\u5BC6\u7801\u9519\u8BEF
 FR-Hyperlink_ChartHyperlink=\u56FE\u8868\u8D85\u94FE
 M_Edit-FormatBrush=\u683C\u5F0F\u5237(B)
diff --git a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties
index 4ae23d014..5038f3df5 100644
--- a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties
+++ b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties
@@ -859,7 +859,7 @@ RP_Authority_Edit=\u6B0A\u9650\u7DE8\u8F2F
 Warnning=\u63D0\u9192
 RoleName_Can_Not_Be_Null=\u89D2\u8272\u540D\u4E0D\u5141\u8A31\u70BA\u7A7A\u4E14\u4E0D\u80FD\u91CD\u8907
 Application=\u61C9\u7528\u7A0B\u5F0F
-Formula_Dictionary_Display_Examples_Html=
+Formula_Dictionary_Display_Examples_Html=<html>\u5BE6\u969B\u503C\u7BC4\u570D\u70BA \=range(100),\u5C0D\u5BE6\u969B\u503C\u7BC4\u570D\u5167\u7684\u6BCF\u500B$$$\u7684\u986F\u793A\u516C\u5F0F\u70BA \=0 - $$$\uFF0C<br>\u5247\u6700\u7D42\u7684\u7D50\u679C\u5BE6\u969B\u503C\u70BA1, 2, ..., 100,\u986F\u793A\u503C\u70BA-1, -2, ... , -100\u3002<br>&nbsp;</html>
 ECP-error_pwd=\u5BC6\u78BC\u932F\u8AA4
 FR-Hyperlink_ChartHyperlink=\u5716\u8868\u8D85\u93C8
 M_Edit-FormatBrush=\u8907\u88FD\u683C\u5F0F(B)
diff --git a/designer_base/src/com/fr/design/present/dict/FormulaDictPane.java b/designer_base/src/com/fr/design/present/dict/FormulaDictPane.java
index 03f3ea790..176b9c2aa 100644
--- a/designer_base/src/com/fr/design/present/dict/FormulaDictPane.java
+++ b/designer_base/src/com/fr/design/present/dict/FormulaDictPane.java
@@ -58,7 +58,7 @@ public class FormulaDictPane extends FurtherBasicBeanPane<FormulaDictionary> {
         int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}};
 
         UILabel tag = new UILabel(Inter.getLocText("Formula_Dictionary_Display_Examples_Html"));
-        tag.setPreferredSize(new Dimension(225,20));
+        tag.setPreferredSize(new Dimension(225,40));
         JPanel t = new JPanel(new BorderLayout());
         t.add(tag, BorderLayout.CENTER);
 

From 3fee041e270a870f74640472da20de50232e2316 Mon Sep 17 00:00:00 2001
From: MoMeak <MoMeak@fanruan.com>
Date: Tue, 22 Aug 2017 15:08:51 +0800
Subject: [PATCH 4/6] update

---
 .../fr/design/mainframe/cell/settingpane/CellOtherSetPane.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/designer/src/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java b/designer/src/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java
index ad5b0d077..53aa5e3dc 100644
--- a/designer/src/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java
+++ b/designer/src/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java
@@ -22,6 +22,7 @@ import com.fr.report.cell.cellattr.CellGUIAttr;
 import com.fr.report.cell.cellattr.CellInsertPolicyAttr;
 import com.fr.report.cell.cellattr.CellPageAttr;
 import com.fr.report.elementcase.TemplateElementCase;
+import com.fr.stable.StringUtils;
 
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
@@ -342,7 +343,7 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
             this.valueEditor.populate(defaultValue);
         } else {
             insertRowPolicy.setSelectedIndex(0);
-            this.valueEditor.populate("");
+            this.valueEditor.populate(StringUtils.EMPTY);
         }
         if (insertRowPolicy.getSelectedIndex() == 1) {
             insertRowPane.setPreferredSize(new Dimension(100, 20));

From 7c3c69a1a0cad99dafe8f3d790ba0b2e5b8a51d6 Mon Sep 17 00:00:00 2001
From: MoMeak <MoMeak@fanruan.com>
Date: Tue, 22 Aug 2017 15:48:25 +0800
Subject: [PATCH 5/6] update

---
 .../com/fr/design/actions/insert/flot/ChartFloatAction.java  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/designer/src/com/fr/design/actions/insert/flot/ChartFloatAction.java b/designer/src/com/fr/design/actions/insert/flot/ChartFloatAction.java
index afab2c69f..80b731c1a 100644
--- a/designer/src/com/fr/design/actions/insert/flot/ChartFloatAction.java
+++ b/designer/src/com/fr/design/actions/insert/flot/ChartFloatAction.java
@@ -89,10 +89,7 @@ public class ChartFloatAction extends ElementCaseAction {
 
                     Style style = newFloatElement.getStyle();
                     if (style != null) {
-                        newFloatElement.setStyle(style.deriveBorder(Constants.LINE_NONE, Color.black,
-                                Constants.LINE_NONE, Color.black,
-                                Constants.LINE_NONE, Color.black,
-                                Constants.LINE_NONE, Color.black));
+                        newFloatElement.setStyle(style.deriveBorder(Constants.LINE_NONE, Color.black, Constants.LINE_NONE, Color.black, Constants.LINE_NONE, Color.black, Constants.LINE_NONE, Color.black));
                     }
                     reportPane.getEditingElementCase().addFloatElement(newFloatElement);
                     reportPane.setSelection(new FloatSelection(newFloatElement.getName()));

From dba3866d94672522df3803d1edf7209b90d385c3 Mon Sep 17 00:00:00 2001
From: MoMeak <MoMeak@fanruan.com>
Date: Tue, 22 Aug 2017 15:48:41 +0800
Subject: [PATCH 6/6] update

---
 .../com/fr/design/present/dict/FormulaDictPane.java   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/designer_base/src/com/fr/design/present/dict/FormulaDictPane.java b/designer_base/src/com/fr/design/present/dict/FormulaDictPane.java
index 176b9c2aa..3abd31dd8 100644
--- a/designer_base/src/com/fr/design/present/dict/FormulaDictPane.java
+++ b/designer_base/src/com/fr/design/present/dict/FormulaDictPane.java
@@ -20,6 +20,7 @@ import java.awt.*;
 public class FormulaDictPane extends FurtherBasicBeanPane<FormulaDictionary> {
 
     private static final int EDITOR_COLUMN = 15;
+    private static final int LEFT_BORDER = 5;
     private FormulaEditor keyFormulaEditor;
     private FormulaEditor valueFormulaEditor;
 
@@ -41,8 +42,8 @@ public class FormulaDictPane extends FurtherBasicBeanPane<FormulaDictionary> {
     private void initComponents() {
         keyFormulaEditor = new FormulaEditor();
         keyFormulaEditor.setColumns(EDITOR_COLUMN);
-        JPanel keyFormulaContainer = new JPanel(new FlowLayout(FlowLayout.RIGHT, 5, 0));
-        keyFormulaContainer.setBorder(BorderFactory.createEmptyBorder(0,-5,0,-5));
+        JPanel keyFormulaContainer = new JPanel(new FlowLayout(FlowLayout.RIGHT, LEFT_BORDER, 0));
+        keyFormulaContainer.setBorder(BorderFactory.createEmptyBorder(0, -LEFT_BORDER, 0, -LEFT_BORDER));
         keyFormulaEditor.setPreferredSize(new Dimension(144, 20));
         Icon icon = BaseUtils.readIcon("/com/fr/design/images/m_insert/formula.png");
         keyFormulaContainer.add(new JLabel(icon));
@@ -58,15 +59,15 @@ public class FormulaDictPane extends FurtherBasicBeanPane<FormulaDictionary> {
         int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}};
 
         UILabel tag = new UILabel(Inter.getLocText("Formula_Dictionary_Display_Examples_Html"));
-        tag.setPreferredSize(new Dimension(225,40));
+        tag.setPreferredSize(new Dimension(225, 40));
         JPanel t = new JPanel(new BorderLayout());
         t.add(tag, BorderLayout.CENTER);
 
         Formula vf = new Formula("$$$");
         valueFormulaEditor = new FormulaEditor("", vf);
 
-        JPanel valueFormulaContainer = new JPanel(new FlowLayout(FlowLayout.RIGHT, 5, 0));
-        valueFormulaContainer.setBorder(BorderFactory.createEmptyBorder(0,-5,0,-5));
+        JPanel valueFormulaContainer = new JPanel(new FlowLayout(FlowLayout.RIGHT, LEFT_BORDER, 0));
+        valueFormulaContainer.setBorder(BorderFactory.createEmptyBorder(0, -LEFT_BORDER, 0, -LEFT_BORDER));
         valueFormulaEditor.setPreferredSize(new Dimension(144, 20));
         valueFormulaContainer.add(new JLabel(icon));
         valueFormulaContainer.add(valueFormulaEditor);