diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java
index f836757399..87b1c404f3 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java
@@ -21,8 +21,8 @@ import com.fr.event.EventDispatcher;
 import com.fr.file.ConnectionConfig;
 import com.fr.file.ConnectionOperator;
 import com.fr.general.NameObject;
-import com.fr.license.database.BaseDataBaseTypePoint;
 import com.fr.license.database.DBTypes;
+import com.fr.license.database.DataBaseTypePointManager;
 import com.fr.license.exception.DataBaseNotSupportedException;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ArrayUtils;
@@ -279,8 +279,7 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
                 Connection connection = bean.getConnection();
                 // 仅校验jdbc连接，其他插件数据连接不进行校验
                 if (connection instanceof JDBCDatabaseConnection) {
-                    BaseDataBaseTypePoint dataBaseTypePoint = BaseDataBaseTypePoint.getDataBaseTypePoint(connection.getDriver(), connection.feature());
-
+                    DBTypes dataBaseTypePoint = DataBaseTypePointManager.getInstance().getDataBaseTypePoint(connection.getDriver(), connection.feature());
                     if (connectionIsNotSupported(connection, dataBaseTypePoint)) {
                         notSupportedConnections.addAll(dataBaseTypePoint.getDataBaseType());
                     }
@@ -296,9 +295,9 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
     /**
      * 校验当前数据连接是否被限制
      */
-    private static boolean connectionIsNotSupported(Connection connection, BaseDataBaseTypePoint dataBaseTypePoint) {
+    private static boolean connectionIsNotSupported(Connection connection, DBTypes dataBaseTypePoint) {
         return !validateFRDemo(connection.getDriver(), connection.feature()) &&
-                (dataBaseTypePoint != null && !supportedDatabaseTypes.containsAll(dataBaseTypePoint.getDatabaseType()));
+                (dataBaseTypePoint != null && !supportedDatabaseTypes.containsAll(dataBaseTypePoint.getDataBaseType()));
     }
 
     /**
diff --git a/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java b/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java
index 646f0e517a..b506dd81c3 100644
--- a/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java
+++ b/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java
@@ -24,6 +24,7 @@ import com.fr.design.utils.gui.GUIPaintUtils;
 import com.fr.design.worker.WorkerManager;
 import com.fr.design.worker.save.CallbackSaveWorker;
 import com.fr.file.FILE;
+import com.fr.file.FileNodeFILE;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.IOUtils;
 import com.fr.log.FineLoggerFactory;
@@ -282,7 +283,8 @@ public class MultiTemplateTabPane extends JComponent {
         private void locateTemplate(JTemplate<?, ?> template) {
             FILE currentTemplate = template.getEditingFILE();
             //模板不属于当前环境，跟预览一样先提示保存，再定位模板
-            if (!currentTemplate.exists()) {
+            //如果是拖拽进来的模板单单用exist不能判断，这边参考预览的判断逻辑（browserTemplate），补充一下
+            if (!currentTemplate.exists() || !(currentTemplate instanceof FileNodeFILE)) {
                 int selVal = showConfirmDialog(
                         DesignerContext.getDesignerFrame(),
                         Toolkit.i18nText("Fine-Design_Basic_Web_Preview_Message"),