Merge pull request #9386 in DESIGN/design from bugfix/11.0 to feature/x

* commit 'a169bff2e982b75c99b3178c02acd231e5f6fd70':
  REPORT-74603 嵌入式数据库的限制访问
  REPORT-74664 重新打开新模式模板按钮显示老模式

designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java

@@ -1,5 +1,6 @@
 package com.fr.design.data.datapane.connect;
 
+import com.fr.base.TemplateUtils;
 import com.fr.config.RemoteConfigEvent;
 import com.fr.data.core.db.JDBCSecurityChecker;
 import com.fr.data.impl.Connection;
@@ -201,7 +202,7 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
             Connection connection = connectionBean.getConnection();
             if (connection instanceof JDBCDatabaseConnection) {
                 try {
-                    JDBCSecurityChecker.checkURL(((JDBCDatabaseConnection) connection).getURL());
+                    JDBCSecurityChecker.checkURL(TemplateUtils.render(((JDBCDatabaseConnection) connection).getURL()));
                     JDBCSecurityChecker.checkValidationQuery(((JDBCDatabaseConnection) connection).getDbcpAttr().getValidationQuery());
                 } catch (SQLException e) {
                     throw new SQLException(Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Invalid_Config", connectionBean.getName()) + ", " + e.getMessage(), e.getCause());

designer-form/src/main/java/com/fr/design/fit/NewJForm.java

@@ -55,7 +55,7 @@ public class NewJForm extends JForm {
     public NewJForm(Form form) {
         super(form);
         //新建的模板都要加上新表单标志attr
-        form.addAttrMark(NewFormMarkAttr.createNewFormAttr());
+        getTarget().addAttrMark(NewFormMarkAttr.createNewFormAttr());
         init();
     }