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

* commit 'bb7183256b20e75a84c048a24b0c2fc590a26780':
  MOBILE-6341 【9.2】FR9.0设计器支持修改决策报表图表块移动端自适应逻辑=>修改提示

designer_base/src/com/fr/design/locale/designer.properties

@@ -2181,6 +2181,7 @@ FR-Designer_Joption_News=news
 FR-Designer_Zoom_In_Logic=zoom in logic
 FR-Designer_Zoom_Out_Logic=zoom out logic
 FR-Designer_Chart_Adaptivity=chart adaptivity
-FR-Designer_Tip_Chart_Adaptivity_Unavailable=Hint: since the mobile relayout option is not checked, chart adaptivity settings are not available
+FR-Designer_Tip_Chart_Adaptivity_Unavailable=Under the reserved layout state, the chart does not support the setting of self-adaptive
 FR-Designer_Official_Website=Official Website:
 FR-Designer_Support_Email=Email:
+FR-Designer_Tip_Chart_Adaptivity_Unavailable_In_Absolute_Layout=Under the absolute canvas block, the chart does not support the setting of self-adaptive

designer_base/src/com/fr/design/locale/designer_en_US.properties

@@ -2180,6 +2180,7 @@ FR-Designer_Joption_News=news
 FR-Designer_Zoom_In_Logic=zoom in logic
 FR-Designer_Zoom_Out_Logic=zoom out logic
 FR-Designer_Chart_Adaptivity=chart adaptivity
-FR-Designer_Tip_Chart_Adaptivity_Unavailable=Hint: since the mobile relayout option is not checked, chart adaptivity settings are not available
+FR-Designer_Tip_Chart_Adaptivity_Unavailable=Under the reserved layout state, the chart does not support the setting of self-adaptive
 FR-Designer_Official_Website=Official Website:
 FR-Designer_Support_Email=Email:
+FR-Designer_Tip_Chart_Adaptivity_Unavailable_In_Absolute_Layout=Under the absolute canvas block, the chart does not support the setting of self-adaptive

designer_base/src/com/fr/design/locale/designer_ja_JP.properties

@@ -2181,3 +2181,4 @@ FR-Designer_Chart_Adaptivity=
 FR-Designer_Tip_Chart_Adaptivity_Unavailable=
 FR-Designer_Official_Website=
 FR-Designer_Support_Email=
+FR-Designer_Tip_Chart_Adaptivity_Unavailable_In_Absolute_Layout=

designer_base/src/com/fr/design/locale/designer_ko_KR.properties

@@ -2182,3 +2182,4 @@ FR-Designer_Chart_Adaptivity=
 FR-Designer_Tip_Chart_Adaptivity_Unavailable=
 FR-Designer_Official_Website=
 FR-Designer_Support_Email=
+FR-Designer_Tip_Chart_Adaptivity_Unavailable_In_Absolute_Layout=

designer_base/src/com/fr/design/locale/designer_zh_CN.properties

@@ -2181,6 +2181,7 @@ FR-Designer_Joption_News=\u6D88\u606F
 FR-Designer_Zoom_In_Logic=\u653E\u5927\u903B\u8F91
 FR-Designer_Zoom_Out_Logic=\u7F29\u5C0F\u903B\u8F91
 FR-Designer_Chart_Adaptivity=\u56FE\u8868\u81EA\u9002\u5E94
-FR-Designer_Tip_Chart_Adaptivity_Unavailable=\u63D0\u793A\uFF1Abody\u672A\u52FE\u9009\u624B\u673A\u91CD\u5E03\u5C40\u72B6\u6001\u4E0B\uFF0C\u4E0D\u652F\u6301\u56FE\u8868\u81EA\u9002\u5E94
+FR-Designer_Tip_Chart_Adaptivity_Unavailable=\u4FDD\u7559\u5E03\u5C40\u72B6\u6001\u4E0B\uFF0C\u56FE\u8868\u4E0D\u652F\u6301\u8BBE\u7F6E\u81EA\u9002\u5E94
 FR-Designer_Official_Website=\u5B98\u65B9\u7F51\u7AD9\uFF1A
 FR-Designer_Support_Email=\u652F\u6301\u90AE\u7BB1\uFF1A
+FR-Designer_Tip_Chart_Adaptivity_Unavailable_In_Absolute_Layout=\u7EDD\u5BF9\u753B\u5E03\u5757\u72B6\u6001\u4E0B\uFF0C\u56FE\u8868\u4E0D\u652F\u6301\u8BBE\u7F6E\u81EA\u9002\u5E94

designer_base/src/com/fr/design/locale/designer_zh_TW.properties

@@ -2180,6 +2180,7 @@ FR-Designer_Joption_News=\u6D88\u606F
 FR-Designer_Zoom_In_Logic=\u653E\u5927\u908F\u8F2F
 FR-Designer_Zoom_Out_Logic=\u7E2E\u5C0F\u908F\u8F2F
 FR-Designer_Chart_Adaptivity=\u5716\u8868\u81EA\u6211\u8ABF\u6574
-FR-Designer_Tip_Chart_Adaptivity_Unavailable=\u63D0\u793A\uFF1Abody\u672A\u52FE\u9078\u624B\u6A5F\u91CD\u4F48\u5C40\u72C0\u614B\u4E0B\uFF0C\u4E0D\u652F\u6301\u5716\u8868\u81EA\u6211\u8ABF\u6574
+FR-Designer_Tip_Chart_Adaptivity_Unavailable=\u4FDD\u7559\u4F48\u5C40\u72C0\u614B\u4E0B\uFF0C\u5716\u8868\u4E0D\u652F\u6301\u8A2D\u5B9A\u81EA\u6211\u8ABF\u6574
 FR-Designer_Official_Website=\u5B98\u65B9\u7DB2\u7AD9\uFF1A
 FR-Designer_Support_Email=\u652F\u6301\u90F5\u7BB1\uFF1A
+FR-Designer_Tip_Chart_Adaptivity_Unavailable_In_Absolute_Layout=\u7D55\u5C0D\u756B\u5E03\u584A\u72C0\u614B\u4E0B\uFF0C\u5716\u8868\u4E0D\u652F\u6301\u8A2D\u5B9A\u81EA\u6211\u8ABF\u6574

designer_form/src/com/fr/design/widget/ui/designer/mobile/ChartEditorDefinePane.java

@@ -5,6 +5,8 @@ import com.fr.base.mobile.ChartMobileFitAttrState;
 import com.fr.base.mobile.ChartMobileFitAttrStateProvider;
 import com.fr.design.constants.LayoutConstants;
 import com.fr.design.designer.creator.XCreator;
+import com.fr.design.designer.creator.XWAbsoluteBodyLayout;
+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;
@@ -53,19 +55,38 @@ public class ChartEditorDefinePane extends MobileWidgetDefinePane{
     public void initPropertyGroups(Object source) {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         this.designer = WidgetPropertyPane.getInstance().getEditingFormDesigner();
-        this.add(isAppRelayout() ? getMobileSettingsPane() : getUnavailableTipPane(), BorderLayout.NORTH);
+        JPanel mobileSettingsPane;
+        if (isInAbsoluteLayout()) {
+            mobileSettingsPane = getUnavailableTipPane(Inter.getLocText("FR-Designer_Tip_Chart_Adaptivity_Unavailable_In_Absolute_Layout"));
+        } else if (!isAppRelayout()) {
+            mobileSettingsPane = getUnavailableTipPane(Inter.getLocText("FR-Designer_Tip_Chart_Adaptivity_Unavailable"));
+        } else {
+            mobileSettingsPane = getMobileSettingsPane();
+        }
+        this.add(mobileSettingsPane, BorderLayout.NORTH);
         this.repaint();
     }
 
+    private boolean isInAbsoluteLayout() {
+        Container parent = xCreator.getParent();
+        while (parent != null) {
+            if (parent instanceof XWAbsoluteLayout && !(parent instanceof XWAbsoluteBodyLayout)) {
+                return true;
+            }
+            parent = parent.getParent();
+        }
+        return false;
+    }
+
     // body是否开启手机重布局
     private boolean isAppRelayout() {
         return ((WFitLayout)designer.getRootComponent().toData()).isAppRelayout();
     }
 
-    private JPanel getUnavailableTipPane() {
+    private JPanel getUnavailableTipPane(String tipText) {
         JPanel panel = new JPanel(new BorderLayout());
         UILabel unavailableTipLabel = new UILabel();
-        unavailableTipLabel.setText("<html>" + Inter.getLocText("FR-Designer_Tip_Chart_Adaptivity_Unavailable") + "<html>");
+        unavailableTipLabel.setText("<html>" + tipText + "<html>");
         unavailableTipLabel.setForeground(Color.gray);
         panel.add(unavailableTipLabel, BorderLayout.NORTH);
         return panel;
@@ -129,7 +150,7 @@ public class ChartEditorDefinePane extends MobileWidgetDefinePane{
     public void populate(FormDesigner designer) {
         this.designer = designer;
 
-        if (!isAppRelayout()) {
+        if (!isAppRelayout() || isInAbsoluteLayout()) {
             return;
         }