REPORT-127436【NewUI】设计器样式翻新-模板相关/服务器配置/数据集

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

@@ -2,15 +2,18 @@ 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 javax.swing.*;
-import java.awt.*;
+import java.awt.BorderLayout;
 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.
  */
@@ -29,18 +32,17 @@ public class AppFitBrowserPane extends BasicBeanPane<ElementCaseMobileAttr> {
     }
 
     private void initComponents() {
-        this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        JPanel borderPane = FRGUIPaneFactory.createTitledBorderPane(this.title4PopupWindow());
-        JPanel fitOpsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        this.setLayout(new BorderLayout());
         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);
-        fitOpsPane.add(horizionPane, BorderLayout.NORTH);
-        fitOpsPane.add(verticalPane, BorderLayout.SOUTH);
-        borderPane.add(fitOpsPane);
-        this.add(borderPane);
+        this.add(
+                wrapComponentWithTitle((column(10,
+                        row(cell(horizionPane)),
+                        row(cell(verticalPane))
+                ).getComponent()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fit")));
     }
 
     public void setAppFitPreviewPane(AppFitPreviewPane appFitPreviewPane) {
@@ -59,7 +61,6 @@ public class AppFitBrowserPane extends BasicBeanPane<ElementCaseMobileAttr> {
         }
         horizionPane.populateBean(ob.getHorziontalAttr());
         verticalPane.populateBean(ob.getVerticalAttr());
-//        radioCheckPane.populateBean(ob.isZoom());
         appFitPreviewPane.refreshPreview(getCurrentFitOptions());
 
     }
@@ -68,8 +69,6 @@ public class AppFitBrowserPane extends BasicBeanPane<ElementCaseMobileAttr> {
     public ElementCaseMobileAttr updateBean() {
         MobileFitAttrState horizonState = horizionPane.updateBean();
         MobileFitAttrState verticalState = verticalPane.updateBean();
-//        boolean isZoom = radioCheckPane.updateBean();
-//        return new ElementCaseMobileAttr(horizonState, verticalState, isZoom);
         return new ElementCaseMobileAttr(horizonState, verticalState);
     }
 

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

@@ -14,8 +14,6 @@ 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,9 +17,6 @@ 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.
  */