From 81184e843a68819d01602f2befcd5380386aab9f Mon Sep 17 00:00:00 2001 From: xiqiu Date: Tue, 10 Aug 2021 09:18:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-56601=20=20=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E8=BF=87=E7=A8=8B=E6=97=B6=EF=BC=8C=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=88=B7=E6=96=B0=E6=A0=91=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/data/tabledata/tabledatapane/ProcedureDataPane.java | 3 +++ 1 file changed, 3 insertions(+) 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()); } }; From bffaec522a43048a6a3c72bf4056b99b83fd0d8c Mon Sep 17 00:00:00 2001 From: rinoux Date: Tue, 10 Aug 2021 13:51:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-56263=20=E6=96=B0=E5=BB=BA=E5=85=B6?= =?UTF-8?q?=E5=AE=83=E6=95=B0=E6=8D=AE=E9=9B=86=E5=A4=B1=E8=B4=A5=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/data/datapane/TableDataTreePane.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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); }