Pull request #14266: REPORT-114392 FR-FBP版本本地设计适配

Merge in DESIGN/design from ~DESTINY.LIN/design:mss/2.0 to mss/2.0

* commit '7868f27a79e13a6b83d9db0dd70090e298f96128':
  REPORT-114392 FR-FBP版本本地设计适配 去除模板主题中的frm选项
  REPORT-114392 FR-FBP版本本地设计适配 修复数据连接预览

designer-base/src/main/java/com/fr/design/data/datapane/preview/ConnectionInfoBeanHelper.java

@@ -5,6 +5,7 @@ import com.fr.data.auth.kerberos.KerberosAuthentication;
 import com.fr.data.auth.kerberos.KerberosUtils;
 import com.fr.data.impl.Connection;
 import com.fr.data.impl.JDBCDatabaseConnection;
+import com.fr.data.impl.NameDatabaseConnection;
 import com.fr.data.pool.DBCPConnectionPoolAttr;
 import com.fr.data.security.ssh.BaseSsh;
 import com.fr.data.security.ssh.SshType;
@@ -36,6 +37,10 @@ public class ConnectionInfoBeanHelper {
      * 创建数据连接Bean，可自定义是否携带密码
      */
     public static ConnectionInfoBean createConnectionInfoBean(String name, Connection connection, boolean withPassword) throws Exception {
+        if (connection instanceof NameDatabaseConnection) {
+            name = ((NameDatabaseConnection) connection).getName();
+            connection = ((NameDatabaseConnection) connection).createDatabase();
+        }
         if (JDBCConnectionProcessor.KEY.acceptConnections().contains(connection.getClass())) {
             ConnectionInfoBean bean = new ConnectionInfoBean();
             bean.setConnectionData(objectMapper.writeValueAsString(convertToJDBCConnectionBean(connection, withPassword)));

designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeGridPagesPane.java

@@ -284,28 +284,24 @@ public class TemplateThemeGridPagesPane extends JPanel {
             tabbedPane = new UITabbedPane();
             tabbedPane.setTabBorderColor(new Color(0xE0E0E1));
             add(tabbedPane, BorderLayout.CENTER);
-
-            TemplateThemeGridControlPane<FormTheme> formThemesManagerPane = TemplateThemeGridControlPane.createFormThemesManagerPane(window);
+            /// 去除frm
+            //TemplateThemeGridControlPane<FormTheme> formThemesManagerPane = TemplateThemeGridControlPane.createFormThemesManagerPane(window);
             TemplateThemeGridControlPane<ReportTheme> reportThemesManagerPane = TemplateThemeGridControlPane.createReportThemesManagerPane(window);
-
-            tabbedPane.addTab(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Manager_Dialog_Form_Tab"), formThemesManagerPane);
+            /// 去除frm
+            //tabbedPane.addTab(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Manager_Dialog_Form_Tab"), formThemesManagerPane);
             tabbedPane.addTab(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Manager_Dialog_Report_Tab"), reportThemesManagerPane);
 
             tabbedPane.setSelectedIndex(0);
             JTemplate<?,?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
             TemplateThemeConfig<? extends TemplateTheme> config = template.getUsingTemplateThemeConfig();
             if (config == reportThemesManagerPane.getConfig()) {
-                tabbedPane.setSelectedIndex(1);
+                tabbedPane.setSelectedIndex(0);
             }
         }
 
         @Override
         public TemplateThemeConfig<? extends TemplateTheme> getConfig() {
-            if (tabbedPane.getSelectedIndex() == 0) {
-                return FormThemeConfig.getInstance();
-            } else {
-                return ReportThemeConfig.getInstance();
-            }
+            return ReportThemeConfig.getInstance();
         }
 
         @Override