Merge remote-tracking branch 'origin/feature/x' into feature/x

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

@@ -22,6 +22,7 @@ import com.fr.file.ConnectionConfig;
 import com.fr.file.ConnectionOperator;
 import com.fr.general.NameObject;
 import com.fr.log.FineLoggerFactory;
+import com.fr.regist.FRCoreContext;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.Nameable;
 import com.fr.stable.StringUtils;
@@ -118,17 +119,25 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
      * @return 菜单项
      */
     public NameableCreator[] createNameableCreators() {
-        NameableCreator[] creators = new NameableCreator[]{new NameObjectCreator(
+        NameObjectCreator jdbc = new NameObjectCreator(
                 "JDBC",
                 "/com/fr/design/images/data/source/jdbcTableData.png",
                 JDBCDatabaseConnection.class,
                 DatabaseConnectionPane.JDBC.class
-        ), new NameObjectCreator(
+        );
+        NameObjectCreator jndi = new NameObjectCreator(
                 "JNDI",
                 "/com/fr/design/images/data/source/jdbcTableData.png",
                 JNDIDatabaseConnection.class,
                 DatabaseConnectionPane.JNDI.class
-        )};
+        );
+        NameableCreator[] creators;
+        if (FRCoreContext.getLicense().limitDatabaseType()) {
+            // 不支持JDNI，屏蔽接口
+            creators = new NameableCreator[]{jdbc};
+        } else {
+            creators = new NameableCreator[]{jdbc, jndi};
+        }
         Set<ConnectionProvider> pluginCreators = ExtraDesignClassManager.getInstance().getArray(ConnectionProvider.XML_TAG);
         for (ConnectionProvider provider : pluginCreators) {
             NameObjectCreator creator = new NameObjectCreator(