Merge pull request #5315 in DESIGN/design from release/11.0 to feature/x

* commit 'fa75ab2fd984a5cf78d7a8fc53895310f7cb4d49':
  REPORT-56263 新建其它数据集失败的问题
  REPORT-56601   新增存储过程时，没有刷新树结构

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

@@ -230,13 +230,14 @@ public class TableDataTreePane extends BasicTableDataTreePane {
                 protected TemplateTableDataWrapper getTableDataInstance() {
                     TableData tableData = (TableData) creator.createObject();
 
-                    //新建的DBTableData单独换为DBTableData
+                    //11中所有数据集都是StrategicTableData的子类
                     if (tableData instanceof StrategicTableData) {
-                        tableData = new DBTableData();
+                        StrategicTableData std = (StrategicTableData) tableData;
-                        StrategicTableData.Binder
+                        tableData = StrategicTableData.Binder
-                                .bind((DBTableData) tableData)
+                                .bind(std)
                                 .setDsName(createDsName(creator.getPrefix()))
-                                .setScope(StrategicTableData.Scope.TEMPLATE);
+                                .setScope(StrategicTableData.Scope.TEMPLATE)
+                                .done();
                     }
                     return new TemplateTableDataWrapper(tableData);
                 }

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

@@ -8,10 +8,12 @@ import com.fr.data.impl.NameDatabaseConnection;
 import com.fr.data.impl.storeproc.ProcedureDataModel;
 import com.fr.data.impl.storeproc.StoreProcedure;
 import com.fr.data.operator.DataOperator;
+import com.fr.design.DesignModelAdapter;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.border.UIRoundedBorder;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.data.DesignTableDataManager;
+import com.fr.design.data.datapane.TableDataTreePane;
 import com.fr.design.data.datapane.connect.ConnectionTableProcedurePane;
 import com.fr.design.data.datapane.connect.ConnectionTableProcedurePane.DoubleClickSelectedNodeOnTreeListener;
 import com.fr.design.data.datapane.sqlpane.SQLEditPane;
@@ -291,6 +293,7 @@ public class ProcedureDataPane extends AbstractTableDataPane<StoreProcedure> imp
                     sp.setCalculating(false);
                     doAfterProcudureDone();
                     fireDSChanged();
+                    TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter());
                 }
             };