From ac4f5e034ddada33dc4681df4768aa324b8ee6b0 Mon Sep 17 00:00:00 2001 From: plough Date: Fri, 3 Nov 2017 15:49:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-5308=20[9.0=E4=B8=89=E8=BD=AE?= =?UTF-8?q?=E5=9B=9E=E5=BD=92]=E3=80=908.0=20master=20=E4=B9=9F=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E3=80=91=20=E4=BF=AE=E6=94=B9=E5=90=8E=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E6=AC=A1=E9=A2=84=E8=A7=88=E6=B2=A1=E6=9C=89=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=EF=BC=8C=E5=86=8D=E9=A2=84=E8=A7=88=E4=B8=80=E6=AC=A1?= =?UTF-8?q?=E5=B0=B1=E5=A5=BD=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/data/datapane/TableDataTreePane.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java b/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java index 3a3e877eb6..49ad0f2654 100644 --- a/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java +++ b/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java @@ -3,6 +3,7 @@ package com.fr.design.data.datapane; import com.fr.base.BaseUtils; import com.fr.base.TableData; import com.fr.data.TableDataSource; +import com.fr.data.impl.ConditionTableData; import com.fr.design.DesignModelAdapter; import com.fr.design.ExtraDesignClassManager; import com.fr.design.actions.UpdateAction; @@ -204,6 +205,9 @@ public class TableDataTreePane extends BasicTableDataTreePane { tc.renameTableData(oldName, nPanel.getObjectName(), false); TableDataSource tds = tc.getBook(); TableData td = uPanel.updateBean(); + if (td instanceof ConditionTableData) { + ((ConditionTableData) td).setTableDataSource(tds); + } String tdName = nPanel.getObjectName(); tds.putTableData(tdName, td); Map map = new HashMap(); From 46b2bceaf7d4fba9f9ed64cd6ea08c04e6632661 Mon Sep 17 00:00:00 2001 From: plough Date: Mon, 6 Nov 2017 09:49:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-5308=20=E4=BB=A3=E7=A0=81=E8=A7=84?= =?UTF-8?q?=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/data/datapane/TableDataTreePane.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java b/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java index 49ad0f2654..d3277bd19a 100644 --- a/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java +++ b/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java @@ -3,7 +3,7 @@ package com.fr.design.data.datapane; import com.fr.base.BaseUtils; import com.fr.base.TableData; import com.fr.data.TableDataSource; -import com.fr.data.impl.ConditionTableData; +import com.fr.data.impl.TableDataSourceDependent; import com.fr.design.DesignModelAdapter; import com.fr.design.ExtraDesignClassManager; import com.fr.design.actions.UpdateAction; @@ -205,8 +205,8 @@ public class TableDataTreePane extends BasicTableDataTreePane { tc.renameTableData(oldName, nPanel.getObjectName(), false); TableDataSource tds = tc.getBook(); TableData td = uPanel.updateBean(); - if (td instanceof ConditionTableData) { - ((ConditionTableData) td).setTableDataSource(tds); + if (td instanceof TableDataSourceDependent) { + ((TableDataSourceDependent) td).setTableDataSource(tds); } String tdName = nPanel.getObjectName(); tds.putTableData(tdName, td);