From 46333ce75228c1a061ba05e5410906bccb6e5729 Mon Sep 17 00:00:00 2001 From: Fangjie Hu Date: Mon, 24 Oct 2016 17:23:16 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=98=AF=E5=90=A6=E5=8F=AF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java index 0a563723c..0fef00f31 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java @@ -162,6 +162,8 @@ public class ChartTypeButtonPane extends BasicBeanPane implemen if (state.isDynamicState() && parent != null){ parent.reactorChartTypePane(editingCollection); } + //检查是否可以配置切换 + configButton.setEnabled(editingCollection.changeEnable()); } ActionListener configListener = new ActionListener() { From 10f4be45070fd5233c3c062431621b105bb4d147 Mon Sep 17 00:00:00 2001 From: fr_shine Date: Tue, 25 Oct 2016 09:31:19 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E6=A0=87=E7=AD=BE=20?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E5=90=8D=E5=92=8C=E5=8C=BA=E5=9F=9F=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SeriesCondition/TooltipContentsPane.java | 29 +++++++++---------- .../SeriesCondition/dlp/DataLabelPane.java | 15 +++++----- .../SeriesCondition/dlp/MapDataLabelPane.java | 18 ++++++++++++ 3 files changed, 38 insertions(+), 24 deletions(-) diff --git a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/TooltipContentsPane.java b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/TooltipContentsPane.java index 0be84de39..c8f2fe394 100644 --- a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/TooltipContentsPane.java +++ b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/TooltipContentsPane.java @@ -1,28 +1,23 @@ package com.fr.design.chart.series.SeriesCondition; -import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.text.Format; - -import javax.swing.JPanel; -import javax.swing.SwingUtilities; - import com.fr.chart.base.AttrContents; import com.fr.chart.base.ChartConstants; +import com.fr.design.dialog.BasicPane; +import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.design.dialog.BasicPane; -import com.fr.design.dialog.DialogActionAdapter; +import com.fr.design.style.FormatPane; import com.fr.general.Inter; import com.fr.stable.StringUtils; -import com.fr.design.style.FormatPane; + +import javax.swing.*; +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.text.Format; /** * 数据点提示内容面板，包含系列值、系列百分比 @@ -58,7 +53,7 @@ public class TooltipContentsPane extends BasicPane{ protected JPanel createJPanel4Value() { if (showValueCB == null) { - showValueCB = new UICheckBox(Inter.getLocText("Value")); + showValueCB = new UICheckBox(getValueString()); } showValueCB.setSelected(true); @@ -75,7 +70,9 @@ public class TooltipContentsPane extends BasicPane{ return valuePane; } - + protected String getValueString() { + return Inter.getLocText("Value"); + } protected Component[] createComponents4PercentValue() { if (showPercent == null) { diff --git a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/dlp/DataLabelPane.java b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/dlp/DataLabelPane.java index 33f2dccb7..7d8b6c8ce 100644 --- a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/dlp/DataLabelPane.java +++ b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/dlp/DataLabelPane.java @@ -1,12 +1,5 @@ package com.fr.design.chart.series.SeriesCondition.dlp; -import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.Dimension; - -import javax.swing.ButtonGroup; -import javax.swing.JPanel; - import com.fr.base.Utils; import com.fr.chart.base.AttrContents; import com.fr.chart.base.ChartConstants; @@ -21,6 +14,9 @@ import com.fr.general.Inter; import com.fr.stable.Constants; import com.fr.stable.StringUtils; +import javax.swing.*; +import java.awt.*; + /** * Created by IntelliJ IDEA. * Author : Richer @@ -80,11 +76,14 @@ public class DataLabelPane extends TooltipContentsPane { protected Component[] createComponents4ShowCategoryName() { if (showCategoryNameCB == null) { - showCategoryNameCB = new UICheckBox(Inter.getLocText(new String[]{"StyleFormat-Category", "WF-Name"})); + showCategoryNameCB = new UICheckBox(getCategoryString()); } return new Component[]{null, showCategoryNameCB}; } + protected String getCategoryString(){ + return Inter.getLocText(new String[]{"StyleFormat-Category", "WF-Name"}); + } protected Component[] createComponents4ShowGuidLine() { diff --git a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/dlp/MapDataLabelPane.java b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/dlp/MapDataLabelPane.java index 355ec9eee..451197e2a 100644 --- a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/dlp/MapDataLabelPane.java +++ b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/dlp/MapDataLabelPane.java @@ -1,6 +1,9 @@ package com.fr.design.chart.series.SeriesCondition.dlp; +import com.fr.general.Inter; + import javax.swing.*; +import java.awt.*; /** @@ -13,6 +16,21 @@ import javax.swing.*; */ public class MapDataLabelPane extends DataLabelPane { + @Override + protected Component[] createComponents4ShowSeriesName() { + return new Component[0]; + } + + @Override + protected String getCategoryString() { + return Inter.getLocText("FR-Chart-Area_Name"); + } + + @Override + protected String getValueString() { + return Inter.getLocText("FR-Chart-Area_Value"); + } + protected JPanel createJPanel4Position() { return null; } From 3d6f0f3e90de7163095a2cfc48ea69a39e263348 Mon Sep 17 00:00:00 2001 From: fr_shine Date: Tue, 25 Oct 2016 15:08:32 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E4=B8=80=E7=BB=B4=E5=8D=95=E5=85=83?= =?UTF-8?q?=E6=A0=BC=E6=95=B0=E6=8D=AE=E9=85=8D=E7=BD=AE=E9=80=9A=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/report/MeterPlotReportDataContentPane.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/MeterPlotReportDataContentPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/MeterPlotReportDataContentPane.java index b785373bc..6bd4b3fbe 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/MeterPlotReportDataContentPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/MeterPlotReportDataContentPane.java @@ -46,8 +46,8 @@ public class MeterPlotReportDataContentPane extends AbstractReportDataContentPan double[] rowSize = { p, p, p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(CATENAME), getSingCatePane()}, - new Component[]{new UILabel(NVALUE), singValuePane = new TinyFormulaPane()}, + new Component[]{new UILabel(getCateName()), getSingCatePane()}, + new Component[]{new UILabel(getNValue()), singValuePane = new TinyFormulaPane()}, new Component[]{null, null} }; @@ -66,6 +66,14 @@ public class MeterPlotReportDataContentPane extends AbstractReportDataContentPan this.add(pane, BorderLayout.CENTER); } + + protected String getCateName() { + return CATENAME; + } + + protected String getNValue() { + return NVALUE; + } public void populateBean(ChartCollection collection) { TopDefinitionProvider definition = collection.getSelectedChart().getFilterDefinition(); From 17d5e09692c64e7933666ab49f7ffc5b7dcfa3fa Mon Sep 17 00:00:00 2001 From: fr_shine Date: Tue, 25 Oct 2016 15:10:08 +0800 Subject: [PATCH 04/12] update --- .../gui/data/report/MeterPlotReportDataContentPane.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/MeterPlotReportDataContentPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/MeterPlotReportDataContentPane.java index 6bd4b3fbe..c23f64dc1 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/MeterPlotReportDataContentPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/MeterPlotReportDataContentPane.java @@ -46,8 +46,8 @@ public class MeterPlotReportDataContentPane extends AbstractReportDataContentPan double[] rowSize = { p, p, p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(getCateName()), getSingCatePane()}, - new Component[]{new UILabel(getNValue()), singValuePane = new TinyFormulaPane()}, + new Component[]{new UILabel(getCateNameString()), getSingCatePane()}, + new Component[]{new UILabel(getNValueString()), singValuePane = new TinyFormulaPane()}, new Component[]{null, null} }; @@ -67,11 +67,11 @@ public class MeterPlotReportDataContentPane extends AbstractReportDataContentPan this.add(pane, BorderLayout.CENTER); } - protected String getCateName() { + protected String getCateNameString() { return CATENAME; } - protected String getNValue() { + protected String getNValueString() { return NVALUE; } From 04a2611500ee126d8a739d0b85a6a5b0c408f39b Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Tue, 25 Oct 2016 16:59:24 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=B8=8B?= =?UTF-8?q?=E6=8E=A7=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/mainframe/ShareWidgetButton.java | 40 ++++--------------- 1 file changed, 8 insertions(+), 32 deletions(-) diff --git a/designer_form/src/com/fr/design/mainframe/ShareWidgetButton.java b/designer_form/src/com/fr/design/mainframe/ShareWidgetButton.java index 955e54822..ffb688578 100644 --- a/designer_form/src/com/fr/design/mainframe/ShareWidgetButton.java +++ b/designer_form/src/com/fr/design/mainframe/ShareWidgetButton.java @@ -4,7 +4,6 @@ import com.fr.base.BaseUtils; import com.fr.design.designer.creator.XCreator; import com.fr.design.designer.creator.XCreatorUtils; import com.fr.design.gui.ilable.UILabel; -import com.fr.design.layout.FRGUIPaneFactory; import com.fr.form.share.ShareLoader; import com.fr.form.ui.ElCaseBindInfo; import com.fr.form.ui.Widget; @@ -20,7 +19,6 @@ import java.awt.dnd.*; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener; -import java.awt.image.BufferedImage; import java.io.IOException; import java.io.Serializable; @@ -36,42 +34,20 @@ public class ShareWidgetButton extends JPanel implements MouseListener, MouseMot public ShareWidgetButton(ElCaseBindInfo bindInfo) { this.bindInfo = bindInfo; initUI(); - this.setBorder(BorderFactory.createEmptyBorder(0,0,0,0)); this.addMouseListener(this); this.addMouseMotionListener(this); new DragAndDropDragGestureListener(this, DnDConstants.ACTION_COPY_OR_MOVE); } - private void initUI() { - this.setBackground(Color.WHITE); - this.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); - setPreferredSize(new Dimension(108, 72)); - setLayout(FRGUIPaneFactory.createBorderLayout()); - ImagePanel imagePanel = new ImagePanel((BufferedImage) bindInfo.getCover()); - imagePanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); - - this.add(imagePanel, BorderLayout.NORTH); - UILabel label = new UILabel(bindInfo.getName(), SwingConstants.HORIZONTAL); - label.setOpaque(true); - label.setBackground(new Color(184, 220, 242)); - this.add(label, BorderLayout.SOUTH); - } - - private class ImagePanel extends JPanel { - - private BufferedImage image; - - public ImagePanel(BufferedImage image) { - this.image = image; - this.setPreferredSize(new Dimension(108, 52)); - } - - @Override - public void paintComponent(Graphics g) { - g.drawImage(image, 0, 0, null); - } - + JPanel reportPane = new JPanel(new BorderLayout()); + reportPane.add(new UILabel(new ImageIcon(bindInfo.getCover())), BorderLayout.CENTER); + JPanel labelPane = new JPanel(new BorderLayout()); + UILabel label = new UILabel(bindInfo.getName(), UILabel.CENTER); + labelPane.setBackground(new Color(184, 220, 242)); + labelPane.add(label, BorderLayout.CENTER); + reportPane.add(labelPane, BorderLayout.SOUTH); + add(reportPane); } public ElCaseBindInfo getBindInfo() { From 989358cf8b463d17e8644df93c8eff35c0354c37 Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Tue, 25 Oct 2016 17:02:03 +0800 Subject: [PATCH 06/12] rt --- .../mainframe/FormWidgetDetailPane.java | 42 ++++++++++--------- .../fr/design/mainframe/ShareWidgetPane.java | 13 +++--- .../mainframe/widget/UITreeComboBox.java | 1 + 3 files changed, 29 insertions(+), 27 deletions(-) diff --git a/designer_form/src/com/fr/design/mainframe/FormWidgetDetailPane.java b/designer_form/src/com/fr/design/mainframe/FormWidgetDetailPane.java index 372377077..f4af3d79d 100644 --- a/designer_form/src/com/fr/design/mainframe/FormWidgetDetailPane.java +++ b/designer_form/src/com/fr/design/mainframe/FormWidgetDetailPane.java @@ -47,7 +47,7 @@ public class FormWidgetDetailPane extends FormDockView{ private UITabbedPane tabbedPane; private UIScrollPane downPanel; - private JPanel reuWidgetPanel; + private JPanel esp; private UIComboBox comboBox; private ElCaseBindInfo[] elCaseBindInfoList; private UIButton downloadButton; @@ -95,21 +95,14 @@ public class FormWidgetDetailPane extends FormDockView{ clearDockingView(); return; } - - JPanel esp = FRGUIPaneFactory.createBorderLayout_S_Pane(); + esp = FRGUIPaneFactory.createBorderLayout_S_Pane(); esp.setBorder(null); if (elCaseBindInfoList == null) { elCaseBindInfoList = ShareLoader.getLoader().getAllBindInfoList(); } initReuWidgetPanel(); - esp.add(reuWidgetPanel, BorderLayout.CENTER); createDownloadButton(); - JPanel widgetPane = FRGUIPaneFactory.createBorderLayout_L_Pane(); - widgetPane.setBorder(BorderFactory.createEmptyBorder(3, 10, 3, 3)); - widgetPane.add(new UILabel(Inter.getLocText("FR-Designer_LocalWidget"), - SwingConstants.HORIZONTAL), BorderLayout.WEST); - widgetPane.add(downloadButton, BorderLayout.EAST); - esp.add(widgetPane,BorderLayout.NORTH); + initMenuPanel(); tabbedPane = new UITabbedPane(); tabbedPane.setOpaque(true); tabbedPane.setBorder(null); @@ -124,16 +117,25 @@ public class FormWidgetDetailPane extends FormDockView{ * 初始化组件共享和复用面板 */ private void initReuWidgetPanel() { - int rowCount = (elCaseBindInfoList.length + 1)/2; downPanel = new UIScrollPane(new ShareWidgetPane(elCaseBindInfoList)); - downPanel.setPreferredSize(new Dimension(236, rowCount * 82)); - reuWidgetPanel = new JPanel(); + esp.add(downPanel); + } + + /** + * 初始化菜单栏面板 + */ + private void initMenuPanel() { + JPanel menutPane = new JPanel(); + menutPane.setLayout(FRGUIPaneFactory.createBorderLayout()); + menutPane.setBorder(BorderFactory.createEmptyBorder(3, 6, 3, 3)); + menutPane.add(new UILabel(Inter.getLocText("FR-Designer_LocalWidget"), + SwingConstants.HORIZONTAL), BorderLayout.WEST); + menutPane.add(downloadButton, BorderLayout.EAST); comboBox = new UIComboBox(getFormCategories()); - comboBox.setPreferredSize(new Dimension(236, 30)); + comboBox.setPreferredSize(new Dimension(240, 30)); initComboBoxSelectedListener(); - reuWidgetPanel.add(comboBox, BorderLayout.NORTH); - reuWidgetPanel.add(downPanel, BorderLayout.CENTER); - reuWidgetPanel.setBorder(new LineBorder(Color.gray)); + menutPane.add(comboBox, BorderLayout.SOUTH); + esp.add(menutPane,BorderLayout.NORTH); } private void initComboBoxSelectedListener() { @@ -144,7 +146,7 @@ public class FormWidgetDetailPane extends FormDockView{ if (filterIndex == 0) { elCaseBindInfoList = ShareLoader.getLoader().getAllBindInfoList(); } else { - String filterName = (String) e.getItem(); + String filterName = comboBox.getSelectedItem().toString(); elCaseBindInfoList = ShareLoader.getLoader().getFilterBindInfoList(filterName); } refreshDownPanel(); @@ -191,10 +193,10 @@ public class FormWidgetDetailPane extends FormDockView{ public void refreshDownPanel() { - reuWidgetPanel.remove(downPanel); + esp.remove(downPanel); downPanel = new UIScrollPane(new ShareWidgetPane(elCaseBindInfoList)); //todo:这个地方有问题 - reuWidgetPanel.add(downPanel); + esp.add(downPanel); repaintContainer(); } diff --git a/designer_form/src/com/fr/design/mainframe/ShareWidgetPane.java b/designer_form/src/com/fr/design/mainframe/ShareWidgetPane.java index f5e8e0126..47fb69275 100644 --- a/designer_form/src/com/fr/design/mainframe/ShareWidgetPane.java +++ b/designer_form/src/com/fr/design/mainframe/ShareWidgetPane.java @@ -1,6 +1,7 @@ package com.fr.design.mainframe; +import com.fr.design.form.layout.FRGridLayout; import com.fr.form.ui.ElCaseBindInfo; @@ -16,17 +17,15 @@ import java.util.List; public class ShareWidgetPane extends JPanel { public ShareWidgetPane(ElCaseBindInfo[] elCaseBindInfoList) { - this.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));// 设置面板的边框 ，距离上、左、下、右 的距离 - int rowCount = (elCaseBindInfoList.length + 1)/2; - this.setLayout(new GridLayout(rowCount, 2, 10, 10)); + this.setBorder(BorderFactory.createEmptyBorder(5, 2, 0, 0));// 设置面板的边框 ，距离上、左、下、右 的距离 + int rowCount = (elCaseBindInfoList.length + 1) / 2; + this.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0)); for (ElCaseBindInfo rbModuleInfo : elCaseBindInfoList) { ShareWidgetButton widgetButton = new ShareWidgetButton(rbModuleInfo); this.add(widgetButton); } - if (elCaseBindInfoList.length == 1) { - this.add(new JPanel()); - } + this.setPreferredSize(new Dimension(240, rowCount * 80)); } -} +} \ No newline at end of file diff --git a/designer_form/src/com/fr/design/mainframe/widget/UITreeComboBox.java b/designer_form/src/com/fr/design/mainframe/widget/UITreeComboBox.java index ef01c7b71..cbcf8f197 100644 --- a/designer_form/src/com/fr/design/mainframe/widget/UITreeComboBox.java +++ b/designer_form/src/com/fr/design/mainframe/widget/UITreeComboBox.java @@ -15,6 +15,7 @@ import com.fr.design.designer.beans.*; import com.fr.design.designer.beans.events.DesignerEditListener; import com.fr.design.designer.beans.events.DesignerEvent; import com.fr.design.designer.creator.XCreator; +import com.fr.design.gui.ilable.UILabel; import com.fr.design.mainframe.ComponentTree; import com.sun.java.swing.plaf.motif.*; import com.sun.java.swing.plaf.windows.*; From a9f89dc2680cd65cafc1edd4552ab36f02fcc5c9 Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Tue, 25 Oct 2016 17:02:43 +0800 Subject: [PATCH 07/12] rt --- .../src/com/fr/design/mainframe/widget/UITreeComboBox.java | 1 - 1 file changed, 1 deletion(-) diff --git a/designer_form/src/com/fr/design/mainframe/widget/UITreeComboBox.java b/designer_form/src/com/fr/design/mainframe/widget/UITreeComboBox.java index cbcf8f197..ef01c7b71 100644 --- a/designer_form/src/com/fr/design/mainframe/widget/UITreeComboBox.java +++ b/designer_form/src/com/fr/design/mainframe/widget/UITreeComboBox.java @@ -15,7 +15,6 @@ import com.fr.design.designer.beans.*; import com.fr.design.designer.beans.events.DesignerEditListener; import com.fr.design.designer.beans.events.DesignerEvent; import com.fr.design.designer.creator.XCreator; -import com.fr.design.gui.ilable.UILabel; import com.fr.design.mainframe.ComponentTree; import com.sun.java.swing.plaf.motif.*; import com.sun.java.swing.plaf.windows.*; From 45edc1997f0bb1f3aeb9c017466c835940714cba Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Tue, 25 Oct 2016 17:05:31 +0800 Subject: [PATCH 08/12] rt --- .../src/com/fr/design/mainframe/ShareWidgetPane.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/designer_form/src/com/fr/design/mainframe/ShareWidgetPane.java b/designer_form/src/com/fr/design/mainframe/ShareWidgetPane.java index 47fb69275..d9228f7fb 100644 --- a/designer_form/src/com/fr/design/mainframe/ShareWidgetPane.java +++ b/designer_form/src/com/fr/design/mainframe/ShareWidgetPane.java @@ -1,14 +1,10 @@ package com.fr.design.mainframe; -import com.fr.design.form.layout.FRGridLayout; -import com.fr.form.ui.ElCaseBindInfo; - +import com.fr.form.ui.ElCaseBindInfo; import javax.swing.*; import java.awt.*; -import java.util.*; -import java.util.List; /** From 660024a8e1a14da473dda095b14ca898de5553ac Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Tue, 25 Oct 2016 17:08:34 +0800 Subject: [PATCH 09/12] rt --- designer_form/src/com/fr/design/mainframe/ShareWidgetPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_form/src/com/fr/design/mainframe/ShareWidgetPane.java b/designer_form/src/com/fr/design/mainframe/ShareWidgetPane.java index d9228f7fb..8d52eb4c8 100644 --- a/designer_form/src/com/fr/design/mainframe/ShareWidgetPane.java +++ b/designer_form/src/com/fr/design/mainframe/ShareWidgetPane.java @@ -13,7 +13,7 @@ import java.awt.*; public class ShareWidgetPane extends JPanel { public ShareWidgetPane(ElCaseBindInfo[] elCaseBindInfoList) { - this.setBorder(BorderFactory.createEmptyBorder(5, 2, 0, 0));// 设置面板的边框 ，距离上、左、下、右 的距离 + this.setBorder(BorderFactory.createEmptyBorder(10, 3, 0, 0));// 设置面板的边框 ，距离上、左、下、右 的距离 int rowCount = (elCaseBindInfoList.length + 1) / 2; this.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0)); for (ElCaseBindInfo rbModuleInfo : elCaseBindInfoList) { From 583458bede4b79a59645859116e47d4c049ef754 Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Tue, 25 Oct 2016 17:10:41 +0800 Subject: [PATCH 10/12] rt --- .../src/com/fr/design/mainframe/FormWidgetDetailPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_form/src/com/fr/design/mainframe/FormWidgetDetailPane.java b/designer_form/src/com/fr/design/mainframe/FormWidgetDetailPane.java index f4af3d79d..3eef45c40 100644 --- a/designer_form/src/com/fr/design/mainframe/FormWidgetDetailPane.java +++ b/designer_form/src/com/fr/design/mainframe/FormWidgetDetailPane.java @@ -127,7 +127,7 @@ public class FormWidgetDetailPane extends FormDockView{ private void initMenuPanel() { JPanel menutPane = new JPanel(); menutPane.setLayout(FRGUIPaneFactory.createBorderLayout()); - menutPane.setBorder(BorderFactory.createEmptyBorder(3, 6, 3, 3)); + menutPane.setBorder(BorderFactory.createEmptyBorder(5, 8, 3, 3)); menutPane.add(new UILabel(Inter.getLocText("FR-Designer_LocalWidget"), SwingConstants.HORIZONTAL), BorderLayout.WEST); menutPane.add(downloadButton, BorderLayout.EAST); From 3ad0e4764a6a00114423ebfe14ee459d4c208168 Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Tue, 25 Oct 2016 17:18:37 +0800 Subject: [PATCH 11/12] rt --- .../src/com/fr/design/mainframe/FormWidgetDetailPane.java | 1 - 1 file changed, 1 deletion(-) diff --git a/designer_form/src/com/fr/design/mainframe/FormWidgetDetailPane.java b/designer_form/src/com/fr/design/mainframe/FormWidgetDetailPane.java index 3eef45c40..e31187826 100644 --- a/designer_form/src/com/fr/design/mainframe/FormWidgetDetailPane.java +++ b/designer_form/src/com/fr/design/mainframe/FormWidgetDetailPane.java @@ -195,7 +195,6 @@ public class FormWidgetDetailPane extends FormDockView{ public void refreshDownPanel() { esp.remove(downPanel); downPanel = new UIScrollPane(new ShareWidgetPane(elCaseBindInfoList)); - //todo:这个地方有问题 esp.add(downPanel); repaintContainer(); From f8ffda50923974e7f62daa1d76acf78a075f9f4c Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Tue, 25 Oct 2016 20:19:29 +0800 Subject: [PATCH 12/12] rt --- .../design/mainframe/FormWidgetDetailPane.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/designer_form/src/com/fr/design/mainframe/FormWidgetDetailPane.java b/designer_form/src/com/fr/design/mainframe/FormWidgetDetailPane.java index e31187826..ef3a1e708 100644 --- a/designer_form/src/com/fr/design/mainframe/FormWidgetDetailPane.java +++ b/designer_form/src/com/fr/design/mainframe/FormWidgetDetailPane.java @@ -47,7 +47,7 @@ public class FormWidgetDetailPane extends FormDockView{ private UITabbedPane tabbedPane; private UIScrollPane downPanel; - private JPanel esp; + private JPanel reuWidgetPanel; private UIComboBox comboBox; private ElCaseBindInfo[] elCaseBindInfoList; private UIButton downloadButton; @@ -95,8 +95,8 @@ public class FormWidgetDetailPane extends FormDockView{ clearDockingView(); return; } - esp = FRGUIPaneFactory.createBorderLayout_S_Pane(); - esp.setBorder(null); + reuWidgetPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); + reuWidgetPanel.setBorder(null); if (elCaseBindInfoList == null) { elCaseBindInfoList = ShareLoader.getLoader().getAllBindInfoList(); } @@ -107,7 +107,7 @@ public class FormWidgetDetailPane extends FormDockView{ tabbedPane.setOpaque(true); tabbedPane.setBorder(null); tabbedPane.setTabPlacement(SwingConstants.BOTTOM); - tabbedPane.addTab(Inter.getLocText("FR-Engine_Report"), esp); + tabbedPane.addTab(Inter.getLocText("FR-Engine_Report"), reuWidgetPanel); tabbedPane.addTab(Inter.getLocText("FR-Designer-Form-ToolBar_Chart"), new JPanel()); add(tabbedPane, BorderLayout.CENTER); @@ -118,7 +118,7 @@ public class FormWidgetDetailPane extends FormDockView{ */ private void initReuWidgetPanel() { downPanel = new UIScrollPane(new ShareWidgetPane(elCaseBindInfoList)); - esp.add(downPanel); + reuWidgetPanel.add(downPanel); } /** @@ -135,7 +135,7 @@ public class FormWidgetDetailPane extends FormDockView{ comboBox.setPreferredSize(new Dimension(240, 30)); initComboBoxSelectedListener(); menutPane.add(comboBox, BorderLayout.SOUTH); - esp.add(menutPane,BorderLayout.NORTH); + reuWidgetPanel.add(menutPane,BorderLayout.NORTH); } private void initComboBoxSelectedListener() { @@ -193,9 +193,9 @@ public class FormWidgetDetailPane extends FormDockView{ public void refreshDownPanel() { - esp.remove(downPanel); + reuWidgetPanel.remove(downPanel); downPanel = new UIScrollPane(new ShareWidgetPane(elCaseBindInfoList)); - esp.add(downPanel); + reuWidgetPanel.add(downPanel); repaintContainer(); }