From 89bd13daafd062ff823353291f159c6ce2d6f1d6 Mon Sep 17 00:00:00 2001 From: "yaoh.wu" Date: Wed, 26 Jul 2017 13:42:11 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-3348=20=E5=8D=95=E5=85=83=E6=A0=BC?= =?UTF-8?q?=E5=85=83=E7=B4=A0=E6=95=B0=E6=8D=AE=E5=88=97=E5=9F=BA=E6=9C=AC?= =?UTF-8?q?=E8=AE=BE=E7=BD=AEOK?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dscolumn/DSColumnBasicEditorPane.java | 1 + .../dscolumn/SelectedDataColumnPane.java | 38 +++++++++---------- .../cellquick/CellDSColumnEditor.java | 7 ++-- 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/designer/src/com/fr/design/dscolumn/DSColumnBasicEditorPane.java b/designer/src/com/fr/design/dscolumn/DSColumnBasicEditorPane.java index 92ffedb288..cdebc29f41 100644 --- a/designer/src/com/fr/design/dscolumn/DSColumnBasicEditorPane.java +++ b/designer/src/com/fr/design/dscolumn/DSColumnBasicEditorPane.java @@ -27,6 +27,7 @@ public class DSColumnBasicEditorPane extends CellEditorPane { private JPanel conditionPane; public DSColumnBasicEditorPane(TemplateCellElement cellElement, SelectedDataColumnPane dataPane, ResultSetGroupDockingPane groupPane, JPanel conditionPane) { + this.setLayout(new BorderLayout()); this.cellElement = cellElement; this.dataPane = dataPane; this.groupPane = groupPane; diff --git a/designer/src/com/fr/design/dscolumn/SelectedDataColumnPane.java b/designer/src/com/fr/design/dscolumn/SelectedDataColumnPane.java index 9f047c0d3b..3d97abd411 100644 --- a/designer/src/com/fr/design/dscolumn/SelectedDataColumnPane.java +++ b/designer/src/com/fr/design/dscolumn/SelectedDataColumnPane.java @@ -40,15 +40,15 @@ import java.util.regex.Pattern; * * @author yaoh.wu * @version 2017年7月26日 - * todo 9.0设计器更新，修改动态参数注入按钮部分,使其能在右侧边栏正常显示 + * 9.0设计器更新，修改动态参数注入按钮部分,使其显示动态参数按钮时能在右侧边栏正常显示 * @since 8.0 */ public class SelectedDataColumnPane extends BasicPane { - protected UITableEditorPane editorPane; - protected Parameter[] ps; + private UITableEditorPane editorPane; + private Parameter[] ps; - protected TableDataComboBox tableNameComboBox; - protected LazyComboBox columnNameComboBox; + TableDataComboBox tableNameComboBox; + LazyComboBox columnNameComboBox; private ItemListener itemListener; private UIButton paramButton; @@ -57,7 +57,7 @@ public class SelectedDataColumnPane extends BasicPane { this(true); } - public SelectedDataColumnPane(boolean showParameterButton) { + SelectedDataColumnPane(boolean showParameterButton) { initComponent(showParameterButton); } @@ -72,32 +72,33 @@ public class SelectedDataColumnPane extends BasicPane { initWithParameterButton(); } columnNameComboBox = new LazyComboBox() { - @Override public Object[] load() { List l = calculateColumnNameList(); return l.toArray(new String[l.size()]); } - }; columnNameComboBox.setEditable(true); + double f = TableLayout.FILL; double p = TableLayout.PREFERRED; UILabel label1 = new UILabel(Inter.getLocText("TableData") + ":"); - UILabel label2 = new UILabel(Inter.getLocText("DataColumn") + ":"); + UILabel label3 = new UILabel(Inter.getLocText("DataColumn") + ":"); if (showParameterButton) { - label1.setPreferredSize(new Dimension(200, 25)); - label2.setPreferredSize(new Dimension(200, 25)); - } - if (showParameterButton) { - Component[][] comps = {{label1, null, label2}, {tableNameComboBox, paramButton, columnNameComboBox}}; - this.add(TableLayoutHelper.createTableLayoutPane(comps, new double[]{p, p}, new double[]{p, p, p})); + //todo 国际化 + UILabel label2 = new UILabel("param" + ":"); + Component[][] components = { + {label1, tableNameComboBox}, + {label2, paramButton}, + {label3, columnNameComboBox} + }; + this.setLayout(new BorderLayout()); + this.add(TableLayoutHelper.createTableLayoutPane(components, new double[]{p, p, p}, new double[]{p, f})); } else { - double f = TableLayout.FILL; double[] columnSize = {p, f}; double[] rowSize = {p, p}; Component[][] components = new Component[][]{ new Component[]{label1, tableNameComboBox}, - new Component[]{label2, columnNameComboBox} + new Component[]{label3, columnNameComboBox} }; JPanel jPanel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); this.setLayout(new BorderLayout()); @@ -110,16 +111,13 @@ public class SelectedDataColumnPane extends BasicPane { if (cellElement == null) { return; } - if (itemListener != null) { removeListener(itemListener); } - Object value = cellElement.getValue(); if (!(value instanceof DSColumn)) { return; } - DSColumn dsColumn = (DSColumn) value; String dsName = dsColumn.getDSName(); tableNameComboBox.setSelectedTableDataByName(dsName); diff --git a/designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java b/designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java index a3c38d0575..0e439a0bae 100644 --- a/designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java +++ b/designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java @@ -174,19 +174,18 @@ public class CellDSColumnEditor extends CellQuickEditor { paneList = new ArrayList<>(); /*基本设置面板*/ - this.dataPane = new SelectedDataColumnPane(false); + this.dataPane = new SelectedDataColumnPane(); this.groupPane = new ResultSetGroupDockingPane(tc); this.conditionPane = new JPanel(new BorderLayout()); - conditionPane.add(new UILabel("filter"), BorderLayout.WEST); + conditionPane.add(new UILabel("filter:"), BorderLayout.WEST); if (tc != null) { //第一次初始化时tc为空，引发NullPointerException - conditionPane.add(new UIButton(new DSColumnConditionAction(tc)), BorderLayout.EAST); + conditionPane.add(new UIButton(new DSColumnConditionAction(tc)), BorderLayout.CENTER); } dataPane.addListener(dataListener); groupPane.addListener(groupListener); paneList.add(new DSColumnBasicEditorPane(cellElement, dataPane, groupPane, conditionPane)); - /*高级设置面板*/ paneList.add(new DSColumnAdvancedEditorPane()); }