From e53f35dccb68cc0b465f5fd5aa4b52768520308f Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 7 Nov 2017 16:19:51 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=EF=BC=8C?= =?UTF-8?q?=E9=80=89=E4=B8=AD=E8=81=9A=E5=90=88=E6=8A=A5=E8=A1=A8=E5=9D=97?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=82=AC=E6=B5=AE=E5=85=83=E7=B4=A0=E4=B8=8D?= =?UTF-8?q?=E5=BA=94=E6=9B=B4=E6=96=B0=E6=9D=A1=E4=BB=B6=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer/src/com/fr/poly/creator/ECBlockEditor.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/designer/src/com/fr/poly/creator/ECBlockEditor.java b/designer/src/com/fr/poly/creator/ECBlockEditor.java index 9048987fb..6cf370bb6 100644 --- a/designer/src/com/fr/poly/creator/ECBlockEditor.java +++ b/designer/src/com/fr/poly/creator/ECBlockEditor.java @@ -161,19 +161,18 @@ public class ECBlockEditor extends BlockEditor { EastRegionContainerPane.getInstance().replaceCellAttrPane(CellElementPropertyPane.getInstance()); EastRegionContainerPane.getInstance().replaceCellElementPane(QuickEditorRegion.getInstance()); EastRegionContainerPane.getInstance().replaceWidgetSettingsPane(CellWidgetPropertyPane.getInstance()); + // 条件属性 + ConditionAttributesGroupPane conditionAttributesGroupPane = ConditionAttributesGroupPane.getInstance(); + conditionAttributesGroupPane.populate(editComponent); EastRegionContainerPane.getInstance().updateCellElementState(isSelectedOneCell()); - } - EastRegionContainerPane.getInstance().replaceCellAttrPane(CellElementPropertyPane.getInstance()); + } // 超级链接 HyperlinkGroupPane hyperlinkGroupPane = DesignerContext.getDesignerFrame().getSelectedJTemplate() .getHyperLinkPane(HyperlinkGroupPaneActionImpl.getInstance()); hyperlinkGroupPane.populate(editComponent); - // 条件属性 - ConditionAttributesGroupPane conditionAttributesGroupPane = ConditionAttributesGroupPane.getInstance(); - conditionAttributesGroupPane.populate(editComponent); } private boolean isSelectedOneCell() { From 26795885d8b3a564ec088a1fc30bbc7b7c08db64 Mon Sep 17 00:00:00 2001 From: mengao <283296419@qq.com> Date: Wed, 8 Nov 2017 19:42:22 +0800 Subject: [PATCH 2/5] =?UTF-8?q?CHART-1697=20=20=E7=B1=BB=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E4=B8=8E8.0=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/map/designer/type/VanChartMapSourceChoosePane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapSourceChoosePane.java b/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapSourceChoosePane.java index a6b8cb5e1..a98c8d7f7 100644 --- a/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapSourceChoosePane.java +++ b/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapSourceChoosePane.java @@ -23,10 +23,10 @@ import com.fr.general.Inter; import com.fr.general.http.HttpClient; import com.fr.plugin.chart.base.GisLayer; import com.fr.plugin.chart.base.ViewCenter; -import com.fr.plugin.chart.base.WMSLayer; import com.fr.plugin.chart.designer.TableLayout4VanChartHelper; import com.fr.plugin.chart.drillmap.designer.data.comp.MapDataTree; import com.fr.plugin.chart.map.VanChartMapPlot; +import com.fr.plugin.chart.map.layer.WMSLayer; import com.fr.plugin.chart.map.server.CompatibleGEOJSONHelper; import com.fr.plugin.chart.map.server.GEOJSONHelper; import com.fr.plugin.chart.map.server.MapLayerConfigManager; From eb800a517fa6ce8dc224c73ecbf9e6747a9f4f10 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Wed, 8 Nov 2017 23:34:09 +0800 Subject: [PATCH 3/5] =?UTF-8?q?REPORT-5284=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E4=BA=A4=E4=BA=92=E4=BF=AE=E6=94=B9=20=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E5=A4=9A=E4=BD=99=E5=88=86=E5=89=B2=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/mainframe/toolbar/ToolBarMenuDock.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java index 258a9e22b..f43419d47 100644 --- a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java +++ b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java @@ -441,14 +441,8 @@ public abstract class ToolBarMenuDock { shortCuts.add(new VideoAction()); shortCuts.add(new TutorialAction()); } - shortCuts.add(SeparatorDef.DEFAULT); - shortCuts.add(SeparatorDef.DEFAULT); - if (ComparatorUtils.equals(ProductConstants.APP_NAME, FINEREPORT)) { - shortCuts.add(SeparatorDef.DEFAULT); - } if (AlphaFineConfigManager.isALPHALicAvailable()) { shortCuts.add(new AlphaFineAction()); - shortCuts.add(SeparatorDef.DEFAULT); } shortCuts.add(SeparatorDef.DEFAULT); shortCuts.add(new AboutAction()); From 16251de0cbaf54d190c91d4cdd97ebf0ca7db391 Mon Sep 17 00:00:00 2001 From: "yaoh.wu" Date: Thu, 9 Nov 2017 13:41:44 +0800 Subject: [PATCH 4/5] =?UTF-8?q?REPORT-5473=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E5=86=B3=E7=AD=96=E6=8A=A5=E8=A1=A8=E9=80=89=E4=B8=AD=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E7=BB=84=E4=BB=B6=E7=B2=98=E8=B4=B4=E5=88=B0=E5=8F=A6?= =?UTF-8?q?=E5=A4=96=E4=B8=80=E5=BC=A0=E5=86=B3=E7=AD=96=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E5=90=8E=E4=B8=8D=E8=83=BD=E5=88=87=E6=8D=A2=E5=9B=9E=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../widget/ui/FormWidgetCardPane.java | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java b/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java index 07a1fe033..963caf8a3 100644 --- a/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java +++ b/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java @@ -2,7 +2,14 @@ package com.fr.design.mainframe.widget.ui; import com.fr.design.data.DataCreatorUI; import com.fr.design.designer.beans.events.DesignerEvent; -import com.fr.design.designer.creator.*; +import com.fr.design.designer.creator.XCreator; +import com.fr.design.designer.creator.XCreatorUtils; +import com.fr.design.designer.creator.XLayoutContainer; +import com.fr.design.designer.creator.XWAbsoluteLayout; +import com.fr.design.designer.creator.XWFitLayout; +import com.fr.design.designer.creator.XWParameterLayout; +import com.fr.design.designer.creator.XWScaleLayout; +import com.fr.design.designer.creator.XWTitleLayout; import com.fr.design.dialog.AttrScrollPane; import com.fr.design.dialog.BasicScrollPane; import com.fr.design.foldablepane.UIExpandablePane; @@ -11,8 +18,8 @@ import com.fr.design.gui.frpane.AttributeChangeListener; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.FormDesigner; import com.fr.design.widget.DataModify; -import com.fr.design.widget.Operator; import com.fr.design.widget.FormWidgetDefinePaneFactoryBase; +import com.fr.design.widget.Operator; import com.fr.design.widget.ui.designer.component.WidgetAbsoluteBoundPane; import com.fr.design.widget.ui.designer.component.WidgetBoundPane; import com.fr.form.ui.Widget; @@ -79,14 +86,8 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane { } public XCreator findXcreator(FormDesigner designer) { - int size = designer.getSelectionModel().getSelection().size(); - if (size == 0 || size == 1) { - XCreator creator = size == 0 ? designer.getRootComponent() : designer.getSelectionModel().getSelection() - .getSelectedCreator(); - return creator; - } else { - return null; - } + XCreator creator = designer.getSelectionModel().getSelection().getSelectedCreator(); + return creator != null ? creator : designer.getRootComponent(); } /** @@ -128,7 +129,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane { this.listener = new AttributeChangeListener() { @Override public void attributeChange() { - if(!isExtraWidget){ + if (!isExtraWidget) { updateCreator(); } updateWidgetBound(); @@ -136,7 +137,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane { } }; - if(isExtraWidget){ + if (isExtraWidget) { return; } @@ -191,7 +192,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane { innerWidget = crBoundsWidget.getWidget(); } currentEditorDefinePane.populateBean(innerWidget); - if(widgetPropertyPane != null){ + if (widgetPropertyPane != null) { widgetPropertyPane.populate(innerWidget); } reinitAllListeners(); @@ -212,7 +213,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane { fireValueChanged(); } - public void updateWidgetBound (){ + public void updateWidgetBound() { if (widgetBoundPane != null && ComparatorUtils.equals(getGlobalName(), Inter.getLocText("FR-Designer_Coords_And_Size"))) { widgetBoundPane.update(); designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_RESIZED); From df2c3c18ffecbc8fbd293779e2fdfbe1bfac3e00 Mon Sep 17 00:00:00 2001 From: kerry Date: Thu, 9 Nov 2017 14:36:17 +0800 Subject: [PATCH 5/5] =?UTF-8?q?REPORT-5369=20[9.0=E4=B8=89=E8=BD=AE?= =?UTF-8?q?=E5=9B=9E=E5=BD=92]=E6=92=A4=E9=94=80=E9=94=AE=E6=8C=89?= =?UTF-8?q?=E4=B8=A4=E4=B8=89=E6=AC=A1=E6=89=8D=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/gui/icombobox/TextFontComboBox.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/designer_base/src/com/fr/design/gui/icombobox/TextFontComboBox.java b/designer_base/src/com/fr/design/gui/icombobox/TextFontComboBox.java index f2d4b1e29..a0b3f056b 100644 --- a/designer_base/src/com/fr/design/gui/icombobox/TextFontComboBox.java +++ b/designer_base/src/com/fr/design/gui/icombobox/TextFontComboBox.java @@ -6,10 +6,10 @@ import com.fr.design.gui.icombobox.filter.StartsWithFilter; import com.fr.design.gui.itextfield.UITextField; import com.fr.stable.StringUtils; -import javax.swing.*; +import javax.swing.ComboBoxEditor; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; -import java.awt.*; +import java.awt.Component; import java.awt.event.ActionListener; import java.util.ArrayList; import java.util.List; @@ -61,7 +61,12 @@ public class TextFontComboBox extends ExtendedComboBox { private volatile boolean setting = false; public FilterComboBoxEditor() { - textField = new UITextField(15); + textField = new UITextField(15){ + @Override + public boolean shouldResponseChangeListener() { + return false; + } + }; textField.getDocument().addDocumentListener(this); }