Browse Source

Pull request #7366: REPORT-65087 共享数据集兼容性问题

Merge in DESIGN/design from ~RINOUX/design:feature/x to feature/x

* commit '1a4503a242ca89a06448b5aa73aaa12bf8c163f0':
  REPORT-65087 共享数据集兼容性问题
feature/x
rinoux 3 years ago
parent
commit
1513be3955
  1. 4
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java

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

@ -715,8 +715,8 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
if (useGlobal(getTableData(), strategyConfig)) { if (useGlobal(getTableData(), strategyConfig)) {
//使用全局配置 //使用全局配置
strategyConfig = StrategyConfigHelper.createStrategyConfig(true); strategyConfig = StrategyConfigHelper.createStrategyConfig(true);
} else if (getTableData().isShare()) { } else if (strategyConfig == null && getTableData().isShare()) {
//使用共享数据集兼容配置 //没有配置时,使用共享数据集兼容配置
strategyConfig = StrategyConfigHelper.createStrategyConfig(true, false, true); strategyConfig = StrategyConfigHelper.createStrategyConfig(true, false, true);
} }
} }

Loading…
Cancel
Save