|
|
@ -27,6 +27,7 @@ public class CellDSColumnSortGroupPane extends AbstractSortGroupPane { |
|
|
|
java.util.Map<String, TableDataWrapper> tableDataWrapperMap = |
|
|
|
java.util.Map<String, TableDataWrapper> tableDataWrapperMap = |
|
|
|
DesignTableDataManager.getAllEditingDataSet(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getTarget()); |
|
|
|
DesignTableDataManager.getAllEditingDataSet(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getTarget()); |
|
|
|
Map<String, TableDataWrapper> allDataSetIncludingProcedure = DesignTableDataManager.getAllDataSetIncludingProcedure(tableDataWrapperMap); |
|
|
|
Map<String, TableDataWrapper> allDataSetIncludingProcedure = DesignTableDataManager.getAllDataSetIncludingProcedure(tableDataWrapperMap); |
|
|
|
|
|
|
|
if (dsColumn != null) { |
|
|
|
TableDataWrapper tableDataWrapper = allDataSetIncludingProcedure.get(dsColumn.getDSName()); |
|
|
|
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(); |
|
|
@ -37,6 +38,8 @@ public class CellDSColumnSortGroupPane extends AbstractSortGroupPane { |
|
|
|
cellDSColumnSortItemPane.sortAreaUiComboBox.addItem(columnName); |
|
|
|
cellDSColumnSortItemPane.sortAreaUiComboBox.addItem(columnName); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
cellDSColumnSortItemPane.populateBean(sortExpression); |
|
|
|
cellDSColumnSortItemPane.populateBean(sortExpression); |
|
|
|
return cellDSColumnSortItemPane; |
|
|
|
return cellDSColumnSortItemPane; |
|
|
|
} |
|
|
|
} |
|
|
|