Browse Source

Pull request #5822: REPORT-58984 服务器数据集兼容共享数据集

Merge in DESIGN/design from ~RINOUX/design:release/11.0 to release/11.0

* commit '08c75b39820ccbd86e586d2dba5ba5d1291168ba':
  REPORT-58984 服务器数据集兼容共享数据集
bugfix/11.0
rinoux 3 years ago
parent
commit
7abfea7113
  1. 10
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java

10
designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java

@ -647,10 +647,12 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
public StrategyConfig find() { public StrategyConfig find() {
StrategyConfig strategyConfig = null; StrategyConfig strategyConfig = null;
if (getTableData() != null) { if (getTableData() != null) {
try { strategyConfig = getTableData().getStrategyConfig();
strategyConfig = getTableData().getStrategyConfig() == null ? null : getTableData().getStrategyConfig().clone(); if (strategyConfig == null) {
} catch (CloneNotSupportedException e) { //共享数据集
FineLoggerFactory.getLogger().error(e.getMessage(), e); if (getTableData().isShare()) {
strategyConfig = StrategyConfigHelper.createStrategyConfig(true, false, true);
}
} }
} }

Loading…
Cancel
Save