Merge remote-tracking branch 'origin/release/11.0' into release/11.0

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.core.sort.sortexpression.SortExpression;
 
+import java.util.Map;
+
 public class CellDSColumnSortGroupPane extends AbstractSortGroupPane {
     DSColumn dsColumn;
 
@@ -24,7 +26,8 @@ public class CellDSColumnSortGroupPane extends AbstractSortGroupPane {
         CellDSColumnSortItemPane cellDSColumnSortItemPane = new CellDSColumnSortItemPane(sortItemPaneWidth, sortItemPaneRightWidth);
         java.util.Map<String, TableDataWrapper> tableDataWrapperMap =
                 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) {
             java.util.List<String> columnNameList = tableDataWrapper.calculateColumnNameList();
             String[] columnNames = new String[columnNameList.size()];