REPORT-130762 feat:JNDI数据连接提供禁用配置

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

@@ -99,7 +99,8 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
         @Override
         public void actionPerformed(ActionEvent evt) {
             if (mainPanel instanceof JNDIDefPane && SecurityConfig.getInstance().isDisableJNDI()) {
-                FineJOptionPane.showMessageDialog(mainPanel, Toolkit.i18nText("Fine-Design_Basic_Database_Connection_JNDI_Disabled"), Toolkit.i18nText("Fine-Design_Basic_Error"), JOptionPane.ERROR_MESSAGE);
+                FineJOptionPane.showMessageDialog(mainPanel, Toolkit.i18nText("Fine-Design_Basic_Database_Connection_JNDI_Disabled"),
+                        Toolkit.i18nText("Fine-Design_Basic_Error"), JOptionPane.ERROR_MESSAGE);
                 return;
             }
             // Try the java connection.
@@ -587,6 +588,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
                 public void mouseExited(MouseEvent e) {
                     driverTestTip.setCursor(Cursor.getDefaultCursor());
                 }
+
                 @Override
                 public void mouseClicked(MouseEvent e) {
                     try {

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

@@ -606,8 +606,8 @@ public class PreviewTablePane extends BasicPane {
      * @param connection
      */
     private void validateJndiDisabled(Connection connection) throws SecurityRestrictionException {
-        if (connection instanceof NameDatabaseConnection && ((NameDatabaseConnection) connection).getConnection() instanceof JNDIDatabaseConnection) {
         if (SecurityConfig.getInstance().isDisableJNDI()) {
+            if (connection instanceof NameDatabaseConnection && ((NameDatabaseConnection) connection).getConnection() instanceof JNDIDatabaseConnection) {
                 throw new SecurityRestrictionException(Toolkit.i18nText("Fine-Design_Basic_Database_Connection_JNDI_Disabled"));
             }
         }