diff --git a/designer/src/com/fr/design/dscolumn/ResultSetGroupDockingPane.java b/designer/src/com/fr/design/dscolumn/ResultSetGroupDockingPane.java index ed4c24cba1..3c36414681 100644 --- a/designer/src/com/fr/design/dscolumn/ResultSetGroupDockingPane.java +++ b/designer/src/com/fr/design/dscolumn/ResultSetGroupDockingPane.java @@ -69,13 +69,13 @@ public class ResultSetGroupDockingPane extends ResultSetGroupPane { int i = goBox.getSelectedIndex(); if (i == BIND_GROUP) { cardLayout.show(cardPane, "groupPane"); - cardPane.setPreferredSize(new Dimension(155, 20)); + cardPane.setPreferredSize(new Dimension(156, 20)); } else if (i == BIND_SELECTED) { cardLayout.show(cardPane, "listPane"); cardPane.setPreferredSize(new Dimension(0, 0)); } else if (i == BIND_SUMMARY) { cardLayout.show(cardPane, "summaryPane"); - cardPane.setPreferredSize(new Dimension(155, 20)); + cardPane.setPreferredSize(new Dimension(156, 20)); CellExpandAttr cellExpandAttr = cellElement.getCellExpandAttr(); cellExpandAttr.setDirection(Constants.NONE); } diff --git a/designer/src/com/fr/quickeditor/CellQuickEditor.java b/designer/src/com/fr/quickeditor/CellQuickEditor.java index 2e1f4531d2..ae4e4b73f9 100644 --- a/designer/src/com/fr/quickeditor/CellQuickEditor.java +++ b/designer/src/com/fr/quickeditor/CellQuickEditor.java @@ -55,6 +55,8 @@ public abstract class CellQuickEditor extends QuickEditor { emptyLabel.setPreferredSize(new Dimension(60, 20)); } + protected static final int VGAP = 10, HGAP = 8, VGAP_INNER = 5; + public CellQuickEditor() { scrollBar = new UIScrollBar(UIScrollBar.VERTICAL) { @@ -101,7 +103,7 @@ public abstract class CellQuickEditor extends QuickEditor { new Component[]{initTopContent(), null}, new Component[]{centerBody, null} }; - leftContentPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); + leftContentPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, HGAP, VGAP); this.setLayout(new BarLayout()); this.add(scrollBar); this.add(leftContentPane); @@ -122,8 +124,8 @@ public abstract class CellQuickEditor extends QuickEditor { new Component[]{cellLabel, columnRowTextField = initColumnRowTextField()}, new Component[]{insertContentLabel, cellElementEditButton}, }; - JPanel topContent = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); - topContent.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 0)); + JPanel topContent = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, HGAP, VGAP); + topContent.setBorder(BorderFactory.createEmptyBorder(10, 10, 0, 0)); return topContent; } diff --git a/designer/src/com/fr/quickeditor/cellquick/CellBiasTextPainterEditor.java b/designer/src/com/fr/quickeditor/cellquick/CellBiasTextPainterEditor.java index c9a1ad1e17..c17ac86784 100644 --- a/designer/src/com/fr/quickeditor/cellquick/CellBiasTextPainterEditor.java +++ b/designer/src/com/fr/quickeditor/cellquick/CellBiasTextPainterEditor.java @@ -34,10 +34,10 @@ public class CellBiasTextPainterEditor extends CellQuickEditor { } }); editButton.setOpaque(false); - content.add(TableLayoutHelper.createTableLayoutPane(new Component[][]{ + content.add(TableLayoutHelper.createGapTableLayoutPane(new Component[][]{ new Component[]{emptyLabel, editButton}}, new double[]{TableLayout.PREFERRED}, - new double[]{TableLayout.PREFERRED, TableLayout.FILL}), BorderLayout.CENTER); + new double[]{TableLayout.PREFERRED, TableLayout.FILL}, HGAP, VGAP), BorderLayout.CENTER); return content; } diff --git a/designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java b/designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java index 0cb1919bcc..5a2822afb6 100644 --- a/designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java +++ b/designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java @@ -55,7 +55,7 @@ import java.util.ArrayList; public class CellDSColumnEditor extends CellQuickEditor { private static final double P = TableLayout.PREFERRED, F = TableLayout.FILL; - private static final Color TIP_FONT_COLOR = new Color(51f, 51f, 52f, 1.0f); + private static final Color TIP_FONT_COLOR = new Color(0x7F333334, true); private enum FilterType { //前N个 后N个 奇数 偶数 自定义 未定义 @@ -73,8 +73,6 @@ public class CellDSColumnEditor extends CellQuickEditor { private JPanel cardContainer; // 卡片布局TAB切换按钮 private UIHeadGroup tabsHeaderIconPane; - // 数据列基本设置 - private DSColumnBasicEditorPane cellDSColumnBasicPane; // 数据列高级设置 private DSColumnAdvancedEditorPane cellDSColumnAdvancedPane; @@ -158,7 +156,7 @@ public class CellDSColumnEditor extends CellQuickEditor { private void createPanes() { paneList = new ArrayList<>(); /*基本设置面板*/ - cellDSColumnBasicPane = new DSColumnBasicEditorPane(); + DSColumnBasicEditorPane cellDSColumnBasicPane = new DSColumnBasicEditorPane(); paneList.add(cellDSColumnBasicPane); /*高级设置面板*/ cellDSColumnAdvancedPane = new DSColumnAdvancedEditorPane(); @@ -227,7 +225,7 @@ public class CellDSColumnEditor extends CellQuickEditor { Component[][] components = new Component[][]{ new Component[]{uiLabel, uiButton} }; - conditionPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); + conditionPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, HGAP, VGAP); this.add(this.createContentPane(), BorderLayout.CENTER); this.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0)); } @@ -274,7 +272,7 @@ public class CellDSColumnEditor extends CellQuickEditor { //条件过滤 new Component[]{this.conditionPane} }; - return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); + return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, HGAP, VGAP); } } @@ -485,11 +483,11 @@ public class CellDSColumnEditor extends CellQuickEditor { //数据倍数 UILabel multipleLabel = new UILabel(Inter.getLocText("Column_Multiple")); multipleLabel.setPreferredSize(new Dimension(60, 20)); - multiPane = TableLayoutHelper.createTableLayoutPane(new Component[][]{ + multiPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{ new Component[]{ multipleLabel, multiNumSpinner } - }, new double[]{P}, new double[]{P, F} + }, new double[]{P}, new double[]{P, F}, HGAP, VGAP ); multiNumPane.add(multiPane); useMultiplyNumCheckBox.addActionListener(new ActionListener() { @@ -518,7 +516,7 @@ public class CellDSColumnEditor extends CellQuickEditor { {extendableDirectionPane}, {multiNumPane} }; - return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); + return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, HGAP, VGAP); } @@ -584,7 +582,9 @@ public class CellDSColumnEditor extends CellQuickEditor { }; double[] rowSize = {P, P}, columnSize = {P, F}; - this.add(TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize), BorderLayout.CENTER); + this.add(TableLayoutHelper.createGapTableLayoutPane( + components, rowSize, columnSize, HGAP, VGAP + ), BorderLayout.CENTER); } @@ -606,7 +606,7 @@ public class CellDSColumnEditor extends CellQuickEditor { if (noContent) { centerPane.setPreferredSize(new Dimension(0, 0)); } else { - centerPane.setPreferredSize(new Dimension(158, 20)); + centerPane.setPreferredSize(new Dimension(156, 20)); } String sortFormula = dSColumn.getSortFormula(); if (sortFormula != null && sortFormula.length() >= 1) { @@ -680,14 +680,14 @@ public class CellDSColumnEditor extends CellQuickEditor { setCardPaneLayout.show(setCardPane, FilterType.TOP.name()); tipCardPaneLayout.show(tipCardPane, FilterType.TOP.name()); //隐藏tip 显示set - setCardPane.setPreferredSize(new Dimension(158, 20)); + setCardPane.setPreferredSize(new Dimension(156, 20)); tipCardPane.setPreferredSize(new Dimension(0, 0)); } else if (selectIndex == 2) { //后N个 setCardPaneLayout.show(setCardPane, FilterType.BOTTOM.name()); tipCardPaneLayout.show(tipCardPane, FilterType.BOTTOM.name()); //隐藏tip 显示set - setCardPane.setPreferredSize(new Dimension(158, 20)); + setCardPane.setPreferredSize(new Dimension(156, 20)); tipCardPane.setPreferredSize(new Dimension(0, 0)); } else if (selectIndex == 3) { //奇数 @@ -706,7 +706,7 @@ public class CellDSColumnEditor extends CellQuickEditor { setCardPaneLayout.show(setCardPane, FilterType.SPECIFY.name()); tipCardPaneLayout.show(tipCardPane, FilterType.SPECIFY.name()); //显示set和tip - setCardPane.setPreferredSize(new Dimension(158, 20)); + setCardPane.setPreferredSize(new Dimension(156, 20)); tipCardPane.setPreferredSize(new Dimension(224, 40)); } else { setCardPaneLayout.show(setCardPane, FilterType.UNDEFINE.name()); @@ -760,11 +760,11 @@ public class CellDSColumnEditor extends CellQuickEditor { specifyTip.setForeground(TIP_FONT_COLOR); tipCardPane.add(specifyTip, FilterType.SPECIFY.name()); - this.add(TableLayoutHelper.createTableLayoutPane(new Component[][]{ + this.add(TableLayoutHelper.createGapTableLayoutPane(new Component[][]{ {filterLabel, rsComboBox}, {null, setCardPane}, {tipCardPane, null} - }, new double[]{P, P, P}, new double[]{P, F}), BorderLayout.CENTER); + }, new double[]{P, P, P}, new double[]{P, F}, HGAP, VGAP), BorderLayout.CENTER); } public void populate(CellElement cellElement) { @@ -782,19 +782,19 @@ public class CellDSColumnEditor extends CellQuickEditor { case SelectCount.TOP: this.topFormulaPane.populate(selectCount.getFormulaCount()); //隐藏tip 显示set - setCardPane.setPreferredSize(new Dimension(158, 20)); + setCardPane.setPreferredSize(new Dimension(156, 20)); tipCardPane.setPreferredSize(new Dimension(0, 0)); break; case SelectCount.BOTTOM: this.bottomFormulaPane.populate(selectCount.getFormulaCount()); //隐藏tip 显示set - setCardPane.setPreferredSize(new Dimension(158, 20)); + setCardPane.setPreferredSize(new Dimension(156, 20)); tipCardPane.setPreferredSize(new Dimension(0, 0)); break; case SelectCount.SPECIFY: this.serialTextField.setText(selectCount.getSerial()); //显示set和tip - setCardPane.setPreferredSize(new Dimension(158, 20)); + setCardPane.setPreferredSize(new Dimension(156, 20)); tipCardPane.setPreferredSize(new Dimension(224, 40)); break; case SelectCount.EVEN: @@ -955,9 +955,9 @@ public class CellDSColumnEditor extends CellQuickEditor { UILabel customValueLabel = new UILabel(Inter.getLocText("FR-Designer_Display_Value")); customValueLabel.setPreferredSize(new Dimension(60, 20)); formulaField = new JFormulaField("$$$"); - this.add(TableLayoutHelper.createTableLayoutPane(new Component[][]{ + this.add(TableLayoutHelper.createGapTableLayoutPane(new Component[][]{ new Component[]{customValueLabel, formulaField}, - }, new double[]{P}, new double[]{P, F}), BorderLayout.CENTER); + }, new double[]{P}, new double[]{P, F}, HGAP, VGAP), BorderLayout.CENTER); } public void populate(CellElement cellElement) { diff --git a/designer/src/com/fr/quickeditor/cellquick/CellFormulaQuickEditor.java b/designer/src/com/fr/quickeditor/cellquick/CellFormulaQuickEditor.java index faebf9b816..fcd16a6765 100644 --- a/designer/src/com/fr/quickeditor/cellquick/CellFormulaQuickEditor.java +++ b/designer/src/com/fr/quickeditor/cellquick/CellFormulaQuickEditor.java @@ -120,10 +120,10 @@ public class CellFormulaQuickEditor extends CellQuickEditor { pane.add(formulaButton, BorderLayout.EAST); content.add(pane, BorderLayout.NORTH); - return TableLayoutHelper.createTableLayoutPane(new Component[][]{ + return TableLayoutHelper.createGapTableLayoutPane(new Component[][]{ new Component[]{emptyLabel, content}}, new double[]{TableLayout.PREFERRED}, - new double[]{TableLayout.PREFERRED, TableLayout.FILL}); + new double[]{TableLayout.PREFERRED, TableLayout.FILL}, HGAP, VGAP); } @Override diff --git a/designer/src/com/fr/quickeditor/cellquick/CellImageQuickEditor.java b/designer/src/com/fr/quickeditor/cellquick/CellImageQuickEditor.java index 6bbbf5fcf5..51b7417ac5 100644 --- a/designer/src/com/fr/quickeditor/cellquick/CellImageQuickEditor.java +++ b/designer/src/com/fr/quickeditor/cellquick/CellImageQuickEditor.java @@ -42,10 +42,10 @@ public class CellImageQuickEditor extends CellQuickEditor { } }); editButton.setOpaque(false); - content.add(TableLayoutHelper.createTableLayoutPane(new Component[][]{ + content.add(TableLayoutHelper.createGapTableLayoutPane(new Component[][]{ new Component[]{emptyLabel, editButton}}, new double[]{TableLayout.PREFERRED}, - new double[]{TableLayout.PREFERRED, TableLayout.FILL}), BorderLayout.CENTER); + new double[]{TableLayout.PREFERRED, TableLayout.FILL}, HGAP, VGAP), BorderLayout.CENTER); return content; } diff --git a/designer/src/com/fr/quickeditor/cellquick/CellRichTextEditor.java b/designer/src/com/fr/quickeditor/cellquick/CellRichTextEditor.java index 9e9bf3bc9d..8f8afbeed2 100644 --- a/designer/src/com/fr/quickeditor/cellquick/CellRichTextEditor.java +++ b/designer/src/com/fr/quickeditor/cellquick/CellRichTextEditor.java @@ -29,10 +29,10 @@ public class CellRichTextEditor extends CellQuickEditor { JPanel content = new JPanel(new BorderLayout()); richTextButton = new UIButton(); richTextButton.setOpaque(false); - content.add(TableLayoutHelper.createTableLayoutPane(new Component[][]{ + content.add(TableLayoutHelper.createGapTableLayoutPane(new Component[][]{ new Component[]{emptyLabel, richTextButton}}, new double[]{TableLayout.PREFERRED}, - new double[]{TableLayout.PREFERRED, TableLayout.FILL}), BorderLayout.CENTER); + new double[]{TableLayout.PREFERRED, TableLayout.FILL}, HGAP, VGAP), BorderLayout.CENTER); return content; } diff --git a/designer/src/com/fr/quickeditor/cellquick/CellSubReportEditor.java b/designer/src/com/fr/quickeditor/cellquick/CellSubReportEditor.java index c2d5e52df6..e28bdbf395 100644 --- a/designer/src/com/fr/quickeditor/cellquick/CellSubReportEditor.java +++ b/designer/src/com/fr/quickeditor/cellquick/CellSubReportEditor.java @@ -30,10 +30,10 @@ public class CellSubReportEditor extends CellQuickEditor { JPanel content = new JPanel(new BorderLayout()); subReportButton = new UIButton(); subReportButton.setOpaque(false); - content.add(TableLayoutHelper.createTableLayoutPane(new Component[][]{ + content.add(TableLayoutHelper.createGapTableLayoutPane(new Component[][]{ new Component[]{emptyLabel, subReportButton}}, new double[]{TableLayout.PREFERRED}, - new double[]{TableLayout.PREFERRED, TableLayout.FILL}), BorderLayout.CENTER); + new double[]{TableLayout.PREFERRED, TableLayout.FILL}, HGAP, VGAP), BorderLayout.CENTER); return content; }