Browse Source

Pull request #14906: REPORT-135703 【fr-fbp回归】linux设计器,下拉树-构建树按钮点不开

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

* commit '8225ac7de73ac2141c24717783c129d976875505':
  REPORT-135703 【fr-fbp回归】linux设计器,下拉树-构建树按钮点不开
fbp/release
Destiny.Lin-林锦龙 2 months ago
parent
commit
e77125f8c3
  1. 4
      designer-base/src/main/java/com/fr/design/data/datapane/TreeTableDataComboBox.java

4
designer-base/src/main/java/com/fr/design/data/datapane/TreeTableDataComboBox.java

@ -13,7 +13,6 @@ import com.fr.design.data.tabledata.wrapper.TableDataWrapper;
import com.fr.design.data.tabledata.wrapper.TemplateTableDataWrapper; import com.fr.design.data.tabledata.wrapper.TemplateTableDataWrapper;
import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icombobox.UIComboBox;
import com.fr.design.gui.icombobox.UIComboBoxRenderer; import com.fr.design.gui.icombobox.UIComboBoxRenderer;
import com.fr.security.encryption.transmission.TransmissionEncryptionManager;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
import com.fr.workspace.server.repository.connection.ConnectionRepository; import com.fr.workspace.server.repository.connection.ConnectionRepository;
import com.fr.workspace.server.repository.tabledata.TableDataRepository; import com.fr.workspace.server.repository.tabledata.TableDataRepository;
@ -73,14 +72,11 @@ public class TreeTableDataComboBox extends UIComboBox {
Map<String, TableData> map = new HashMap<>(); Map<String, TableData> map = new HashMap<>();
final Map<String, Connection> connectionMap = ConnectionInfoBeanHelper.createConnectionMap(ConnectionRepository.getInstance().getAll()); final Map<String, Connection> connectionMap = ConnectionInfoBeanHelper.createConnectionMap(ConnectionRepository.getInstance().getAll());
try { try {
TransmissionEncryptionManager.setTransEncryptionLevel(1);
for (ServerDataSetBean bean : beans) { for (ServerDataSetBean bean : beans) {
map.put(bean.getDatasetName() , TableDataBeanHelper.getTableDataSet(connectionMap, bean.getDatasetType(), bean.getDatasetData())); map.put(bean.getDatasetName() , TableDataBeanHelper.getTableDataSet(connectionMap, bean.getDatasetType(), bean.getDatasetData()));
} }
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} finally {
TransmissionEncryptionManager.removeTransEncryptionLevel();
} }
for (Map.Entry<String, TableData> entry : map.entrySet()) { for (Map.Entry<String, TableData> entry : map.entrySet()) {
TableData tableData = entry.getValue(); TableData tableData = entry.getValue();

Loading…
Cancel
Save