diff --git a/designer/src/com/fr/design/dscolumn/ResultSetGroupDockingPane.java b/designer/src/com/fr/design/dscolumn/ResultSetGroupDockingPane.java index b89eec7e7b..530c92f844 100644 --- a/designer/src/com/fr/design/dscolumn/ResultSetGroupDockingPane.java +++ b/designer/src/com/fr/design/dscolumn/ResultSetGroupDockingPane.java @@ -34,6 +34,7 @@ public class ResultSetGroupDockingPane extends ResultSetGroupPane { private UIButton advancedButton; private FunctionComboBox functionComboBox; + private JPanel contentPane; private JPanel cardPane; private CardLayout cardLayout; private UIComboBox goBox; @@ -48,9 +49,9 @@ public class ResultSetGroupDockingPane extends ResultSetGroupPane { public void initComponents(ElementCasePane ePane) { goBox = new UIComboBox(new String[]{Inter.getLocText("BindColumn-Group"), Inter.getLocText("BindColumn-Select"), Inter.getLocText("BindColumn-Summary")}); initCardPane(); - JPanel pane = layoutPane(); + contentPane = layoutPane(); this.setLayout(new BorderLayout()); - this.add(pane, BorderLayout.CENTER); + this.add(contentPane, BorderLayout.CENTER); } private JPanel layoutPane() { @@ -70,12 +71,15 @@ public class ResultSetGroupDockingPane extends ResultSetGroupPane { if (i == BIND_GROUP) { cardLayout.show(cardPane, "groupPane"); cardPane.setPreferredSize(new Dimension(156, 20)); + TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane,2,10); } else if (i == BIND_SELECTED) { cardLayout.show(cardPane, "listPane"); cardPane.setPreferredSize(new Dimension(0, 0)); + TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane,2,0); } else if (i == BIND_SUMMARY) { cardLayout.show(cardPane, "summaryPane"); cardPane.setPreferredSize(new Dimension(156, 20)); + TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane,2,10); 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 05e117ab4f..b2d66fc25c 100644 --- a/designer/src/com/fr/quickeditor/CellQuickEditor.java +++ b/designer/src/com/fr/quickeditor/CellQuickEditor.java @@ -55,7 +55,7 @@ public abstract class CellQuickEditor extends QuickEditor { emptyLabel.setPreferredSize(new Dimension(60, 20)); } - protected static final int VGAP = 10, HGAP = 8; + protected static final int VGAP = 10, HGAP = 8, VGAP_INNER = 3; public CellQuickEditor() { diff --git a/designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java b/designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java index 5a2822afb6..7c0ceaa851 100644 --- a/designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java +++ b/designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java @@ -436,12 +436,6 @@ public class CellDSColumnEditor extends CellQuickEditor { filterPane.update(cellElement); fireTargetModified(); } - }, new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - filterPane.update(cellElement); - fireTargetModified(); - } } ); //自定义值显示 @@ -489,6 +483,7 @@ public class CellDSColumnEditor extends CellQuickEditor { } }, new double[]{P}, new double[]{P, F}, HGAP, VGAP ); + multiPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0)); multiNumPane.add(multiPane); useMultiplyNumCheckBox.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -505,7 +500,6 @@ public class CellDSColumnEditor extends CellQuickEditor { } }); - double[] rowSize = {P, P, P, P, P, P}; double[] columnSize = {F}; @@ -537,6 +531,7 @@ public class CellDSColumnEditor extends CellQuickEditor { * @see DSColumnAdvancedPane.SortPane */ public class ResultSetSortConfigPane extends JPanel { + private JPanel contentPane; //面板 private UIButtonGroup sortTypePane; private JFormulaField formulaField; @@ -570,8 +565,10 @@ public class CellDSColumnEditor extends CellQuickEditor { cardLayout.show(centerPane, noContent ? "none" : "content"); if (noContent) { centerPane.setPreferredSize(new Dimension(0, 0)); + TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 2, 0); } else { centerPane.setPreferredSize(new Dimension(165, 20)); + TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 2, VGAP); } } }); @@ -582,9 +579,8 @@ public class CellDSColumnEditor extends CellQuickEditor { }; double[] rowSize = {P, P}, columnSize = {P, F}; - this.add(TableLayoutHelper.createGapTableLayoutPane( - components, rowSize, columnSize, HGAP, VGAP - ), BorderLayout.CENTER); + contentPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, HGAP, VGAP); + this.add(contentPane, BorderLayout.CENTER); } @@ -605,8 +601,10 @@ public class CellDSColumnEditor extends CellQuickEditor { cardLayout.show(centerPane, noContent ? "none" : "content"); if (noContent) { centerPane.setPreferredSize(new Dimension(0, 0)); + TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 2, 0); } else { centerPane.setPreferredSize(new Dimension(156, 20)); + TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 2, VGAP); } String sortFormula = dSColumn.getSortFormula(); if (sortFormula != null && sortFormula.length() >= 1) { @@ -650,7 +648,7 @@ public class CellDSColumnEditor extends CellQuickEditor { * @see DSColumnAdvancedPane.SelectCountPane */ public class ResultSetFilterConfigPane extends JPanel { - + private JPanel contentPane; private UIComboBox rsComboBox; private JPanel setCardPane; private JPanel tipCardPane; @@ -681,44 +679,52 @@ public class CellDSColumnEditor extends CellQuickEditor { tipCardPaneLayout.show(tipCardPane, FilterType.TOP.name()); //隐藏tip 显示set setCardPane.setPreferredSize(new Dimension(156, 20)); + TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 2, VGAP); tipCardPane.setPreferredSize(new Dimension(0, 0)); + TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 4, 0); } else if (selectIndex == 2) { //后N个 setCardPaneLayout.show(setCardPane, FilterType.BOTTOM.name()); tipCardPaneLayout.show(tipCardPane, FilterType.BOTTOM.name()); //隐藏tip 显示set setCardPane.setPreferredSize(new Dimension(156, 20)); + TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 2, VGAP); tipCardPane.setPreferredSize(new Dimension(0, 0)); + TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 4, 0); } else if (selectIndex == 3) { //奇数 setCardPaneLayout.show(setCardPane, FilterType.ODD.name()); tipCardPaneLayout.show(tipCardPane, FilterType.ODD.name()); //隐藏set 显示tip setCardPane.setPreferredSize(new Dimension(0, 0)); + TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 2, 0); tipCardPane.setPreferredSize(new Dimension(224, 40)); + TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 4, VGAP_INNER); } else if (selectIndex == 4) { setCardPaneLayout.show(setCardPane, FilterType.EVEN.name()); tipCardPaneLayout.show(tipCardPane, FilterType.EVEN.name()); //隐藏set 显示tip setCardPane.setPreferredSize(new Dimension(0, 0)); + TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 2, 0); tipCardPane.setPreferredSize(new Dimension(224, 40)); + TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 4, VGAP_INNER); } else if (selectIndex == 5) { setCardPaneLayout.show(setCardPane, FilterType.SPECIFY.name()); tipCardPaneLayout.show(tipCardPane, FilterType.SPECIFY.name()); //显示set和tip setCardPane.setPreferredSize(new Dimension(156, 20)); + TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 2, VGAP); tipCardPane.setPreferredSize(new Dimension(224, 40)); + TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 4, VGAP_INNER); } else { setCardPaneLayout.show(setCardPane, FilterType.UNDEFINE.name()); tipCardPaneLayout.show(tipCardPane, FilterType.UNDEFINE.name()); //隐藏set和tip setCardPane.setPreferredSize(new Dimension(0, 0)); + TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 2, 0); tipCardPane.setPreferredSize(new Dimension(0, 0)); + TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 4, 0); } - setCardPane.revalidate(); - tipCardPane.revalidate(); - setCardPane.repaint(); - tipCardPane.repaint(); } }); //配置展示CardLayout @@ -746,7 +752,6 @@ public class CellDSColumnEditor extends CellQuickEditor { oddTip.setForeground(TIP_FONT_COLOR); tipCardPane.add(oddTip, FilterType.ODD.name()); - //偶数 UILabel 占一行作为提示信息 setCardPane.add(new JPanel(), FilterType.EVEN.name()); MultilineLabel evenTip = new MultilineLabel(Inter.getLocText("FS-Designer_DS_Filter_Even_Tip")); @@ -759,12 +764,13 @@ public class CellDSColumnEditor extends CellQuickEditor { MultilineLabel specifyTip = new MultilineLabel(Inter.getLocText("FS-Designer_DS_Filter_Specify_Tip")); specifyTip.setForeground(TIP_FONT_COLOR); tipCardPane.add(specifyTip, FilterType.SPECIFY.name()); - - this.add(TableLayoutHelper.createGapTableLayoutPane(new Component[][]{ + contentPane = TableLayoutHelper.createDiffVGapTableLayoutPane(new Component[][]{ {filterLabel, rsComboBox}, {null, setCardPane}, {tipCardPane, null} - }, new double[]{P, P, P}, new double[]{P, F}, HGAP, VGAP), BorderLayout.CENTER); + }, new double[]{P, P, P}, new double[]{P, F}, HGAP, new double[]{VGAP, VGAP_INNER}); + + this.add(contentPane, BorderLayout.CENTER); } public void populate(CellElement cellElement) { @@ -783,39 +789,53 @@ public class CellDSColumnEditor extends CellQuickEditor { this.topFormulaPane.populate(selectCount.getFormulaCount()); //隐藏tip 显示set setCardPane.setPreferredSize(new Dimension(156, 20)); + TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 2, VGAP); tipCardPane.setPreferredSize(new Dimension(0, 0)); + TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 4, 0); break; case SelectCount.BOTTOM: this.bottomFormulaPane.populate(selectCount.getFormulaCount()); //隐藏tip 显示set setCardPane.setPreferredSize(new Dimension(156, 20)); + TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 2, VGAP); tipCardPane.setPreferredSize(new Dimension(0, 0)); + TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 4, 0); break; case SelectCount.SPECIFY: this.serialTextField.setText(selectCount.getSerial()); //显示set和tip setCardPane.setPreferredSize(new Dimension(156, 20)); + TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 2, VGAP); tipCardPane.setPreferredSize(new Dimension(224, 40)); + TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 4, VGAP_INNER); break; case SelectCount.EVEN: //隐藏set 显示tip setCardPane.setPreferredSize(new Dimension(0, 0)); + TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 2, 0); tipCardPane.setPreferredSize(new Dimension(224, 40)); + TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 4, VGAP_INNER); break; case SelectCount.ODD: //隐藏set 显示tip setCardPane.setPreferredSize(new Dimension(0, 0)); + TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 2, 0); tipCardPane.setPreferredSize(new Dimension(224, 40)); + TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 4, VGAP_INNER); break; default: //隐藏set和tip setCardPane.setPreferredSize(new Dimension(0, 0)); + TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 2, 0); tipCardPane.setPreferredSize(new Dimension(0, 0)); + TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 4, 0); } } else { //隐藏set和tip setCardPane.setPreferredSize(new Dimension(0, 0)); + TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 2, 0); tipCardPane.setPreferredSize(new Dimension(0, 0)); + TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 4, 0); } } } @@ -848,13 +868,12 @@ public class CellDSColumnEditor extends CellQuickEditor { /** * 添加事件监听器 * - * @param formulaListener 公式输入框改动事件监听器 - * @param actionListener 筛选类型下拉框改动事件监听器 + * @param formulaListener 输入框改动事件监听器 */ - public void addListener(UIObserverListener formulaListener, ActionListener actionListener) { + public void addListener(UIObserverListener formulaListener) { topFormulaPane.addListener(formulaListener); bottomFormulaPane.addListener(formulaListener); - rsComboBox.addActionListener(actionListener); + rsComboBox.registerChangeListener(formulaListener); } } diff --git a/designer_base/src/com/fr/design/layout/TableLayoutHelper.java b/designer_base/src/com/fr/design/layout/TableLayoutHelper.java index b15aa99ba7..f3d7ada13d 100644 --- a/designer_base/src/com/fr/design/layout/TableLayoutHelper.java +++ b/designer_base/src/com/fr/design/layout/TableLayoutHelper.java @@ -1,324 +1,426 @@ -package com.fr.design.layout; - - -import com.fr.design.constants.LayoutConstants; -import com.fr.design.gui.ibutton.UIButton; -import com.fr.design.gui.ilable.UILabel; -import com.fr.general.Inter; -import com.fr.design.utils.gui.GUICoreUtils; - -import javax.swing.*; - -import java.awt.*; - - -public class TableLayoutHelper { - public static final int FILL_NONE = 0; - public static final int FILL_LASTCOLUMN = 1; - public static final int FILL_LASTROW = 2; - public static final int FILL_LASTCOL_AND_ROW = 3; - private static final int FIVE = 5; - private static final int TEN = 10; - private TableLayoutHelper() { - } - - /** - *

一个通用的TableLayoutPane生成方法

- *

rowSize为各行高度之间的比例

- *

columnSize 为各列宽度之间的比例

- *

Component[][] components = {

- *

// column_1 column_2 column_3

- *

{component11, component12, component13} // row_1

- *

{component21, component22, component23} // row_2

- *

}

- */ - - /** - *最常用的最后一行列fill或者都是prefer的tablelayout - * @param components 组件 - * @return - */ - public static JPanel createTableLayoutPane(Component[][] components, int fillType){ - return createGapTableLayoutPane(components, fillType, LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM); - } - - - public static JPanel createTableLayoutPane(Component[][] components, double[] rowSize, double[] columnSize) { - return createCommonTableLayoutPane(components, rowSize, columnSize, LayoutConstants.VGAP_MEDIUM); - } - - /** - * 标题布局(二级菜单距左边框46) - * @param title 标题 - * @param component 组件 - * @return 布局好的组件 - */ - public static JPanel createTableLayoutPaneWithTitle(String title, Component component){ - return createTitlePane(title, component, LayoutConstants.CHART_ATTR_TOMARGIN); - } - - public static JPanel createTitlePane(String title, Component component, int gap){ - return createTitlePaneWithUILabel(new UILabel(title), component, gap); - } - - /** - * 标题布局（指定gap） - * @param label 标题label - * @param component 组件 - * @param gap 距左侧距离 - * @return 布局好的组件 - */ - public static JPanel createTitlePaneWithUILabel(UILabel label, Component component, int gap){ - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - double[] columnSize = {gap, f}; - double[] rowSize = {p, p}; - Component[][] components = new Component[][]{ - new Component[]{label,null}, - new Component[]{null,component}, - }; - return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); - } - - - public static JPanel createCommonTableLayoutPane(Component[][] components, double[] rowSize, double[] columnSize, double gap) { - - return createGapTableLayoutPane(components, rowSize, columnSize, gap, gap); - } - - public static JPanel createGapTableLayoutPane(Component[][] components, int fillType, double horizontalGap, double verticalGap) { - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - int maxColCount = 0; - for (int i = 0 ; i < components.length; i ++) { - if (components[i].length > maxColCount) { - maxColCount = components[i].length; - } - } - double[] rowSize = new double[components.length]; - for (int i = 0; i < components.length; i ++) { - rowSize[i] = p; - } - double[] columnSize = new double[maxColCount]; - for (int i = 0; i < maxColCount; i ++) { - columnSize[i] = p; - } - if (fillType == FILL_LASTCOLUMN && columnSize.length > 0) { - columnSize[columnSize.length - 1] = f; - } - if (fillType == FILL_LASTROW && rowSize.length > 0) { - rowSize[rowSize.length - 1] = f; - } - if (fillType == FILL_LASTCOL_AND_ROW ) { - if (columnSize.length > 0) { - columnSize[columnSize.length - 1] = f; - } - if (rowSize.length > 0) { - rowSize[rowSize.length - 1] = f; - } - } - return createGapTableLayoutPane(components, rowSize, columnSize, horizontalGap, verticalGap); - } - - public static JPanel createGapTableLayoutPane(Component[][] components, - double[] rowSize, double[] columnSize, double horizontalGap, double verticalGap) { - - JPanel resultPane = setPanelLayout(rowSize, columnSize, horizontalGap, verticalGap); - - for (int i = 0; i < components.length; i++) { - if (i >= rowSize.length) { - break; - } - Component[] rowComponents = components[i]; - for (int j = 0; j < rowComponents.length && j < columnSize.length; j++) { - if (rowComponents[j] == null) { - continue; - } - - if (isNextAllNull(rowComponents, j + 1)) { - resultPane.add(rowComponents[j], (2 * j + 1) + "," + (2 * i + 1) + "," + (2 * rowComponents.length - 1) + ",0"); - } else { - resultPane.add(rowComponents[j], (2 * j + 1) + "," + (2 * i + 1)); - } - } - } - - return resultPane; - } - - - public static JPanel createGapTableLayoutPane(Component[][] components, - double[] rowSize, double[] columnSize, int rowCount[][], double horizontalGap, double verticalGap) { - - JPanel resultPane = setPanelLayout(rowSize, columnSize, horizontalGap, verticalGap); - - int k = components.length; - int[] row = new int[k]; //存放每组控件在第几行开始 - int sumRow = 1; //存放一次递增的行的数目 - - - for (int i = 0; i < components.length; i++) { - row[i] = sumRow; - int maxRowCount = 1; - - if (i >= rowSize.length) { - break; - } - - Component[] rowComponents = components[i]; - for (int j = 0; j < rowComponents.length && j < columnSize.length; j++) { - if (rowComponents[j] == null) { - continue; - } - if (isNextAllNull(rowComponents, j + 1)) { - if (rowCount[i][j] != 1) { - resultPane.add(rowComponents[j], (2 * j + 1) + "," + row[i] + "," + (2 * rowComponents.length - 1) + "," + (row[i] + rowCount[i][j] - 1)); - if (rowCount[i][j] > maxRowCount) { - maxRowCount = rowCount[i][j]; - } - } else { - - resultPane.add(rowComponents[j], (2 * j + 1) + "," + row[i] + "," + (2 * rowComponents.length - 1) + "," + row[i]); - } - } else { - - if (rowCount[i][j] != 1) { - resultPane.add(rowComponents[j], (2 * j + 1) + "," + row[i] + "," + (2 * j + 1) + "," + (row[i] + rowCount[i][j] - 1)); - if (rowCount[i][j] > maxRowCount) { - maxRowCount = rowCount[i][j]; - } - } else { - resultPane.add(rowComponents[j], (2 * j + 1) + "," + row[i]); - } - } - } - sumRow = row[i] + maxRowCount + 1; - } - - return resultPane; - } - - - private static boolean isNextAllNull(Component[] rowComponents, int currentIndex) { - for (int i = currentIndex; i < rowComponents.length; i++) { - if (rowComponents[i] != null) { - return false; - } - } - return true; - } - - private static JPanel setPanelLayout(double[] rowSize, double[] columnSize, double horizontalGap, double verticalGap) { - double layoutSize[][] = new double[2][]; - double layoutColumnSize[] = new double[2 * columnSize.length]; - double layoutRowSize[] = new double[2 * rowSize.length]; - - for (int i = 0; i < columnSize.length; i++) { - if (i == 0) { - layoutColumnSize[i * 2] = 0; - } else { - layoutColumnSize[i * 2] = horizontalGap; - } - layoutColumnSize[i * 2 + 1] = columnSize[i]; - } - - for (int i = 0; i < rowSize.length; i++) { - if (i == 0) { - layoutRowSize[i * 2] = 0; - } else { - layoutRowSize[i * 2] = verticalGap; - } - layoutRowSize[i * 2 + 1] = rowSize[i]; - } - - layoutSize[0] = layoutColumnSize; - layoutSize[1] = layoutRowSize; - - JPanel resultPane = new JPanel(); - resultPane.setLayout(new TableLayout(layoutSize)); - - return resultPane; - } - - /** - * 图表属性表用的比较多的一种布局，第一行是title,下面的components相当于二级菜单 - * 二级菜单和上层面板的间距在layoutconstants里定义 - * @param title - * @param components 二级菜单的内容 - * @param rowSize 二级菜单的行数 - * @param columnSize 二级菜单的列数 - * @return - */ - public static JPanel createTableLayoutPane4Chart(String[] title, Component[][] components, double[] rowSize, double[] columnSize){ - JPanel secondMenu = createTableLayoutPane(components, rowSize, columnSize); - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - double[] column = {LayoutConstants.CHART_ATTR_TOMARGIN, f}; - double[] row = { p,p}; - Component[][] comp = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText(title)), null}, - new Component[]{null, secondMenu}, - }; - return createTableLayoutPane(comp, row, column); - } - - public static void main (String[] args) { - JFrame jf = new JFrame("test"); - jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - JPanel content = (JPanel) jf.getContentPane(); - content.setLayout(new GridLayout(2,2)); - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - JPanel jp1 = TableLayoutHelper.createTableLayoutPane(createTestComponents("jp1"), TableLayoutHelper.FILL_NONE); - JPanel jp2 = TableLayoutHelper.createGapTableLayoutPane(createTestComponents("jp2"), TableLayoutHelper.FILL_LASTCOL_AND_ROW, 2 * TEN, 2 * TEN); - JPanel jp3 = TableLayoutHelper.createGapTableLayoutPane(createTestComponents("jp3"), - new double[] {f,p,f,p}, new double[] {f,f}, 4,4); - JPanel jp4 = TableLayoutHelper.createGapTableLayoutPane(createTestComponents("jp4"), - new double[] {p,FIVE * TEN,p,p,p,p},new double[] {p, f}, new int[][] {{1,3},{1,1},{1,1},{1,1},{1,1}}, 1, FIVE); - jp1.setBorder(BorderFactory.createLineBorder(Color.red)); - jp2.setBorder(BorderFactory.createLineBorder(Color.red)); - jp3.setBorder(BorderFactory.createLineBorder(Color.red)); - jp4.setBorder(BorderFactory.createLineBorder(Color.red)); - - content.add(jp1); - content.add(jp2); - content.add(jp3); - content.add(jp4); - - GUICoreUtils.centerWindow(jf); - jf.setSize(600, 600); - jf.setVisible(true); - } - - private static Component[][] createTestComponents (String name ) { - UILabel label1 = new UILabel(name + "laaaable1"); - UILabel label2 = new UILabel(name + "lable2"); - UILabel label3 = new UILabel(name + "lable3"); - UILabel label4 = new UILabel(name + "lable4"); - UILabel label5 = new UILabel(name + "lable5"); - UIButton button1 = new UIButton(name + "button1"); - UIButton button2 = new UIButton(name + "button2"); - label1.setSize(label1.getPreferredSize()); - label1.setBorder(BorderFactory.createLineBorder(Color.blue)); - label2.setSize(label2.getPreferredSize()); - label2.setBorder(BorderFactory.createLineBorder(Color.blue)); - label3.setSize(label3.getPreferredSize()); - label3.setBorder(BorderFactory.createLineBorder(Color.blue)); - label4.setSize(label4.getPreferredSize()); - label4.setBorder(BorderFactory.createLineBorder(Color.blue)); - label5.setSize(label5.getPreferredSize()); - label5.setBorder(BorderFactory.createLineBorder(Color.blue)); - button1.setSize(button1.getPreferredSize()); - button2.setSize(button2.getPreferredSize()); - button1.setBackground(Color.darkGray); - button2.setBackground(Color.darkGray); - Component[][] components = new Component[][] { - new Component[] {label1, button1}, - new Component[] {label2, null}, - new Component[] {label3}, - new Component[] {null,label4}, - new Component[] {button2, label5} - } ; - return components; - } +package com.fr.design.layout; + + +import com.fr.design.constants.LayoutConstants; +import com.fr.design.gui.ibutton.UIButton; +import com.fr.design.gui.ilable.UILabel; +import com.fr.design.utils.gui.GUICoreUtils; +import com.fr.general.Inter; + +import javax.swing.*; +import java.awt.*; + + +public class TableLayoutHelper { + public static final int FILL_NONE = 0; + public static final int FILL_LASTCOLUMN = 1; + public static final int FILL_LASTROW = 2; + public static final int FILL_LASTCOL_AND_ROW = 3; + private static final int FIVE = 5; + private static final int TEN = 10; + + private TableLayoutHelper() { + } + + /** + *

一个通用的TableLayoutPane生成方法

+ *

rowSize为各行高度之间的比例

+ *

columnSize 为各列宽度之间的比例

+ *

Component[][] components = {

+ *

// column_1 column_2 column_3

+ *

{component11, component12, component13} // row_1

+ *

{component21, component22, component23} // row_2

+ *

}

+ */ + + /** + * 最常用的最后一行列fill或者都是prefer的tablelayout + * + * @param components 组件 + * @return + */ + public static JPanel createTableLayoutPane(Component[][] components, int fillType) { + return createGapTableLayoutPane(components, fillType, LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM); + } + + + public static JPanel createTableLayoutPane(Component[][] components, double[] rowSize, double[] columnSize) { + return createCommonTableLayoutPane(components, rowSize, columnSize, LayoutConstants.VGAP_MEDIUM); + } + + /** + * 标题布局(二级菜单距左边框46) + * + * @param title 标题 + * @param component 组件 + * @return 布局好的组件 + */ + public static JPanel createTableLayoutPaneWithTitle(String title, Component component) { + return createTitlePane(title, component, LayoutConstants.CHART_ATTR_TOMARGIN); + } + + public static JPanel createTitlePane(String title, Component component, int gap) { + return createTitlePaneWithUILabel(new UILabel(title), component, gap); + } + + /** + * 标题布局（指定gap） + * + * @param label 标题label + * @param component 组件 + * @param gap 距左侧距离 + * @return 布局好的组件 + */ + public static JPanel createTitlePaneWithUILabel(UILabel label, Component component, int gap) { + double p = TableLayout.PREFERRED; + double f = TableLayout.FILL; + double[] columnSize = {gap, f}; + double[] rowSize = {p, p}; + Component[][] components = new Component[][]{ + new Component[]{label, null}, + new Component[]{null, component}, + }; + return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); + } + + + public static JPanel createCommonTableLayoutPane(Component[][] components, double[] rowSize, double[] columnSize, double gap) { + + return createGapTableLayoutPane(components, rowSize, columnSize, gap, gap); + } + + public static JPanel createGapTableLayoutPane(Component[][] components, int fillType, double horizontalGap, double verticalGap) { + double p = TableLayout.PREFERRED; + double f = TableLayout.FILL; + int maxColCount = 0; + for (int i = 0; i < components.length; i++) { + if (components[i].length > maxColCount) { + maxColCount = components[i].length; + } + } + double[] rowSize = new double[components.length]; + for (int i = 0; i < components.length; i++) { + rowSize[i] = p; + } + double[] columnSize = new double[maxColCount]; + for (int i = 0; i < maxColCount; i++) { + columnSize[i] = p; + } + if (fillType == FILL_LASTCOLUMN && columnSize.length > 0) { + columnSize[columnSize.length - 1] = f; + } + if (fillType == FILL_LASTROW && rowSize.length > 0) { + rowSize[rowSize.length - 1] = f; + } + if (fillType == FILL_LASTCOL_AND_ROW) { + if (columnSize.length > 0) { + columnSize[columnSize.length - 1] = f; + } + if (rowSize.length > 0) { + rowSize[rowSize.length - 1] = f; + } + } + return createGapTableLayoutPane(components, rowSize, columnSize, horizontalGap, verticalGap); + } + + public static JPanel createGapTableLayoutPane(Component[][] components, + double[] rowSize, + double[] columnSize, + double horizontalGap, + double verticalGap) { + + JPanel resultPane = setPanelLayout(rowSize, columnSize, horizontalGap, verticalGap); + + addComponent2ResultPane(components, rowSize, columnSize, resultPane); + + return resultPane; + } + + + public static JPanel createDiffVGapTableLayoutPane(Component[][] components, + double[] rowSize, + double[] columnSize, + double horizontalGap, + double[] verticalGap) { + JPanel resultPane = setPanelLayout(rowSize, columnSize, horizontalGap, verticalGap); + addComponent2ResultPane(components, rowSize, columnSize, resultPane); + return resultPane; + } + + + public static JPanel createGapTableLayoutPane(Component[][] components, + double[] rowSize, double[] columnSize, int rowCount[][], double horizontalGap, double verticalGap) { + + JPanel resultPane = setPanelLayout(rowSize, columnSize, horizontalGap, verticalGap); + + int k = components.length; + int[] row = new int[k]; //存放每组控件在第几行开始 + int sumRow = 1; //存放一次递增的行的数目 + + + for (int i = 0; i < components.length; i++) { + row[i] = sumRow; + int maxRowCount = 1; + + if (i >= rowSize.length) { + break; + } + + Component[] rowComponents = components[i]; + for (int j = 0; j < rowComponents.length && j < columnSize.length; j++) { + if (rowComponents[j] == null) { + continue; + } + if (isNextAllNull(rowComponents, j + 1)) { + if (rowCount[i][j] != 1) { + resultPane.add(rowComponents[j], (2 * j + 1) + "," + row[i] + "," + (2 * rowComponents.length - 1) + "," + (row[i] + rowCount[i][j] - 1)); + if (rowCount[i][j] > maxRowCount) { + maxRowCount = rowCount[i][j]; + } + } else { + + resultPane.add(rowComponents[j], (2 * j + 1) + "," + row[i] + "," + (2 * rowComponents.length - 1) + "," + row[i]); + } + } else { + + if (rowCount[i][j] != 1) { + resultPane.add(rowComponents[j], (2 * j + 1) + "," + row[i] + "," + (2 * j + 1) + "," + (row[i] + rowCount[i][j] - 1)); + if (rowCount[i][j] > maxRowCount) { + maxRowCount = rowCount[i][j]; + } + } else { + resultPane.add(rowComponents[j], (2 * j + 1) + "," + row[i]); + } + } + } + sumRow = row[i] + maxRowCount + 1; + } + + return resultPane; + } + + /** + * 修改TableLayout布局的容器指定位置垂直间距的大小。 + * + * @param container 容器 + * @param index vgap的索引，Container【vGapA[ComponentA]vGapB[ComponentB]vGapC】,vGapB index=2, + * 详情见{@link TableLayout#setRow(int, double)} + * @param vgap vgap的新值 + */ + public static void modifyTableLayoutIndexVGap(Container container, int index, double vgap) { + TableLayout layout = (TableLayout) container.getLayout(); + layout.setRow(index, vgap); + layout.layoutContainer(container); + container.repaint(); + } + + /** + * 修改TableLayout布局的容器指定位置水平间距的大小。 + * + * @param container 容器 + * @param index hgap的索引，Container【hGapA[ComponentA]hGapB[ComponentB]】,hGapB index=2, + * 详情见{@link TableLayout#setColumn(int, double)} + * @param hgap hgap的新值 + */ + public static void modifyTableLayoutIndexHGap(Container container, int index, double hgap) { + TableLayout layout = (TableLayout) container.getLayout(); + layout.setColumn(index, hgap); + layout.layoutContainer(container); + container.repaint(); + } + + private static void addComponent2ResultPane(Component[][] components, double[] rowSize, double[] columnSize, JPanel resultPane) { + + for (int i = 0; i < components.length; i++) { + if (i >= rowSize.length) { + break; + } + Component[] rowComponents = components[i]; + for (int j = 0; j < rowComponents.length && j < columnSize.length; j++) { + if (rowComponents[j] == null) { + continue; + } + + if (isNextAllNull(rowComponents, j + 1)) { + resultPane.add(rowComponents[j], (2 * j + 1) + "," + (2 * i + 1) + "," + (2 * rowComponents.length - 1) + ",0"); + } else { + resultPane.add(rowComponents[j], (2 * j + 1) + "," + (2 * i + 1)); + } + } + } + + } + + private static boolean isNextAllNull(Component[] rowComponents, int currentIndex) { + for (int i = currentIndex; i < rowComponents.length; i++) { + if (rowComponents[i] != null) { + return false; + } + } + return true; + } + + private static JPanel setPanelLayout(double[] rowSize, double[] columnSize, double horizontalGap, double verticalGap) { + double layoutSize[][] = new double[2][]; + double layoutColumnSize[] = new double[2 * columnSize.length]; + double layoutRowSize[] = new double[2 * rowSize.length]; + + for (int i = 0; i < columnSize.length; i++) { + if (i == 0) { + layoutColumnSize[i * 2] = 0; + } else { + layoutColumnSize[i * 2] = horizontalGap; + } + layoutColumnSize[i * 2 + 1] = columnSize[i]; + } + + for (int i = 0; i < rowSize.length; i++) { + if (i == 0) { + layoutRowSize[i * 2] = 0; + } else { + layoutRowSize[i * 2] = verticalGap; + } + layoutRowSize[i * 2 + 1] = rowSize[i]; + } + + layoutSize[0] = layoutColumnSize; + layoutSize[1] = layoutRowSize; + + JPanel resultPane = new JPanel(); + resultPane.setLayout(new TableLayout(layoutSize)); + + return resultPane; + } + + /** + * 创建具有不同垂直间距的TableLayout面板 + * + * @param rowSize 行 + * @param columnSize 列 + * @param horizontalGap 水平间距 + * @param verticalGap 不同的垂直间距 + * @return JPanel 具有不同垂直间距的TableLayout面板 + */ + private static JPanel setPanelLayout(double[] rowSize, double[] columnSize, double horizontalGap, double[] verticalGap) { + double layoutSize[][] = new double[2][]; + double layoutColumnSize[] = new double[2 * columnSize.length]; + double layoutRowSize[] = new double[2 * rowSize.length]; + + for (int i = 0; i < columnSize.length; i++) { + if (i == 0) { + layoutColumnSize[i * 2] = 0; + } else { + layoutColumnSize[i * 2] = horizontalGap; + } + layoutColumnSize[i * 2 + 1] = columnSize[i]; + } + + for (int i = 0; i < rowSize.length; i++) { + if (i == 0) { + layoutRowSize[i * 2] = 0; + } else { + layoutRowSize[i * 2] = verticalGap[i - 1]; + } + layoutRowSize[i * 2 + 1] = rowSize[i]; + } + + layoutSize[0] = layoutColumnSize; + layoutSize[1] = layoutRowSize; + + JPanel resultPane = new JPanel(); + resultPane.setLayout(new TableLayout(layoutSize)); + + return resultPane; + } + + /** + * 图表属性表用的比较多的一种布局，第一行是title,下面的components相当于二级菜单 + * 二级菜单和上层面板的间距在layoutconstants里定义 + * + * @param title + * @param components 二级菜单的内容 + * @param rowSize 二级菜单的行数 + * @param columnSize 二级菜单的列数 + * @return + */ + public static JPanel createTableLayoutPane4Chart(String[] title, Component[][] components, double[] rowSize, double[] columnSize) { + JPanel secondMenu = createTableLayoutPane(components, rowSize, columnSize); + double p = TableLayout.PREFERRED; + double f = TableLayout.FILL; + double[] column = {LayoutConstants.CHART_ATTR_TOMARGIN, f}; + double[] row = {p, p}; + Component[][] comp = new Component[][]{ + new Component[]{new UILabel(Inter.getLocText(title)), null}, + new Component[]{null, secondMenu}, + }; + return createTableLayoutPane(comp, row, column); + } + + public static void main(String[] args) { + JFrame jf = new JFrame("test"); + jf.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); + JPanel content = (JPanel) jf.getContentPane(); + content.setLayout(new GridLayout(2, 3)); + double p = TableLayout.PREFERRED; + double f = TableLayout.FILL; + JPanel jp1 = TableLayoutHelper.createTableLayoutPane(createTestComponents("jp1"), TableLayoutHelper.FILL_NONE); + JPanel jp2 = TableLayoutHelper.createGapTableLayoutPane(createTestComponents("jp2"), TableLayoutHelper.FILL_LASTCOL_AND_ROW, 2 * TEN, 2 * TEN); + JPanel jp3 = TableLayoutHelper.createGapTableLayoutPane(createTestComponents("jp3"), + new double[]{f, p, f, p}, new double[]{f, f}, 4, 4); + JPanel jp4 = TableLayoutHelper.createGapTableLayoutPane(createTestComponents("jp4"), + new double[]{p, FIVE * TEN, p, p, p, p}, new double[]{p, f}, new int[][]{{1, 3}, {1, 1}, {1, 1}, {1, 1}, {1, 1}}, 1, FIVE); + + JPanel jp5 = TableLayoutHelper.createDiffVGapTableLayoutPane(createTestComponents("jp5"), + new double[]{p, p, p, p, p}, new double[]{p, f}, 4, new double[]{4, 8, 14, 4}); + JPanel jp6 = new JPanel(); + jp1.setBorder(BorderFactory.createLineBorder(Color.red)); + jp2.setBorder(BorderFactory.createLineBorder(Color.red)); + jp3.setBorder(BorderFactory.createLineBorder(Color.red)); + jp4.setBorder(BorderFactory.createLineBorder(Color.red)); + jp5.setBorder(BorderFactory.createLineBorder(Color.red)); + jp6.setBorder(BorderFactory.createLineBorder(Color.red)); + + + content.add(jp1); + content.add(jp2); + content.add(jp3); + content.add(jp4); + content.add(jp5); + content.add(jp6); + + GUICoreUtils.centerWindow(jf); + jf.setSize(900, 600); + jf.setVisible(true); + } + + private static Component[][] createTestComponents(String name) { + UILabel label1 = new UILabel(name + "laaaable1"); + UILabel label2 = new UILabel(name + "lable2"); + UILabel label3 = new UILabel(name + "lable3"); + UILabel label4 = new UILabel(name + "lable4"); + UILabel label5 = new UILabel(name + "lable5"); + UIButton button1 = new UIButton(name + "button1"); + UIButton button2 = new UIButton(name + "button2"); + label1.setSize(label1.getPreferredSize()); + label1.setBorder(BorderFactory.createLineBorder(Color.blue)); + label2.setSize(label2.getPreferredSize()); + label2.setBorder(BorderFactory.createLineBorder(Color.blue)); + label3.setSize(label3.getPreferredSize()); + label3.setBorder(BorderFactory.createLineBorder(Color.blue)); + label4.setSize(label4.getPreferredSize()); + label4.setBorder(BorderFactory.createLineBorder(Color.blue)); + label5.setSize(label5.getPreferredSize()); + label5.setBorder(BorderFactory.createLineBorder(Color.blue)); + button1.setSize(button1.getPreferredSize()); + button2.setSize(button2.getPreferredSize()); + button1.setBackground(Color.darkGray); + button2.setBackground(Color.darkGray); + return new Component[][]{ + new Component[]{label1, button1}, + new Component[]{label2, null}, + new Component[]{label3}, + new Component[]{null, label4}, + new Component[]{button2, label5} + }; + } } \ No newline at end of file