Merge pull request #1597 in BA/design from ~PLOUGH/design:feature/9.0 to feature/9.0

* commit 'd730951fe119a29b461ab4933ca5af5371f6aa85':
  无JIRA任务，修复打包失败的问题

designer_form/src/com/fr/design/form/mobile/FormMobileTemplateSettingsPane.java

@@ -26,6 +26,7 @@ public class FormMobileTemplateSettingsPane extends BasicBeanPane<FormMobileAttr
     private UICheckBox mobileOnlyCheck;  // 设置为手机端专属模版
     private UICheckBox mobileCanvasSizeCheck;  // 设置为手机模版画布大小
     private UICheckBox adaptivePropertyAutoMatchCheck;  // 自适应属性自动匹配
+    private JPanel mobileSettingsPane;
 
     public FormMobileTemplateSettingsPane() {
         this.initComponents();
@@ -38,7 +39,7 @@ public class FormMobileTemplateSettingsPane extends BasicBeanPane<FormMobileAttr
         JPanel contentPane = new JPanel(FRGUIPaneFactory.createBorderLayout());
         contentPane.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, IntervalConstants.INTERVAL_L5, IntervalConstants.INTERVAL_L2, 0));
 
-        JPanel mobileSettingsPane = new JPanel(FRGUIPaneFactory.createBorderLayout());
+        mobileSettingsPane = new JPanel(FRGUIPaneFactory.createBorderLayout());
         mobileSettingsPane.setVisible(false);
         mobileSettingsPane.add(getMobileCanvasSizeCheckPane(), BorderLayout.NORTH);
         mobileSettingsPane.add(getAdaptivePropertyAutoMatchCheckPane(), BorderLayout.CENTER);
@@ -73,8 +74,8 @@ public class FormMobileTemplateSettingsPane extends BasicBeanPane<FormMobileAttr
 
     private JPanel getAdaptivePropertyAutoMatchCheckPane() {
         JPanel panel = new JPanel(FRGUIPaneFactory.createBorderLayout());
-        String selectedDesc = Inter.getLocText("FR-Designer_Adaptive_Property_Auto_Match");
-        String unselectedDesc = Inter.getLocText("FR-Designer_Open_Adaptive_Property_Auto_Match");
+        final String selectedDesc = Inter.getLocText("FR-Designer_Adaptive_Property_Auto_Match");
+        final String unselectedDesc = Inter.getLocText("FR-Designer_Open_Adaptive_Property_Auto_Match");
         adaptivePropertyAutoMatchCheck = new UICheckBox();
         adaptivePropertyAutoMatchCheck.registerChangeListener(new UIObserverListener() {
             @Override

designer_form/src/com/fr/design/mainframe/FormArea.java

@@ -42,6 +42,7 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
     private static final int MOBILE_ONLY_WIDTH = 375;
     private static final int MOBILE_ONLY_HEIGHT = 560;
     private FormDesigner designer;
+    private JForm jForm;
     private int horizontalValue = 0;
     private int verticalValue = 0;
     private int verticalMax = 0;
@@ -81,6 +82,7 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
     public FormArea(FormDesigner designer, JForm jForm, boolean useScrollBar) {
         this.designer = designer;
         this.designer.setParent(this);
+        this.jForm = jForm;
         isValid = useScrollBar;
         verScrollBar = new FormScrollBar(Adjustable.VERTICAL, this);
         horScrollBar = new FormScrollBar(Adjustable.HORIZONTAL, this);
@@ -100,10 +102,10 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
         }
         this.setFocusTraversalKeysEnabled(false);
         this.designer.addMouseWheelListener(showValSpinnerMouseWheelListener);
-        initMobileAttrModifiedListener(jForm);
+        initMobileAttrModifiedListener();
     }
 
-    private void initMobileAttrModifiedListener(JForm jForm) {
+    private void initMobileAttrModifiedListener() {
         if (jForm == null) {
             return;
         }