Merge pull request #7663 in DESIGN/design from release/11.0 to feature/x

* commit '2f19a903135804527903c43976bff4ca80b29c0e':
  REPORT-65373 JDK11设计器-菜单栏-文件-选项弹窗边框被截断
  CHART-22545 设计器语言英语-甘特图-标签格式-控件宽度不一致
  REPORT-65976 final同步传一份
  代码修改
  REPORT-65976 复用组件-绝对布局拖入绝对画布块的组件，绝对画布块里的子组件没有随着绝对画布块的尺寸进行缩放，比绝对画布块小；拖入到占位块里是正常充满的
  Revert "REPORT-64445 新老自适应配置面板修改"
  REPORT-64445 新老自适应配置面板修改

designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java

@@ -108,7 +108,7 @@ public class PreferencePane extends BasicPane {
     private static final int CACHING_DEFAULT = 5;
     private static final int CACHING_GAP = 5;
     private static final int MEMORY_TIP_LABEL_MAX_WIDTH = 230;
-    private static final int OFFSET_HEIGHT = 50;
+    private static final int OFFSET_HEIGHT = 60;
 
     private static final String TYPE = "pressed";
     private static final String DISPLAY_TYPE = "+";

designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/tooltip/VanChartFormatComBoxWithCheckBox.java

@@ -53,7 +53,7 @@ public class VanChartFormatComBoxWithCheckBox extends JPanel {
 
             }
         });
-        formatComBox.setPreferredSize(new Dimension(40, 20));
+        formatComBox.setPreferredSize(new Dimension(55, 20));
 
         if (showSelectBox()) {
             this.add(isSelectedBox, BorderLayout.CENTER);

designer-form/src/main/java/com/fr/design/mainframe/share/ui/block/LocalWidgetBlock.java

@@ -250,6 +250,7 @@ public class LocalWidgetBlock extends PreviewWidgetBlock<DefaultSharableWidget>
             ShareUIUtils.showErrorMessageDialog(Toolkit.i18nText("Fine-Design_Share_Drag_Error_Info"));
             return null;
         }
+        compatibleProcessAbsoluteLayoutResolution(creatorSource);
         creatorSource.setWidgetID(UUID.randomUUID().toString());
         ((AbstractBorderStyleWidget) creatorSource).addWidgetAttrMark(new SharableAttrMark(true));
         //tab布局WCardMainBorderLayout通过反射出来的大小是960*480

designer-form/src/main/java/com/fr/design/mainframe/share/ui/block/OnlineWidgetBlock.java

@@ -194,6 +194,7 @@ public class OnlineWidgetBlock extends AbstractOnlineWidgetBlock {
                 ShareUIUtils.showErrorMessageDialog(Toolkit.i18nText("Fine-Design_Share_Drag_Error_Info"));
                 return;
             }
+            compatibleProcessAbsoluteLayoutResolution(creatorSource);
             creatorSource.setWidgetID(UUID.randomUUID().toString());
             ((AbstractBorderStyleWidget) creatorSource).addWidgetAttrMark(new SharableAttrMark(true));
             SharableWidgetProvider bindInfo = ShareUtils.getElCaseBindInfoById(shareId);

designer-form/src/main/java/com/fr/design/mainframe/share/ui/block/PreviewWidgetBlock.java

@@ -12,7 +12,12 @@ import com.fr.design.mainframe.share.collect.ComponentCollector;
 import com.fr.design.mainframe.share.ui.online.CarouselStateManger;
 import com.fr.design.mainframe.share.ui.online.embed.AnimatePopupDialog;
 import com.fr.design.mainframe.share.ui.online.embed.FirstDragAnimateStateManager;
+import com.fr.form.main.Form;
+import com.fr.form.main.WidgetGather;
 import com.fr.form.share.constants.ShareComponentConstants;
+import com.fr.form.ui.Widget;
+import com.fr.form.ui.container.WAbsoluteLayout;
+import com.fr.general.FRScreen;
 import com.fr.module.ModuleContext;
 import org.jetbrains.annotations.NotNull;
 import javax.swing.ImageIcon;
@@ -285,4 +290,18 @@ public abstract class PreviewWidgetBlock<T> extends JPanel implements MouseListe
     }
 
 
+    protected void compatibleProcessAbsoluteLayoutResolution(Widget widget) {
+        Form.traversalWidget(widget, new WidgetGather() {
+            @Override
+            public void dealWith(Widget widget) {
+                ((WAbsoluteLayout) widget).setDesigningResolution(FRScreen.p1440.getDimension());
+            }
+
+            @Override
+            public boolean dealWithAllCards() {
+                return true;
+            }
+        }, WAbsoluteLayout.class);
+    }
+
 }

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

@@ -2,7 +2,6 @@ package com.fr.design.report;
 
 import com.fr.base.theme.ReportTheme;
 import com.fr.base.theme.TemplateTheme;
-import com.fr.base.theme.settings.ThemedComponentStyle;
 import com.fr.base.theme.settings.ThemedReportBodyStyle;
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.dialog.BasicPane;
@@ -10,21 +9,19 @@ import com.fr.design.gui.frpane.AbstractAttrNoScrollPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.gui.style.ReportBackgroundSpecialPane;
 import com.fr.design.gui.style.FollowingThemePane;
+import com.fr.design.gui.style.ReportBackgroundSpecialPane;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.theme.ui.BorderUtils;
-import com.fr.form.ui.PaddingMargin;
 import com.fr.general.Background;
 import com.fr.page.ReportSettingsProvider;
 import com.fr.report.stable.ReportSettings;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
-import javax.swing.SwingConstants;
 import javax.swing.border.CompoundBorder;
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -168,7 +165,7 @@ public class NewReportBackgroundPane extends BasicPane {
             container.setBorder(BorderFactory.createEmptyBorder());
             JPanel titledPane =  FRGUIPaneFactory.createBorderLayout_S_Pane();
             titledPane.setBorder(new CompoundBorder(
-                    BorderUtils.createTitleBorder("预览", 12),
+                    BorderUtils.createTitleBorder(Toolkit.i18nText("Fine-Design_Basic_Preview"), 12),
                     BorderFactory.createEmptyBorder(5, 5, 4, 5)
             ));
             titledPane.setPreferredSize(new Dimension(377, 502));