Merging in latest from upstream (DESIGN/design:refs/heads/feature/x)

* commit '55b545d9d112d0e465d38e396dc5c8574162effc':
  REPORT-75140 抽象出一个多结果数据集, 图标匹配问题

designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java

@@ -624,7 +624,7 @@ public abstract class DesignTableDataManager {
             XMLPrintWriter writer = XMLPrintWriter.create(out);
             // 把storeProcedure写成xml文件到out
             DataCoreXmlUtils.writeXMLStoreProcedure(writer, storeProcedure, null);
-            if (storeProcedure.getDataModelSize() > 0 && !storeProcedure.isFirstExpand()) {
+            if (storeProcedure.getDataModelList().size() > 0 && !storeProcedure.isFirstExpand()) {
                 return storeProcedure.getDataModelList().toArray(new ProcedureDataModel[0]);
             }
             ParameterProvider[] inParameters = DataOperator.getInstance().getStoreProcedureParameters(storeProcedure);

designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/MultiResultTableDataNameWrapper.java

@@ -69,7 +69,7 @@ public final class MultiResultTableDataNameWrapper implements TableDataWrapper {
     @Override
     public Icon getIcon() {
         for (TableDataNameObjectCreator creator : TableDataCreatorProducer.getInstance().createReportTableDataCreator()) {
-            if (creator.createObject().getClass() == this.tableData.getClass()) {
+            if (creator.createObject().getClass().isAssignableFrom(this.tableData.getClass())) {
                 return IOUtils.readIcon(creator.getIconPath());
             }
         }

designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/MultiResultTableDataWrapper.java

@@ -164,7 +164,7 @@ public final class MultiResultTableDataWrapper implements TableDataWrapper {
     @Override
     public Icon getIcon() {
         for (TableDataNameObjectCreator creator : TableDataCreatorProducer.getInstance().createReportTableDataCreator()) {
-            if (creator.createObject().getClass() == this.tableData.getClass()) {
+            if (creator.createObject().getClass().isAssignableFrom(this.tableData.getClass())) {
                 return IOUtils.readIcon(creator.getIconPath());
             }
         }