Merge pull request #6413 in DESIGN/design from final/11.0 to persist/11.0

* commit '6f5a51bc44fc36968f092942ef5aa29f16997874':
  REPORT-58836 自定义导出二期-revert
  REPORT-61682【固定布局-原布局推荐4.1】决策报表-自适应布局-布局id有几个重复了
  REPORT-61669：新建报表引擎界面默认选择新计算引擎选项
  REPORT-61642 导出-导出事件-其他模板-参数设置默认值错误
  REPORT-61521 主题下载引导页加载异常

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

@@ -95,7 +95,7 @@ public class OnlineWidgetRepoPane extends BasicPane {
         setContent();
     }
 
-    private void setContent() {
+    public void setContent() {
         if (sharableWidgets != null) {
             initContentPane();
             addCenterPane();
@@ -144,14 +144,25 @@ public class OnlineWidgetRepoPane extends BasicPane {
     private boolean initContentPane() {
         boolean loadWidgetsSuccess = loadWidgets();
         if (loadWidgetsSuccess) {
+            if (componentTabPane != null) {
+                componentTabPane.removeTabChangeListener(tabChangeListener);
+            }
             this.componentTabPane = new OnlineWidgetTabPane(sharableWidgets[0].toArray(new OnlineShareWidget[sharableWidgets[0].size()]),
                     sharableWidgets[1].toArray(new OnlineShareWidget[sharableWidgets[1].size()]));
+            this.componentTabPane.addTabChangeListener(tabChangeListener);
         } else {
             switchPane(Status.DISCONNECTED);
         }
         return loadWidgetsSuccess;
     }
 
+    private OnlineWidgetTabPane.TabChangeListener tabChangeListener = new OnlineWidgetTabPane.TabChangeListener() {
+        @Override
+        public void tabChange(int selectedIndex) {
+            setShowPackagePanel(selectedIndex != 0);
+        }
+    };
+
     private void reload() {
         this.removeAll();
         sharableWidgets = null;

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

@@ -10,6 +10,9 @@ import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
+import java.util.ArrayList;
+import java.util.EventListener;
+import java.util.List;
 
 /**
  * Created by kerry on 2020-10-19
@@ -20,8 +23,10 @@ public class OnlineWidgetTabPane extends JPanel {
     private CardLayout cardLayout;
     private JPanel centerPane;
     private boolean packagePaneCreated = false;
+    private List<TabChangeListener> tabChangeListeners;
 
     public OnlineWidgetTabPane(OnlineShareWidget[] sharableWidgets, OnlineShareWidget[] sharableWidgetPackage) {
+        tabChangeListeners = new ArrayList<>();
         initPane(sharableWidgets, sharableWidgetPackage);
     }
 
@@ -33,7 +38,9 @@ public class OnlineWidgetTabPane extends JPanel {
         //延迟组件包面板的初始化，防止组件面板里组件的缩略图和组件包面板里组件的缩略图一起加载
         UITabGroup headGroup = new UITabGroup(new String[]{COMPONENT, COMPONENT_PACKAGE}) {
             public void tabChanged(int newSelectedIndex) {
-                OnlineWidgetRepoPane.getInstance().setShowPackagePanel(newSelectedIndex != 0);
+                for (TabChangeListener changeListener : tabChangeListeners) {
+                    changeListener.tabChange(newSelectedIndex);
+                }
                 if (newSelectedIndex == 0) {
                     cardLayout.show(centerPane, COMPONENT);
                 } else {
@@ -45,6 +52,7 @@ public class OnlineWidgetTabPane extends JPanel {
                     }
                     cardLayout.show(centerPane, COMPONENT_PACKAGE);
                 }
+
             }
         };
         headGroup.setSelectedIndex(0);
@@ -55,4 +63,18 @@ public class OnlineWidgetTabPane extends JPanel {
         this.add(jPanel, BorderLayout.NORTH);
         this.add(centerPane, BorderLayout.CENTER);
     }
+
+    public void addTabChangeListener(TabChangeListener listener) {
+        if (!tabChangeListeners.contains(listener)) {
+            tabChangeListeners.add(listener);
+        }
+    }
+
+    public void removeTabChangeListener(TabChangeListener listener) {
+        tabChangeListeners.remove(listener);
+    }
+
+    public interface TabChangeListener extends EventListener {
+        void tabChange(int selectedIndex);
+    }
 }

designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/5.frm

@@ -129,7 +129,7 @@
 </WatermarkAttr>
 </WatermarkAttr>
 <TemplateLayoutIdAttrMark class="com.fr.base.iofile.attr.TemplateLayoutIdAttrMark">
-<TemplateLayoutIdAttrMark LayoutId="fcbeb8e9-e709-45cc-8826-36b519776098"/>
+<TemplateLayoutIdAttrMark LayoutId="37411f22-0083-4508-aec2-ee0cdd4c47b1"/>
 </TemplateLayoutIdAttrMark>
 <TemplateIdAttMark class="com.fr.base.iofile.attr.TemplateIdAttrMark">
 <TemplateIdAttMark TemplateId="1b495536-b042-45db-a6be-768b472fe7b5"/>

designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/6.frm

@@ -129,7 +129,7 @@
 </WatermarkAttr>
 </WatermarkAttr>
 <TemplateLayoutIdAttrMark class="com.fr.base.iofile.attr.TemplateLayoutIdAttrMark">
-<TemplateLayoutIdAttrMark LayoutId="fcbeb8e9-e709-45cc-8826-36b519776098"/>
+<TemplateLayoutIdAttrMark LayoutId="70dae42a-09f9-404e-a5fc-b94acee03d0c"/>
 </TemplateLayoutIdAttrMark>
 <TemplateIdAttMark class="com.fr.base.iofile.attr.TemplateIdAttrMark">
 <TemplateIdAttMark TemplateId="13b65e55-e7da-43b2-b0e4-3521d500829a"/>

designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/2.frm

@@ -138,7 +138,7 @@
 </WatermarkAttr>
 </WatermarkAttr>
 <TemplateLayoutIdAttrMark class="com.fr.base.iofile.attr.TemplateLayoutIdAttrMark">
-<TemplateLayoutIdAttrMark LayoutId="fcbeb8e9-e709-45cc-8826-36b519776098"/>
+<TemplateLayoutIdAttrMark LayoutId="436c01cc-a271-4cf0-9610-956a405771fd"/>
 </TemplateLayoutIdAttrMark>
 <TemplateIdAttMark class="com.fr.base.iofile.attr.TemplateIdAttrMark">
 <TemplateIdAttMark TemplateId="75a803de-4022-4a58-953a-3db28c1a7aeb"/>

designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/theme/DownloadComponentPackageGuide.java

@@ -102,6 +102,7 @@ public class DownloadComponentPackageGuide {
                             EastRegionContainerPane.getInstance().showContainer();
                             EastRegionContainerPane.getInstance().switchTabTo(EastRegionContainerPane.KEY_WIDGET_SETTINGS);
                             OnlineWidgetRepoPane onlineWidgetRepoPane = OnlineWidgetRepoPane.getInstance();
+                            onlineWidgetRepoPane.setContent();
                             OnlineWidgetTabPane tabPane = (OnlineWidgetTabPane) ComponentUtils.findComponentByClass(onlineWidgetRepoPane, OnlineWidgetTabPane.class);
                             UITabGroup tabGroup = (UITabGroup) ComponentUtils.findComponentByClass(tabPane, UITabGroup.class);
                             JPanel centerPane = (JPanel) tabPane.getComponent(1);

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

@@ -107,7 +107,7 @@ public class ReportEnginePane extends BasicBeanPane<LayerReportAttr> {
         engineSettingPane.add(outEngineXSettingPane, JLayeredPane.DEFAULT_LAYER);
         engineSettingPane.add(outLineEngineSettingPane, JLayeredPane.DEFAULT_LAYER);
         engineSettingPane.moveToFront(outEngineXSettingPane);
-        engineSettingPane.setVisible(false);
+        engineSettingPane.setVisible(true);
         JPanel pagingEngineSelectPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_M_Pane();
         pagingEngineSelectPane.add(createPagingEngineRadioPanel());
         pagingEngineSelectPane.add(engineSettingPane);
@@ -197,7 +197,7 @@ public class ReportEnginePane extends BasicBeanPane<LayerReportAttr> {
     }
 
     private JPanel createPagingEngineRadioPanel(){
-        UIRadioButton newEngine = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_New_Engine"), false);
+        UIRadioButton newEngine = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_New_Engine"), true);
         UIRadioButton lineEngine = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Line_Engine"), false);
         ButtonGroup buttonGroup = new ButtonGroup();
         buttonGroup.add(newEngine);