diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java index 8a7652290..b95c03ac6 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java +++ b/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.Binder - .bind((DBTableData) tableData) + StrategicTableData std = (StrategicTableData) tableData; + tableData = StrategicTableData.Binder + .bind(std) .setDsName(createDsName(creator.getPrefix())) - .setScope(StrategicTableData.Scope.TEMPLATE); + .setScope(StrategicTableData.Scope.TEMPLATE) + .done(); } return new TemplateTableDataWrapper(tableData); } diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java index f1d2433db..d2a1918d4 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java +++ b/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 imp sp.setCalculating(false); doAfterProcudureDone(); fireDSChanged(); + TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()); } };