From 738ded6e88ae30eb4274ef80d0282b1572d9ed5f Mon Sep 17 00:00:00 2001 From: kerry Date: Wed, 11 Oct 2017 18:30:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?REPORT-4717=20[9.0=E5=86=85=E6=B5=8B]=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=9D=E5=AF=B9=E5=B8=83=E5=B1=80=E5=86=B3?= =?UTF-8?q?=E7=AD=96=E6=8A=A5=E8=A1=A8body=E6=A0=B7=E5=BC=8F=EF=BC=8C?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=88=97=E8=A1=A8=E4=BC=9A=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E4=B8=A4=E4=B8=AAbody=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../designer/layout/FRFitLayoutDefinePane.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/designer_form/src/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java index 1b88936c9..eaafb9dbf 100644 --- a/designer_form/src/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java +++ b/designer_form/src/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java @@ -3,6 +3,7 @@ package com.fr.design.widget.ui.designer.layout; import com.fr.design.data.DataCreatorUI; import com.fr.design.designer.IntervalConstants; import com.fr.design.designer.creator.XCreator; +import com.fr.design.designer.creator.XLayoutContainer; import com.fr.design.designer.creator.XWAbsoluteBodyLayout; import com.fr.design.designer.creator.XWFitLayout; import com.fr.design.designer.creator.XWScaleLayout; @@ -117,6 +118,13 @@ public class FRFitLayoutDefinePane extends AbstractDataModify { @Override public void populateBean(WFitLayout ob) { + FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner(); + XLayoutContainer rootLayout = selectedBodyLayout(formDesigner); + if (rootLayout != formDesigner.getRootComponent() + && formDesigner.getSelectionModel().getSelection().getSelectedCreator() == formDesigner.getRootComponent()) { + formDesigner.getSelectionModel().setSelectedCreators( + FormSelectionUtils.rebuildSelection(xWFitLayout, new Widget[]{selectedBodyLayout(formDesigner).toData()})); + } paddingBound.populate(ob); layoutComboBox.setSelectedIndex(ob.getBodyLayoutType().getTypeValue()); adaptComboBox.setSelectedIndex(ob.getCompState()); @@ -124,6 +132,14 @@ public class FRFitLayoutDefinePane extends AbstractDataModify { stylePane.setValue(ob.getBorderStyle()); } + private XLayoutContainer selectedBodyLayout(FormDesigner formDesigner) { + XLayoutContainer rootLayout = formDesigner.getRootComponent(); + if (rootLayout.getComponentCount() == 1 && rootLayout.getXCreator(0).acceptType(XWAbsoluteBodyLayout.class)){ + rootLayout = (XWAbsoluteBodyLayout)rootLayout.getXCreator(0); + } + return rootLayout; + } + @Override public WFitLayout updateBean() { From 85a4da728987fc15d927d9c72e173448ae2ab85e Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 12 Oct 2017 10:07:50 +0800 Subject: [PATCH 2/3] PFC-1053 --- designer/designer.iml | 44 --------------------- designer_base/src/com/fr/env/RemoteEnv.java | 8 +--- 2 files changed, 2 insertions(+), 50 deletions(-) delete mode 100644 designer/designer.iml diff --git a/designer/designer.iml b/designer/designer.iml deleted file mode 100644 index 9ff693f28..000000000 --- a/designer/designer.iml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/designer_base/src/com/fr/env/RemoteEnv.java b/designer_base/src/com/fr/env/RemoteEnv.java index f80a3a584..842257d1f 100644 --- a/designer_base/src/com/fr/env/RemoteEnv.java +++ b/designer_base/src/com/fr/env/RemoteEnv.java @@ -29,11 +29,7 @@ import com.fr.file.CacheManager; import com.fr.file.DatasourceManager; import com.fr.file.DatasourceManagerProvider; import com.fr.file.filetree.FileNode; -import com.fr.general.ComparatorUtils; -import com.fr.general.FRLogger; -import com.fr.general.IOUtils; -import com.fr.general.Inter; -import com.fr.general.LogRecordTime; +import com.fr.general.*; import com.fr.general.http.HttpClient; import com.fr.json.JSONArray; import com.fr.json.JSONException; @@ -1839,7 +1835,7 @@ public class RemoteEnv extends AbstractEnv { if (input == null) { return; } - LogRecordTime[] records = DavXMLUtils.readXMLLogRecords(input); + LogRecordTime[] records = LogUtils.readXMLLogRecords(input); for (LogRecordTime logRecordTime : records) { //TODO } From 33e739fb556e47c83f6922f811d592498e99252c Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 12 Oct 2017 13:35:39 +0800 Subject: [PATCH 3/3] PFC-1053 --- .../src/com/fr/design/hyperlink/ReportletHyperlinkPane.java | 2 +- designer_base/src/com/fr/design/hyperlink/WebHyperlinkPane.java | 2 +- .../src/com/fr/design/javascript/JavaScriptImplPane.java | 2 +- .../src/com/fr/design/javascript/ParameterJavaScriptPane.java | 2 +- .../series/SeriesCondition/impl/ChartHyperPoplinkPane.java | 2 +- .../SeriesCondition/impl/ChartHyperRelateCellLinkPane.java | 2 +- .../SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java | 2 +- .../chart/series/SeriesCondition/impl/FormHyperlinkPane.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/designer_base/src/com/fr/design/hyperlink/ReportletHyperlinkPane.java b/designer_base/src/com/fr/design/hyperlink/ReportletHyperlinkPane.java index 395c6dbd8..9fc87f67e 100644 --- a/designer_base/src/com/fr/design/hyperlink/ReportletHyperlinkPane.java +++ b/designer_base/src/com/fr/design/hyperlink/ReportletHyperlinkPane.java @@ -75,7 +75,7 @@ public class ReportletHyperlinkPane extends BasicBeanPane { } protected boolean needRenamePane(){ - return plot != null && plot.needRenameHyperLinkPane(); + return plot != null && plot.isNeedRenameHyperLinkPane(); } @Override diff --git a/designer_base/src/com/fr/design/hyperlink/WebHyperlinkPane.java b/designer_base/src/com/fr/design/hyperlink/WebHyperlinkPane.java index c3185d392..d906d4efa 100644 --- a/designer_base/src/com/fr/design/hyperlink/WebHyperlinkPane.java +++ b/designer_base/src/com/fr/design/hyperlink/WebHyperlinkPane.java @@ -73,7 +73,7 @@ public class WebHyperlinkPane extends BasicBeanPane { } protected boolean needRenamePane(){ - return plot != null && plot.needRenameHyperLinkPane(); + return plot != null && plot.isNeedRenameHyperLinkPane(); } @Override diff --git a/designer_base/src/com/fr/design/javascript/JavaScriptImplPane.java b/designer_base/src/com/fr/design/javascript/JavaScriptImplPane.java index c110471a3..dae8bc232 100644 --- a/designer_base/src/com/fr/design/javascript/JavaScriptImplPane.java +++ b/designer_base/src/com/fr/design/javascript/JavaScriptImplPane.java @@ -118,7 +118,7 @@ public class JavaScriptImplPane extends FurtherBasicBeanPane { } protected boolean needRenamePane(){ - return plot != null && plot.needRenameHyperLinkPane(); + return plot != null && plot.isNeedRenameHyperLinkPane(); } /** diff --git a/designer_base/src/com/fr/design/javascript/ParameterJavaScriptPane.java b/designer_base/src/com/fr/design/javascript/ParameterJavaScriptPane.java index 353fd887d..02981703f 100644 --- a/designer_base/src/com/fr/design/javascript/ParameterJavaScriptPane.java +++ b/designer_base/src/com/fr/design/javascript/ParameterJavaScriptPane.java @@ -49,7 +49,7 @@ public class ParameterJavaScriptPane extends BasicBeanPane } protected boolean needRenamePane(){ - return plot != null && plot.needRenameHyperLinkPane(); + return plot != null && plot.isNeedRenameHyperLinkPane(); } @Override diff --git a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java index f0669a99e..5edcf38f3 100644 --- a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java +++ b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java @@ -96,7 +96,7 @@ public class ChartHyperPoplinkPane extends BasicBeanPane { } protected boolean needRenamePane(){ - return plot != null && plot.needRenameHyperLinkPane(); + return plot != null && plot.isNeedRenameHyperLinkPane(); } @Override diff --git a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java index 6d535e487..be7b2ce60 100644 --- a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java +++ b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java @@ -77,7 +77,7 @@ public class ChartHyperRelateCellLinkPane extends BasicBeanPane { } protected boolean needRenamePane(){ - return plot != null && plot.needRenameHyperLinkPane(); + return plot != null && plot.isNeedRenameHyperLinkPane(); } protected int getHyperlinkType() {