From 670e8f66abc473f42c45d18a6f8cf2c33db3d460 Mon Sep 17 00:00:00 2001 From: mengao <283296419@qq.com> Date: Mon, 4 Sep 2017 14:03:52 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E9=80=89=E6=8B=A9=E9=9D=A2=E6=9D=BF=E4=B8=AD?= =?UTF-8?q?=EF=BC=8C=E4=B8=AD=E5=BF=83=E7=82=B9=E8=AE=BE=E7=BD=AEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/chart/map/designer/type/VanChartMapPlotPane.java | 3 +-- .../chart/map/designer/type/VanChartMapSourceChoosePane.java | 5 ++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapPlotPane.java b/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapPlotPane.java index 977e7ce3a4..8f73e2d5f1 100644 --- a/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapPlotPane.java +++ b/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapPlotPane.java @@ -7,7 +7,6 @@ import com.fr.design.mainframe.chart.gui.type.ChartImagePane; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.FRLogger; import com.fr.general.Inter; -import com.fr.plugin.chart.attr.plot.VanChartPlot; import com.fr.plugin.chart.base.VanChartTools; import com.fr.plugin.chart.designer.type.AbstractVanChartTypePane; import com.fr.plugin.chart.map.MapIndependentVanChart; @@ -116,7 +115,7 @@ public class VanChartMapPlotPane extends AbstractVanChartTypePane { Plot plot = chart.getPlot(); if(plot instanceof VanChartMapPlot) { sourceChoosePane.updateBean((VanChartMapPlot) plot); - if(typeChanged && samePlot){ + if(!samePlot || (typeChanged && samePlot)){ resetAttr(plot); } } 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 6b15607c6e..3314b180ad 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 @@ -567,8 +567,11 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver { } private void resetViewCenter(VanChartMapPlot mapPlot) { - mapPlot.getViewCenter().setAuto(true); + mapPlot.setViewCenter(new ViewCenter()); viewCenterCom.setSelectedIndex(0); + longitude.setValue(0); + latitude.setValue(0); + longAndLatPane.setVisible(false); } private void resetZoomLevel(VanChartMapPlot mapPlot) { From f789fc0a8f93910ca1bad3e33b5e3c5bec985757 Mon Sep 17 00:00:00 2001 From: mengao <283296419@qq.com> Date: Mon, 4 Sep 2017 14:37:44 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8C=83=E5=9B=B4?= =?UTF-8?q?=E5=9B=BE=E4=BE=8B=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/plugin/chart/range/component/LegendGradientBar.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer_chart/src/com/fr/plugin/chart/range/component/LegendGradientBar.java b/designer_chart/src/com/fr/plugin/chart/range/component/LegendGradientBar.java index 782fc1b795..b13c21352f 100644 --- a/designer_chart/src/com/fr/plugin/chart/range/component/LegendGradientBar.java +++ b/designer_chart/src/com/fr/plugin/chart/range/component/LegendGradientBar.java @@ -39,7 +39,7 @@ public class LegendGradientBar extends JComponent implements ColorSelectable, UI //主题色 private Color subColor; - private int max = 154; + private int max = 150; private int min = 4; //选中的颜色 @@ -77,7 +77,7 @@ public class LegendGradientBar extends JComponent implements ColorSelectable, UI iniListener(); - this.setPreferredSize(new Dimension(10 + max, MAX_VERTICAL)); + this.setPreferredSize(new Dimension(5 + max, MAX_VERTICAL)); } private void initColorsAndDist() { From 15128aa8fd73918cb889a85bbef1701fc502f956 Mon Sep 17 00:00:00 2001 From: mengao <283296419@qq.com> Date: Mon, 4 Sep 2017 15:14:53 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E9=9B=B7=E8=BE=BE=E5=9B=BE=20=E8=BD=B4?= =?UTF-8?q?=E7=BA=BF=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/designer/style/axis/VanChartBaseAxisPane.java | 6 +++++- .../designer/style/axis/radar/VanChartRadarXAxisPane.java | 6 ++++++ .../designer/style/axis/radar/VanChartRadarYAxisPane.java | 6 ++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartBaseAxisPane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartBaseAxisPane.java index 649e030da4..b76dd98e87 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartBaseAxisPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartBaseAxisPane.java @@ -197,7 +197,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { } protected JPanel createLineStylePane(double[] row, double[] col){ - axisLineStyle = new LineComboBox(CoreConstants.LINE_STYLE_ARRAY_4_AXIS); + axisLineStyle = createLineComboBox(); axisLineColor = new ColorSelectBox(100); String[] strings = new String[]{Inter.getLocText("Plugin-ChartF_Open"),Inter.getLocText("Plugin-ChartF_Close")}; AxisTickLineType[] values = new AxisTickLineType[]{AxisTickLineType.TICK_LINE_OUTSIDE, AxisTickLineType.TICK_LINE_NONE}; @@ -208,6 +208,10 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_AxisLineStyle"), panel); } + protected LineComboBox createLineComboBox() { + return new LineComboBox(CoreConstants.LINE_STYLE_ARRAY_4_AXIS); + } + protected Component[][] getLineStylePaneComponents() { return new Component[][]{ new Component[]{null,null} , diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/axis/radar/VanChartRadarXAxisPane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/axis/radar/VanChartRadarXAxisPane.java index 02075c8c50..eae979c829 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/style/axis/radar/VanChartRadarXAxisPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/style/axis/radar/VanChartRadarXAxisPane.java @@ -1,11 +1,13 @@ package com.fr.plugin.chart.designer.style.axis.radar; +import com.fr.design.gui.icombobox.LineComboBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.general.Inter; import com.fr.plugin.chart.designer.TableLayout4VanChartHelper; import com.fr.plugin.chart.designer.style.axis.VanChartBaseAxisPane; +import com.fr.stable.CoreConstants; import javax.swing.*; import java.awt.*; @@ -40,4 +42,8 @@ public class VanChartRadarXAxisPane extends VanChartBaseAxisPane { new Component[]{new UILabel(Inter.getLocText("FR-Chart-Color_Color")),axisLineColor}, }; } + + protected LineComboBox createLineComboBox() { + return new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART); + } } \ No newline at end of file diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/axis/radar/VanChartRadarYAxisPane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/axis/radar/VanChartRadarYAxisPane.java index e722402be8..054b05f7b1 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/style/axis/radar/VanChartRadarYAxisPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/style/axis/radar/VanChartRadarYAxisPane.java @@ -1,6 +1,7 @@ package com.fr.plugin.chart.designer.style.axis.radar; import com.fr.design.gui.ibutton.UIButtonGroup; +import com.fr.design.gui.icombobox.LineComboBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; @@ -10,6 +11,7 @@ import com.fr.plugin.chart.attr.axis.VanChartValueAxis; import com.fr.plugin.chart.designer.TableLayout4VanChartHelper; import com.fr.plugin.chart.designer.style.axis.VanChartValueAxisPane; import com.fr.plugin.chart.designer.style.axis.component.MinMaxValuePaneWithOutSecTick; +import com.fr.stable.CoreConstants; import javax.swing.*; import java.awt.*; @@ -43,6 +45,10 @@ public class VanChartRadarYAxisPane extends VanChartValueAxisPane { return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); } + protected LineComboBox createLineComboBox() { + return new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART); + } + protected JPanel createMinMaxValuePane(double[] row, double[] col) { double p = TableLayout.PREFERRED; double f = TableLayout.FILL; From 3ea73837dcb9e5a1464a006d0e18233f2b8f112b Mon Sep 17 00:00:00 2001 From: MoMeak Date: Mon, 4 Sep 2017 15:15:17 +0800 Subject: [PATCH 4/8] =?UTF-8?q?REPORT-3959=20[9.0=E4=B8=80=E8=BD=AE?= =?UTF-8?q?=E5=9B=9E=E5=BD=92]=E8=A1=8C=EF=BC=88=E5=88=97=EF=BC=89?= =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=97=B6=E8=A1=8C=EF=BC=88=E5=88=97=EF=BC=89?= =?UTF-8?q?=E5=8F=B7=E4=BE=9D=E7=84=B6=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer/src/com/fr/grid/GridColumnUI.java | 8 ++++---- designer/src/com/fr/grid/GridRowUI.java | 23 +++++++++++----------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/designer/src/com/fr/grid/GridColumnUI.java b/designer/src/com/fr/grid/GridColumnUI.java index 9712821682..ab32e6ce86 100644 --- a/designer/src/com/fr/grid/GridColumnUI.java +++ b/designer/src/com/fr/grid/GridColumnUI.java @@ -163,11 +163,11 @@ public class GridColumnUI extends ComponentUI { float time = (float)resolution/ScreenResolution.getScreenResolution(); double stringWidth = gridColumn.getFont().getStringBounds(columnContent, fontRenderContext).getWidth() * time; -// if (stringWidth > tmpIncreaseWidth) { -// paintMoreContent(i, g2d, tmpWidth1, size, tmpIncreaseWidth, isSelectedBounds, gridColumn, elementCase, columnContent, stringWidth, fmAscent); -// } else { + if (stringWidth > tmpIncreaseWidth) { + paintMoreContent(i, g2d, tmpWidth1, size, tmpIncreaseWidth, isSelectedBounds, gridColumn, elementCase, columnContent, stringWidth, fmAscent); + } else { paintNormalContent(i, g2d, tmpWidth1, tmpIncreaseWidth, isSelectedBounds, gridColumn, elementCase, columnContent, stringWidth, fmAscent); -// } + } } diff --git a/designer/src/com/fr/grid/GridRowUI.java b/designer/src/com/fr/grid/GridRowUI.java index 016cfe6378..2f97914bbc 100644 --- a/designer/src/com/fr/grid/GridRowUI.java +++ b/designer/src/com/fr/grid/GridRowUI.java @@ -159,20 +159,21 @@ public class GridRowUI extends ComponentUI { float fmAscent = GraphHelper.getFontMetrics(gridRow.getFont()).getAscent() * time; double stringWidth = gridRow.getFont().getStringBounds(paintText, fontRenderContext).getWidth() * time; double stringHeight = gridRow.getFont().getStringBounds(paintText, fontRenderContext).getHeight() * time; - if (isSelectedBounds) { - g2d.setColor(gridRow.getSelectedForeground()); - } else { - // p:检查eanbled - if (gridRow.isEnabled()) { - g2d.setColor(gridRow.getForeground()); + // 如果高度太小了就不画了 + if (stringHeight <= tmpIncreaseHeight + 2) { + if (isSelectedBounds) { + g2d.setColor(gridRow.getSelectedForeground()); } else { - g2d.setPaint(UIManager.getColor("controlShadow")); + // p:检查eanbled + if (gridRow.isEnabled()) { + g2d.setColor(gridRow.getForeground()); + } else { + g2d.setPaint(UIManager.getColor("controlShadow")); + } } - } - - GraphHelper.drawString(g2d, paintText, (size.width - stringWidth) / 2, tmpHeight1 + (tmpIncreaseHeight - stringHeight) / 2 + GridHeader.SIZE_ADJUST / 2 + fmAscent - - 2); + GraphHelper.drawString(g2d, paintText, (size.width - stringWidth) / 2, tmpHeight1 + (tmpIncreaseHeight - stringHeight) / 2 + GridHeader.SIZE_ADJUST / 2 + fmAscent - 2); + } } } \ No newline at end of file From baa1255697a2c96ee00b55668ff9cb0ef528fdb2 Mon Sep 17 00:00:00 2001 From: plough Date: Mon, 4 Sep 2017 18:07:18 +0800 Subject: [PATCH 5/8] =?UTF-8?q?REPORT-3837=20[9.0=E4=B8=80=E8=BD=AE?= =?UTF-8?q?=E5=9B=9E=E5=BD=92]=E6=96=B0=E5=BB=BA=E5=8D=95=E5=85=83?= =?UTF-8?q?=E6=A0=BC=E6=9D=A1=E4=BB=B6=E5=B1=9E=E6=80=A7=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B9=8B=E5=89=8D=E5=85=AC=E5=BC=8F=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/condition/LiteConditionPane.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/designer_base/src/com/fr/design/condition/LiteConditionPane.java b/designer_base/src/com/fr/design/condition/LiteConditionPane.java index 33f2e30c86..1ce56fb3ad 100644 --- a/designer_base/src/com/fr/design/condition/LiteConditionPane.java +++ b/designer_base/src/com/fr/design/condition/LiteConditionPane.java @@ -167,9 +167,6 @@ public abstract class LiteConditionPane extends BasicBeanPa TreePath selectedTreePath = conditionsTree.getSelectionPath(); if (selectedTreePath == null) { - // 清空编辑框 - defaultConditionPane.populateBean((T)new ObjectCondition(new Compare(Compare.EQUALS, StringUtils.EMPTY))); - formulaTextArea.setText(StringUtils.EMPTY); return; } @@ -856,6 +853,10 @@ public abstract class LiteConditionPane extends BasicBeanPa rootTreeNode.setUserObject(new JoinCondition(DataConstants.AND, new ListCondition())); rootTreeNode.removeAllChildren(); + // 清空编辑框 + defaultConditionPane.populateBean((T)new ObjectCondition(new Compare(Compare.EQUALS, StringUtils.EMPTY))); + formulaTextArea.setText(StringUtils.EMPTY); + // peter:需要构建成ListCondition,加入到里面. if (liteCondition instanceof ListCondition) { ListCondition listCondition = (ListCondition) liteCondition; From 4afcb2bd89a672e3226ca362386e67303c864846 Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 5 Sep 2017 09:41:30 +0800 Subject: [PATCH 6/8] =?UTF-8?q?REPORT-4364=20=E6=9D=A1=E4=BB=B6=E5=B1=9E?= =?UTF-8?q?=E6=80=A7>=E8=B6=85=E7=BA=A7=E9=93=BE=E6=8E=A5=E5=BC=B9?= =?UTF-8?q?=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/condition/HyperlinkPane.java | 2 +- .../com/fr/design/mainframe/JWorkBook.java | 5 +++ .../mainframe/ReportHyperlinkGroupPane.java | 5 +-- .../ReportHyperlinkGroupPaneNoPop.java | 35 +++++++++++++++++++ .../com/fr/design/mainframe/JTemplate.java | 7 ++++ .../gui/xpane/FormHyperlinkGroupPane.java | 2 +- .../xpane/FormHyperlinkGroupPaneNoPop.java | 33 +++++++++++++++++ .../src/com/fr/design/mainframe/JForm.java | 7 ++++ 8 files changed, 92 insertions(+), 4 deletions(-) create mode 100644 designer/src/com/fr/design/mainframe/ReportHyperlinkGroupPaneNoPop.java create mode 100644 designer_form/src/com/fr/design/gui/xpane/FormHyperlinkGroupPaneNoPop.java diff --git a/designer/src/com/fr/design/condition/HyperlinkPane.java b/designer/src/com/fr/design/condition/HyperlinkPane.java index bbdecf6611..7ff03a7c88 100644 --- a/designer/src/com/fr/design/condition/HyperlinkPane.java +++ b/designer/src/com/fr/design/condition/HyperlinkPane.java @@ -37,7 +37,7 @@ public class HyperlinkPane extends ConditionAttrSingleConditionPane { return ReportHyperlinkGroupPane.getInstance(hyperlinkGroupPaneActionProvider); } + @Override + public HyperlinkGroupPane getHyperLinkPaneNoPop(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider) { + return ReportHyperlinkGroupPaneNoPop.getInstance(hyperlinkGroupPaneActionProvider); + } + public void setAuthorityMode(boolean isUpMode) { centerPane.setAuthorityMode(isUpMode); } diff --git a/designer/src/com/fr/design/mainframe/ReportHyperlinkGroupPane.java b/designer/src/com/fr/design/mainframe/ReportHyperlinkGroupPane.java index b2b018e0be..20886536ae 100644 --- a/designer/src/com/fr/design/mainframe/ReportHyperlinkGroupPane.java +++ b/designer/src/com/fr/design/mainframe/ReportHyperlinkGroupPane.java @@ -23,7 +23,8 @@ import java.awt.*; public class ReportHyperlinkGroupPane extends HyperlinkGroupPane { private static ReportHyperlinkGroupPane singleton; - private ReportHyperlinkGroupPane(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider) { + // 仅供继承使用，外部通过 getInstance 获取实例 + protected ReportHyperlinkGroupPane(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider) { super(hyperlinkGroupPaneActionProvider); } @@ -35,7 +36,7 @@ public class ReportHyperlinkGroupPane extends HyperlinkGroupPane { return singleton; } - private void refreshPane() { + protected void refreshPane() { ElementCasePane reportPane = ((JWorkBook)HistoryTemplateListPane.getInstance().getCurrentEditingTemplate()).getEditingElementCasePane(); if (reportPane == null) { return; diff --git a/designer/src/com/fr/design/mainframe/ReportHyperlinkGroupPaneNoPop.java b/designer/src/com/fr/design/mainframe/ReportHyperlinkGroupPaneNoPop.java new file mode 100644 index 0000000000..9a694e5ffe --- /dev/null +++ b/designer/src/com/fr/design/mainframe/ReportHyperlinkGroupPaneNoPop.java @@ -0,0 +1,35 @@ +package com.fr.design.mainframe; + +import com.fr.design.gui.frpane.HyperlinkGroupPane; +import com.fr.design.gui.frpane.HyperlinkGroupPaneActionProvider; + +import java.awt.*; + +/** + * Created by plough on 2017/9/4. + */ +public class ReportHyperlinkGroupPaneNoPop extends ReportHyperlinkGroupPane{ + private static ReportHyperlinkGroupPaneNoPop singleton; + + private ReportHyperlinkGroupPaneNoPop(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider) { + super(hyperlinkGroupPaneActionProvider); + } + + public static ReportHyperlinkGroupPaneNoPop getInstance(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider) { + if (singleton == null) { + singleton = new ReportHyperlinkGroupPaneNoPop(hyperlinkGroupPaneActionProvider); + } + singleton.refreshPane(); + return singleton; + } + + @Override + protected boolean isNewStyle() { + return false; + } + + @Override + protected void popupEditDialog(Point mousePos) { + // no pop, do nothing + } +} diff --git a/designer_base/src/com/fr/design/mainframe/JTemplate.java b/designer_base/src/com/fr/design/mainframe/JTemplate.java index 4f9c7a2056..633fc066b9 100644 --- a/designer_base/src/com/fr/design/mainframe/JTemplate.java +++ b/designer_base/src/com/fr/design/mainframe/JTemplate.java @@ -890,6 +890,13 @@ public abstract class JTemplate> ex */ public abstract HyperlinkGroupPane getHyperLinkPane(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider); + /** + * 返回当前支持的超链界面pane + * 没有悬浮弹窗，显示为两列 + * @return 超链连接界面 + */ + public abstract HyperlinkGroupPane getHyperLinkPaneNoPop(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider); + /** * 是否是图表 * diff --git a/designer_form/src/com/fr/design/gui/xpane/FormHyperlinkGroupPane.java b/designer_form/src/com/fr/design/gui/xpane/FormHyperlinkGroupPane.java index 125f6b751c..1d3e146860 100644 --- a/designer_form/src/com/fr/design/gui/xpane/FormHyperlinkGroupPane.java +++ b/designer_form/src/com/fr/design/gui/xpane/FormHyperlinkGroupPane.java @@ -12,7 +12,7 @@ import com.fr.js.EmailJavaScript; public class FormHyperlinkGroupPane extends HyperlinkGroupPane{ private static FormHyperlinkGroupPane singleton; - private FormHyperlinkGroupPane(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider) { + protected FormHyperlinkGroupPane(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider) { super(hyperlinkGroupPaneActionProvider); } diff --git a/designer_form/src/com/fr/design/gui/xpane/FormHyperlinkGroupPaneNoPop.java b/designer_form/src/com/fr/design/gui/xpane/FormHyperlinkGroupPaneNoPop.java new file mode 100644 index 0000000000..9e57269113 --- /dev/null +++ b/designer_form/src/com/fr/design/gui/xpane/FormHyperlinkGroupPaneNoPop.java @@ -0,0 +1,33 @@ +package com.fr.design.gui.xpane; + +import com.fr.design.gui.frpane.HyperlinkGroupPaneActionProvider; + +import java.awt.*; + +/** + * Created by plough on 2017/9/5. + */ +public class FormHyperlinkGroupPaneNoPop extends FormHyperlinkGroupPane{ + private static FormHyperlinkGroupPaneNoPop singleton; + + private FormHyperlinkGroupPaneNoPop(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider) { + super(hyperlinkGroupPaneActionProvider); + } + + public static FormHyperlinkGroupPaneNoPop getInstance(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider) { + if (singleton == null) { + singleton = new FormHyperlinkGroupPaneNoPop(hyperlinkGroupPaneActionProvider); + } + return singleton; + } + + @Override + protected boolean isNewStyle() { + return false; + } + + @Override + protected void popupEditDialog(Point mousePos) { + // no pop, do nothing + } +} diff --git a/designer_form/src/com/fr/design/mainframe/JForm.java b/designer_form/src/com/fr/design/mainframe/JForm.java index c84f572fd3..e6432bf1ed 100644 --- a/designer_form/src/com/fr/design/mainframe/JForm.java +++ b/designer_form/src/com/fr/design/mainframe/JForm.java @@ -22,6 +22,7 @@ import com.fr.design.gui.frpane.HyperlinkGroupPaneActionProvider; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.imenu.UIMenuItem; import com.fr.design.gui.xpane.FormHyperlinkGroupPane; +import com.fr.design.gui.xpane.FormHyperlinkGroupPaneNoPop; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.actions.EmbeddedFormExportExportAction; import com.fr.design.mainframe.actions.FormMobileAttrAction; @@ -147,10 +148,16 @@ public class JForm extends JTemplate implements BaseJForm { * * @return 超链连接界面 */ + @Override public HyperlinkGroupPane getHyperLinkPane(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider) { return FormHyperlinkGroupPane.getInstance(hyperlinkGroupPaneActionProvider); } + @Override + public HyperlinkGroupPane getHyperLinkPaneNoPop(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider) { + return FormHyperlinkGroupPaneNoPop.getInstance(hyperlinkGroupPaneActionProvider); + } + //表单返回 FORM_TAB or ELEMENTCASE_TAB public int getEditingReportIndex() { return this.index; From 44a4f91bb42e6490e25cc967111c32dccc480725 Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 5 Sep 2017 10:45:54 +0800 Subject: [PATCH 7/8] =?UTF-8?q?REPORT-4364=20=E6=9D=A1=E4=BB=B6=E5=B1=9E?= =?UTF-8?q?=E6=80=A7>=E6=8E=A7=E4=BB=B6=E3=80=81=E8=B6=85=E7=BA=A7?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E5=BC=B9=E7=AA=97=3D>=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainframe/ReportHyperlinkGroupPaneNoPop.java | 8 -------- .../com/fr/design/widget/WidgetEventPaneNoPop.java | 7 ------- .../fr/design/gui/controlpane/UIControlPane.java | 14 ++++++++------ .../design/gui/controlpane/UIListControlPane.java | 14 ++++++++------ .../gui/xpane/FormHyperlinkGroupPaneNoPop.java | 7 ------- 5 files changed, 16 insertions(+), 34 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/ReportHyperlinkGroupPaneNoPop.java b/designer/src/com/fr/design/mainframe/ReportHyperlinkGroupPaneNoPop.java index 9a694e5ffe..451c899755 100644 --- a/designer/src/com/fr/design/mainframe/ReportHyperlinkGroupPaneNoPop.java +++ b/designer/src/com/fr/design/mainframe/ReportHyperlinkGroupPaneNoPop.java @@ -1,10 +1,7 @@ package com.fr.design.mainframe; -import com.fr.design.gui.frpane.HyperlinkGroupPane; import com.fr.design.gui.frpane.HyperlinkGroupPaneActionProvider; -import java.awt.*; - /** * Created by plough on 2017/9/4. */ @@ -27,9 +24,4 @@ public class ReportHyperlinkGroupPaneNoPop extends ReportHyperlinkGroupPane{ protected boolean isNewStyle() { return false; } - - @Override - protected void popupEditDialog(Point mousePos) { - // no pop, do nothing - } } diff --git a/designer/src/com/fr/design/widget/WidgetEventPaneNoPop.java b/designer/src/com/fr/design/widget/WidgetEventPaneNoPop.java index 60597b77be..b9d67ec883 100644 --- a/designer/src/com/fr/design/widget/WidgetEventPaneNoPop.java +++ b/designer/src/com/fr/design/widget/WidgetEventPaneNoPop.java @@ -2,8 +2,6 @@ package com.fr.design.widget; import com.fr.design.mainframe.ElementCasePane; -import java.awt.*; - /** * 没有悬浮弹窗的控件事件编辑面板 * Created by plough on 2017/8/28. @@ -17,9 +15,4 @@ public class WidgetEventPaneNoPop extends WidgetEventPane { protected boolean isNewStyle() { return false; } - - @Override - protected void popupEditDialog(Point mousePos) { - // no pop, do nothing - } } diff --git a/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java b/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java index 4e5fd2bb1c..4deb8ac401 100644 --- a/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java +++ b/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java @@ -27,22 +27,17 @@ import java.awt.event.WindowEvent; public abstract class UIControlPane extends BasicPane implements UnrepeatedNameHelper { protected static final int SHORT_WIDTH = 30; //每加一个short Divider位置加30 protected JPanel controlUpdatePane; - private ShortCut4JControlPane[] shorts; private NameableCreator[] creators; private ToolBarDef toolbarDef; - private UIToolbar toolBar; private UIToolbar topToolBar; protected PopupEditDialog popupEditDialog; // peter:这是整体的一个cardLayout Pane protected CardLayout cardLayout; - protected JPanel cardPane; - protected BasePlot plot; - public UIControlPane() { this.initComponentPane(); } @@ -128,8 +123,15 @@ public abstract class UIControlPane extends BasicPane implements UnrepeatedNameH this.add(getLeftPane(), BorderLayout.CENTER); this.setBorder(BorderFactory.createEmptyBorder(10, 10, 15, 15)); } else { + // 增加边框 + JPanel leftPaneWrapper = new JPanel(new BorderLayout()); + leftPaneWrapper.add(getLeftPane(), BorderLayout.CENTER); + leftPaneWrapper.setBorder(BorderFactory.createEmptyBorder(6, 6, 6, 6)); + JPanel rightPaneWrapper = new JPanel(new BorderLayout()); + rightPaneWrapper.add(cardPane, BorderLayout.CENTER); + rightPaneWrapper.setBorder(BorderFactory.createEmptyBorder(6, 6, 6, 6)); // SplitPane - JSplitPane mainSplitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, getLeftPane(), cardPane); + JSplitPane mainSplitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, leftPaneWrapper, rightPaneWrapper); mainSplitPane.setBorder(BorderFactory.createLineBorder(GUICoreUtils.getTitleLineBorderColor())); mainSplitPane.setOneTouchExpandable(true); this.add(mainSplitPane, BorderLayout.CENTER); diff --git a/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java b/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java index d96862a392..ca0363d25c 100644 --- a/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java +++ b/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java @@ -390,13 +390,15 @@ public abstract class UIListControlPane extends UIControlPane { } } - protected void popupEditDialog(Point mousePos) { - Rectangle currentCellBounds = nameableList.getCellBounds(editingIndex, editingIndex); - if (editingIndex < 0 || !currentCellBounds.contains(mousePos)) { - return; + private void popupEditDialog(Point mousePos) { + if (isNewStyle()) { + Rectangle currentCellBounds = nameableList.getCellBounds(editingIndex, editingIndex); + if (editingIndex < 0 || !currentCellBounds.contains(mousePos)) { + return; + } + popupEditDialog.setLocation(getPopupDialogLocation()); + popupEditDialog.setVisible(true); } - popupEditDialog.setLocation(getPopupDialogLocation()); - popupEditDialog.setVisible(true); } private Point getPopupDialogLocation() { diff --git a/designer_form/src/com/fr/design/gui/xpane/FormHyperlinkGroupPaneNoPop.java b/designer_form/src/com/fr/design/gui/xpane/FormHyperlinkGroupPaneNoPop.java index 9e57269113..313b571470 100644 --- a/designer_form/src/com/fr/design/gui/xpane/FormHyperlinkGroupPaneNoPop.java +++ b/designer_form/src/com/fr/design/gui/xpane/FormHyperlinkGroupPaneNoPop.java @@ -2,8 +2,6 @@ package com.fr.design.gui.xpane; import com.fr.design.gui.frpane.HyperlinkGroupPaneActionProvider; -import java.awt.*; - /** * Created by plough on 2017/9/5. */ @@ -25,9 +23,4 @@ public class FormHyperlinkGroupPaneNoPop extends FormHyperlinkGroupPane{ protected boolean isNewStyle() { return false; } - - @Override - protected void popupEditDialog(Point mousePos) { - // no pop, do nothing - } } From 83f12a44b27dd66cc8409574dbd745f40c92bc46 Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 5 Sep 2017 10:57:40 +0800 Subject: [PATCH 8/8] =?UTF-8?q?REPORT-4364=20=E6=9D=A1=E4=BB=B6=E5=B1=9E?= =?UTF-8?q?=E6=80=A7>=E6=8E=A7=E4=BB=B6=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/condition/WidgetHighlightPane.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/designer/src/com/fr/design/condition/WidgetHighlightPane.java b/designer/src/com/fr/design/condition/WidgetHighlightPane.java index da3b747e41..f8701c1e8c 100644 --- a/designer/src/com/fr/design/condition/WidgetHighlightPane.java +++ b/designer/src/com/fr/design/condition/WidgetHighlightPane.java @@ -6,6 +6,9 @@ import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.ilable.UILabel; +import com.fr.design.mainframe.ElementCasePane; +import com.fr.design.widget.CellWidgetCardPane; +import com.fr.design.widget.WidgetManageCardPane; import com.fr.design.widget.WidgetPane; import com.fr.form.ui.*; import com.fr.general.Inter; @@ -35,7 +38,12 @@ public class WidgetHighlightPane extends ConditionAttrSingleConditionPane