Browse Source

Pull request #14738: REPORT-130733 【FBP数据源】fbp设计器新建数据连接,选择不到手动上传的驱动

Merge in DESIGN/design from ~DESTINY.LIN/design:fbp/release to fbp/release

* commit '4d8ae306114d7acccd8e4faed225ba1aa13a962c':
  REPORT-130733 【FBP数据源】fbp设计器新建数据连接,选择不到手动上传的驱动
fbp/merge
Destiny.Lin-林锦龙 5 months ago
parent
commit
bf6cd607bb
  1. 10
      designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java

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

@ -22,11 +22,13 @@ import com.fr.design.utils.BrowseUtils;
import com.fr.file.filter.ChooseFileFilter; import com.fr.file.filter.ChooseFileFilter;
import com.fr.general.CloudCenter; import com.fr.general.CloudCenter;
import com.fr.general.ComparatorUtils; import com.fr.general.ComparatorUtils;
import com.fr.log.FineLoggerFactory;
import com.fr.stable.ArrayUtils; import com.fr.stable.ArrayUtils;
import com.fr.stable.EncodeConstants; import com.fr.stable.EncodeConstants;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
import com.fr.third.guava.collect.HashBiMap; import com.fr.third.guava.collect.HashBiMap;
import com.fr.workspace.WorkContext; import com.fr.workspace.WorkContext;
import com.fr.workspace.server.repository.connection.ConnectionRepository;
import javax.swing.JFileChooser; import javax.swing.JFileChooser;
import javax.swing.JPanel; import javax.swing.JPanel;
@ -331,7 +333,13 @@ public class JDBCDefPane extends JPanel {
} }
private void initMap() { private void initMap() {
Map<String, DriverLoader> driverLoaders = DriverLoaderConfig.getInstance().getDriverLoaders(); Map<String, DriverLoader> driverLoaders = null;
try {
driverLoaders = ConnectionRepository.getInstance().getDriverLoaders();
} catch (Exception e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
driverLoaders = new HashMap<>();
}
nameAndRepresent = getDriverLoaderAndRepresent(driverLoaders); nameAndRepresent = getDriverLoaderAndRepresent(driverLoaders);
} }

Loading…
Cancel
Save