Merge pull request #258 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0

* commit 'c57680e903aa62ea043d049480670cc9c5b7fe00':
  REPORT-9953
  REPORT-9377 & REPORT-9953
  REPORT-9377 & REPORT-9953

designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java

@@ -81,7 +81,9 @@ public class AboutPane extends JPanel {
         contentPane.add(urlActionPane);
         contentPane.add(emailPane);
 
-        contentPane.add(getRemarkPane());
+        if (FRContext.getLocale().equals(Locale.CHINA) || FRContext.getLocale().equals(Locale.TAIWAN)){
+            contentPane.add(getRemarkPane());
+         }
 
         if (shouldShowThanks()) {
             addThankPane(contentPane);

designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ChartEditorDefinePane.java

@@ -10,6 +10,7 @@ import com.fr.design.designer.creator.XWAbsoluteLayout;
 import com.fr.design.designer.properties.items.Item;
 import com.fr.design.foldablepane.UIExpandablePane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
+import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
@@ -42,6 +43,7 @@ public class ChartEditorDefinePane extends MobileWidgetDefinePane {
     private UIComboBox zoomOutComboBox;// 缩小逻辑下拉框
     private AttributeChangeListener changeListener;
     private UILabel tipLabel;
+    private UICheckBox allowFullCheckBox;//允许全屏
 
     public ChartEditorDefinePane(XCreator xCreator) {
         this.xCreator = xCreator;
@@ -94,18 +96,20 @@ public class ChartEditorDefinePane extends MobileWidgetDefinePane {
         tipLabel = new UILabel();
         tipLabel.setForeground(Color.gray);
         updateTipLabel();
+        allowFullCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Allow_Full_Screen"));
 
         Component[][] components = new Component[][]{
                 new Component[] {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Zoom_In_Logic"), SwingConstants.LEFT), new UILabel(ChartMobileFitAttrState.PROPORTION.description())},
                 new Component[] {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Zoom_Out_Logic"), SwingConstants.LEFT), zoomOutComboBox},
-                new Component[] {tipLabel, null}
+                new Component[] {tipLabel, null},
+                new Component[] {allowFullCheckBox}
         };
 
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
-        double[] rowSize = {p, p, p};
+        double[] rowSize = {p, p, p, p};
         double[] columnSize = {p,f};
-        int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}};
+        int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}};
         final JPanel panel =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 30, LayoutConstants.VGAP_LARGE);
         panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
         final JPanel panelWrapper = FRGUIPaneFactory.createBorderLayout_S_Pane();
@@ -154,6 +158,8 @@ public class ChartEditorDefinePane extends MobileWidgetDefinePane {
         ChartMobileFitAttrStateProvider zoomOutAttr = chartEditor.getMobileAttr().getZoomOutAttr();
         this.zoomOutComboBox.setSelectedItem(new Item(zoomOutAttr.description(), zoomOutAttr));
         updateTipLabel();
+        boolean allowFullScreen = chartEditor.getMobileAttr().isAllowFullScreen();
+        this.allowFullCheckBox.setSelected(allowFullScreen);
 
         // 数据 populate 完成后，再设置监听
         this.bindListeners2Widgets();
@@ -179,6 +185,7 @@ public class ChartEditorDefinePane extends MobileWidgetDefinePane {
         ChartMobileAttrProvider mobileAttr = ((BaseChartEditor)xCreator.toData()).getMobileAttr();
         mobileAttr.setZoomInAttr(ChartMobileFitAttrState.PROPORTION);
         mobileAttr.setZoomOutAttr((ChartMobileFitAttrState)((Item)zoomOutComboBox.getSelectedItem()).getValue());
+        mobileAttr.setAllowFullScreen(allowFullCheckBox.isSelected());
         DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified(); // 触发设计器保存按钮亮起来
     }
 }

designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ElementCaseDefinePane.java

@@ -49,6 +49,7 @@ public class ElementCaseDefinePane extends MobileWidgetDefinePane{
     private UILabel maxHeightLabel;
     private UISpinner maxHeightSpinner; // 最大高度Spinner
     private AttributeChangeListener changeListener;
+    private UICheckBox allowFullCheckBox;
 
     public ElementCaseDefinePane (XCreator xCreator) {
         this.xCreator = xCreator;
@@ -84,17 +85,20 @@ public class ElementCaseDefinePane extends MobileWidgetDefinePane{
         maxHeightSpinner.setVisible(false);
         maxHeightLabel.setVisible(false);
 
+        allowFullCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Allow_Full_Screen"));
+
         Component[][] components = new Component[][]{
                 new Component[] {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-Horizontal"), SwingConstants.LEFT), hComboBox},
                 new Component[] {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-Vertical"), SwingConstants.LEFT), vComboBox},
                 new Component[] {heightRestrictCheckBox, null},
+                new Component[] {allowFullCheckBox},
                 new Component[] {maxHeightLabel, maxHeightSpinner}
         };
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
-        double[] rowSize = {p, p, p, p};
+        double[] rowSize = {p, p, p, p, p};
         double[] columnSize = {p,f};
-        int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}};
+        int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}};
         final JPanel panel =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 30, LayoutConstants.VGAP_LARGE);
         panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
         final JPanel panelWrapper = FRGUIPaneFactory.createBorderLayout_S_Pane();
@@ -134,6 +138,7 @@ public class ElementCaseDefinePane extends MobileWidgetDefinePane{
         this.maxHeightLabel.setVisible(elementCaseEditor.isHeightRestrict());
         this.maxHeightSpinner.setVisible(elementCaseEditor.isHeightRestrict());
         this.maxHeightSpinner.setValue(elementCaseEditor.getHeightPercent());
+        this.allowFullCheckBox.setSelected(elementCaseEditor.isAllowFullScreen());
     }
 
     @Override
@@ -156,6 +161,8 @@ public class ElementCaseDefinePane extends MobileWidgetDefinePane{
             case "maxHeightSpinner":
                 ((ElementCaseEditor)xCreator.toData()).setHeightPercent(maxHeightSpinner.getValue());
                 break;
+            case "allowFullCheckBox":
+                ((ElementCaseEditor)xCreator.toData()).setAllowFullScreen(allowFullCheckBox.isSelected());
         }
     }
 
@@ -164,6 +171,7 @@ public class ElementCaseDefinePane extends MobileWidgetDefinePane{
         this.vComboBox.setGlobalName("vComboBox");
         this.heightRestrictCheckBox.setGlobalName("heightRestrictCheckBox");
         this.maxHeightSpinner.setGlobalName("maxHeightSpinner");
+        this.allowFullCheckBox.setGlobalName("allowFullCheckBox");
     }
 
 }