Browse Source

Pull request #11815: REPORT-83689 单元格为存储过程数据列的时候无法设置数据集排列

Merge in DESIGN/design from ~LEO.QIN/design:release/11.0 to release/11.0

* commit 'ddb6498516674b3e518459169ce85be49032bf80':
  REPORT-83689 单元格为存储过程数据列的时候无法设置数据集排列 【问题原因】设置数据集排列,获取当前模版所有数据集时,未考虑存储过程数据集,导致获取的tableDataWrapper为空 【改动思路】获取所有数据集时,包括存储过程。
release/11.0
Leo.Qin-覃宇攀 2 years ago
parent
commit
b4844bdf0f
  1. 5
      designer-realize/src/main/java/com/fr/design/sort/celldscolumn/CellDSColumnSortGroupPane.java

5
designer-realize/src/main/java/com/fr/design/sort/celldscolumn/CellDSColumnSortGroupPane.java

@ -8,6 +8,8 @@ import com.fr.design.sort.common.AbstractSortItemPane;
import com.fr.report.cell.cellattr.core.group.DSColumn; import com.fr.report.cell.cellattr.core.group.DSColumn;
import com.fr.report.core.sort.sortexpression.SortExpression; import com.fr.report.core.sort.sortexpression.SortExpression;
import java.util.Map;
public class CellDSColumnSortGroupPane extends AbstractSortGroupPane { public class CellDSColumnSortGroupPane extends AbstractSortGroupPane {
DSColumn dsColumn; DSColumn dsColumn;
@ -24,7 +26,8 @@ public class CellDSColumnSortGroupPane extends AbstractSortGroupPane {
CellDSColumnSortItemPane cellDSColumnSortItemPane = new CellDSColumnSortItemPane(sortItemPaneWidth, sortItemPaneRightWidth); CellDSColumnSortItemPane cellDSColumnSortItemPane = new CellDSColumnSortItemPane(sortItemPaneWidth, sortItemPaneRightWidth);
java.util.Map<String, TableDataWrapper> tableDataWrapperMap = java.util.Map<String, TableDataWrapper> tableDataWrapperMap =
DesignTableDataManager.getAllEditingDataSet(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getTarget()); DesignTableDataManager.getAllEditingDataSet(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getTarget());
TableDataWrapper tableDataWrapper = tableDataWrapperMap.get(dsColumn.getDSName()); Map<String, TableDataWrapper> allDataSetIncludingProcedure = DesignTableDataManager.getAllDataSetIncludingProcedure(tableDataWrapperMap);
TableDataWrapper tableDataWrapper = allDataSetIncludingProcedure.get(dsColumn.getDSName());
if (tableDataWrapper != null) { if (tableDataWrapper != null) {
java.util.List<String> columnNameList = tableDataWrapper.calculateColumnNameList(); java.util.List<String> columnNameList = tableDataWrapper.calculateColumnNameList();
String[] columnNames = new String[columnNameList.size()]; String[] columnNames = new String[columnNameList.size()];

Loading…
Cancel
Save