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

* commit 'a8c9fe698d37f37978b1797f121eb966548d4305':
  REPORT-66254 【组件商城风格优化】打开商城窗口到商城内容显示出来，期间大概有5秒空白状态，需要优化下
  代码修改
  REPORT-66808  && REPORT-66811 【新老自适应配置面板修改】老模式-PC端自适应属性的“报表”选择默认时，报表块右侧设置面板预期是有个“已选择默认balabala”提示文字的，现在么有；【新老自适应配置面板修改】老模式-交互文档里设计的绝对布局下，“报表缩放设置”可选“双向自适应”“不自适应”，现在的效果是“固定大小”“适应区域”

designer-base/src/main/java/com/fr/design/report/fit/FormFitAttrModelType.java

@@ -27,8 +27,8 @@ public enum FormFitAttrModelType {
         @Override
         public Item[] getAbsoluteLayoutSaleAttr() {
             return new Item[]{
-                    new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Scaling_Mode_Fit"), WAbsoluteLayout.STATE_FIT),
-                    new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Scaling_Mode_Fixed"), WAbsoluteLayout.STATE_FIXED)
+                    new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Attr_Bidirectional_Adaptive"), WAbsoluteLayout.STATE_FIT),
+                    new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-No"), WAbsoluteLayout.STATE_FIXED)
             };
         }
 

designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/mini/MiniComponentShopDialog.java

@@ -67,8 +67,7 @@ public class MiniComponentShopDialog {
                 for (WindowListener listener: windowListeners) {
                     listener.windowClosed(e);
                 }
-                getInstance().frame = null;
-                shopPane.dispose();
+                shopPane.reload();
             }
 
             @Override

designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/mini/MiniComponentShopPane.java

@@ -59,13 +59,13 @@ public class MiniComponentShopPane extends JPanel {
         loginListener = new Listener<String>() {
             @Override
             public void on(Event event, String param) {
-                modernUIPane.redirect(OnlineShopUtils.getWebMiniShopPath());
+                reload();
             }
         };
         logoutListener = new Listener<String>() {
             @Override
             public void on(Event event, String param) {
-                modernUIPane.redirect(OnlineShopUtils.getWebMiniShopPath());
+                reload();
             }
         };
 
@@ -78,4 +78,8 @@ public class MiniComponentShopPane extends JPanel {
         EventDispatcher.stopListen(loginListener);
         EventDispatcher.stopListen(logoutListener);
     }
+
+    public void reload() {
+        modernUIPane.redirect(OnlineShopUtils.getWebMiniShopPath());
+    }
 }

designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/ElementEditorDefinePane.java

@@ -7,22 +7,28 @@ import com.fr.design.designer.IntervalConstants;
 import com.fr.design.designer.creator.*;
 import com.fr.design.fit.common.TemplateTool;
 import com.fr.design.fit.attrpane.PcFitExpandablePane;
+import com.fr.design.gui.ilable.UIAutoChangeLineLabel;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.style.FollowingThemePane;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.mainframe.WidgetPropertyPane;
 import com.fr.design.mainframe.widget.accessibles.AccessibleElementCaseToolBarEditor;
 import com.fr.design.widget.ui.designer.component.PaddingBoundPane;
 import com.fr.form.ui.ElementCaseEditor;
 import com.fr.form.ui.PaddingMargin;
 import com.fr.form.web.FormToolBarManager;
 import com.fr.general.ComparatorUtils;
+import com.fr.report.fit.FitProvider;
 import com.fr.report.fit.ReportFitAttr;
+import com.fr.report.fit.ReportFitConfig;
 
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import java.awt.BorderLayout;
+import java.awt.Color;
 import java.awt.Component;
 import java.util.ArrayList;
 import java.util.List;
@@ -78,11 +84,23 @@ public class ElementEditorDefinePane extends WTitleLayoutDefinePane<ElementCaseE
         pcFitExpandablePane = new PcFitExpandablePane(this);
         if (TemplateTool.isCurrentEditingNewJForm()) {
             centerPane.add(pcFitExpandablePane, BorderLayout.SOUTH);
+        } else if (isGlobalReportFitBrowser()) {
+            UIAutoChangeLineLabel tip = new UIAutoChangeLineLabel(Toolkit.i18nText("Fine-Design_EC_Default_Fit_Config_Tip"), 216);
+            tip.setForeground(Color.lightGray);
+            centerPane.add(tip, BorderLayout.SOUTH);
         }
-
         return centerPane;
     }
 
+    private boolean isGlobalReportFitBrowser() {
+        FitProvider fitProvider = WidgetPropertyPane.getInstance().getEditingFormDesigner().getTarget();
+        ReportFitAttr fitAttr = fitProvider.getReportFitAttr();
+        if (fitAttr == null) {
+            fitAttr = ReportFitConfig.getInstance().getFrmFitAttr();
+        }
+        return fitAttr.fitStateInPC() == 0;
+    }
+
     private CRPropertyDescriptor[] removeOldFitEditor(CRPropertyDescriptor[] extraTableEditor) {
         if (!TemplateTool.isCurrentEditingNewJForm()) {
             return extraTableEditor;