Merge remote-tracking branch 'origin/newui' into newui

# Conflicts:
#	designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java
#	designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java
#	designer-base/src/main/java/com/fr/design/report/WatermarkPane.java
#	designer-base/src/main/java/com/fr/design/widget/IconDefinePane.java
#	designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java
#	designer-realize/src/main/java/com/fr/design/report/ExcelExportPane.java
#	designer-realize/src/main/java/com/fr/design/report/ExportUniversalPane.java
#	designer-realize/src/main/java/com/fr/design/report/ImageExportPane.java
#	designer-realize/src/main/java/com/fr/design/report/PDFExportPane.java
#	designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java
#	designer-realize/src/main/java/com/fr/design/report/WordExportPane.java
#	designer-realize/src/main/java/com/fr/design/report/mobile/AppFitBrowserPane.java
#	designer-realize/src/main/java/com/fr/design/report/mobile/AppFitPreviewPane.java
#	designer-realize/src/main/java/com/fr/design/report/mobile/MobileOthersPane.java
#	designer-realize/src/main/java/com/fr/design/report/mobile/MobileRadioGroupPane.java
#	designer-realize/src/main/java/com/fr/design/report/mobile/ReportMobileAttrPane.java
#	designer-realize/src/main/java/com/fr/design/webattr/CommonPane.java
#	designer-realize/src/main/java/com/fr/design/webattr/DragToolBarPane.java
#	designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java
#	designer-realize/src/main/java/com/fr/design/webattr/ErrorTemplatePane.java
#	designer-realize/src/main/java/com/fr/design/webattr/ServerPrinterPane.java
#	designer-realize/src/main/java/com/fr/design/webattr/ToolBarButton.java
#	designer-realize/src/main/java/com/fr/design/webattr/ToolBarDragPane.java
#	designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java
#	designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java

designer-realize/src/main/java/com/fr/design/report/mobile/AppFitBrowserPane.java

@@ -2,18 +2,15 @@ package com.fr.design.report.mobile;
 
 import com.fr.base.mobile.MobileFitAttrState;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.layout.FRGUIPaneFactory;
 
 import com.fr.report.mobile.ElementCaseMobileAttr;
 
-import java.awt.BorderLayout;
+import javax.swing.*;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
-import static com.fine.swing.ui.layout.Layouts.cell;
-import static com.fine.swing.ui.layout.Layouts.column;
-import static com.fine.swing.ui.layout.Layouts.row;
-import static com.fine.theme.utils.FineUIUtils.wrapComponentWithTitle;
-
 /**
  * Created by 夏翔 on 2016/5/28.
  */
@@ -28,23 +25,22 @@ public class AppFitBrowserPane extends BasicBeanPane<ElementCaseMobileAttr> {
 
     public AppFitBrowserPane(){
         initComponents();
+
     }
 
-    /**
-     * 自适应面板
-     */
     private void initComponents() {
-        this.setLayout(new BorderLayout());
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        JPanel borderPane = FRGUIPaneFactory.createTitledBorderPane(this.title4PopupWindow());
+        JPanel fitOpsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         horizionPane = new MobileRadioGroupPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Mobile_Horizontal"));
         verticalPane = new MobileRadioGroupPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Mobile_Vertical"));
         ActionListener actionListener = getAppPreviewActionListener();
         horizionPane.addActionListener(actionListener);
         verticalPane.addActionListener(actionListener);
-        this.add(
+        fitOpsPane.add(horizionPane, BorderLayout.NORTH);
-                wrapComponentWithTitle((column(10,
+        fitOpsPane.add(verticalPane, BorderLayout.SOUTH);
-                row(cell(horizionPane)),
+        borderPane.add(fitOpsPane);
-                row(cell(verticalPane))
+        this.add(borderPane);
-        ).getComponent()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fit")));
     }
 
     public void setAppFitPreviewPane(AppFitPreviewPane appFitPreviewPane) {

designer-realize/src/main/java/com/fr/design/report/mobile/MobileToolBarPane.java

@@ -14,6 +14,8 @@ import static com.fine.swing.ui.layout.Layouts.column;
 import static com.fine.swing.ui.layout.Layouts.flex;
 import static com.fine.swing.ui.layout.Layouts.row;
 
+import static com.fine.swing.ui.layout.Layouts.*;
+
 /**
  * Created by 方磊 on 2016/11/8.
  */

designer-realize/src/main/java/com/fr/design/report/mobile/ReportMobileTemplateSettingsPane.java

@@ -17,6 +17,9 @@ import static com.fine.swing.ui.layout.Layouts.cell;
 import static com.fine.swing.ui.layout.Layouts.column;
 import static com.fine.theme.utils.FineUIUtils.wrapComponentWithTitle;
 
+import static com.fine.swing.ui.layout.Layouts.*;
+import static com.fine.theme.utils.FineUIUtils.wrapComponentWithTitle;
+
 /**
  * Created by plough on 2018/1/8.
  */