From 716b26cd32695219ea7947251ffbad2aa783665c Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 5 Jun 2018 09:04:38 +0800 Subject: [PATCH 1/4] =?UTF-8?q?REPORT-6090=20=E5=8D=95=E5=85=83=E6=A0=BC?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B6=85=E9=93=BE=E6=8E=A5-=E6=82=AC?= =?UTF-8?q?=E6=B5=AE=E7=AA=97=E5=9B=BE=E8=A1=A8=E5=92=8C=E8=B6=85=E9=93=BE?= =?UTF-8?q?=E6=8E=A5-=E6=82=AC=E6=B5=AE=E5=85=83=E7=B4=A0=E6=9C=89?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ChartHyperRelateFloatLinkPane.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/designer-chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java b/designer-chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java index f3610da86..caf766df3 100644 --- a/designer-chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java +++ b/designer-chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java @@ -19,6 +19,7 @@ import javax.swing.border.Border; import javax.swing.border.LineBorder; import javax.swing.border.TitledBorder; import java.awt.*; +import java.util.Arrays; import java.util.HashMap; import java.util.List; @@ -93,7 +94,16 @@ public class ChartHyperRelateFloatLinkPane extends AbstractHyperLinkPane Date: Tue, 5 Jun 2018 09:09:45 +0800 Subject: [PATCH 2/4] =?UTF-8?q?REPORT-6048=20[=E8=AE=BE=E8=AE=A1=E5=99=A8]?= =?UTF-8?q?=E7=BB=9D=E5=AF=B9=E7=94=BB=E5=B8=83=E5=9D=97=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=B8=8D=E8=B7=9F=E9=9A=8F=E8=87=AA=E9=80=82?= =?UTF-8?q?=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/designer/creator/XWAbsoluteLayout.java | 10 ++++------ .../component/WidgetAbsoluteBoundPane.java | 9 +++++++++ .../ui/designer/component/WidgetBoundPane.java | 1 + .../com/fr/design/mainframe/ElementCasePane.java | 15 +++++++-------- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/designer-form/src/com/fr/design/designer/creator/XWAbsoluteLayout.java b/designer-form/src/com/fr/design/designer/creator/XWAbsoluteLayout.java index 7940bfd66..69277fc6f 100644 --- a/designer-form/src/com/fr/design/designer/creator/XWAbsoluteLayout.java +++ b/designer-form/src/com/fr/design/designer/creator/XWAbsoluteLayout.java @@ -171,16 +171,14 @@ public class XWAbsoluteLayout extends XLayoutContainer { tabLayout.updateBoundsWidget(); } } - BoundsWidget boundsWidget = (BoundsWidget) layout.getBoundsWidget(xCreator.toData()); - Rectangle rectangle = dealWidgetBound(xCreator.getBounds()); } private Rectangle calculateBound(Rectangle rec, double pw, double ph) { Rectangle calRec = new Rectangle(0, 0, 0, 0); - calRec.x = (int) (rec.x / pw); - calRec.y = (int) (rec.y / ph); - calRec.width = (int) (rec.width / pw); - calRec.height = (int) (rec.height / ph); + calRec.x = (int) Math.round(rec.x / pw); + calRec.y = (int) Math.round(rec.y / ph); + calRec.width = (int) Math.round(rec.width / pw); + calRec.height = (int) Math.round(rec.height / ph); return calRec; } diff --git a/designer-form/src/com/fr/design/widget/ui/designer/component/WidgetAbsoluteBoundPane.java b/designer-form/src/com/fr/design/widget/ui/designer/component/WidgetAbsoluteBoundPane.java index 262e52588..3b64c4a8e 100644 --- a/designer-form/src/com/fr/design/widget/ui/designer/component/WidgetAbsoluteBoundPane.java +++ b/designer-form/src/com/fr/design/widget/ui/designer/component/WidgetAbsoluteBoundPane.java @@ -1,7 +1,11 @@ package com.fr.design.widget.ui.designer.component; import com.fr.design.designer.creator.XCreator; +import com.fr.design.designer.creator.XWAbsoluteLayout; import com.fr.design.gui.ispinner.UISpinner; +import com.fr.design.mainframe.FormDesigner; +import com.fr.design.mainframe.WidgetPropertyPane; +import com.fr.design.utils.gui.LayoutUtils; import com.fr.design.widget.WidgetBoundsPaneFactory; import com.fr.form.ui.container.WLayout; import com.fr.general.Inter; @@ -35,6 +39,8 @@ public class WidgetAbsoluteBoundPane extends WidgetBoundPane { @Override public void update() { + FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner(); + formDesigner.getSelectionModel().getSelection().backupBounds(); super.update(); Rectangle bounds = new Rectangle(creator.getBounds()); bounds.x = (int) x.getValue(); @@ -45,6 +51,9 @@ public class WidgetAbsoluteBoundPane extends WidgetBoundPane { WLayout wabs = parent.toData(); wabs.setBounds(creator.toData(), bounds); creator.setBounds(bounds); + LayoutUtils.layoutContainer(creator); + XWAbsoluteLayout layout = (XWAbsoluteLayout) parent; + layout.updateBoundsWidget(creator); } @Override diff --git a/designer-form/src/com/fr/design/widget/ui/designer/component/WidgetBoundPane.java b/designer-form/src/com/fr/design/widget/ui/designer/component/WidgetBoundPane.java index a046b2d18..1d2bab88b 100644 --- a/designer-form/src/com/fr/design/widget/ui/designer/component/WidgetBoundPane.java +++ b/designer-form/src/com/fr/design/widget/ui/designer/component/WidgetBoundPane.java @@ -85,6 +85,7 @@ public class WidgetBoundPane extends BasicPane { public void fix() { Rectangle bounds = new Rectangle(creator.getBounds()); + creator.setBackupBound(creator.getBounds()); int w = (int) width.getValue(); int h = (int) height.getValue(); Rectangle rec = ComponentUtils.getRelativeBounds(parent); diff --git a/designer-realize/src/com/fr/design/mainframe/ElementCasePane.java b/designer-realize/src/com/fr/design/mainframe/ElementCasePane.java index fe4841962..c69e43748 100644 --- a/designer-realize/src/com/fr/design/mainframe/ElementCasePane.java +++ b/designer-realize/src/com/fr/design/mainframe/ElementCasePane.java @@ -81,7 +81,6 @@ import com.fr.design.selection.Selectedable; import com.fr.design.selection.SelectionEvent; import com.fr.design.selection.SelectionListener; import com.fr.general.ComparatorUtils; -import com.fr.log.FineLoggerFactory; import com.fr.general.Inter; import com.fr.grid.Grid; import com.fr.grid.GridColumn; @@ -91,6 +90,7 @@ import com.fr.grid.GridUtils; import com.fr.grid.dnd.ElementCasePaneDropTarget; import com.fr.grid.selection.CellSelection; import com.fr.grid.selection.Selection; +import com.fr.log.FineLoggerFactory; import com.fr.page.PageAttributeGetter; import com.fr.page.ReportPageAttrProvider; import com.fr.poly.creator.PolyElementCasePane; @@ -524,15 +524,14 @@ public abstract class ElementCasePane extends Tar * 因为这边判断selection是一个selection，所以不会触发fireSelectionChanged */ public void setSelection(Selection selection) { - try { - //旧选中内容编辑器释放模板对象 - this.getCurrentEditor().release(); - } catch (UnsupportedOperationException e) { - FRContext.getLogger().info("Nothing to release"); - } - if (!ComparatorUtils.equals(this.selection, selection) || !ComparatorUtils.equals(EastRegionContainerPane.getInstance().getCellAttrPane(), CellElementPropertyPane.getInstance())) { + try { + //旧选中内容编辑器释放模板对象 + this.getCurrentEditor().release(); + } catch (UnsupportedOperationException e) { + FRContext.getLogger().info("Nothing to release"); + } this.selection = selection; fireSelectionChanged(); } From c25a950906a6b7b482062ab80b5eebb35cb7aa31 Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 5 Jun 2018 09:38:34 +0800 Subject: [PATCH 3/4] =?UTF-8?q?REPORT-6123=20=E5=8F=96=E8=89=B2=E6=A1=86?= =?UTF-8?q?=E7=BC=A9=E6=94=BE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/style/color/ColorSelectDialog.java | 1 + 1 file changed, 1 insertion(+) diff --git a/designer-base/src/com/fr/design/style/color/ColorSelectDialog.java b/designer-base/src/com/fr/design/style/color/ColorSelectDialog.java index b26da1eee..87148bdf4 100644 --- a/designer-base/src/com/fr/design/style/color/ColorSelectDialog.java +++ b/designer-base/src/com/fr/design/style/color/ColorSelectDialog.java @@ -85,6 +85,7 @@ public class ColorSelectDialog extends MiddleChartDialog{ this.add(pane,BorderLayout.NORTH); this.setBasicDialogSize(545,500); + this.setResizable(false); JPanel buttonPane = new JPanel(); buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); From 8e20bebc5afb701ae6a632a280e4c8c0d3c65b49 Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 5 Jun 2018 09:39:02 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=93=E5=8C=85=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/form/mobile/FormMobileTemplateSettingsPane.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/designer-form/src/com/fr/design/form/mobile/FormMobileTemplateSettingsPane.java b/designer-form/src/com/fr/design/form/mobile/FormMobileTemplateSettingsPane.java index dbb758a90..a32faac5b 100644 --- a/designer-form/src/com/fr/design/form/mobile/FormMobileTemplateSettingsPane.java +++ b/designer-form/src/com/fr/design/form/mobile/FormMobileTemplateSettingsPane.java @@ -26,6 +26,7 @@ public class FormMobileTemplateSettingsPane extends BasicBeanPane