From e53f35dccb68cc0b465f5fd5aa4b52768520308f Mon Sep 17 00:00:00 2001
From: plough <plough@fanruan.com>
Date: Tue, 7 Nov 2017 16:19:51 +0800
Subject: [PATCH 01/29] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=EF=BC=8C?=
 =?UTF-8?q?=E9=80=89=E4=B8=AD=E8=81=9A=E5=90=88=E6=8A=A5=E8=A1=A8=E5=9D=97?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=82=AC=E6=B5=AE=E5=85=83=E7=B4=A0=E4=B8=8D?=
 =?UTF-8?q?=E5=BA=94=E6=9B=B4=E6=96=B0=E6=9D=A1=E4=BB=B6=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer/src/com/fr/poly/creator/ECBlockEditor.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/designer/src/com/fr/poly/creator/ECBlockEditor.java b/designer/src/com/fr/poly/creator/ECBlockEditor.java
index 9048987fb..6cf370bb6 100644
--- a/designer/src/com/fr/poly/creator/ECBlockEditor.java
+++ b/designer/src/com/fr/poly/creator/ECBlockEditor.java
@@ -161,19 +161,18 @@ public class ECBlockEditor extends BlockEditor<ECBlockPane, PolyECBlock> {
             EastRegionContainerPane.getInstance().replaceCellAttrPane(CellElementPropertyPane.getInstance());
             EastRegionContainerPane.getInstance().replaceCellElementPane(QuickEditorRegion.getInstance());
             EastRegionContainerPane.getInstance().replaceWidgetSettingsPane(CellWidgetPropertyPane.getInstance());
+            // 条件属性
+            ConditionAttributesGroupPane conditionAttributesGroupPane = ConditionAttributesGroupPane.getInstance();
+            conditionAttributesGroupPane.populate(editComponent);
 
             EastRegionContainerPane.getInstance().updateCellElementState(isSelectedOneCell());
-        }
 
-        EastRegionContainerPane.getInstance().replaceCellAttrPane(CellElementPropertyPane.getInstance());
+        }
 
         // 超级链接
         HyperlinkGroupPane hyperlinkGroupPane = DesignerContext.getDesignerFrame().getSelectedJTemplate()
                 .getHyperLinkPane(HyperlinkGroupPaneActionImpl.getInstance());
         hyperlinkGroupPane.populate(editComponent);
-        // 条件属性
-        ConditionAttributesGroupPane conditionAttributesGroupPane = ConditionAttributesGroupPane.getInstance();
-        conditionAttributesGroupPane.populate(editComponent);
     }
 
     private boolean isSelectedOneCell() {

From 26795885d8b3a564ec088a1fc30bbc7b7c08db64 Mon Sep 17 00:00:00 2001
From: mengao <283296419@qq.com>
Date: Wed, 8 Nov 2017 19:42:22 +0800
Subject: [PATCH 02/29] =?UTF-8?q?CHART-1697=20=20=E7=B1=BB=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=E4=B8=8E8.0=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/map/designer/type/VanChartMapSourceChoosePane.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapSourceChoosePane.java b/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapSourceChoosePane.java
index a6b8cb5e1..a98c8d7f7 100644
--- a/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapSourceChoosePane.java
+++ b/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapSourceChoosePane.java
@@ -23,10 +23,10 @@ import com.fr.general.Inter;
 import com.fr.general.http.HttpClient;
 import com.fr.plugin.chart.base.GisLayer;
 import com.fr.plugin.chart.base.ViewCenter;
-import com.fr.plugin.chart.base.WMSLayer;
 import com.fr.plugin.chart.designer.TableLayout4VanChartHelper;
 import com.fr.plugin.chart.drillmap.designer.data.comp.MapDataTree;
 import com.fr.plugin.chart.map.VanChartMapPlot;
+import com.fr.plugin.chart.map.layer.WMSLayer;
 import com.fr.plugin.chart.map.server.CompatibleGEOJSONHelper;
 import com.fr.plugin.chart.map.server.GEOJSONHelper;
 import com.fr.plugin.chart.map.server.MapLayerConfigManager;

From eb800a517fa6ce8dc224c73ecbf9e6747a9f4f10 Mon Sep 17 00:00:00 2001
From: XiaXiang <xiaoxia@finereport.com>
Date: Wed, 8 Nov 2017 23:34:09 +0800
Subject: [PATCH 03/29] =?UTF-8?q?REPORT-5284=20=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=E4=BA=A4=E4=BA=92=E4=BF=AE=E6=94=B9=20=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E5=A4=9A=E4=BD=99=E5=88=86=E5=89=B2=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/mainframe/toolbar/ToolBarMenuDock.java    | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
index 258a9e22b..f43419d47 100644
--- a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
+++ b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
@@ -441,14 +441,8 @@ public abstract class ToolBarMenuDock {
             shortCuts.add(new VideoAction());
             shortCuts.add(new TutorialAction());
         }
-        shortCuts.add(SeparatorDef.DEFAULT);
-        shortCuts.add(SeparatorDef.DEFAULT);
-        if (ComparatorUtils.equals(ProductConstants.APP_NAME, FINEREPORT)) {
-            shortCuts.add(SeparatorDef.DEFAULT);
-        }
         if (AlphaFineConfigManager.isALPHALicAvailable()) {
             shortCuts.add(new AlphaFineAction());
-            shortCuts.add(SeparatorDef.DEFAULT);
         }
         shortCuts.add(SeparatorDef.DEFAULT);
         shortCuts.add(new AboutAction());

From 565d3a038b4054438197f3356f8b0b91bcd5d86e Mon Sep 17 00:00:00 2001
From: mengao <283296419@qq.com>
Date: Thu, 9 Nov 2017 10:50:51 +0800
Subject: [PATCH 04/29] =?UTF-8?q?CHART-1662=20=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E5=A4=A7=E5=B0=8F=EF=BC=8C=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=A1=86=E9=80=89=E9=A1=B9=E5=8F=AF=E4=BB=A5=E6=AD=A3=E5=B8=B8?=
 =?UTF-8?q?=E9=80=89=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component/format/VanChartFormatPaneWithCheckBox.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer_chart/src/com/fr/plugin/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java b/designer_chart/src/com/fr/plugin/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java
index 2853cae73..3893f4f8d 100644
--- a/designer_chart/src/com/fr/plugin/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java
+++ b/designer_chart/src/com/fr/plugin/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java
@@ -93,7 +93,7 @@ public abstract class VanChartFormatPaneWithCheckBox extends JPanel{
                     }
                     Point comPoint = formatButton.getLocationOnScreen();
                     Point arrowPoint = new Point(comPoint.x +formatButton.getWidth() - 25, comPoint.y + formatButton.getHeight());
-                    UIBubbleFloatPane<Style> pane = new UIBubbleFloatPane(Constants.LEFT, arrowPoint, formatPane, 258, 240) {
+                    UIBubbleFloatPane<Style> pane = new UIBubbleFloatPane(Constants.LEFT, arrowPoint, formatPane, 258, 255) {
 
                         @Override
                         public void updateContentPane() {

From 16251de0cbaf54d190c91d4cdd97ebf0ca7db391 Mon Sep 17 00:00:00 2001
From: "yaoh.wu" <yaoh.wu@fanruan.com>
Date: Thu, 9 Nov 2017 13:41:44 +0800
Subject: [PATCH 05/29] =?UTF-8?q?REPORT-5473=20=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=E5=86=B3=E7=AD=96=E6=8A=A5=E8=A1=A8=E9=80=89=E4=B8=AD=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E7=BB=84=E4=BB=B6=E7=B2=98=E8=B4=B4=E5=88=B0=E5=8F=A6?=
 =?UTF-8?q?=E5=A4=96=E4=B8=80=E5=BC=A0=E5=86=B3=E7=AD=96=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E5=90=8E=E4=B8=8D=E8=83=BD=E5=88=87=E6=8D=A2=E5=9B=9E=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../widget/ui/FormWidgetCardPane.java         | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java b/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java
index 07a1fe033..963caf8a3 100644
--- a/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java
+++ b/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java
@@ -2,7 +2,14 @@ package com.fr.design.mainframe.widget.ui;
 
 import com.fr.design.data.DataCreatorUI;
 import com.fr.design.designer.beans.events.DesignerEvent;
-import com.fr.design.designer.creator.*;
+import com.fr.design.designer.creator.XCreator;
+import com.fr.design.designer.creator.XCreatorUtils;
+import com.fr.design.designer.creator.XLayoutContainer;
+import com.fr.design.designer.creator.XWAbsoluteLayout;
+import com.fr.design.designer.creator.XWFitLayout;
+import com.fr.design.designer.creator.XWParameterLayout;
+import com.fr.design.designer.creator.XWScaleLayout;
+import com.fr.design.designer.creator.XWTitleLayout;
 import com.fr.design.dialog.AttrScrollPane;
 import com.fr.design.dialog.BasicScrollPane;
 import com.fr.design.foldablepane.UIExpandablePane;
@@ -11,8 +18,8 @@ import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.widget.DataModify;
-import com.fr.design.widget.Operator;
 import com.fr.design.widget.FormWidgetDefinePaneFactoryBase;
+import com.fr.design.widget.Operator;
 import com.fr.design.widget.ui.designer.component.WidgetAbsoluteBoundPane;
 import com.fr.design.widget.ui.designer.component.WidgetBoundPane;
 import com.fr.form.ui.Widget;
@@ -79,14 +86,8 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
     }
 
     public XCreator findXcreator(FormDesigner designer) {
-        int size = designer.getSelectionModel().getSelection().size();
-        if (size == 0 || size == 1) {
-            XCreator creator = size == 0 ? designer.getRootComponent() : designer.getSelectionModel().getSelection()
-                    .getSelectedCreator();
-            return creator;
-        } else {
-            return null;
-        }
+        XCreator creator = designer.getSelectionModel().getSelection().getSelectedCreator();
+        return creator != null ? creator : designer.getRootComponent();
     }
 
     /**
@@ -128,7 +129,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
         this.listener = new AttributeChangeListener() {
             @Override
             public void attributeChange() {
-                if(!isExtraWidget){
+                if (!isExtraWidget) {
                     updateCreator();
                 }
                 updateWidgetBound();
@@ -136,7 +137,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
             }
         };
 
-        if(isExtraWidget){
+        if (isExtraWidget) {
             return;
         }
 
@@ -191,7 +192,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
             innerWidget = crBoundsWidget.getWidget();
         }
         currentEditorDefinePane.populateBean(innerWidget);
-        if(widgetPropertyPane != null){
+        if (widgetPropertyPane != null) {
             widgetPropertyPane.populate(innerWidget);
         }
         reinitAllListeners();
@@ -212,7 +213,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
         fireValueChanged();
     }
 
-    public void updateWidgetBound (){
+    public void updateWidgetBound() {
         if (widgetBoundPane != null && ComparatorUtils.equals(getGlobalName(), Inter.getLocText("FR-Designer_Coords_And_Size"))) {
             widgetBoundPane.update();
             designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_RESIZED);

From df2c3c18ffecbc8fbd293779e2fdfbe1bfac3e00 Mon Sep 17 00:00:00 2001
From: kerry <kerry@finereport.com>
Date: Thu, 9 Nov 2017 14:36:17 +0800
Subject: [PATCH 06/29] =?UTF-8?q?REPORT-5369=20[9.0=E4=B8=89=E8=BD=AE?=
 =?UTF-8?q?=E5=9B=9E=E5=BD=92]=E6=92=A4=E9=94=80=E9=94=AE=E6=8C=89?=
 =?UTF-8?q?=E4=B8=A4=E4=B8=89=E6=AC=A1=E6=89=8D=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/gui/icombobox/TextFontComboBox.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/designer_base/src/com/fr/design/gui/icombobox/TextFontComboBox.java b/designer_base/src/com/fr/design/gui/icombobox/TextFontComboBox.java
index f2d4b1e29..a0b3f056b 100644
--- a/designer_base/src/com/fr/design/gui/icombobox/TextFontComboBox.java
+++ b/designer_base/src/com/fr/design/gui/icombobox/TextFontComboBox.java
@@ -6,10 +6,10 @@ import com.fr.design.gui.icombobox.filter.StartsWithFilter;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.stable.StringUtils;
 
-import javax.swing.*;
+import javax.swing.ComboBoxEditor;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
-import java.awt.*;
+import java.awt.Component;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
 import java.util.List;
@@ -61,7 +61,12 @@ public class TextFontComboBox<T> extends ExtendedComboBox {
         private volatile boolean setting = false;
 
         public FilterComboBoxEditor() {
-            textField = new UITextField(15);
+            textField = new UITextField(15){
+                @Override
+                public boolean shouldResponseChangeListener() {
+                    return false;
+                }
+            };
             textField.getDocument().addDocumentListener(this);
         }
 

From 0dfdf66a8964c860a1343c52fb13b4bb85275050 Mon Sep 17 00:00:00 2001
From: vito <vito@finereport.com>
Date: Thu, 9 Nov 2017 14:59:58 +0800
Subject: [PATCH 07/29] =?UTF-8?q?REPORT-5518=20[9.0=E4=B8=89=E8=BD=AE?=
 =?UTF-8?q?=E5=9B=9E=E5=BD=92]jdk1.7=E7=9A=84=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=E8=B5=B7=E4=B8=8D=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/mainframe/bbs/UserInfoLabel.java   | 45 +++++++++++----
 designer/src/com/fr/start/Designer.java       | 41 +++++++++++---
 .../com/fr/design/extra/LoginWebBridge.java   |  2 +-
 .../com/fr/design/extra/PluginWebBridge.java  | 19 +++++--
 .../com/fr/design/extra/ShopManagerPane.java  |  6 +-
 .../com/fr/design/extra/WebViewDlgHelper.java | 56 +++++++++++++------
 6 files changed, 126 insertions(+), 43 deletions(-)

diff --git a/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java b/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java
index c1dd4c876..2af6adc62 100644
--- a/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java
+++ b/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java
@@ -7,7 +7,11 @@ import com.fr.base.ConfigManager;
 import com.fr.base.FRContext;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.bbs.BBSLoginUtils;
-import com.fr.design.extra.*;
+import com.fr.design.extra.LoginContextListener;
+import com.fr.design.extra.LoginWebBridge;
+import com.fr.design.extra.PluginWebBridge;
+import com.fr.design.extra.UserLoginContext;
+import com.fr.design.extra.WebViewDlgHelper;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.imenu.UIMenuItem;
 import com.fr.design.gui.imenu.UIPopupMenu;
@@ -18,17 +22,28 @@ import com.fr.general.DateUtils;
 import com.fr.general.Inter;
 import com.fr.general.SiteCenter;
 import com.fr.general.http.HttpClient;
-import com.fr.stable.*;
-
-import javax.swing.*;
-import java.awt.*;
+import com.fr.stable.EncodeConstants;
+import com.fr.stable.OperatingSystem;
+import com.fr.stable.StringUtils;
+import net.sf.ehcache.util.NamedThreadFactory;
+
+import javax.swing.SwingConstants;
+import java.awt.Cursor;
+import java.awt.Desktop;
+import java.awt.Frame;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
 import java.net.URI;
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @author neil
@@ -104,8 +119,12 @@ public class UserInfoLabel extends UILabel {
      * showBBSDialog 弹出BBS资讯框
      */
     public static void showBBSDialog() {
-        Thread showBBSThread = new Thread(new Runnable() {
-
+        ThreadFactory namedThread = new NamedThreadFactory("bbs-dlg");
+        ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(
+                1, 1,
+                0L, TimeUnit.MILLISECONDS,
+                new LinkedBlockingQueue<Runnable>(1), namedThread);
+        threadPoolExecutor.execute(new Runnable() {
             @Override
             public void run() {
                 // vito:最新mac10.12和javafx弹出框初始化时会有大几率卡死在native方法，这里先屏蔽一下。
@@ -127,18 +146,20 @@ public class UserInfoLabel extends UILabel {
                     return;
                 }
                 String res = hc.getResponseText();
-                if (res.indexOf(BBSConstants.UPDATE_KEY) == -1) {
+                if (!res.contains(BBSConstants.UPDATE_KEY)) {
                     return;
                 }
                 try {
-                    BBSDialog bbsLabel = new BBSDialog(DesignerContext.getDesignerFrame());
-                    bbsLabel.showWindow(SiteCenter.getInstance().acquireUrlByKind("bbs.popup"));
+                    Class<?> clazz = Class.forName("com.fr.design.mainframe.bbs.BBSDialog");
+                    Constructor constructor = clazz.getConstructor(Frame.class);
+                    Object instance = constructor.newInstance(DesignerContext.getDesignerFrame());
+                    Method showWindow = clazz.getMethod("showWindow", String.class);
+                    showWindow.invoke(instance, SiteCenter.getInstance().acquireUrlByKind("bbs.popup"));
                     DesignerEnvManager.getEnvManager().setLastShowBBSNewsTime(DateUtils.DATEFORMAT2.format(new Date()));
-                } catch (Throwable e) {
+                } catch (Throwable ignored) {
                 }
             }
         });
-        showBBSThread.start();
     }
 
     private void sleep(long millis) {
diff --git a/designer/src/com/fr/start/Designer.java b/designer/src/com/fr/start/Designer.java
index 7f1a7b8cb..71808c2b0 100644
--- a/designer/src/com/fr/start/Designer.java
+++ b/designer/src/com/fr/start/Designer.java
@@ -20,7 +20,12 @@ import com.fr.design.gui.ibutton.UIPreviewButton;
 import com.fr.design.gui.imenu.UIMenuItem;
 import com.fr.design.gui.imenu.UIPopupMenu;
 import com.fr.design.gui.itoolbar.UILargeToolbar;
-import com.fr.design.mainframe.*;
+import com.fr.design.mainframe.ActiveKeyGenerator;
+import com.fr.design.mainframe.BaseJForm;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.InformationCollector;
+import com.fr.design.mainframe.JTemplate;
+import com.fr.design.mainframe.JWorkBook;
 import com.fr.design.mainframe.alphafine.component.AlphaFinePane;
 import com.fr.design.mainframe.bbs.UserInfoLabel;
 import com.fr.design.mainframe.bbs.UserInfoPane;
@@ -37,16 +42,24 @@ import com.fr.general.Inter;
 import com.fr.stable.ProductConstants;
 import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
-import com.fr.stable.web.ServletContext;
 import com.fr.stable.xml.XMLTools;
+import net.sf.ehcache.util.NamedThreadFactory;
 
-import javax.swing.*;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
 import javax.swing.border.MatteBorder;
-import java.awt.*;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Insets;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
 import java.util.ArrayList;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 
 public class Designer extends BaseDesigner {
     private static final int TOOLBARPANEVGAP = -4;
@@ -147,6 +160,7 @@ public class Designer extends BaseDesigner {
 
     private JPanel generateEmptyGap(final int width) {
         JPanel panel = new JPanel() {
+            @Override
             public Dimension getPreferredSize() {
                 Dimension dim = super.getPreferredSize();
                 dim.width = width;
@@ -163,6 +177,7 @@ public class Designer extends BaseDesigner {
      *
      * @return 按钮
      */
+    @Override
     public UIButton[] createUp() {
         return new UIButton[]{createSaveButton(), createUndoButton(), createRedoButton()};
     }
@@ -218,10 +233,12 @@ public class Designer extends BaseDesigner {
 
     private void createRunButton(UILargeToolbar largeToolbar) {
         run = new UIPreviewButton(new UIButton(UIConstants.PAGE_BIG_ICON) {
+            @Override
             public Dimension getPreferredSize() {
                 return new Dimension(34, 34);
             }
         }, new UIButton(UIConstants.PREVIEW_DOWN) {
+            @Override
             public Dimension getPreferredSize() {
                 return new Dimension(34, 10);
             }
@@ -296,6 +313,7 @@ public class Designer extends BaseDesigner {
      * @param plus             对象
      * @return 更新后的toolbar
      */
+    @Override
     public JComponent resetToolBar(JComponent toolbarComponent, ToolBarMenuDockPlus plus) {
         //如果是处于权限编辑状态
         if (BaseUtils.isAuthorityEditing()) {
@@ -339,6 +357,7 @@ public class Designer extends BaseDesigner {
      *
      * @return 面板组件
      */
+    @Override
     public Component createBBSLoginPane() {
         if (userInfoPane == null) {
             userInfoPane = new UserInfoPane();
@@ -351,11 +370,13 @@ public class Designer extends BaseDesigner {
      *
      * @return 面板组件
      */
+    @Override
     public Component createAlphaFinePane() {
         return AlphaFinePane.getAlphaFinePane();
     }
 
 
+    @Override
     protected SplashPane createSplashPane() {
         return new ReportSplashPane();
     }
@@ -363,6 +384,7 @@ public class Designer extends BaseDesigner {
     /**
      * 收集用户信息吗
      */
+    @Override
     protected void collectUserInformation() {
         //定制的就不弹出来了
         if (!ComparatorUtils.equals(ProductConstants.APP_NAME, ProductConstants.DEFAULT_APP_NAME)) {
@@ -395,14 +417,18 @@ public class Designer extends BaseDesigner {
         int status = envManager.getActiveKeyStatus();
         //没有联网验证过
         if (status != 0) {
-            Thread authThread = new Thread(new Runnable() {
-
+            ThreadFactory namedThread = new NamedThreadFactory("net-verify");
+            ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(
+                    1, 1,
+                    0L, TimeUnit.MILLISECONDS,
+                    new LinkedBlockingQueue<Runnable>(1),
+                    namedThread);
+            threadPoolExecutor.execute(new Runnable() {
                 @Override
                 public void run() {
                     ActiveKeyGenerator.onLineVerify(key);
                 }
             });
-            authThread.start();
         }
     }
 
@@ -443,6 +469,7 @@ public class Designer extends BaseDesigner {
     /**
      * 设计器退出时, 做的一些操作.
      */
+    @Override
     public void shutDown() {
         InformationCollector collector = InformationCollector.getInstance();
         collector.collectStopTime();
diff --git a/designer_base/src/com/fr/design/extra/LoginWebBridge.java b/designer_base/src/com/fr/design/extra/LoginWebBridge.java
index eef13830e..7d002572c 100644
--- a/designer_base/src/com/fr/design/extra/LoginWebBridge.java
+++ b/designer_base/src/com/fr/design/extra/LoginWebBridge.java
@@ -92,7 +92,7 @@ public class LoginWebBridge {
         return messageCount;
     }
 
-    public void setQqDialog(UIDialog qqDialog) {
+    public void setQQDialog(UIDialog qqDialog) {
         closeQQWindow();
         this.qqDialog = qqDialog;
     }
diff --git a/designer_base/src/com/fr/design/extra/PluginWebBridge.java b/designer_base/src/com/fr/design/extra/PluginWebBridge.java
index 8f40280b1..3de329f26 100644
--- a/designer_base/src/com/fr/design/extra/PluginWebBridge.java
+++ b/designer_base/src/com/fr/design/extra/PluginWebBridge.java
@@ -27,7 +27,9 @@ import javafx.concurrent.Task;
 import javafx.scene.web.WebEngine;
 import javafx.stage.FileChooser;
 import javafx.stage.Stage;
+import net.sf.ehcache.util.NamedThreadFactory;
 import netscape.javascript.JSObject;
+
 import javax.swing.JDialog;
 import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
@@ -41,25 +43,34 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 开放给Web组件的接口,用于安装,卸载,更新以及更改插件可用状态
  */
 public class PluginWebBridge {
+    private static final String PREFIX = "pluginbridge-pool";
+    private static final String ACTION = "action";
+    private static final String KEYWORD = "keyword";
+    private static final int COREPOOLSIZE = 3;
+    private static final int MAXPOOLSIZE = 5;
 
     private static PluginWebBridge helper;
 
     private UIDialog uiDialog;
     private ACTIONS action;
-    private String ACTION = "action";
-    private String KEYWORD = "keyword";
+
     private Map<String, Object> config;
     private WebEngine webEngine;
 
     private UILabel uiLabel;
 
-    private ExecutorService threadPoolExecutor = Executors.newSingleThreadExecutor();
+    private ExecutorService threadPoolExecutor = new ThreadPoolExecutor(COREPOOLSIZE, MAXPOOLSIZE,
+            0L, TimeUnit.MILLISECONDS,
+            new LinkedBlockingQueue<Runnable>(COREPOOLSIZE),
+            new NamedThreadFactory(PREFIX));
 
     /**
      * 动作枚举
diff --git a/designer_base/src/com/fr/design/extra/ShopManagerPane.java b/designer_base/src/com/fr/design/extra/ShopManagerPane.java
index 857e96cc8..49d89733d 100644
--- a/designer_base/src/com/fr/design/extra/ShopManagerPane.java
+++ b/designer_base/src/com/fr/design/extra/ShopManagerPane.java
@@ -2,9 +2,9 @@ package com.fr.design.extra;
 
 import com.fr.design.dialog.BasicPane;
 import com.fr.general.Inter;
-import javafx.embed.swing.JFXPanel;
 
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Component;
 
 /**
  * @author richie
@@ -19,7 +19,7 @@ import java.awt.*;
  */
 public class ShopManagerPane extends BasicPane {
 
-    public ShopManagerPane(JFXPanel webPane) {
+    public ShopManagerPane(Component webPane) {
         setLayout(new BorderLayout());
         add(webPane, BorderLayout.CENTER);
     }
diff --git a/designer_base/src/com/fr/design/extra/WebViewDlgHelper.java b/designer_base/src/com/fr/design/extra/WebViewDlgHelper.java
index c394e7519..30de87974 100644
--- a/designer_base/src/com/fr/design/extra/WebViewDlgHelper.java
+++ b/designer_base/src/com/fr/design/extra/WebViewDlgHelper.java
@@ -17,23 +17,28 @@ import com.fr.plugin.PluginVerifyException;
 import com.fr.stable.EnvChangedListener;
 import com.fr.stable.StableUtils;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.JOptionPane;
+import javax.swing.SwingWorker;
+import java.awt.BorderLayout;
+import java.awt.Component;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.InputStream;
+import java.lang.reflect.Constructor;
 import java.net.HttpURLConnection;
 import java.util.concurrent.ExecutionException;
 
 /**
- * Created by vito on 2016/9/28.
+ * 在合适的 jre 环境下创建带有 WebView 的窗口
+ *
+ * @author vito
+ * @date 2016/9/28
  */
 public class WebViewDlgHelper {
     private static final String LATEST = "latest";
     private static final String SHOP_SCRIPTS = "shop_scripts";
     private static final int VERSION_8 = 8;
-    // 调试时，使用installHome = ClassLoader.getSystemResource("").getPath()代替下面
     private static String installHome = FRContext.getCurrentEnv().getWebReportPath();
     private static final int BYTES_NUM = 1024;
 
@@ -146,24 +151,43 @@ public class WebViewDlgHelper {
     }
 
     public static void createQQLoginDialog() {
-        QQLoginWebPane webPane = new QQLoginWebPane(new File(installHome).getAbsolutePath());
-        UIDialog qqlog = new QQLoginDialog(DesignerContext.getDesignerFrame(), webPane);
-        LoginWebBridge.getHelper().setQqDialog(qqlog);
-        qqlog.setVisible(true);
+        try {
+            Class<?> clazz = Class.forName("com.fr.design.extra.QQLoginWebPane");
+            Constructor constructor = clazz.getConstructor(String.class);
+            Component webPane = (Component) constructor.newInstance(new File(installHome).getAbsolutePath());
+
+            UIDialog qqLoginDialog = new QQLoginDialog(DesignerContext.getDesignerFrame(), webPane);
+            LoginWebBridge.getHelper().setQQDialog(qqLoginDialog);
+            qqLoginDialog.setVisible(true);
+        } catch (Throwable ignored) {
+        }
     }
 
     private static void showPluginDlg(String mainJsPath) {
-        BasicPane managerPane = new ShopManagerPane(new PluginWebPane(mainJsPath));
-        UIDialog dlg = new ShopDialog(DesignerContext.getDesignerFrame(), managerPane);
-        PluginWebBridge.getHelper().setDialogHandle(dlg);
-        dlg.setVisible(true);
+        try {
+            Class<?> clazz = Class.forName("com.fr.design.extra.PluginWebPane");
+            Constructor constructor = clazz.getConstructor(String.class);
+            Component webPane = (Component) constructor.newInstance(mainJsPath);
+
+            BasicPane managerPane = new ShopManagerPane(webPane);
+            UIDialog dlg = new ShopDialog(DesignerContext.getDesignerFrame(), managerPane);
+            PluginWebBridge.getHelper().setDialogHandle(dlg);
+            dlg.setVisible(true);
+        } catch (Throwable ignored) {
+        }
     }
 
     private static void showLoginDlg() {
-        LoginWebPane webPane = new LoginWebPane(installHome);
-        UIDialog qqdlg = new LoginDialog(DesignerContext.getDesignerFrame(), webPane);
-        LoginWebBridge.getHelper().setDialogHandle(qqdlg);
-        qqdlg.setVisible(true);
+        try {
+            Class<?> clazz = Class.forName("com.fr.design.extra.LoginWebPane");
+            Constructor constructor = clazz.getConstructor(String.class);
+            Component webPane = (Component) constructor.newInstance(installHome);
+
+            UIDialog qqdlg = new LoginDialog(DesignerContext.getDesignerFrame(), webPane);
+            LoginWebBridge.getHelper().setDialogHandle(qqdlg);
+            qqdlg.setVisible(true);
+        } catch (Throwable ignored) {
+        }
     }
 
     private static Component initTraditionalStore() {

From 01e46659d8b778b09a0d0b28a6bb994cf592d36d Mon Sep 17 00:00:00 2001
From: vito <vito@finereport.com>
Date: Thu, 9 Nov 2017 16:20:48 +0800
Subject: [PATCH 08/29] =?UTF-8?q?refact:=20=E5=A2=9E=E5=8A=A0ThreadFactory?=
 =?UTF-8?q?Builder?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/mainframe/bbs/UserInfoLabel.java   |   7 +-
 designer/src/com/fr/start/Designer.java       |   7 +-
 .../com/fr/design/extra/PluginWebBridge.java  |   8 +-
 .../concurrent/ThreadFactoryBuilder.java      | 177 ++++++++++++++++++
 4 files changed, 189 insertions(+), 10 deletions(-)
 create mode 100644 designer_base/src/com/fr/design/utils/concurrent/ThreadFactoryBuilder.java

diff --git a/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java b/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java
index 2af6adc62..c985fc6e5 100644
--- a/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java
+++ b/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java
@@ -16,6 +16,7 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.imenu.UIMenuItem;
 import com.fr.design.gui.imenu.UIPopupMenu;
 import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.utils.concurrent.ThreadFactoryBuilder;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.DateUtils;
@@ -25,7 +26,6 @@ import com.fr.general.http.HttpClient;
 import com.fr.stable.EncodeConstants;
 import com.fr.stable.OperatingSystem;
 import com.fr.stable.StringUtils;
-import net.sf.ehcache.util.NamedThreadFactory;
 
 import javax.swing.SwingConstants;
 import java.awt.Cursor;
@@ -119,11 +119,12 @@ public class UserInfoLabel extends UILabel {
      * showBBSDialog 弹出BBS资讯框
      */
     public static void showBBSDialog() {
-        ThreadFactory namedThread = new NamedThreadFactory("bbs-dlg");
+        ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                .setNameFormat("bbs-dlg-thread-%s").build();
         ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(
                 1, 1,
                 0L, TimeUnit.MILLISECONDS,
-                new LinkedBlockingQueue<Runnable>(1), namedThread);
+                new LinkedBlockingQueue<Runnable>(1), namedThreadFactory);
         threadPoolExecutor.execute(new Runnable() {
             @Override
             public void run() {
diff --git a/designer/src/com/fr/start/Designer.java b/designer/src/com/fr/start/Designer.java
index 71808c2b0..2f484553a 100644
--- a/designer/src/com/fr/start/Designer.java
+++ b/designer/src/com/fr/start/Designer.java
@@ -36,6 +36,7 @@ import com.fr.design.menu.SeparatorDef;
 import com.fr.design.menu.ShortCut;
 import com.fr.design.module.DesignModuleFactory;
 import com.fr.design.module.DesignerModule;
+import com.fr.design.utils.concurrent.ThreadFactoryBuilder;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.Inter;
@@ -43,7 +44,6 @@ import com.fr.stable.ProductConstants;
 import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
 import com.fr.stable.xml.XMLTools;
-import net.sf.ehcache.util.NamedThreadFactory;
 
 import javax.swing.JComponent;
 import javax.swing.JPanel;
@@ -417,12 +417,13 @@ public class Designer extends BaseDesigner {
         int status = envManager.getActiveKeyStatus();
         //没有联网验证过
         if (status != 0) {
-            ThreadFactory namedThread = new NamedThreadFactory("net-verify");
+            ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                    .setNameFormat("net-verify-thread-%s").build();
             ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(
                     1, 1,
                     0L, TimeUnit.MILLISECONDS,
                     new LinkedBlockingQueue<Runnable>(1),
-                    namedThread);
+                    namedThreadFactory);
             threadPoolExecutor.execute(new Runnable() {
                 @Override
                 public void run() {
diff --git a/designer_base/src/com/fr/design/extra/PluginWebBridge.java b/designer_base/src/com/fr/design/extra/PluginWebBridge.java
index 3de329f26..fed3c6855 100644
--- a/designer_base/src/com/fr/design/extra/PluginWebBridge.java
+++ b/designer_base/src/com/fr/design/extra/PluginWebBridge.java
@@ -7,12 +7,13 @@ import com.fr.design.bbs.BBSLoginUtils;
 import com.fr.design.dialog.UIDialog;
 import com.fr.design.extra.exe.GetPluginCategoriesExecutor;
 import com.fr.design.extra.exe.GetPluginFromStoreExecutor;
+import com.fr.design.extra.exe.GetPluginPrefixExecutor;
 import com.fr.design.extra.exe.PluginLoginExecutor;
 import com.fr.design.extra.exe.ReadUpdateOnlineExecutor;
 import com.fr.design.extra.exe.SearchOnlineExecutor;
 import com.fr.design.extra.exe.callback.JSCallback;
-import com.fr.design.extra.exe.GetPluginPrefixExecutor;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.utils.concurrent.ThreadFactoryBuilder;
 import com.fr.general.FRLogger;
 import com.fr.general.Inter;
 import com.fr.general.SiteCenter;
@@ -27,7 +28,6 @@ import javafx.concurrent.Task;
 import javafx.scene.web.WebEngine;
 import javafx.stage.FileChooser;
 import javafx.stage.Stage;
-import net.sf.ehcache.util.NamedThreadFactory;
 import netscape.javascript.JSObject;
 
 import javax.swing.JDialog;
@@ -51,7 +51,7 @@ import java.util.concurrent.TimeUnit;
  * 开放给Web组件的接口,用于安装,卸载,更新以及更改插件可用状态
  */
 public class PluginWebBridge {
-    private static final String PREFIX = "pluginbridge-pool";
+    private static final String THREAD_NAME_TEMPLATE = "pluginbridge-thread-%s";
     private static final String ACTION = "action";
     private static final String KEYWORD = "keyword";
     private static final int COREPOOLSIZE = 3;
@@ -70,7 +70,7 @@ public class PluginWebBridge {
     private ExecutorService threadPoolExecutor = new ThreadPoolExecutor(COREPOOLSIZE, MAXPOOLSIZE,
             0L, TimeUnit.MILLISECONDS,
             new LinkedBlockingQueue<Runnable>(COREPOOLSIZE),
-            new NamedThreadFactory(PREFIX));
+            new ThreadFactoryBuilder().setNameFormat(THREAD_NAME_TEMPLATE).build());
 
     /**
      * 动作枚举
diff --git a/designer_base/src/com/fr/design/utils/concurrent/ThreadFactoryBuilder.java b/designer_base/src/com/fr/design/utils/concurrent/ThreadFactoryBuilder.java
new file mode 100644
index 000000000..d7d2393e8
--- /dev/null
+++ b/designer_base/src/com/fr/design/utils/concurrent/ThreadFactoryBuilder.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright (C) 2010 The Guava Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.fr.design.utils.concurrent;
+
+import java.lang.Thread.UncaughtExceptionHandler;
+import java.util.Locale;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicLong;
+
+/**
+ * A ThreadFactory builder, providing any combination of these features:
+ * <ul>
+ * <li>whether threads should be marked as {@linkplain Thread#setDaemon daemon} threads
+ * <li>a {@linkplain ThreadFactoryBuilder#setNameFormat naming format}
+ * <li>a {@linkplain Thread#setPriority thread priority}
+ * <li>an {@linkplain Thread#setUncaughtExceptionHandler uncaught exception handler}
+ * <li>a {@linkplain ThreadFactory#newThread backing thread factory}
+ * </ul>
+ * <p>If no backing thread factory is provided, a default backing thread factory is used as if by
+ * calling {@code setThreadFactory(}{@link Executors#defaultThreadFactory()}{@code )}.
+ *
+ * @author Kurt Alfred Kluever
+ * @since 4.0
+ */
+public final class ThreadFactoryBuilder {
+    private String nameFormat = null;
+    private Boolean daemon = null;
+    private Integer priority = null;
+    private UncaughtExceptionHandler uncaughtExceptionHandler = null;
+    private ThreadFactory backingThreadFactory = null;
+
+    /**
+     * Creates a new {@link ThreadFactory} builder.
+     */
+    public ThreadFactoryBuilder() {
+    }
+
+    /**
+     * Sets the naming format to use when naming threads ({@link Thread#setName}) which are created
+     * with this ThreadFactory.
+     *
+     * @param nameFormat a {@link String#format(String, Object...)}-compatible format String, to which
+     *                   a unique integer (0, 1, etc.) will be supplied as the single parameter. This integer will
+     *                   be unique to the built instance of the ThreadFactory and will be assigned sequentially. For
+     *                   example, {@code "rpc-pool-%d"} will generate thread names like {@code "rpc-pool-0"},
+     *                   {@code "rpc-pool-1"}, {@code "rpc-pool-2"}, etc.
+     * @return this for the builder pattern
+     */
+    public ThreadFactoryBuilder setNameFormat(String nameFormat) {
+        String unused = format(nameFormat, 0); // fail fast if the format is bad or null
+        this.nameFormat = nameFormat;
+        return this;
+    }
+
+    /**
+     * Sets daemon or not for new threads created with this ThreadFactory.
+     *
+     * @param daemon whether or not new Threads created with this ThreadFactory will be daemon threads
+     * @return this for the builder pattern
+     */
+    public ThreadFactoryBuilder setDaemon(boolean daemon) {
+        this.daemon = daemon;
+        return this;
+    }
+
+    /**
+     * Sets the priority for new threads created with this ThreadFactory.
+     *
+     * @param priority the priority for new Threads created with this ThreadFactory
+     * @return this for the builder pattern
+     */
+    public ThreadFactoryBuilder setPriority(int priority) {
+        // Thread#setPriority() already checks for validity. These error messages
+        // are nicer though and will fail-fast.
+
+        if (priority < Thread.MIN_PRIORITY) {
+            throw new IllegalArgumentException(format("Thread priority (%s) must be >= %s", priority, Thread.MIN_PRIORITY));
+        }
+        if (priority > Thread.MAX_PRIORITY) {
+            throw new IllegalArgumentException(format("Thread priority (%s) must be <= %s", priority, Thread.MAX_PRIORITY));
+        }
+        this.priority = priority;
+        return this;
+    }
+
+    /**
+     * Sets the {@link UncaughtExceptionHandler} for new threads created with this ThreadFactory.
+     *
+     * @param uncaughtExceptionHandler the uncaught exception handler for new Threads created with
+     *                                 this ThreadFactory
+     * @return this for the builder pattern
+     */
+    public ThreadFactoryBuilder setUncaughtExceptionHandler(
+            UncaughtExceptionHandler uncaughtExceptionHandler) {
+        if (uncaughtExceptionHandler == null) {
+            throw new NullPointerException();
+        }
+        this.uncaughtExceptionHandler = uncaughtExceptionHandler;
+        return this;
+    }
+
+    /**
+     * Sets the backing {@link ThreadFactory} for new threads created with this ThreadFactory. Threads
+     * will be created by invoking #newThread(Runnable) on this backing {@link ThreadFactory}.
+     *
+     * @param backingThreadFactory the backing {@link ThreadFactory} which will be delegated to during
+     *                             thread creation.
+     * @return this for the builder pattern
+     */
+    public ThreadFactoryBuilder setThreadFactory(ThreadFactory backingThreadFactory) {
+        if (backingThreadFactory == null) {
+            throw new NullPointerException();
+        }
+        this.backingThreadFactory = backingThreadFactory;
+        return this;
+    }
+
+    /**
+     * Returns a new thread factory using the options supplied during the building process. After
+     * building, it is still possible to change the options used to build the ThreadFactory and/or
+     * build again. State is not shared amongst built instances.
+     *
+     * @return the fully constructed {@link ThreadFactory}
+     */
+    public ThreadFactory build() {
+        return doBuild(this);
+    }
+
+    // Split out so that the anonymous ThreadFactory can't contain a reference back to the builder.
+    // At least, I assume that's why. TODO(cpovirk): Check, and maybe add a test for this.
+    private static ThreadFactory doBuild(ThreadFactoryBuilder builder) {
+        final String nameFormat = builder.nameFormat;
+        final Boolean daemon = builder.daemon;
+        final Integer priority = builder.priority;
+        final UncaughtExceptionHandler uncaughtExceptionHandler = builder.uncaughtExceptionHandler;
+        final ThreadFactory backingThreadFactory =
+                (builder.backingThreadFactory != null)
+                        ? builder.backingThreadFactory
+                        : Executors.defaultThreadFactory();
+        final AtomicLong count = (nameFormat != null) ? new AtomicLong(0) : null;
+        return new ThreadFactory() {
+            @Override
+            public Thread newThread(Runnable runnable) {
+                Thread thread = backingThreadFactory.newThread(runnable);
+                if (nameFormat != null) {
+                    thread.setName(format(nameFormat, count.getAndIncrement()));
+                }
+                if (daemon != null) {
+                    thread.setDaemon(daemon);
+                }
+                if (priority != null) {
+                    thread.setPriority(priority);
+                }
+                if (uncaughtExceptionHandler != null) {
+                    thread.setUncaughtExceptionHandler(uncaughtExceptionHandler);
+                }
+                return thread;
+            }
+        };
+    }
+
+    private static String format(String format, Object... args) {
+        return String.format(Locale.ROOT, format, args);
+    }
+}

From d911f0be0405330c89c1a4deec3a6e1923d4c163 Mon Sep 17 00:00:00 2001
From: ju <ju@finereport.com>
Date: Thu, 9 Nov 2017 16:57:50 +0800
Subject: [PATCH 09/29] =?UTF-8?q?RES-32=20=E5=85=AC=E6=9C=89=E4=BA=91?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E7=9A=84=E6=94=AF=E6=8C=81=20=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E7=82=B9=E6=80=A7=E8=83=BD=E4=BC=98=E5=8C=96=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8A=E5=B1=82=E7=9B=B4=E6=8E=A5=E7=94=A8=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E8=A6=81=E7=9B=91=E5=90=AC=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mainframe/errorinfo/ErrorInfoUploader.java   | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/designer/src/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java b/designer/src/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java
index 40e870047..1ab7e44de 100644
--- a/designer/src/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java
+++ b/designer/src/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java
@@ -35,7 +35,6 @@ public class ErrorInfoUploader {
     public static final String FOLDER_NAME = "errorInfo";
 
     private static ErrorInfoUploader collector;
-    private static boolean licSupport = true;
     // 在一台不能上网的电脑里发现了10w个errorinfo...
     private static final int MAX_ERROR_SIZE = 2000;
 
@@ -51,17 +50,7 @@ public class ErrorInfoUploader {
                 });
             }
         });
-
-        // 这个控制没啥意义, 主要在于宣传功能.
-        licSupport = VT4FR.AlphaFine.support();
-        FRCoreContext.listenerLicense(new LicenseListener() {
-        
-            @Override
-            public void onChange() {
-            
-                licSupport = VT4FR.AlphaFine.support();
-            }
-        });
+    
     }
 
     private ErrorInfoUploader() {
@@ -83,7 +72,8 @@ public class ErrorInfoUploader {
 
     // 从云中心更新最新的解决方案文件
     private void checkUpdateSolution(){
-        if (!licSupport) {
+    
+        if (!VT4FR.AlphaFine.support()) {
             return;
         }
 

From 300c51c305404d8f608b5b06ff7af9564222da03 Mon Sep 17 00:00:00 2001
From: kerry <kerry@finereport.com>
Date: Thu, 9 Nov 2017 17:53:47 +0800
Subject: [PATCH 10/29] =?UTF-8?q?REPORT-5553=20[9.0=E4=B8=89=E8=BD=AE?=
 =?UTF-8?q?=E5=9B=9E=E5=BD=92]=E8=A1=A8=E5=8D=95=E5=A4=8D=E9=80=89?=
 =?UTF-8?q?=E6=A1=86=E6=8E=A7=E4=BB=B6=E6=96=87=E6=9C=AC=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/designer/creator/XCheckBox.java     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/designer_form/src/com/fr/design/designer/creator/XCheckBox.java b/designer_form/src/com/fr/design/designer/creator/XCheckBox.java
index 92c09aed7..a16416c33 100644
--- a/designer_form/src/com/fr/design/designer/creator/XCheckBox.java
+++ b/designer_form/src/com/fr/design/designer/creator/XCheckBox.java
@@ -83,4 +83,12 @@ public class XCheckBox extends XWidgetCreator {
     protected String getIconName() {
         return "check_box_16.png";
     }
+
+	public void firePropertyChange(){
+		((UICheckBox) editor).setText(((CheckBox) data).getText());
+		WidgetValue value = ((CheckBox) data).getWidgetValue();
+		if (value != null && value.getValue() instanceof Boolean) {
+			((UICheckBox) editor).setSelected((Boolean) value.getValue());
+		}
+	}
 }
\ No newline at end of file

From aa3e7e1ce9e4dbbfc96e208ee8e67afefdad3c5f Mon Sep 17 00:00:00 2001
From: vito <vito@finereport.com>
Date: Fri, 10 Nov 2017 15:04:24 +0800
Subject: [PATCH 11/29] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20SonarQu?=
 =?UTF-8?q?be?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer_base/src/com/fr/design/extra/LoginWebBridge.java   | 6 +++---
 designer_base/src/com/fr/design/extra/WebViewDlgHelper.java | 4 ++++
 .../fr/design/utils/concurrent/ThreadFactoryBuilder.java    | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/designer_base/src/com/fr/design/extra/LoginWebBridge.java b/designer_base/src/com/fr/design/extra/LoginWebBridge.java
index 7d002572c..f946a7cc6 100644
--- a/designer_base/src/com/fr/design/extra/LoginWebBridge.java
+++ b/designer_base/src/com/fr/design/extra/LoginWebBridge.java
@@ -63,7 +63,7 @@ public class LoginWebBridge {
     private UILabel uiLabel;
     private WebEngine webEngine;
 
-    public LoginWebBridge() {
+    private LoginWebBridge() {
     }
 
     public static LoginWebBridge getHelper() {
@@ -298,13 +298,13 @@ public class LoginWebBridge {
                 closeQQWindow();
                 try {
                     Desktop.getDesktop().browse(new URI(SiteCenter.getInstance().acquireUrlByKind("QQ_binding")));
-                } catch (Exception exp) {
+                } catch (Exception ignored) {
+                    // ignored
                 }
             }
         } catch (Exception e) {
             FRContext.getLogger().error(e.getMessage());
         }
-
     }
 
     public void openUrlAtLocalWebBrowser(WebEngine eng, String url) {
diff --git a/designer_base/src/com/fr/design/extra/WebViewDlgHelper.java b/designer_base/src/com/fr/design/extra/WebViewDlgHelper.java
index 30de87974..16eb61192 100644
--- a/designer_base/src/com/fr/design/extra/WebViewDlgHelper.java
+++ b/designer_base/src/com/fr/design/extra/WebViewDlgHelper.java
@@ -160,6 +160,7 @@ public class WebViewDlgHelper {
             LoginWebBridge.getHelper().setQQDialog(qqLoginDialog);
             qqLoginDialog.setVisible(true);
         } catch (Throwable ignored) {
+            // ignored
         }
     }
 
@@ -174,6 +175,7 @@ public class WebViewDlgHelper {
             PluginWebBridge.getHelper().setDialogHandle(dlg);
             dlg.setVisible(true);
         } catch (Throwable ignored) {
+            // ignored
         }
     }
 
@@ -187,6 +189,7 @@ public class WebViewDlgHelper {
             LoginWebBridge.getHelper().setDialogHandle(qqdlg);
             qqdlg.setVisible(true);
         } catch (Throwable ignored) {
+            // ignored
         }
     }
 
@@ -207,6 +210,7 @@ public class WebViewDlgHelper {
                     PluginUtils.downloadShopScripts(scriptsId, new Process<Double>() {
                         @Override
                         public void process(Double integer) {
+                            // 这个注释毫无意义，就是为了通过SonarQube
                         }
                     });
                 } catch (PluginVerifyException e) {
diff --git a/designer_base/src/com/fr/design/utils/concurrent/ThreadFactoryBuilder.java b/designer_base/src/com/fr/design/utils/concurrent/ThreadFactoryBuilder.java
index d7d2393e8..3af213ac9 100644
--- a/designer_base/src/com/fr/design/utils/concurrent/ThreadFactoryBuilder.java
+++ b/designer_base/src/com/fr/design/utils/concurrent/ThreadFactoryBuilder.java
@@ -45,6 +45,7 @@ public final class ThreadFactoryBuilder {
      * Creates a new {@link ThreadFactory} builder.
      */
     public ThreadFactoryBuilder() {
+        // 这个注释毫无意义，就是为了通过SonarQube
     }
 
     /**

From fba3595d78074ec212b7f56d25e2d86ab8b05194 Mon Sep 17 00:00:00 2001
From: vito <vito@finereport.com>
Date: Fri, 10 Nov 2017 15:10:14 +0800
Subject: [PATCH 12/29] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20SonarQu?=
 =?UTF-8?q?be?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/mainframe/bbs/UserInfoLabel.java     | 5 +++++
 designer_base/src/com/fr/design/extra/LoginWebBridge.java  | 7 ++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java b/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java
index c985fc6e5..940bc9b4f 100644
--- a/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java
+++ b/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java
@@ -87,6 +87,10 @@ public class UserInfoLabel extends UILabel {
     }
 
     public UserInfoLabel(UserInfoPane userInfoPane) {
+        init(userInfoPane);
+    }
+
+    private void init(UserInfoPane userInfoPane) {
         this.userInfoPane = userInfoPane;
 
         String userName = ConfigManager.getProviderInstance().getBbsUsername();
@@ -158,6 +162,7 @@ public class UserInfoLabel extends UILabel {
                     showWindow.invoke(instance, SiteCenter.getInstance().acquireUrlByKind("bbs.popup"));
                     DesignerEnvManager.getEnvManager().setLastShowBBSNewsTime(DateUtils.DATEFORMAT2.format(new Date()));
                 } catch (Throwable ignored) {
+                    // ignored
                 }
             }
         });
diff --git a/designer_base/src/com/fr/design/extra/LoginWebBridge.java b/designer_base/src/com/fr/design/extra/LoginWebBridge.java
index f946a7cc6..330b9fc03 100644
--- a/designer_base/src/com/fr/design/extra/LoginWebBridge.java
+++ b/designer_base/src/com/fr/design/extra/LoginWebBridge.java
@@ -8,6 +8,7 @@ import com.fr.design.extra.exe.PluginLoginExecutor;
 import com.fr.design.extra.ucenter.Client;
 import com.fr.design.extra.ucenter.XMLHelper;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.general.ComparatorUtils;
 import com.fr.general.SiteCenter;
 import com.fr.general.http.HttpClient;
 import com.fr.json.JSONObject;
@@ -282,9 +283,9 @@ public class LoginWebBridge {
         try {
             JSONObject jo = new JSONObject(userInfo);
             String status = jo.get("status").toString();
-            if (status.equals(LOGIN_SUCCESS)) {
+            if (ComparatorUtils.equals(status, LOGIN_SUCCESS)) {
                 String username = jo.get("username").toString();
-                int uid = Integer.parseInt(jo.get("uid") == null ? "" : jo.get("uid").toString());
+                int uid = Integer.parseInt(jo.get("uid") == null ? StringUtils.EMPTY : jo.get("uid").toString());
                 closeQQWindow();
                 loginSuccess(username);
 
@@ -293,7 +294,7 @@ public class LoginWebBridge {
                 list.add(username);
                 list.add(StringUtils.EMPTY);
                 BBSLoginUtils.bbsLogin(list);
-            } else if (status.equals(LOGIN_FAILED)) {
+            } else if (ComparatorUtils.equals(status, LOGIN_FAILED)) {
                 //账号没有QQ授权
                 closeQQWindow();
                 try {

From 81e97dec178c4c190b9eb568effdd062e81058f0 Mon Sep 17 00:00:00 2001
From: neil <459208047@qq.com>
Date: Fri, 10 Nov 2017 15:52:04 +0800
Subject: [PATCH 13/29] =?UTF-8?q?REPORT-5568=209.0=20=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=99=A8=E5=86=85=E5=AD=98=E6=B6=A8=E7=9A=84=E5=BE=88=E5=BF=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/gui/date/UICalendarPanel.java   | 52 ++++++++++++-------
 1 file changed, 34 insertions(+), 18 deletions(-)

diff --git a/designer_base/src/com/fr/design/gui/date/UICalendarPanel.java b/designer_base/src/com/fr/design/gui/date/UICalendarPanel.java
index 137209b90..e11b908db 100644
--- a/designer_base/src/com/fr/design/gui/date/UICalendarPanel.java
+++ b/designer_base/src/com/fr/design/gui/date/UICalendarPanel.java
@@ -1,30 +1,48 @@
 package com.fr.design.gui.date;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.awt.geom.RoundRectangle2D;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-
-import javax.swing.*;
-
 import com.fr.base.BaseUtils;
 import com.fr.base.background.GradientBackground;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ilable.UILabel;
-
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import javax.swing.event.EventListenerList;
-
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.utils.gui.GUIPaintUtils;
 import com.fr.general.Inter;
 import com.fr.stable.Constants;
 import com.fr.stable.StringUtils;
-import com.fr.design.utils.gui.GUIPaintUtils;
+
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.Icon;
+import javax.swing.JComponent;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.SwingConstants;
+import javax.swing.UIManager;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.event.EventListenerList;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.GridLayout;
+import java.awt.Insets;
+import java.awt.Rectangle;
+import java.awt.Shape;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.geom.RoundRectangle2D;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
 
 public class UICalendarPanel extends JPanel {
     private static final Font FONT_SONG = new Font(Inter.getLocText("Song_TypeFace"),0,12);
@@ -60,6 +78,7 @@ public class UICalendarPanel extends JPanel {
     }
 
     public UICalendarPanel(Date selectedDate, boolean isTimerPicker) {
+
         this.selectedDate = selectedDate;
         this.isTimePicker = isTimerPicker;
         calendar = Calendar.getInstance();
@@ -84,11 +103,8 @@ public class UICalendarPanel extends JPanel {
         if (isTimerPicker) {
             setPreferredSize(new Dimension(218, 209));
             add(BorderLayout.SOUTH, createSouthPane());
-            updateDays();
             updateHMS();
         }
-
-        updateDays();
     }
 
     //   << <   yyyy/MM/dd  > >>

From a4b39c33d0283d9188b23c13dca3e4889e2c5ed1 Mon Sep 17 00:00:00 2001
From: plough <plough@fanruan.com>
Date: Fri, 10 Nov 2017 16:26:13 +0800
Subject: [PATCH 14/29] =?UTF-8?q?REPORT-5349=20[9.0=E4=B8=89=E8=BD=AE?=
 =?UTF-8?q?=E5=9B=9E=E5=BD=92]=E8=AE=BE=E8=AE=A1=E5=99=A8=E7=B9=81?=
 =?UTF-8?q?=E4=BD=93=E4=B8=8B=E5=9B=BD=E9=99=85=E5=8C=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/locale/designer_zh_TW.properties   | 251 +++++++++---------
 1 file changed, 125 insertions(+), 126 deletions(-)

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 898c1fb3c..4b43d92f4 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
@@ -1,4 +1,3 @@
-# generated time: \u661F\u671F\u56DB \u5341\u4E00\u6708 24 12:02:51 CST 2016
 FR-Designer-BBSLogin_Account=\u767B\u5165\u5E33\u865F
 FR-Designer-BBSLogin_Connection-Failure=\u767B\u5165\u9023\u63A5\u5931\u6557\uFF0C\u8ACB\u6AA2\u67E5\u7576\u524D\u7DB2\u8DEF\u72C0\u614B 
 FR-Designer-BBSLogin_Connection-Failure-Tip=\u9023\u7DDA\u5931\u6557\u63D0\u793A 
@@ -563,19 +562,19 @@ FR-Designer_Plugin_Should_Update_Please_Contact_Developer=\u633F\u4EF6\u7248\u67
 FR-Designer_WidgetOrder=\u63A7\u4EF6\u9806\u5E8F
 FR-Designer_Mobile_Form_Analysis_Annotation=\u6CE8\u91CB\uFF1A\u53EF\u4EE5\u901A\u904E\u8A72\u5C6C\u6027\u63A7\u5236\u8868\u55AE\u5728APP\u4E2D\u7684\u89E3\u6790\u65B9\u5F0F\u3002
 FR-Designer_Mobile_Report_Analysis_Annotation=\u6CE8\u91CB\uFF1A\u53EF\u4EE5\u901A\u904E\u8A72\u5C6C\u6027\u63A7\u5236\u5831\u8868\u5728APP\u4E2D\u7684\u89E3\u6790\u65B9\u5F0F\uFF0C\u53EA\u652F\u6301\u5206\u9801\u9810\u89BD\uFF0C\u586B\u5831\u9810\u89BD\u6642\u5C6C\u6027\u7121\u6548\u3002
-FR-Designer_Background_Null=
-FR-Designer_Background_Color=
-FR-Designer_Background_Texture=
-FR-Designer_Background_Pattern=
-FR-Designer_Background_Gradient_Color=
-FR-Designer_Background_Image=
-FR-Designer_Background_Clear=
-FR-Designer_Background_Image_Select=
+FR-Designer_Background_Null=\u6C92\u6709\u80CC\u666F
+FR-Designer_Background_Color=\u984F\u8272
+FR-Designer_Background_Texture=\u7D0B\u7406
+FR-Designer_Background_Pattern=\u5716\u6848
+FR-Designer_Background_Gradient_Color=\u6F38\u8B8A\u8272
+FR-Designer_Background_Image=\u5716\u7247
+FR-Designer_Background_Clear=\u6E05\u9664
+FR-Designer_Background_Image_Select=\u9078\u64C7\u5716\u7247
 FR-Designer_Too_Large_To_Paste=\u7D44\u4EF6\u5927\u5C0F\u8D85\u51FA\u908A\u754C\uFF0C\u7121\u6CD5\u7C98\u8CBC\uFF01
 FR-Designer_Too_Small_To_Paste=\u6B64\u8655\u7121\u6CD5\u7C98\u8CBC\uFF0C\u5C0F\u65BC\u7D44\u4EF6\u6700\u5C0F\u9AD8\u5EA6\uFF01
-FR-Designer_Initial_Background_Tips=
-FR-Designer_Mouse_Move_Tips=
-FR-Designer_Mouse_Click_Tips=
+FR-Designer_Initial_Background_Tips=\u6309\u9215\u7684\u521D\u59CB\u80CC\u666F
+FR-Designer_Mouse_Move_Tips=\u6ED1\u9F20\u79FB\u52D5\u5230\u6309\u9215\u4E0A\u7684\u80CC\u666F\uFF0C\u82E5\u7121\u5247\u4E0D\u6539\u8B8A\u80CC\u666F
+FR-Designer_Mouse_Click_Tips=\u6ED1\u9F20\u9EDE\u9078\u6309\u9215\u6642\u80CC\u666F\uFF0C\u82E5\u7121\u5247\u4E0D\u6539\u8B8A\u80CC\u666F
 FR-Designer_AxisReversed=\u8EF8\u9006\u5E8F
 FR-Designer_Logarithmic=\u5C0D\u6578\u523B\u5EA6
 FR-Designer_Chart_Log_Base=\u5E95\u6578
@@ -584,20 +583,20 @@ FR-Designer_Style=\u6A23\u5F0F
 FR-Designer_Color=\u984F\u8272
 FR-Designer_Border=\u6846\u7DDA
 FR-Designer_Background-Pattern=\u5716\u6848
-FR-Designer_SimpleDetail_Report=
-FR-Designer_Reset=
-FR-Designer_AllCategories=
-FR-Designer-Selected_Widget=
-FR-Designer_SimpleCross_Report=
-FR-Designer_LocalWidget=
+FR-Designer_SimpleDetail_Report=\u7C21\u55AE\u660E\u7D30\u8868
+FR-Designer_Reset=\u53D6\u6D88\u522A\u9664
+FR-Designer_AllCategories=\u6240\u6709\u5206\u985E
+FR-Designer-Selected_Widget=\u7576\u524D\u63A7\u5236\u5143\u4EF6
+FR-Designer_SimpleCross_Report=\u7C21\u55AE\u4EA4\u53C9\u8868
+FR-Designer_LocalWidget=\u672C\u5730\u5143\u4EF6\u5EAB
 FR-Designer_Edit_Button_ToolBar=\u7DE8\u8F2F\u6309\u9215\u6240\u5728\u5DE5\u5177\u6B04
 FR-Designer_Remove_Button_ToolBar=\u79FB\u9664\u6309\u9215\u6240\u5728\u5DE5\u5177\u6B04
-FR-Designer_Install_Template=
-FR-Designer_Allow-Blank=
-FR-Designer_Delete_Template=
-FR-Designer_Download_Template=
-FR-Designer_DoubleLayer_Report=
-FR-Designer_Validate=
+FR-Designer_Install_Template=\u5B89\u88DD
+FR-Designer_Allow-Blank=\u5141\u8A31\u70BA\u7A7A
+FR-Designer_Delete_Template=\u522A\u9664
+FR-Designer_Download_Template=\u4E0B\u8F09
+FR-Designer_DoubleLayer_Report=\u96D9\u5C64\u8868\u982D
+FR-Designer_Validate=\u6821\u9A57
 CellWrite-InsertRow_NULL=\u7A7A\u503C
 DashBoard-ChartFloat=\u5716\u8868
 contact_info=\u806F\u7E6B\u8A0A\u606F(\u9078\u586B)
@@ -678,7 +677,7 @@ Need_Min_Value=\u9700\u8981\u6700\u5C0F\u503C
 Allow_Blank=\u5141\u8A31\u70BA\u7A7A\u767D
 CellWrite-InsertRow_DEFAULT=\u9810\u8A2D\u503C
 Widget-Load_By_Complete=\u5B8C\u5168\u8F09\u5165
-FR-Designer-Basic_Only_Submit_Current_Sheet=
+FR-Designer-Basic_Only_Submit_Current_Sheet=\u53EA\u63D0\u4EA4\u7576\u524DSHEET
 Sort-Sort_Order=\u6392\u5217\u9806\u5E8F
 File-File_Size_Limit=\u6A94\u6848\u5927\u5C0F\u9650\u5236
 PrintP-Print=\u5217\u5370(T)
@@ -1759,7 +1758,7 @@ FR-Base_sure_remove_item=\u4F60\u78BA\u5BE6\u6C7A\u5B9A\u522A\u9664\u9078\u4E2D\
 Component_Scale=\u5143\u4EF6\u7E2E\u653E
 Hyperlink-Use_CJK_to_encode_parameter=\u4F7F\u7528CJK\u8655\u7406\u53C3\u6578
 LOG-Has_Been_Openned=\u5DF2\u7D93\u6253\u958B
-FR-Designer-Dependence=
+FR-Designer-Dependence=\u4F9D\u8CF4\u74B0\u5883
 ECP_error_pwd=\u5BC6\u78BC\u932F\u8AA4
 REPORTLET=\u8A2A\u554F\u6A21\u677F\u7684\u8DEF\u5F91\u7684\u53C3\u6578\u3002
 RWA-Column_Offset=\u6B04\u504F\u79FB
@@ -2031,117 +2030,117 @@ FR-Designer_Widget_Library=\u7D44\u4EF6\u5EAB
 FR-Designer_No_Settings_Available=\u7121\u53EF\u7528\u914D\u5BD8\u9805\uFF01
 FR-Designer_Configured_Roles=\u5DF2\u914D\u7F6E\u89D2\u8272
 FR-Designer_Add_Hyperlink=\u65B0\u589E\u9023\u63A5
-FR-Designer_Scale_selfAdaptButton=
-FR-Designer_Scale_customButton=
-FR-Designer_FRFont_Subscript=
-FR-Designer_FRFont_Superscript=
-FR-Designer_FRFont_Shadow=
-FR-Designer_FRFont_Strikethrough=
-FR-Designer_FRFont_Underline=
-FR-Designer_FRFont_bold=
-FR-Designer_FRFont_italic=
-FR-Designer_FRFont_Foreground=
-FR-Designer_FRFont_Style=
-FR-Designer_FRFont_plain=
-FR-Designer_FRFont_bolditalic=
-FR-Designer_outBorder=
-FR-Designer_inBorder=
-FR-Designer_ExpandD_Up_Father_Cell=
-FR-Designer_ExpandD_Expand_Direction=
-FR-Designer_Expand=
-FR-Designer_ExpendSort=
-FR-Designer_ExpandD_Expandable=
-FR-Designer_Read_failure=
-FR-Designer_Image_Layout=
-FR-Designer_StyleAlignment_Text_Style=
-FR-Designer_StyleAlignment_Text_Rotation=
-FR-Designer_Style_Left_Indent=
-FR-Designer_Style_Right_Indent=
-FR-Designer_Style_Spacing_Before=
-FR-Designer_Style_Spacing_After=
-FR-Designer_Style_Line_Spacing=
-FR-Designer_Left=
-FR-Designer_Right=
-FR-Designer_Front=
-FR-Designer_Behind=
-FR-Designer_StyleAlignment_Wrap_Text=
-FR-Designer_StyleAlignment_Single_Line=
-FR-Designer_StyleAlignment_Single_Line(Adjust_Font)=
-FR-Designer_StyleAlignment_Multi_Line(Adjust_Font)=
-FR-Designer_Auto_Adjust_Height=
-FR-Designer_Auto_Adjust_Wdith=
-FR-Designer_Type_Set=
-FR-Designer_Dic_Data_Query=
-FR-Designer_Dictionary_Dynamic_SQL=
-FR-Designer_Datasource_From_Database=
-FR-Designer_CellWrite_InsertRow_NULL=
-FR-Designer_CellWrite_InsertRow_COPY=
-FR-Designer_CellWrite_InsertRow_Policy=
-FR-Designer_CellWrite_Page_Before_Row=
-FR-Designer_CellWrite_Page_After_Row=
-FR-Designer_CellWrite_Page_Before_Column=
-FR-Designer_CellWrite_Page_After_Column=
-FR-Designer_CellPage_Can_Break_On_Paginate=
-FR-Designer_CellPage_Repeat_Content_When_Paging=
-FR-Designer_CellWrite_Preview_Cell_Content=
-FR-Designer_CellWrite_Print_Content=
-FR-Designer_CellWrite_Print_Background=
-FR-Designer_CellWrite_Show_As_Image=
-FR-Designer_CellWrite_Show_As_HTML=
-FR-Designer_Datasource_Other_Attributes=
-FR-Designer_Not_use_a_cell_attribute_table_editing=
-FR-Designer_CellElement_Property_Table=
-FR-Designer_T_Insert_Float=
-FR-Designer_Add_FloatElement=
-FR-Designer_Insert_Image=
-FR-Designer_Insert_Chart=
-FR-Designer_Insert_Text=
-FR-Designer_Insert_Formula=
-FR-Designer_Scale_Down=
-FR-Designer_Scale_Up=
-FR-Designer_Scale_Slider=
-FR-Designer_Scale_Grade=
-FR-Designer_AlphaFine_EnableInternet=
-FR-Designer_Scale_EnlargeOrReduce=
-FR-Designer-StyleAlignment_Style_PartSpacing=
-FR-Designer_Use_Params_Template=
-FR-Designer_Label_Name=
-FR-Designer_Add_Event=
+FR-Designer_Scale_selfAdaptButton=\u6070\u597D\u5BB9\u7D0D\u9078\u5B9A\u5340\u57DF
+FR-Designer_Scale_customButton=\u81EA\u5B9A\u7FA9
+FR-Designer_FRFont_Subscript=\u4E0B\u6A19
+FR-Designer_FRFont_Superscript=\u4E0A\u6A19
+FR-Designer_FRFont_Shadow=\u9670\u5F71
+FR-Designer_FRFont_Strikethrough=\u522A\u9664\u7DDA
+FR-Designer_FRFont_Underline=\u4E0B\u5283\u7DDA
+FR-Designer_FRFont_bold=\u52A0\u7C97
+FR-Designer_FRFont_italic=\u659C\u9AD4
+FR-Designer_FRFont_Foreground=\u984F\u8272
+FR-Designer_FRFont_Style=\u5B57\u5F62
+FR-Designer_FRFont_plain=\u5E38\u898F
+FR-Designer_FRFont_bolditalic=\u52A0\u7C97\u50BE\u659C
+FR-Designer_outBorder=\u5916\u908A\u6846
+FR-Designer_inBorder=\u5167\u908A\u6846
+FR-Designer_ExpandD_Up_Father_Cell=\u4E0A\u7236\u683C
+FR-Designer_ExpandD_Expand_Direction=\u64F4\u5145\u5957\u4EF6\u65B9\u5411
+FR-Designer_Expand=\u64F4\u5145\u5957\u4EF6
+FR-Designer_ExpendSort=\u64F4\u5145\u5957\u4EF6\u5F8C\u6392\u5E8F
+FR-Designer_ExpandD_Expandable=\u53EF\u4F38\u5C55\u6027
+FR-Designer_Read_failure=\u8B80\u53D6\u5931\u6557\uFF0C\u53EF\u80FD\u539F\u59CB\u6A94\u5DF2\u640D\u58DE
+FR-Designer_Image_Layout=\u5716\u7247\u4F48\u5C40
+FR-Designer_StyleAlignment_Text_Style=\u6587\u5B57\u63A7\u5236
+FR-Designer_StyleAlignment_Text_Rotation=\u6587\u5B57\u65B9\u5411
+FR-Designer_Style_Left_Indent=\u5DE6\u7E2E\u6392
+FR-Designer_Style_Right_Indent=\u53F3\u7E2E\u6392
+FR-Designer_Style_Spacing_Before=\u6BB5\u524D
+FR-Designer_Style_Spacing_After=\u6BB5\u5F8C
+FR-Designer_Style_Line_Spacing=\u884C\u9593\u8DDD
+FR-Designer_Left=\u5DE6
+FR-Designer_Right=\u53F3
+FR-Designer_Front=\u524D
+FR-Designer_Behind=\u5F8C
+FR-Designer_StyleAlignment_Wrap_Text=\u81EA\u52D5\u63DB\u884C
+FR-Designer_StyleAlignment_Single_Line=\u55AE\u884C\u986F\u793A
+FR-Designer_StyleAlignment_Single_Line(Adjust_Font)=\u55AE\u884C\u986F\u793A(\u8ABF\u6574\u5B57\u578B)
+FR-Designer_StyleAlignment_Multi_Line(Adjust_Font)=\u591A\u884C\u986F\u793A(\u8ABF\u6574\u5B57\u578B)
+FR-Designer_Auto_Adjust_Height=\u81EA\u52D5\u8ABF\u6574\u884C\u9AD8
+FR-Designer_Auto_Adjust_Wdith=\u81EA\u52D5\u8ABF\u6574\u5217\u5BEC
+FR-Designer_Type_Set=\u578B\u5225\u8A2D\u5B9A
+FR-Designer_Dic_Data_Query=\u8CC7\u6599\u67E5\u8A62
+FR-Designer_Dictionary_Dynamic_SQL=\u52D5\u614BSQL
+FR-Designer_Datasource_From_Database=\u8CC7\u6599\u5EAB\u8868
+FR-Designer_CellWrite_InsertRow_NULL=\u7A7A\u503C
+FR-Designer_CellWrite_InsertRow_COPY=\u539F\u503C
+FR-Designer_CellWrite_InsertRow_Policy=\u63D2\u5165\u884C\u7B56\u7565
+FR-Designer_CellWrite_Page_Before_Row=\u884C\u524D\u5206\u9801
+FR-Designer_CellWrite_Page_After_Row=\u884C\u5F8C\u5206\u9801
+FR-Designer_CellWrite_Page_Before_Column=\u5217\u524D\u5206\u9801
+FR-Designer_CellWrite_Page_After_Column=\u5217\u5F8C\u5206\u9801
+FR-Designer_CellPage_Can_Break_On_Paginate=\u5206\u9801\u6642\u53EF\u4EE5\u65B7\u958B
+FR-Designer_CellPage_Repeat_Content_When_Paging=\u5206\u9801\u65B7\u958B\u6642\u503C\u91CD\u8907\u986F\u793A
+FR-Designer_CellWrite_Preview_Cell_Content=\u9810\u89BD\u55AE\u5143\u683C\u5167\u5BB9
+FR-Designer_CellWrite_Print_Content=\u5217\u5370/\u532F\u51FA\u55AE\u5143\u683C\u5167\u5BB9
+FR-Designer_CellWrite_Print_Background=\u5217\u5370/\u532F\u51FA\u55AE\u5143\u683C\u80CC\u666F
+FR-Designer_CellWrite_Show_As_Image=\u7528\u5716\u7247\u986F\u793A\u5167\u5BB9
+FR-Designer_CellWrite_Show_As_HTML=\u7528HTML\u986F\u793A\u5167\u5BB9
+FR-Designer_Datasource_Other_Attributes=\u5176\u4ED6\u5C6C\u6027
+FR-Designer_Not_use_a_cell_attribute_table_editing=\u60A8\u4E0D\u53EF\u4EE5\u7528\u55AE\u5143\u683C\u5C6C\u6027\u8868\u7DE8\u8F2F
+FR-Designer_CellElement_Property_Table=\u55AE\u5143\u683C\u5C6C\u6027\u8868
+FR-Designer_T_Insert_Float=\u63D2\u5165\u61F8\u6D6E\u5143\u7D20
+FR-Designer_Add_FloatElement=\u65B0\u589E\u5143\u7D20
+FR-Designer_Insert_Image=\u63D2\u5165\u5716\u7247
+FR-Designer_Insert_Chart=\u63D2\u5165\u5716\u8868
+FR-Designer_Insert_Text=\u63D2\u5165\u666E\u901A\u6587\u5B57
+FR-Designer_Insert_Formula=\u63D2\u5165\u516C\u5F0F
+FR-Designer_Scale_Down=\u7E2E\u5C0F
+FR-Designer_Scale_Up=\u653E\u5927
+FR-Designer_Scale_Slider=\u7E2E\u653E\u6ED1\u584A
+FR-Designer_Scale_Grade=\u7E2E\u653E\u7D1A\u5225\uFF0C\u55AE\u64CA\u5F8C\u8ABF\u7BC0\u986F\u793A\u6BD4\u4F8B\u3002
+FR-Designer_AlphaFine_EnableInternet=\u806F\u7DB2
+FR-Designer_Scale_EnlargeOrReduce=\u7E2E\u653E
+FR-Designer-StyleAlignment_Style_PartSpacing=\u6BB5\u9593\u8DDD
+FR-Designer_Use_Params_Template=\u4F7F\u7528\u5E38\u7528\u5F15\u6578\u7D44\u5408
+FR-Designer_Label_Name=\u6A19\u7C64\u540D\u7A31
+FR-Designer_Add_Event=\u65B0\u589E\u4E8B\u4EF6
 FR-Designer_Not_Support_Authority_Edit=\u8A72\u5143\u7D20\u4E0D\u652F\u63F4\u8A31\u53EF\u6B0A\u63A7\u5236
 FR-Designer_Dynamic_Parameter=\u52D5\u614B\u53C3\u6578
-FR-Designer_Remove_Item=
-FR-Designer_Widget_No_Repeat=
-FR-Designer_Widget_Error_Tip=
-FR-Designer_Widget_Return_Leaf=
-FR-Designer_Widget_Return_Path=
-FR-Designer_Widget_Display_Position=
-FR-Designer_Size_Limit=
-FR-Designer_Widget_Name=
-FR-Designer_Coords_And_Size=
-FR-Designer_Barcode_Size=
+FR-Designer_Remove_Item=\u522A\u9664\u9078\u4E2D
+FR-Designer_Widget_No_Repeat=\u53BB\u9664\u91CD\u8907\u9805
+FR-Designer_Widget_Error_Tip=\u932F\u8AA4\u63D0\u793A
+FR-Designer_Widget_Return_Leaf=\u7D50\u679C\u8FD4\u56DE\u8449\u5B50\u7BC0\u9EDE
+FR-Designer_Widget_Return_Path=\u7D50\u679C\u8FD4\u56DE\u5B8C\u6574\u5C64\u6B21\u8DEF\u5F91
+FR-Designer_Widget_Display_Position=\u986F\u793A\u4F4D\u7F6E
+FR-Designer_Size_Limit=\u5927\u5C0F\u9650\u5236
+FR-Designer_Widget_Name=\u63A7\u5236\u5143\u4EF6\u540D\u7A31
+FR-Designer_Coords_And_Size=\u5EA7\u6A19\XB7\u5C3A\u5BF8
+FR-Designer_Barcode_Size=\u689D\u5F62\u78BC\u5927\u5C0F
 FS-Designer_DS_Filter_Odd_Tip=\u63D0\u793A\uFF1A\u5E8F\u865F\u5F9E1\u958B\u59CB\uFF0C\u9078\u64C7\u4E86\u5947\u6578\u96C6(1,3,5...)
 FS-Designer_DS_Filter_Even_Tip=\u63D0\u793A\uFF1A\u5E8F\u865F\u5F9E1\u958B\u59CB\uFF0C\u9078\u64C7\u4E86\u5076\u6578\u96C6(2,4,6...)
 FS-Designer_DS_Filter_Specify_Tip=\u63D0\u793A\uFF1A\u683C\u5F0F\u70BA1,2-3,5,8\uFF0C\u5E8F\u865F\u5F9E1\u958B\u59CB\uFF0C\u5185\u7F6E\u53C3\u6578$_count_\u8868\u793A\u7E02\u500B\u6578
 M-New_FormBook=\u65B0\u589E\u6C7A\u7B56\u5831\u8868
 FR-Designer-AlphaFine_NO_Result=\u7121\u641C\u7D22\u7D50\u679C
-FR-Designer-Download_Online_Sources=
-FR-Designer_Select_Color=
+FR-Designer-Download_Online_Sources=\u5716\u8868\u9700\u8981\u4E0B\u8F09\u6700\u65B0\u7684\u8CC7\u539F\u59CB\u6A94\uFF0C\u662F\u5426\u5B89\u88DD\uFF1F
+FR-Designer_Select_Color=\u9078\u64C7\u984F\u8272
 FR-Designer-Basic_Dynamic_Parameter_Injection=\u6CE8\u5165
 FR-Designer_Label=\u6A19\u7C3D
 FR-Designer_Widgetname=\u63A7\u5236\u9805\u540D
 FR-Designer_Insert_Cell_Element=\u63D2\u5165\u5143\u7D20
-FR-Designer_Add_Condition=
-FR-Designer_Widget_Visible=
-FR-Designer_Widget_Display_Report_Tool=
-FR-Designer_Cell_Value=
-FR-Designer_Cell_Visible=
-FR-Designer_Widget_Formula=
-FR-Designer_Show=
-FR-Designer_Widget_Position=
-FR-Designer_Float_Visible=
-FR-Designer_Widget_String=
-FR-Designer_Widget_Field=
-FR-Designer_Widget_Enabled=
+FR-Designer_Add_Condition=\u65B0\u589E\u689D\u4EF6
+FR-Designer_Widget_Visible=\u63A7\u5236\u5143\u4EF6\u53EF\u898B
+FR-Designer_Widget_Display_Report_Tool=\u986F\u793A\u5831\u8868\u584A\u5DE5\u5177\u6B04
+FR-Designer_Cell_Value=\u55AE\u5143\u683C\u503C
+FR-Designer_Cell_Visible=\u55AE\u5143\u683C\u53EF\u898B
+FR-Designer_Widget_Formula=\u516C\u5F0F
+FR-Designer_Show=\u986F\u793A
+FR-Designer_Widget_Position=\u63A7\u5236\u5143\u4EF6\u4F4D\u7F6E
+FR-Designer_Float_Visible=\u61F8\u6D6E\u5143\u7D20\u53EF\u898B
+FR-Designer_Widget_String=\u5B57\u4E32
+FR-Designer_Widget_Field=\u6B04\u4F4D
+FR-Designer_Widget_Enabled=\u63A7\u5236\u5143\u4EF6\u53EF\u7528
 FR-Designer_Export_Background=
 FR-Designer_Print_Background=
 FR-Designer_Sheet_Label_Page_Display_Position=

From 1d0e97e64ecd9fdc765721c645601e24dbaf9896 Mon Sep 17 00:00:00 2001
From: kerry <kerry@finereport.com>
Date: Fri, 10 Nov 2017 16:38:12 +0800
Subject: [PATCH 15/29] =?UTF-8?q?REPORT-5443=20[9.0=E4=B8=89=E8=BD=AE?=
 =?UTF-8?q?=E5=9B=9E=E5=BD=92]=E8=AE=BE=E8=AE=A1=E5=99=A8=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E5=88=B0=E8=BF=9C=E7=A8=8B=E7=9B=AE=E5=BD=95=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E5=85=B3=E4=BA=8E=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=BA=E9=9D=9E=E5=AE=89=E8=A3=85=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer_base/src/com/fr/env/RemoteEnv.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/designer_base/src/com/fr/env/RemoteEnv.java b/designer_base/src/com/fr/env/RemoteEnv.java
index 842257d1f..65733b1df 100644
--- a/designer_base/src/com/fr/env/RemoteEnv.java
+++ b/designer_base/src/com/fr/env/RemoteEnv.java
@@ -109,6 +109,7 @@ public class RemoteEnv extends AbstractEnv {
     private Timer logTimer = null;
     private static ThreadLocal<String> threadLocal = new ThreadLocal<String>();
     private boolean isReadTimeOut = false;
+    private String buildFilePath;
 
     public RemoteEnv() {
         this.clock = new Clock(this);
@@ -2036,19 +2037,20 @@ public class RemoteEnv extends AbstractEnv {
     public void setLicName(String licName) {
         //do nth
     }
- 
-    
+
+
     /**
      * 获取当前env的build文件路径
      */
     public String getBuildFilePath() {
-        return ResourceConstants.BUILD_PATH;
+        return StringUtils.isEmpty(buildFilePath) ? ResourceConstants.BUILD_PATH : buildFilePath;
     }
 
     /**
      * 设置当前env的build文件路径
      */
     public void setBuildFilePath(String buildFilePath) {
+        this.buildFilePath = buildFilePath;
     }
 
     /**

From 87bd092c93940bc073fee20395481953e7e6b498 Mon Sep 17 00:00:00 2001
From: vito <vito@finereport.com>
Date: Sat, 11 Nov 2017 14:47:14 +0800
Subject: [PATCH 16/29] =?UTF-8?q?REPORT-5518=20[9.0=E4=B8=89=E8=BD=AE?=
 =?UTF-8?q?=E5=9B=9E=E5=BD=92]jdk1.7=E7=9A=84=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=E8=B5=B7=E4=B8=8D=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/mainframe/bbs/UserInfoLabel.java     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java b/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java
index 940bc9b4f..e2dfb0866 100644
--- a/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java
+++ b/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java
@@ -25,6 +25,7 @@ import com.fr.general.SiteCenter;
 import com.fr.general.http.HttpClient;
 import com.fr.stable.EncodeConstants;
 import com.fr.stable.OperatingSystem;
+import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
 
 import javax.swing.SwingConstants;
@@ -98,8 +99,10 @@ public class UserInfoLabel extends UILabel {
         this.setHorizontalAlignment(SwingConstants.CENTER);
         this.setText(userName);
 
-        LoginWebBridge.getHelper().setUILabel(UserInfoLabel.this);
-        PluginWebBridge.getHelper().setUILabel(UserInfoLabel.this);
+        if (StableUtils.getMajorJavaVersion() == 8) {
+            LoginWebBridge.getHelper().setUILabel(UserInfoLabel.this);
+            PluginWebBridge.getHelper().setUILabel(UserInfoLabel.this);
+        }
 
         UserLoginContext.addLoginContextListener(new LoginContextListener() {
             @Override

From 09416aca4dd2fef74d61f7851cf4fc70a6a959df Mon Sep 17 00:00:00 2001
From: vito <vito@finereport.com>
Date: Sat, 11 Nov 2017 14:51:18 +0800
Subject: [PATCH 17/29] pmd

---
 designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java b/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java
index e2dfb0866..b313ac1ba 100644
--- a/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java
+++ b/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java
@@ -52,6 +52,7 @@ import java.util.concurrent.TimeUnit;
  */
 public class UserInfoLabel extends UILabel {
 
+    private static final int VERSION_8 = 8;
     //默认查询消息时间, 30s
     private static final long CHECK_MESSAGE_TIME = 30 * 1000L;
     //默认论坛检测到更新后的弹出延迟时间
@@ -99,7 +100,7 @@ public class UserInfoLabel extends UILabel {
         this.setHorizontalAlignment(SwingConstants.CENTER);
         this.setText(userName);
 
-        if (StableUtils.getMajorJavaVersion() == 8) {
+        if (StableUtils.getMajorJavaVersion() == VERSION_8) {
             LoginWebBridge.getHelper().setUILabel(UserInfoLabel.this);
             PluginWebBridge.getHelper().setUILabel(UserInfoLabel.this);
         }

From 2c845f2688467f23f07b0bbfd5b529e37ed91db0 Mon Sep 17 00:00:00 2001
From: kerry <kerry@finereport.com>
Date: Sat, 11 Nov 2017 20:00:40 +0800
Subject: [PATCH 18/29] =?UTF-8?q?REPORT-5491=209.0=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=99=A8=E4=BA=A4=E4=BA=92=E9=AA=8C=E6=94=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/widget/ui/DateEditorDefinePane.java    | 9 +++++++--
 .../design/widget/ui/btn/DefineAppendColumnRowPane.java  | 5 ++++-
 .../design/widget/ui/btn/DefineDeleteColumnRowPane.java  | 1 +
 .../design/widget/ui/designer/DateEditorDefinePane.java  | 8 ++++++--
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/designer/src/com/fr/design/widget/ui/DateEditorDefinePane.java b/designer/src/com/fr/design/widget/ui/DateEditorDefinePane.java
index 5ef1e7a47..a42227328 100644
--- a/designer/src/com/fr/design/widget/ui/DateEditorDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/DateEditorDefinePane.java
@@ -2,6 +2,8 @@ package com.fr.design.widget.ui;
 
 import com.fr.base.FRContext;
 import com.fr.data.core.FormatField;
+import com.fr.design.border.UIRoundedBorder;
+import com.fr.design.constants.UIConstants;
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.icombobox.UIComboBox;
@@ -16,6 +18,7 @@ import com.fr.general.Inter;
 import com.fr.stable.ArrayUtils;
 
 import javax.swing.*;
+import javax.swing.border.TitledBorder;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import java.awt.*;
@@ -78,8 +81,10 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
 	}
 
 	private JPanel createFormatPane(UIComboBox formatComboBox, UILabel sampleLabel){
-		JPanel previewPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Base_StyleFormat_Sample"));
-		previewPane.setLayout(new BorderLayout());
+
+		JPanel previewPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+		TitledBorder titledBorder = new TitledBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 5), Inter.getLocText("FR-Base_StyleFormat_Sample"), 4, 2, this.getFont(), UIConstants.LINE_COLOR);
+		previewPane.setBorder(titledBorder);
 
 		JPanel sampleLabelWrapper = new JPanel(new BorderLayout());
 		sampleLabelWrapper.setBorder(BorderFactory.createEmptyBorder(0, SAMPLE_LABEL_PADDING, SAMPLE_LABEL_PADDING, SAMPLE_LABEL_PADDING));
diff --git a/designer/src/com/fr/design/widget/ui/btn/DefineAppendColumnRowPane.java b/designer/src/com/fr/design/widget/ui/btn/DefineAppendColumnRowPane.java
index ab92ab83b..7d5aade23 100644
--- a/designer/src/com/fr/design/widget/ui/btn/DefineAppendColumnRowPane.java
+++ b/designer/src/com/fr/design/widget/ui/btn/DefineAppendColumnRowPane.java
@@ -1,5 +1,6 @@
 package com.fr.design.widget.ui.btn;
 
+import java.awt.Color;
 import java.awt.Component;
 
 import javax.swing.BorderFactory;
@@ -43,7 +44,9 @@ public class DefineAppendColumnRowPane extends BasicPane {
 		rowCountLable = new UILabel(Inter.getLocText("Edit-Row_Count"));
 		JPanel lpane = FRGUIPaneFactory.createBorderLayout_S_Pane();
 		lpane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-		lpane.add(new UILabel(Inter.getLocText("Append_Delete_Row_Message")));
+		UILabel label = new UILabel(Inter.getLocText("Append_Delete_Row_Message"));
+		label.setForeground(new Color(0x8F8F92));
+		lpane.add(label);
 		Component[][] components = { { new UILabel(Inter.getLocText(new String[]{"Specify", "Cell"})), crEditor }, { rowCountLable, jNumberEditor } ,{lpane,null}};
 		JPanel contentPane = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
 		contentPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
diff --git a/designer/src/com/fr/design/widget/ui/btn/DefineDeleteColumnRowPane.java b/designer/src/com/fr/design/widget/ui/btn/DefineDeleteColumnRowPane.java
index f35625e86..f5d2c2759 100644
--- a/designer/src/com/fr/design/widget/ui/btn/DefineDeleteColumnRowPane.java
+++ b/designer/src/com/fr/design/widget/ui/btn/DefineDeleteColumnRowPane.java
@@ -36,6 +36,7 @@ public class DefineDeleteColumnRowPane extends BasicPane {
 		double columnSize[] = { p, f};
 		crEditor = new ColumnRowEditor();
 		UILabel messageLabel = new UILabel(Inter.getLocText("Append_Delete_Row_Message"));
+		messageLabel.setForeground(new Color(0x8F8F92));
 		Component[][] components = {
 				{ new UILabel(Inter.getLocText(new String[]{"Specify", "Cell"})), crEditor },
 				{ messageLabel, null}};
diff --git a/designer_form/src/com/fr/design/widget/ui/designer/DateEditorDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/DateEditorDefinePane.java
index 99d1c6d2b..7a44f88a6 100644
--- a/designer_form/src/com/fr/design/widget/ui/designer/DateEditorDefinePane.java
+++ b/designer_form/src/com/fr/design/widget/ui/designer/DateEditorDefinePane.java
@@ -2,6 +2,8 @@ package com.fr.design.widget.ui.designer;
 
 import com.fr.base.FRContext;
 import com.fr.data.core.FormatField;
+import com.fr.design.border.UIRoundedBorder;
+import com.fr.design.constants.UIConstants;
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.gui.ibutton.UIButtonGroup;
@@ -18,6 +20,7 @@ import com.fr.general.Inter;
 import com.fr.stable.ArrayUtils;
 
 import javax.swing.*;
+import javax.swing.border.TitledBorder;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import java.awt.*;
@@ -87,8 +90,9 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
 
 
     private JPanel createFormatPane(UIComboBox formatComboBox, UILabel sampleLabel){
-        JPanel previewPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Base_StyleFormat_Sample"));
-        previewPane.setLayout(new BorderLayout());
+        JPanel previewPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        TitledBorder titledBorder = new TitledBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 5), Inter.getLocText("FR-Base_StyleFormat_Sample"), 4, 2, this.getFont(), UIConstants.LINE_COLOR);
+        previewPane.setBorder(titledBorder);
 
         JPanel sampleLabelWrapper = new JPanel(new BorderLayout());
         sampleLabelWrapper.setBorder(BorderFactory.createEmptyBorder(0, SAMPLE_LABEL_PADDING, SAMPLE_LABEL_PADDING, SAMPLE_LABEL_PADDING));

From 45f5802c1c38fce71ab5675bf272481254fef038 Mon Sep 17 00:00:00 2001
From: plough <plough@fanruan.com>
Date: Mon, 13 Nov 2017 09:26:14 +0800
Subject: [PATCH 19/29] =?UTF-8?q?REPORT-5503=20=E8=A1=A8=E5=8D=95=E8=83=8C?=
 =?UTF-8?q?=E6=99=AF=E4=B8=8D=E8=83=BD=E9=93=BA=E6=BB=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FRAbsoluteBodyLayoutPropertiesGroupModel.java           | 6 ++++++
 .../properties/FRFitLayoutPropertiesGroupModel.java         | 1 +
 2 files changed, 7 insertions(+)

diff --git a/designer_form/src/com/fr/design/designer/properties/FRAbsoluteBodyLayoutPropertiesGroupModel.java b/designer_form/src/com/fr/design/designer/properties/FRAbsoluteBodyLayoutPropertiesGroupModel.java
index eb4b31154..20702ec8f 100644
--- a/designer_form/src/com/fr/design/designer/properties/FRAbsoluteBodyLayoutPropertiesGroupModel.java
+++ b/designer_form/src/com/fr/design/designer/properties/FRAbsoluteBodyLayoutPropertiesGroupModel.java
@@ -2,6 +2,7 @@ package com.fr.design.designer.properties;
 
 import com.fr.design.designer.creator.*;
 import com.fr.design.designer.creator.cardlayout.XWCardMainBorderLayout;
+import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.FormSelectionUtils;
 import com.fr.design.mainframe.WidgetPropertyPane;
@@ -97,6 +98,11 @@ public class FRAbsoluteBodyLayoutPropertiesGroupModel extends FRAbsoluteLayoutPr
                 if (row == 0) {
                     if (state == WBodyLayoutType.FIT.getTypeValue()) {
                         return switch2FitBodyLayout();
+                    } else {
+                        XWFitLayout xfl = (XWFitLayout) xwAbsoluteLayout.getBackupParent();
+                        if (xfl.toData().removeMargin()) {
+                            DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified();
+                        }
                     }
                 }
                 if (row == 1) {
diff --git a/designer_form/src/com/fr/design/designer/properties/FRFitLayoutPropertiesGroupModel.java b/designer_form/src/com/fr/design/designer/properties/FRFitLayoutPropertiesGroupModel.java
index 9ffad4533..d6d7c06c5 100644
--- a/designer_form/src/com/fr/design/designer/properties/FRFitLayoutPropertiesGroupModel.java
+++ b/designer_form/src/com/fr/design/designer/properties/FRFitLayoutPropertiesGroupModel.java
@@ -152,6 +152,7 @@ public class FRFitLayoutPropertiesGroupModel implements GroupModel {
 						wAbsoluteBodyLayout.setCompState(WAbsoluteLayout.STATE_FIXED);
 						Component[] components = xfl.getComponents();
 						xfl.removeAll();
+						xfl.toData().removeMargin();
 						XWAbsoluteBodyLayout xwAbsoluteBodyLayout = new XWAbsoluteBodyLayout(wAbsoluteBodyLayout, new Dimension(0, 0));
 						xfl.getLayoutAdapter().addBean(xwAbsoluteBodyLayout, 0, 0);
 						for (Component component : components) {

From 206afb992a97a65831e26d91277d83e9f169e4c8 Mon Sep 17 00:00:00 2001
From: vito <vito@finereport.com>
Date: Mon, 13 Nov 2017 09:31:44 +0800
Subject: [PATCH 20/29] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20?=
 =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E9=B8=A3=E8=B0=A2=E6=97=A0=E6=B3=95=E8=AF=BB?=
 =?UTF-8?q?=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer/src/com/fr/design/mainframe/bbs/bbs.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/designer/src/com/fr/design/mainframe/bbs/bbs.properties b/designer/src/com/fr/design/mainframe/bbs/bbs.properties
index dc2ee5d73..ae39a3ee3 100644
--- a/designer/src/com/fr/design/mainframe/bbs/bbs.properties
+++ b/designer/src/com/fr/design/mainframe/bbs/bbs.properties
@@ -4,8 +4,8 @@ COLLECT_URL=http://www.finereporthelp.com:8081/bbs/ReportServer?op=bbs&cmd=colle
 DEFAULT_URL=http\://bbs.finereport.com/home.php?mod=space&do=notice
 GET_MESSAGE_URL=http://feedback.finedevelop.com:3000/bbs/message/count
 GET_SIGN_INFO_URL=http\://bbs.finereport.com
-LLINK= http\://bbs.fanruan.com/home.php?mod=space&uid=66470&do=profile|http\://bbs.fanruan.com/home.php?mod=space&uid=67190&do=profile|http\://bbs.fanruan.com/home.php?mod=space&uid=65659&do=profile|http\://bbs.fanruan.com/home.php?mod=space&uid=60352&do=profile|http\://bbs.fanruan.com/home.php?mod=space&uid=78157&do=profile
+LINK=http\://bbs.fanruan.com/home.php?mod=space&uid=66470&do=profile|http\://bbs.fanruan.com/home.php?mod=space&uid=67190&do=profile|http\://bbs.fanruan.com/home.php?mod=space&uid=65659&do=profile|http\://bbs.fanruan.com/home.php?mod=space&uid=60352&do=profile|http\://bbs.fanruan.com/home.php?mod=space&uid=78157&do=profile
 SHARE_URL=http\://bbs.finereport.com
-UUSER=cherishdqy\uFF08\u9093\u79CB\u4E91\uFF09|yets11\uFF08\u9676\u5B5D\u6587\uFF09|\u661F\u75D5\uFF08\u71D5\u5B8F\u4F1F\uFF09|\u9759\u542C\u7985\u9E23\uFF08\u674E\u51A0\u519B\uFF09|yiyemeiying\uFF08\u5218\u4F73\uFF09
+USER=cherishdqy\uFF08\u9093\u79CB\u4E91\uFF09|yets11\uFF08\u9676\u5B5D\u6587\uFF09|\u661F\u75D5\uFF08\u71D5\u5B8F\u4F1F\uFF09|\u9759\u542C\u7985\u9E23\uFF08\u674E\u51A0\u519B\uFF09|yiyemeiying\uFF08\u5218\u4F73\uFF09
 VERIFY_URL=http://www.finereporthelp.com:8081/bbs/ReportServer?op=bbs&cmd=verify
 UPDATE_INFO_URL=http://bbs.finereport.com/source/plugin/infor/infor.html

From 620cb6f49e3fdc01a6921c2566bbc43140850246 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com>
Date: Mon, 13 Nov 2017 14:07:11 +0800
Subject: [PATCH 21/29] =?UTF-8?q?MOBILE-6599=20=E8=AE=BE=E7=BD=AE=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8D=E5=8F=AF=E7=94=A8=E4=BC=9A=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E9=A1=BA=E5=BA=8F=E9=94=99=E4=B9=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/mainframe/MobileWidgetTable.java   | 27 +++++++++----------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/designer_form/src/com/fr/design/mainframe/MobileWidgetTable.java b/designer_form/src/com/fr/design/mainframe/MobileWidgetTable.java
index c9a858797..63b22e421 100644
--- a/designer_form/src/com/fr/design/mainframe/MobileWidgetTable.java
+++ b/designer_form/src/com/fr/design/mainframe/MobileWidgetTable.java
@@ -250,26 +250,23 @@ public class MobileWidgetTable extends JTable {
             return new String[0][0];
         }
 
-        //选择的控件
-        XCreator selectedCreator = designer.getSelectionModel().getSelection().getSelectedCreator();
-        Widget selectedModel = selectedCreator != null ? selectedCreator.toData() : null;
+        WFitLayout body = (WFitLayout) designer.getRootComponent().toData();
 
-        if (selectedModel == null) {
+        if (body == null || !body.acceptType(WSortLayout.class)) {
             return new String[0][0];
         }
 
-        // 选择的控件有两种类型，一种是WLayout，代表容器，一种是Widget，代表控件
-        if (selectedModel.acceptType(WSortLayout.class)) {
-            List<String> mobileWidgetList = ((WSortLayout) selectedModel).getOrderedMobileWidgetList();
-            String[][] widgetName = new String[mobileWidgetList.size() + 1][1];
-            widgetName[0][0] = Inter.getLocText("FR-Designer_WidgetOrder");
-            for (int i = 0; i < mobileWidgetList.size(); i++) {
-                widgetName[i + 1][0] = mobileWidgetList.get(i);
-            }
-            return widgetName;
-        } else {
-            return new String[0][0];
+        List<String> mobileWidgetList = body.getOrderedMobileWidgetList();
+        String[][] widgetName = new String[mobileWidgetList.size() + 1][1];
+        widgetName[0][0] = Inter.getLocText("FR-Designer_WidgetOrder");
+        for (int i = 0; i < mobileWidgetList.size(); i++) {
+            widgetName[i + 1][0] = mobileWidgetList.get(i);
         }
+        if (!body.isSorted()) {
+            body.setSorted(true);
+        }
+        return widgetName;
+
     }
 
     public boolean isCollapsed() {

From acf7591b0cdc7d0134420f3f46a31026ed1d1112 Mon Sep 17 00:00:00 2001
From: plough <plough@fanruan.com>
Date: Mon, 13 Nov 2017 14:42:04 +0800
Subject: [PATCH 22/29] =?UTF-8?q?REPORT-5292=20=E3=80=909.0=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E5=99=A8=E3=80=91=E7=B9=81=E4=BD=93=E5=92=8C=E8=8B=B1?=
 =?UTF-8?q?=E6=96=87=E5=9B=BD=E9=99=85=E5=8C=96=E9=80=82=E9=85=8D9.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/locale/designer_en_US.properties   | 47 +++++++++----------
 1 file changed, 23 insertions(+), 24 deletions(-)

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 1658fecd6..736d53e7c 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
@@ -1,4 +1,3 @@
-# generated time: \u661F\u671F\u56DB \u5341\u4E00\u6708 24 12:02:51 CST 2016
 FR-Designer-BBSLogin_Account=User name
 FR-Designer-BBSLogin_Connection-Failure=Connection failure, check your network status
 FR-Designer-BBSLogin_Connection-Failure-Tip=Tip
@@ -591,13 +590,13 @@ FR-Designer_Style=Style
 FR-Designer_Color=Color
 FR-Designer_Border=Border
 FR-Designer_Background-Pattern=Pattern
-FR-Designer_SimpleDetail_Report=
-FR-Designer_SimpleCross_Report=
+FR-Designer_SimpleDetail_Report=Simple list
+FR-Designer_SimpleCross_Report=Simple cross table
 FR-Designer_Edit_Button_ToolBar=Edit Button ToolBar
 FR-Designer_Remove_Button_ToolBar=Remove Button ToolBar
-FR-Designer_Get-CubeGetting=
-FR-Designer_DoubleLayer_Report=
-FR-Designer_Get-Cube=
+FR-Designer_Get-CubeGetting=Getting cube
+FR-Designer_DoubleLayer_Report=Double deck header
+FR-Designer_Get-Cube=Getting the cube
 CellWrite-InsertRow_NULL=Null
 DashBoard-ChartFloat=Chart
 contact_info=Contact information (optional)
@@ -1246,7 +1245,7 @@ FR-Designer-Cell_Group=Cell Group
 Week=Week
 PageSetup-Orientation=Orientation
 M-Open_Recent=Open Recent
-NNormal=
+NNormal=normal
 Integer=Integer
 Select_The_Source_To_Save=Select Source to Save
 Transition=Branch
@@ -1458,7 +1457,7 @@ Env-Configure_Workspace=Configure working directory
 feedback_info=We welcome your comments and suggestions, please fill out the information as detailed as possible, we will contact you soon
 Ratio=Ratio
 DBCP_TEST_ON_BORROW=Test before Getting Connections
-FR-Designer_layerIndex=
+FR-Designer_layerIndex=Dependent layers
 WEB-Write_Setting=Filling Settings
 M-New_WorkBook=New General Report
 FR-Designer-Plugin_Has_Been_Actived=Plugin is now active, restart the designer and sever to enable it and the sever need to be manually restarted
@@ -1760,7 +1759,7 @@ FR-Base_sure_remove_item=Are you sure to delete the selected item
 Component_Scale=Component Scale
 Hyperlink-Use_CJK_to_encode_parameter=Use CJK to process parameter
 LOG-Has_Been_Openned=Report Has Been Openned
-FR-Designer-Dependence=
+FR-Designer-Dependence=Dependent environment
 ECP_error_pwd=Password Error
 REPORTLET=Parameter of access path to template
 RWA-Column_Offset=Column Offset
@@ -1799,7 +1798,7 @@ ParentCell_Setting=Parent Cell Setting
 Only_selected_cell_can_paste_only=Paste when cell is selected
 M_Report-Report_Columns=Multi-columns/lines
 Unit_Hundred=Hundred
-FR-Designer_DataTable-Build=
+FR-Designer_DataTable-Build=Speed layered construction
 Widget-Form_Widget_Config=Form control
 Server-version-tip-moreInfo=Conform the version numbers of FineReport Designer and the deployment server are consistent, in order to avoid the problems caused by inconsistent versions. If you open the template produced by higher designer vision, error may occurs or the original template properties missed. If the Designer Version you used to create the template is higher than the final deployment server version, the server may not be able to properly load the template.
 Actions=Task
@@ -1819,7 +1818,7 @@ BackgroundTexture-Cork=Cork
 M_Format-Data_Map=Data Dictionary
 FR-mobile_native_analysis=native analysis
 HighLight=High Light
-FR-Designer_Dropdown-More-Preview=
+FR-Designer_Dropdown-More-Preview=Pull down to get more previews
 local=local
 FR-Designer_Gradation=Gradation
 PageSetup-Finis_Start_Column=Duplicate Last Column
@@ -1942,7 +1941,7 @@ Widget-User_Defined=Predefine
 Url_location=Absolute path
 Disk_File=Disk File
 Inside=Inside
-FR-Designer_filedChosen=
+FR-Designer_filedChosen=Dependent fields
 ServerM-Predefined_Styles=Predefined Styles
 is_need_word_adjust=Word Auto Adjust
 Background-Null=No Background
@@ -2122,7 +2121,7 @@ FS-Designer_DS_Filter_Odd_Tip=Odd_Tip
 FS-Designer_DS_Filter_Even_Tip=Even_Tip 
 FS-Designer_DS_Filter_Specify_Tip=Specify_Tip
 FR-Designer-AlphaFine_NO_Result=no search result
-FR-Designer-Download_Online_Sources=
+FR-Designer-Download_Online_Sources=The chart needs to download the latest resource file. Is it installed?
 FR-Designer_Select_Color=Select Color
 FR-Designer-Basic_Dynamic_Parameter_Injection=Injection
 FR-Designer_Label=Label
@@ -2131,17 +2130,17 @@ FR-Designer_Insert_Cell_Element=Insert Cell Element
 FR-Designer_Add_Condition=Add Condition
 FR-Designer_Use_Params_Template=use parameter template
 FR-Designer_Label_Name=label name
-FR-Designer_Widget_Visible=
-FR-Designer_Widget_Display_Report_Tool=
-FR-Designer_Cell_Value=
-FR-Designer_Cell_Visible=
-FR-Designer_Widget_Formula=
-FR-Designer_Show=
-FR-Designer_Widget_Position=
-FR-Designer_Float_Visible=
-FR-Designer_Widget_String=
-FR-Designer_Widget_Field=
-FR-Designer_Widget_Enabled=
+FR-Designer_Widget_Visible=Visible control
+FR-Designer_Widget_Display_Report_Tool=Display report block toolbar
+FR-Designer_Cell_Value=cell value
+FR-Designer_Cell_Visible=Cell visible
+FR-Designer_Widget_Formula=formula
+FR-Designer_Show=display
+FR-Designer_Widget_Position=Control location
+FR-Designer_Float_Visible=Suspended elements are visible
+FR-Designer_Widget_String=Character string
+FR-Designer_Widget_Field=field
+FR-Designer_Widget_Enabled=Control available
 FR-Designer_Export_Background=
 FR-Designer_Print_Background=
 FR-Designer_Sheet_Label_Page_Display_Position=

From c6e31aa55093c1fd557fdf21ad12faaabd1f544d Mon Sep 17 00:00:00 2001
From: MoMeak <fr123456>
Date: Mon, 13 Nov 2017 14:42:14 +0800
Subject: [PATCH 23/29] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=EF=BC=8C?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A8=A1=E6=9D=BF=E6=89=93=E5=BC=80=E9=80=9F?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/mobile/AppFitPreviewPane.java      | 21 ++++++++++---------
 .../com/fr/design/constants/UIConstants.java  | 13 +++++++++++-
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/designer/src/com/fr/design/report/mobile/AppFitPreviewPane.java b/designer/src/com/fr/design/report/mobile/AppFitPreviewPane.java
index bbb44f612..8ee6ebe93 100644
--- a/designer/src/com/fr/design/report/mobile/AppFitPreviewPane.java
+++ b/designer/src/com/fr/design/report/mobile/AppFitPreviewPane.java
@@ -1,5 +1,6 @@
 package com.fr.design.report.mobile;
 
+import com.fr.design.constants.UIConstants;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
@@ -31,16 +32,16 @@ public class AppFitPreviewPane extends BasicPane{
     }
 
     private void initCacheImage() {
-        cachedVerticalPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/V0.png")));
-        cachedVerticalPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/V1.png")));
-        cachedVerticalPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/V2.png")));
-        cachedVerticalPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/V3.png")));
-        cachedVerticalPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/V4.png")));
-        cachedHorizonPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/H0.png")));
-        cachedHorizonPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/H1.png")));
-        cachedHorizonPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/H2.png")));
-        cachedHorizonPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/H3.png")));
-        cachedHorizonPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/H4.png")));
+        cachedVerticalPreviewImage.add(new ImageIcon(UIConstants.APPFIT_V0));
+        cachedVerticalPreviewImage.add(new ImageIcon(UIConstants.APPFIT_V1));
+        cachedVerticalPreviewImage.add(new ImageIcon(UIConstants.APPFIT_V2));
+        cachedVerticalPreviewImage.add(new ImageIcon(UIConstants.APPFIT_V3));
+        cachedVerticalPreviewImage.add(new ImageIcon(UIConstants.APPFIT_V4));
+        cachedHorizonPreviewImage.add(new ImageIcon(UIConstants.APPFIT_H0));
+        cachedHorizonPreviewImage.add(new ImageIcon(UIConstants.APPFIT_H1));
+        cachedHorizonPreviewImage.add(new ImageIcon(UIConstants.APPFIT_H2));
+        cachedHorizonPreviewImage.add(new ImageIcon(UIConstants.APPFIT_H3));
+        cachedHorizonPreviewImage.add(new ImageIcon(UIConstants.APPFIT_H4));
     }
 
     private void initComponents() {
diff --git a/designer_base/src/com/fr/design/constants/UIConstants.java b/designer_base/src/com/fr/design/constants/UIConstants.java
index 3df47f30a..c9ad2c6eb 100644
--- a/designer_base/src/com/fr/design/constants/UIConstants.java
+++ b/designer_base/src/com/fr/design/constants/UIConstants.java
@@ -18,8 +18,19 @@ import java.awt.image.BufferedImage;
 public interface UIConstants {
 
     public static final Icon CPT_ICON = BaseUtils.readIcon("/com/fr/base/images/oem/cpt.png");
-
     public static final Icon BLACK_ICON = BaseUtils.readIcon("/com/fr/base/images/cell/blank.gif");
+
+    public static final Image APPFIT_V0 = BaseUtils.readImage("/com/fr/design/images/dialog/appfit/V0.png");
+    public static final Image APPFIT_V1 = BaseUtils.readImage("/com/fr/design/images/dialog/appfit/V1.png");
+    public static final Image APPFIT_V2 = BaseUtils.readImage("/com/fr/design/images/dialog/appfit/V2.png");
+    public static final Image APPFIT_V3 = BaseUtils.readImage("/com/fr/design/images/dialog/appfit/V3.png");
+    public static final Image APPFIT_V4 = BaseUtils.readImage("/com/fr/design/images/dialog/appfit/V4.png");
+    public static final Image APPFIT_H0 = BaseUtils.readImage("/com/fr/design/images/dialog/appfit/H0.png");
+    public static final Image APPFIT_H1 = BaseUtils.readImage("/com/fr/design/images/dialog/appfit/H1.png");
+    public static final Image APPFIT_H2 = BaseUtils.readImage("/com/fr/design/images/dialog/appfit/H2.png");
+    public static final Image APPFIT_H3 = BaseUtils.readImage("/com/fr/design/images/dialog/appfit/H3.png");
+    public static final Image APPFIT_H4 = BaseUtils.readImage("/com/fr/design/images/dialog/appfit/H4.png");
+
     public static final Border CELL_ATTR_ZEROBORDER = BorderFactory.createEmptyBorder(0, 0, 0, 0);
     public static final Border CELL_ATTR_EMPTYBORDER = BorderFactory.createEmptyBorder(0, 10, 0, 0);
     public static final Border CELL_ATTR_PRESENTBORDER = BorderFactory.createEmptyBorder(0, 5, 0, 0);

From 89128da6c2031e23be7f33a74c9de8c50a8e3742 Mon Sep 17 00:00:00 2001
From: kerry <kerry@finereport.com>
Date: Mon, 13 Nov 2017 15:39:20 +0800
Subject: [PATCH 24/29] =?UTF-8?q?REPORT-5491=209.0=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=99=A8=E4=BA=A4=E4=BA=92=E9=AA=8C=E6=94=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/gui/style/FRFontPane.java   | 11 +++++
 .../widget/WidgetBoundsPaneFactory.java       | 19 +++++---
 .../widget/ui/designer/LabelDefinePane.java   |  2 +-
 .../designer/component/PaddingBoundPane.java  | 44 +++++++++++--------
 4 files changed, 49 insertions(+), 27 deletions(-)

diff --git a/designer_base/src/com/fr/design/gui/style/FRFontPane.java b/designer_base/src/com/fr/design/gui/style/FRFontPane.java
index 6aa5338ae..d7d445ddc 100644
--- a/designer_base/src/com/fr/design/gui/style/FRFontPane.java
+++ b/designer_base/src/com/fr/design/gui/style/FRFontPane.java
@@ -16,6 +16,7 @@ import com.fr.design.gui.ibutton.UIColorButton;
 import com.fr.design.gui.ibutton.UIToggleButton;
 import com.fr.design.gui.icombobox.LineComboBox;
 import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.utils.gui.GUICoreUtils;
@@ -41,6 +42,8 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse
     public static Integer[] FONT_SIZES = {new Integer(6), new Integer(8), new Integer(9), new Integer(10), new Integer(11), new Integer(12), new Integer(14), new Integer(16),
             new Integer(18), new Integer(20), new Integer(22), new Integer(24), new Integer(26), new Integer(28), new Integer(36), new Integer(48), new Integer(72)};
     private static final Dimension BUTTON_SIZE = new Dimension(20, 18);
+    private static final Dimension UNDER_LINE_SIZE = new Dimension(87, 20);
+    private static final Dimension HIDE_SIZE = new Dimension(0, 0);
     private final String[] fontSizeStyles = {Inter.getLocText("FR-Designer_FRFont_plain"), Inter.getLocText("FR-Designer_FRFont_bold"), Inter.getLocText("FR-Designer_FRFont_italic"), Inter.getLocText("FR-Designer_FRFont_bolditalic")};
     private JPanel buttonPane;
     private JPanel isSuperOrSubPane;
@@ -104,9 +107,11 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse
         if (line == Constants.LINE_NONE) {
             underline.setSelected(false);
             cly.show(linePane, "none");
+            linePane.setPreferredSize(HIDE_SIZE);
         } else {
             underline.setSelected(true);
             cly.show(linePane, "combobox");
+            linePane.setPreferredSize(UNDER_LINE_SIZE);
             this.underlineCombo.setSelectedLineStyle(line);
         }
         // effects
@@ -297,8 +302,14 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse
             public void stateChanged(ChangeEvent e) {
                 CardLayout cly = (CardLayout) linePane.getLayout();
                 cly.show(linePane, underline.isSelected() ? "combobox" : "none");
+                if(underline.isSelected()){
+                    linePane.setPreferredSize(UNDER_LINE_SIZE);
+                }else{
+                    linePane.setPreferredSize(HIDE_SIZE);
+                }
             }
         });
+
         return linePane;
     }
 
diff --git a/designer_base/src/com/fr/design/widget/WidgetBoundsPaneFactory.java b/designer_base/src/com/fr/design/widget/WidgetBoundsPaneFactory.java
index bd3612d11..8092fc5e8 100644
--- a/designer_base/src/com/fr/design/widget/WidgetBoundsPaneFactory.java
+++ b/designer_base/src/com/fr/design/widget/WidgetBoundsPaneFactory.java
@@ -28,7 +28,7 @@ public class WidgetBoundsPaneFactory {
         double[] rowSize = {p, p};
         double[] columnSize = {p, f};
         int[][] rowCount = {{1, 1}, {1, 1}};
-        final JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
+        final JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L6);
         panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
         boundsPane.add(panel);
         return new UIExpandablePane(Inter.getLocText("FR-Designer_Coords_And_Size"), 280, 24, boundsPane);
@@ -49,19 +49,24 @@ public class WidgetBoundsPaneFactory {
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
 
-        Component[][] components = new Component[][]{
+        Component[][] northComponents = new Component[][]{
                 new Component[]{new UILabel(Inter.getLocText("FR-Designer_Widget_Position")), createRightPane(x, y)},
                 new Component[]{null, createRightPane(new UILabel(Inter.getLocText("FR-Designer_X_Coordinate"), SwingConstants.CENTER), new UILabel(Inter.getLocText("FR-Designer_Y_Coordinate"), SwingConstants.CENTER))},
+        };
+        Component[][] centerComponents = new Component[][]{
                 new Component[]{new UILabel(Inter.getLocText("FR-Designer-Widget_Size")), createRightPane(width, height)},
                 new Component[]{null, createRightPane(new UILabel(Inter.getLocText("FR-Designer-Tree_Width"), SwingConstants.CENTER), new UILabel(Inter.getLocText("FR-Designer-Tree_Height"), SwingConstants.CENTER))},
         };
-        double[] rowSize = {p, p, p, p};
+        double[] rowSize = {p, p};
         double[] columnSize = {p, f};
-        int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}};
-        final JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
+        int[][] rowCount = {{1, 1}, {1, 1}};
+        final JPanel northPanel = TableLayoutHelper.createGapTableLayoutPane(northComponents, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L6);
+        final JPanel centerPanel = TableLayoutHelper.createGapTableLayoutPane(centerComponents, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L6);
         JPanel boundsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
-        boundsPane.add(panel);
+        northPanel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
+        centerPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0));
+        boundsPane.add(northPanel, BorderLayout.NORTH);
+        boundsPane.add(centerPanel, BorderLayout.CENTER);
         return new UIExpandablePane(Inter.getLocText("FR-Designer_Coords_And_Size"), 230, 24, boundsPane);
     }
 }
diff --git a/designer_form/src/com/fr/design/widget/ui/designer/LabelDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/LabelDefinePane.java
index 549f4266f..02c47c41e 100644
--- a/designer_form/src/com/fr/design/widget/ui/designer/LabelDefinePane.java
+++ b/designer_form/src/com/fr/design/widget/ui/designer/LabelDefinePane.java
@@ -75,7 +75,7 @@ public class LabelDefinePane extends AbstractDataModify<Label> {
         };
         JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
         JPanel boundsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
+        panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
         boundsPane.add(panel);
         return boundsPane;
     }
diff --git a/designer_form/src/com/fr/design/widget/ui/designer/component/PaddingBoundPane.java b/designer_form/src/com/fr/design/widget/ui/designer/component/PaddingBoundPane.java
index 992eb76c6..21dcb4b6e 100644
--- a/designer_form/src/com/fr/design/widget/ui/designer/component/PaddingBoundPane.java
+++ b/designer_form/src/com/fr/design/widget/ui/designer/component/PaddingBoundPane.java
@@ -14,6 +14,7 @@ import com.fr.general.Inter;
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
+import java.awt.BorderLayout;
 import java.awt.Component;
 
 
@@ -40,32 +41,37 @@ public class PaddingBoundPane extends BasicPane{
         bottom.setGlobalName(Inter.getLocText("FR-Designer_Layout-Padding"));
         left.setGlobalName(Inter.getLocText("FR-Designer_Layout-Padding"));
         right.setGlobalName(Inter.getLocText("FR-Designer_Layout-Padding"));
-        double f = TableLayout.FILL;
-        double p = TableLayout.PREFERRED;
-        double[] rowSize = {p, p, p, p};
-        double[] columnSize = {p, f};
-        int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}};
-        Component[][] components = new Component[][]{
-                new Component[]{new UILabel(Inter.getLocText("FR-Designer_Layout-Padding")), createRightPane(top, bottom)},
-                new Component[]{null, createRightPane(new UILabel(Inter.getLocText("FR-Designer_Top"), SwingConstants.CENTER), new UILabel(Inter.getLocText("FR-Designer_Bottom"), SwingConstants.CENTER))},
-                new Component[]{null, createRightPane(left, right)},
-                new Component[]{null, createRightPane(new UILabel(Inter.getLocText("FR-Designer_Left"), SwingConstants.CENTER), new UILabel(Inter.getLocText("FR-Designer_Right"), SwingConstants.CENTER))},
-        };
-        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W2, IntervalConstants.INTERVAL_L1);
-        panel.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, IntervalConstants.INTERVAL_L1, 0));
+        UILabel label = new UILabel(Inter.getLocText("FR-Designer_Layout-Padding"));
+        label.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, 0, 0));
+        label.setVerticalAlignment(SwingConstants.TOP);
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
+                new Component[]{label, createRightPane()}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W2, IntervalConstants.INTERVAL_L1   );
         this.add(panel);
     }
 
-    public JPanel createRightPane(Component com1, Component com2){
+
+    public JPanel createRightPane(){
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
-        double[] rowSize = {p};
+        double[] rowSize = {p, p};
         double[] columnSize = {f, f};
-        int[][] rowCount = {{1, 1}};
-        Component[][] components = new Component[][]{
-                new Component[]{com1, com2}
+        int[][] rowCount = {{1, 1}, {1, 1}};
+        Component[][] components1 = new Component[][]{
+                new Component[]{top, bottom},
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer_Top"), SwingConstants.CENTER), new UILabel(Inter.getLocText("FR-Designer_Bottom"), SwingConstants.CENTER)}
+        };
+        Component[][] components2 = new Component[][]{
+                new Component[]{left, right},
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer_Left"), SwingConstants.CENTER), new UILabel(Inter.getLocText("FR-Designer_Right"), SwingConstants.CENTER)}
         };
-        return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L1);
+        JPanel northPanel = TableLayoutHelper.createGapTableLayoutPane(components1, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L6);
+        northPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, IntervalConstants.INTERVAL_L1, 0));
+        JPanel centerPanel = TableLayoutHelper.createGapTableLayoutPane(components2, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L6);
+        JPanel panel =  FRGUIPaneFactory.createBorderLayout_S_Pane();
+        panel.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, IntervalConstants.INTERVAL_L1, 0));
+        panel.add(northPanel, BorderLayout.NORTH);
+        panel.add(centerPanel, BorderLayout.CENTER);
+        return panel;
     }
 
 

From d901034c1e76f5eea9b54a5c927f12ca483ec51e Mon Sep 17 00:00:00 2001
From: MoMeak <fr123456>
Date: Mon, 13 Nov 2017 16:04:22 +0800
Subject: [PATCH 25/29] =?UTF-8?q?REPORT-5194=20=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E5=A1=AB=E6=8A=A5=E7=9A=84=E6=8E=A5=E5=8F=A3=E8=AF=B4=E6=98=8E?=
 =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE=20REPORT-4549=20=E5=A1=AB=E6=8A=A5?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8F=90=E4=BA=A4=E7=9A=84=E5=9C=B0?=
 =?UTF-8?q?=E6=96=B9=EF=BC=8C=E8=AF=B4=E6=98=8E=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer_base/src/com/fr/design/write/submit/CustomJobPane.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer_base/src/com/fr/design/write/submit/CustomJobPane.java b/designer_base/src/com/fr/design/write/submit/CustomJobPane.java
index d9368d87d..15c655287 100644
--- a/designer_base/src/com/fr/design/write/submit/CustomJobPane.java
+++ b/designer_base/src/com/fr/design/write/submit/CustomJobPane.java
@@ -1 +1 @@
-package com.fr.design.write.submit;

import com.fr.base.GraphHelper;
import com.fr.data.AbstractClassJob;
import com.fr.design.data.tabledata.tabledatapane.ClassNameSelectPane;
import com.fr.design.beans.BasicBeanPane;
import com.fr.design.formula.JavaEditorPane;
import com.fr.design.gui.frpane.ObjectProperiesPane;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.itextarea.UITextArea;
import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.DialogActionAdapter;
import com.fr.general.Inter;
import com.fr.stable.StringUtils;
import com.fr.design.utils.gui.GUICoreUtils;

import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;

/**
 * Author : Shockway
 * Date: 13-7-29
 * Time: 下午6:48
 */
public abstract class CustomJobPane  extends BasicBeanPane {
	protected UITextField classNameTextField;
	protected ObjectProperiesPane objectProperiesPane;
	public static final int DEFAULT_LENGTH = 30;

	public CustomJobPane() {
		this.setLayout(FRGUIPaneFactory.createBorderLayout());
		JPanel reportletNamePane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane();
		classNameTextField = new UITextField(getLengthOfTextField());
		reportletNamePane.add(classNameTextField);

		UIButton browserButton = new UIButton(Inter.getLocText("FR-Designer_Select"));
		browserButton.setPreferredSize(new Dimension(
				GraphHelper.getLocTextWidth("FR-Designer_Select") + 20,
				classNameTextField.getPreferredSize().height));

        UIButton editButton = new UIButton(Inter.getLocText("FR-Designer_Edit"));
        editButton.setPreferredSize(new Dimension(
				GraphHelper.getLocTextWidth("FR-Designer_Edit") + 20,
                classNameTextField.getPreferredSize().height));

		reportletNamePane.add(browserButton);
        reportletNamePane.add(editButton);

		browserButton.addActionListener(new ActionListener() {
			public void actionPerformed(ActionEvent evt) {
				final ClassNameSelectPane bPane = new ClassNameSelectPane();
				bPane.setClassPath(classNameTextField.getText());
				bPane.showWindow(
						SwingUtilities.getWindowAncestor(getWindowAncestor()),
						new DialogActionAdapter() {
							public void doOk() {
								classNameTextField.setText(bPane.getClassPath());
								checkAddButtonEnable();
							}
						}).setVisible(true);
			}
		});
        editButton.addActionListener(new ActionListener() {
            @Override
            public void actionPerformed(ActionEvent e) {
                final JavaEditorPane javaEditorPane = new JavaEditorPane(classNameTextField.getText(), JavaEditorPane.DEFAULT_SUBMIT_JOB);
                final BasicDialog dlg = javaEditorPane.showMediumWindow(SwingUtilities.getWindowAncestor(CustomJobPane.this),
                        new DialogActionAdapter() {
                            public void doOk() {
                                classNameTextField.setText(javaEditorPane.getClassText());
								checkAddButtonEnable();
                            }
                        });
				javaEditorPane.addSaveActionListener(new ActionListener() {
					@Override
					public void actionPerformed(ActionEvent e) {
						dlg.doOK();
					}
				});
                dlg.setVisible(true);
            }
        });

		reportletNamePane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Designer_ClassName"), null));
		this.add(reportletNamePane, BorderLayout.NORTH);

		objectProperiesPane = new ObjectProperiesPane();
		objectProperiesPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Designer_Property"), null));
		this.add(objectProperiesPane, BorderLayout.CENTER);

		UITextArea area = new UITextArea(2, 1);
		area.setText(Inter.getLocText(new String[]{"Come_True", "Interface"}) + ":com.fr.data.SubmitJob");
		JPanel dsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
		dsPane.add(area);
		dsPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Designer_Custom_Job_Description"), null));
		this.add(dsPane, BorderLayout.SOUTH);
		checkAddButtonEnable();
	}

	public int getLengthOfTextField() {
		return DEFAULT_LENGTH;
	}

	protected String title4PopupWindow() {
		return "CustomJob";
	}

	protected Component getWindowAncestor() {
		return this;
	}

	@Override
	public void populateBean(Object ob) {
		if (ob instanceof AbstractClassJob) {
			AbstractClassJob cj = (AbstractClassJob) ob;
			this.classNameTextField.setText(cj.getClassName());
			this.objectProperiesPane.populateBean(cj.getPropertyMap());
			checkAddButtonEnable();
		}
	}

	/**
	 * 添加按钮可用
	 */
	public void checkAddButtonEnable() {
		objectProperiesPane.enableAddButton(StringUtils.isNotEmpty(classNameTextField.getText()));
	}

	/**
	 * 重置
	 */
	public void reset() {
		this.classNameTextField.setText(null);
		this.checkAddButtonEnable();
	}
}
\ No newline at end of file
+package com.fr.design.write.submit;

import com.fr.base.GraphHelper;
import com.fr.data.AbstractClassJob;
import com.fr.design.data.tabledata.tabledatapane.ClassNameSelectPane;
import com.fr.design.beans.BasicBeanPane;
import com.fr.design.formula.JavaEditorPane;
import com.fr.design.gui.frpane.ObjectProperiesPane;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.itextarea.UITextArea;
import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.DialogActionAdapter;
import com.fr.general.Inter;
import com.fr.stable.StringUtils;
import com.fr.design.utils.gui.GUICoreUtils;

import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;

/**
 * Author : Shockway
 * Date: 13-7-29
 * Time: 下午6:48
 */
public abstract class CustomJobPane  extends BasicBeanPane {
	protected UITextField classNameTextField;
	protected ObjectProperiesPane objectProperiesPane;
	public static final int DEFAULT_LENGTH = 30;

	public CustomJobPane() {
		this.setLayout(FRGUIPaneFactory.createBorderLayout());
		JPanel reportletNamePane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane();
		classNameTextField = new UITextField(getLengthOfTextField());
		reportletNamePane.add(classNameTextField);

		UIButton browserButton = new UIButton(Inter.getLocText("FR-Designer_Select"));
		browserButton.setPreferredSize(new Dimension(
				GraphHelper.getLocTextWidth("FR-Designer_Select") + 20,
				classNameTextField.getPreferredSize().height));

        UIButton editButton = new UIButton(Inter.getLocText("FR-Designer_Edit"));
        editButton.setPreferredSize(new Dimension(
				GraphHelper.getLocTextWidth("FR-Designer_Edit") + 20,
                classNameTextField.getPreferredSize().height));

		reportletNamePane.add(browserButton);
        reportletNamePane.add(editButton);

		browserButton.addActionListener(new ActionListener() {
			public void actionPerformed(ActionEvent evt) {
				final ClassNameSelectPane bPane = new ClassNameSelectPane();
				bPane.setClassPath(classNameTextField.getText());
				bPane.showWindow(
						SwingUtilities.getWindowAncestor(getWindowAncestor()),
						new DialogActionAdapter() {
							public void doOk() {
								classNameTextField.setText(bPane.getClassPath());
								checkAddButtonEnable();
							}
						}).setVisible(true);
			}
		});
        editButton.addActionListener(new ActionListener() {
            @Override
            public void actionPerformed(ActionEvent e) {
                final JavaEditorPane javaEditorPane = new JavaEditorPane(classNameTextField.getText(), JavaEditorPane.DEFAULT_SUBMIT_JOB);
                final BasicDialog dlg = javaEditorPane.showMediumWindow(SwingUtilities.getWindowAncestor(CustomJobPane.this),
                        new DialogActionAdapter() {
                            public void doOk() {
                                classNameTextField.setText(javaEditorPane.getClassText());
								checkAddButtonEnable();
                            }
                        });
				javaEditorPane.addSaveActionListener(new ActionListener() {
					@Override
					public void actionPerformed(ActionEvent e) {
						dlg.doOK();
					}
				});
                dlg.setVisible(true);
            }
        });

		reportletNamePane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Designer_ClassName"), null));
		this.add(reportletNamePane, BorderLayout.NORTH);

		objectProperiesPane = new ObjectProperiesPane();
		objectProperiesPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Designer_Property"), null));
		this.add(objectProperiesPane, BorderLayout.CENTER);

		UITextArea area = new UITextArea(2, 1);
		area.setText(Inter.getLocText(new String[]{"Come_True", "Interface"}) + ":com.fr.data.AbstractSubmitTask");
		JPanel dsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
		dsPane.add(area);
		dsPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Designer_Custom_Job_Description"), null));
		this.add(dsPane, BorderLayout.SOUTH);
		checkAddButtonEnable();
	}

	public int getLengthOfTextField() {
		return DEFAULT_LENGTH;
	}

	protected String title4PopupWindow() {
		return "CustomJob";
	}

	protected Component getWindowAncestor() {
		return this;
	}

	@Override
	public void populateBean(Object ob) {
		if (ob instanceof AbstractClassJob) {
			AbstractClassJob cj = (AbstractClassJob) ob;
			this.classNameTextField.setText(cj.getClassName());
			this.objectProperiesPane.populateBean(cj.getPropertyMap());
			checkAddButtonEnable();
		}
	}

	/**
	 * 添加按钮可用
	 */
	public void checkAddButtonEnable() {
		objectProperiesPane.enableAddButton(StringUtils.isNotEmpty(classNameTextField.getText()));
	}

	/**
	 * 重置
	 */
	public void reset() {
		this.classNameTextField.setText(null);
		this.checkAddButtonEnable();
	}
}
\ No newline at end of file

From 56a4a954e53d05a3ae895b699bb6c5c49b89511d Mon Sep 17 00:00:00 2001
From: MoMeak <fr123456>
Date: Mon, 13 Nov 2017 16:05:49 +0800
Subject: [PATCH 26/29] =?UTF-8?q?REPORT-5194=20=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E5=A1=AB=E6=8A=A5=E7=9A=84=E6=8E=A5=E5=8F=A3=E8=AF=B4=E6=98=8E?=
 =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE=20REPORT-4549=20=E5=A1=AB=E6=8A=A5?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8F=90=E4=BA=A4=E7=9A=84=E5=9C=B0?=
 =?UTF-8?q?=E6=96=B9=EF=BC=8C=E8=AF=B4=E6=98=8E=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/write/submit/CustomJobPane.java | 141 +++++++++++++++++-
 1 file changed, 140 insertions(+), 1 deletion(-)

diff --git a/designer_base/src/com/fr/design/write/submit/CustomJobPane.java b/designer_base/src/com/fr/design/write/submit/CustomJobPane.java
index 15c655287..c29c75148 100644
--- a/designer_base/src/com/fr/design/write/submit/CustomJobPane.java
+++ b/designer_base/src/com/fr/design/write/submit/CustomJobPane.java
@@ -1 +1,140 @@
-package com.fr.design.write.submit;

import com.fr.base.GraphHelper;
import com.fr.data.AbstractClassJob;
import com.fr.design.data.tabledata.tabledatapane.ClassNameSelectPane;
import com.fr.design.beans.BasicBeanPane;
import com.fr.design.formula.JavaEditorPane;
import com.fr.design.gui.frpane.ObjectProperiesPane;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.itextarea.UITextArea;
import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.DialogActionAdapter;
import com.fr.general.Inter;
import com.fr.stable.StringUtils;
import com.fr.design.utils.gui.GUICoreUtils;

import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;

/**
 * Author : Shockway
 * Date: 13-7-29
 * Time: 下午6:48
 */
public abstract class CustomJobPane  extends BasicBeanPane {
	protected UITextField classNameTextField;
	protected ObjectProperiesPane objectProperiesPane;
	public static final int DEFAULT_LENGTH = 30;

	public CustomJobPane() {
		this.setLayout(FRGUIPaneFactory.createBorderLayout());
		JPanel reportletNamePane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane();
		classNameTextField = new UITextField(getLengthOfTextField());
		reportletNamePane.add(classNameTextField);

		UIButton browserButton = new UIButton(Inter.getLocText("FR-Designer_Select"));
		browserButton.setPreferredSize(new Dimension(
				GraphHelper.getLocTextWidth("FR-Designer_Select") + 20,
				classNameTextField.getPreferredSize().height));

        UIButton editButton = new UIButton(Inter.getLocText("FR-Designer_Edit"));
        editButton.setPreferredSize(new Dimension(
				GraphHelper.getLocTextWidth("FR-Designer_Edit") + 20,
                classNameTextField.getPreferredSize().height));

		reportletNamePane.add(browserButton);
        reportletNamePane.add(editButton);

		browserButton.addActionListener(new ActionListener() {
			public void actionPerformed(ActionEvent evt) {
				final ClassNameSelectPane bPane = new ClassNameSelectPane();
				bPane.setClassPath(classNameTextField.getText());
				bPane.showWindow(
						SwingUtilities.getWindowAncestor(getWindowAncestor()),
						new DialogActionAdapter() {
							public void doOk() {
								classNameTextField.setText(bPane.getClassPath());
								checkAddButtonEnable();
							}
						}).setVisible(true);
			}
		});
        editButton.addActionListener(new ActionListener() {
            @Override
            public void actionPerformed(ActionEvent e) {
                final JavaEditorPane javaEditorPane = new JavaEditorPane(classNameTextField.getText(), JavaEditorPane.DEFAULT_SUBMIT_JOB);
                final BasicDialog dlg = javaEditorPane.showMediumWindow(SwingUtilities.getWindowAncestor(CustomJobPane.this),
                        new DialogActionAdapter() {
                            public void doOk() {
                                classNameTextField.setText(javaEditorPane.getClassText());
								checkAddButtonEnable();
                            }
                        });
				javaEditorPane.addSaveActionListener(new ActionListener() {
					@Override
					public void actionPerformed(ActionEvent e) {
						dlg.doOK();
					}
				});
                dlg.setVisible(true);
            }
        });

		reportletNamePane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Designer_ClassName"), null));
		this.add(reportletNamePane, BorderLayout.NORTH);

		objectProperiesPane = new ObjectProperiesPane();
		objectProperiesPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Designer_Property"), null));
		this.add(objectProperiesPane, BorderLayout.CENTER);

		UITextArea area = new UITextArea(2, 1);
		area.setText(Inter.getLocText(new String[]{"Come_True", "Interface"}) + ":com.fr.data.AbstractSubmitTask");
		JPanel dsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
		dsPane.add(area);
		dsPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Designer_Custom_Job_Description"), null));
		this.add(dsPane, BorderLayout.SOUTH);
		checkAddButtonEnable();
	}

	public int getLengthOfTextField() {
		return DEFAULT_LENGTH;
	}

	protected String title4PopupWindow() {
		return "CustomJob";
	}

	protected Component getWindowAncestor() {
		return this;
	}

	@Override
	public void populateBean(Object ob) {
		if (ob instanceof AbstractClassJob) {
			AbstractClassJob cj = (AbstractClassJob) ob;
			this.classNameTextField.setText(cj.getClassName());
			this.objectProperiesPane.populateBean(cj.getPropertyMap());
			checkAddButtonEnable();
		}
	}

	/**
	 * 添加按钮可用
	 */
	public void checkAddButtonEnable() {
		objectProperiesPane.enableAddButton(StringUtils.isNotEmpty(classNameTextField.getText()));
	}

	/**
	 * 重置
	 */
	public void reset() {
		this.classNameTextField.setText(null);
		this.checkAddButtonEnable();
	}
}
\ No newline at end of file
+package com.fr.design.write.submit;
+
+import com.fr.base.GraphHelper;
+import com.fr.data.AbstractClassJob;
+import com.fr.design.data.tabledata.tabledatapane.ClassNameSelectPane;
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.formula.JavaEditorPane;
+import com.fr.design.gui.frpane.ObjectProperiesPane;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.itextarea.UITextArea;
+import com.fr.design.gui.itextfield.UITextField;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.dialog.BasicDialog;
+import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.general.Inter;
+import com.fr.stable.StringUtils;
+import com.fr.design.utils.gui.GUICoreUtils;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+/**
+ * Author : Shockway
+ * Date: 13-7-29
+ * Time: 下午6:48
+ */
+public abstract class CustomJobPane  extends BasicBeanPane {
+	protected UITextField classNameTextField;
+	protected ObjectProperiesPane objectProperiesPane;
+	public static final int DEFAULT_LENGTH = 30;
+
+	public CustomJobPane() {
+		this.setLayout(FRGUIPaneFactory.createBorderLayout());
+		JPanel reportletNamePane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane();
+		classNameTextField = new UITextField(getLengthOfTextField());
+		reportletNamePane.add(classNameTextField);
+
+		UIButton browserButton = new UIButton(Inter.getLocText("FR-Designer_Select"));
+		browserButton.setPreferredSize(new Dimension(
+				GraphHelper.getLocTextWidth("FR-Designer_Select") + 20,
+				classNameTextField.getPreferredSize().height));
+
+        UIButton editButton = new UIButton(Inter.getLocText("FR-Designer_Edit"));
+        editButton.setPreferredSize(new Dimension(
+				GraphHelper.getLocTextWidth("FR-Designer_Edit") + 20,
+                classNameTextField.getPreferredSize().height));
+
+		reportletNamePane.add(browserButton);
+        reportletNamePane.add(editButton);
+
+		browserButton.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent evt) {
+				final ClassNameSelectPane bPane = new ClassNameSelectPane();
+				bPane.setClassPath(classNameTextField.getText());
+				bPane.showWindow(
+						SwingUtilities.getWindowAncestor(getWindowAncestor()),
+						new DialogActionAdapter() {
+							public void doOk() {
+								classNameTextField.setText(bPane.getClassPath());
+								checkAddButtonEnable();
+							}
+						}).setVisible(true);
+			}
+		});
+        editButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                final JavaEditorPane javaEditorPane = new JavaEditorPane(classNameTextField.getText(), JavaEditorPane.DEFAULT_SUBMIT_JOB);
+                final BasicDialog dlg = javaEditorPane.showMediumWindow(SwingUtilities.getWindowAncestor(CustomJobPane.this),
+                        new DialogActionAdapter() {
+                            public void doOk() {
+                                classNameTextField.setText(javaEditorPane.getClassText());
+								checkAddButtonEnable();
+                            }
+                        });
+				javaEditorPane.addSaveActionListener(new ActionListener() {
+					@Override
+					public void actionPerformed(ActionEvent e) {
+						dlg.doOK();
+					}
+				});
+                dlg.setVisible(true);
+            }
+        });
+
+		reportletNamePane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Designer_ClassName"), null));
+		this.add(reportletNamePane, BorderLayout.NORTH);
+
+		objectProperiesPane = new ObjectProperiesPane();
+		objectProperiesPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Designer_Property"), null));
+		this.add(objectProperiesPane, BorderLayout.CENTER);
+
+		UITextArea area = new UITextArea(2, 1);
+		area.setText(Inter.getLocText(new String[]{"Come_True", "Interface"}) + ":com.fr.data.AbstractSubmitTask");
+		JPanel dsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+		dsPane.add(area);
+		dsPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Designer_Custom_Job_Description"), null));
+		this.add(dsPane, BorderLayout.SOUTH);
+		checkAddButtonEnable();
+	}
+
+	public int getLengthOfTextField() {
+		return DEFAULT_LENGTH;
+	}
+
+	protected String title4PopupWindow() {
+		return "CustomJob";
+	}
+
+	protected Component getWindowAncestor() {
+		return this;
+	}
+
+	@Override
+	public void populateBean(Object ob) {
+		if (ob instanceof AbstractClassJob) {
+			AbstractClassJob cj = (AbstractClassJob) ob;
+			this.classNameTextField.setText(cj.getClassName());
+			this.objectProperiesPane.populateBean(cj.getPropertyMap());
+			checkAddButtonEnable();
+		}
+	}
+
+	/**
+	 * 添加按钮可用
+	 */
+	public void checkAddButtonEnable() {
+		objectProperiesPane.enableAddButton(StringUtils.isNotEmpty(classNameTextField.getText()));
+	}
+
+	/**
+	 * 重置
+	 */
+	public void reset() {
+		this.classNameTextField.setText(null);
+		this.checkAddButtonEnable();
+	}
+}
\ No newline at end of file

From 764fc3b455e41cf76454526a62dc7fdd7dbec42c Mon Sep 17 00:00:00 2001
From: plough <plough@fanruan.com>
Date: Mon, 13 Nov 2017 16:07:30 +0800
Subject: [PATCH 27/29] =?UTF-8?q?REPORT-5284=20=E5=85=AC=E6=B5=8B=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E5=8F=8D=E9=A6=88=E8=AE=BE=E8=AE=A1=E5=99=A8=E9=85=8D?=
 =?UTF-8?q?=E8=89=B2=E5=92=8C=E4=BA=A4=E4=BA=92=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=3D>=E5=BE=AE=E8=B0=83=E5=BC=B9=E7=AA=97=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/constants/UIConstants.java          | 1 +
 .../src/com/fr/design/gui/controlpane/UIControlPane.java  | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/designer_base/src/com/fr/design/constants/UIConstants.java b/designer_base/src/com/fr/design/constants/UIConstants.java
index 3df47f30a..7444f9f8b 100644
--- a/designer_base/src/com/fr/design/constants/UIConstants.java
+++ b/designer_base/src/com/fr/design/constants/UIConstants.java
@@ -98,6 +98,7 @@ public interface UIConstants {
     public static final Color ATTRIBUTE_NORMAL = Color.WHITE;
     public static final Color ATTRIBUTE_HOVER = new Color(0xF5F5F7);
     public static final Color UI_TOOLBAR_COLOR = new Color(0xF5F5F7);
+    public static final Color DIALOG_TITLEBAR_BACKGROUND = new Color(0xFCFCFD);
     public static final Color CHECKBOX_HOVER_SELECTED = new Color(0x3394f0);
     public static final Color TEXT_FILED_BORDER_SELECTED = new Color(0x3384f0);
     public static final Color SHEET_NORMAL = new Color(0xc8c8ca);
diff --git a/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java b/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java
index d1673d47a..66ce1865c 100644
--- a/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java
+++ b/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java
@@ -443,14 +443,16 @@ public abstract class UIControlPane extends BasicPane implements UnrepeatedNameH
         public PopupToolPane(String title, JDialog parentDialog) {
             super();
             this.parentDialog = parentDialog;
-            originColor = UIConstants.UI_TOOLBAR_COLOR;
+            originColor = UIConstants.DIALOG_TITLEBAR_BACKGROUND;
 
             contentPane = new JPanel();
             contentPane.setBackground(originColor);
             contentPane.setLayout(new BorderLayout());
             titleLabel = new UILabel(title);
+            Font font = new Font("SimSun", Font.PLAIN, 12);
+            titleLabel.setFont(font);
             contentPane.add(titleLabel, BorderLayout.WEST);
-            contentPane.setBorder(new EmptyBorder(5, 10, 5, 0));
+            contentPane.setBorder(new EmptyBorder(5, 14, 6, 0));
 
             setLayout(new BorderLayout());
             add(contentPane, BorderLayout.CENTER);
@@ -466,7 +468,7 @@ public abstract class UIControlPane extends BasicPane implements UnrepeatedNameH
 
         @Override
         public Dimension getPreferredSize() {
-            return new Dimension(super.getPreferredSize().width, 25);
+            return new Dimension(super.getPreferredSize().width, 28);
         }
     }
 }
\ No newline at end of file

From 1994ea4961a67ad70f0b0489fdfed8f237cb392e Mon Sep 17 00:00:00 2001
From: hzzz <hzzz0823@gmail.com>
Date: Tue, 14 Nov 2017 10:44:36 +0800
Subject: [PATCH 28/29] =?UTF-8?q?REPORT-5492=20=E8=8F=9C=E5=8D=95=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/mainframe/ElementCasePaneDelegate.java  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java b/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
index 0f1c38bd2..03e37c63a 100644
--- a/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
+++ b/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
@@ -188,12 +188,14 @@ public class ElementCasePaneDelegate extends ElementCasePane<WorkSheet> {
         MenuDef menuDef = new MenuDef(KeySetUtils.CELL.getMenuKeySetName(), KeySetUtils.CELL.getMnemonic());
 
         menuDef.addShortCut(new CellExpandAttrAction());
-        menuDef.addShortCut(new CellWidgetAttrAction());
         menuDef.addShortCut(new GlobalStyleMenuDef(this));
-        menuDef.addShortCut(new ConditionAttributesAction());
-
         // 单元格形态
         menuDef.addShortCut(DeprecatedActionManager.getPresentMenu(this));
+        menuDef.addShortCut(new CellWidgetAttrAction());
+
+        menuDef.addShortCut(new ConditionAttributesAction());
+
+
         menuDef.addShortCut(new HyperlinkAction());
         menuDef.addShortCut(SeparatorDef.DEFAULT);
         menuDef.addShortCut(new MergeCellAction(this));

From d0cac22dcfb7c849d46d2b0e2a7f03e068ae6019 Mon Sep 17 00:00:00 2001
From: hzzz <hzzz0823@gmail.com>
Date: Tue, 14 Nov 2017 10:47:09 +0800
Subject: [PATCH 29/29] .

---
 .../src/com/fr/design/mainframe/ElementCasePaneDelegate.java    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java b/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
index 03e37c63a..8d25463ab 100644
--- a/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
+++ b/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
@@ -192,10 +192,8 @@ public class ElementCasePaneDelegate extends ElementCasePane<WorkSheet> {
         // 单元格形态
         menuDef.addShortCut(DeprecatedActionManager.getPresentMenu(this));
         menuDef.addShortCut(new CellWidgetAttrAction());
-
         menuDef.addShortCut(new ConditionAttributesAction());
 
-
         menuDef.addShortCut(new HyperlinkAction());
         menuDef.addShortCut(SeparatorDef.DEFAULT);
         menuDef.addShortCut(new MergeCellAction(this));