Merge pull request #1 in ~MOMEAK/design9.0 from ~YAOH.WU/design9.0:9.0 to 9.0

* commit '1bd82501ff4752a5d5c2c575038d01f7238663ad':
  REPORT-3348 数据列集选择组件布局修改，一些代码结构
  REPORT-3348 单元格元素数据列基本设置OK
  REPORT-3348 数据列基本设置添加过滤条件设置，多个文件换行符和todo
  REPORT-3348 单元格元素数据列基本设置动态加载
  REPORT-3348，踩坑，数据列展现方案确定

designer/src/com/fr/design/dscolumn/DSColumnAdvancedEditorPane.java

@@ -0,0 +1,38 @@
+package com.fr.design.dscolumn;
+
+import com.fr.design.mainframe.cell.CellEditorPane;
+import com.fr.report.cell.TemplateCellElement;
+
+
+/**
+ * 单元格元素 数据列 基本设置内容面板
+ *
+ * @author yaoh.wu
+ * @version 2017年7月25日
+ * @since 9.0
+ */
+public class DSColumnAdvancedEditorPane extends CellEditorPane {
+
+
+    @Override
+    public String getIconPath() {
+        return "Advanced";
+    }
+
+    @Override
+    public String title4PopupWindow() {
+        return "Advanced";
+    }
+
+
+    @Override
+    public void update() {
+
+    }
+
+    @Override
+    public void populate(TemplateCellElement cellElement) {
+
+    }
+
+}

designer/src/com/fr/design/dscolumn/DSColumnBasicEditorPane.java

@@ -0,0 +1,84 @@
+package com.fr.design.dscolumn;
+
+import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.mainframe.cell.CellEditorPane;
+import com.fr.report.cell.TemplateCellElement;
+
+import javax.swing.*;
+import java.awt.*;
+
+/**
+ * 单元格元素 数据列 高级设置内容面板
+ *
+ * @author yaoh.wu
+ * @version 2017年7月25日
+ * @since 9.0
+ */
+public class DSColumnBasicEditorPane extends CellEditorPane {
+
+    //数据集和数据列
+    private SelectedDataColumnPane dataPane;
+    //数据分组设置
+    private ResultSetGroupDockingPane groupPane;
+    //当前编辑的单元格
+    private TemplateCellElement cellElement;
+    //条件过滤按钮面板
+    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;
+        this.conditionPane = conditionPane;
+        this.add(this.createContentPane(), BorderLayout.CENTER);
+    }
+
+
+    @Override
+    public String getIconPath() {
+        return "Basic";
+    }
+
+    @Override
+    public String title4PopupWindow() {
+        return "Basic";
+    }
+
+
+    @Override
+    public void update() {
+        dataPane.update(this.cellElement);
+        groupPane.update();
+    }
+
+    @Override
+    public void populate(TemplateCellElement cellElement) {
+        this.cellElement = cellElement;
+        dataPane.populate(null, cellElement);
+        groupPane.populate(cellElement);
+    }
+
+
+    /**
+     * 创建有内容的面板显示信息
+     *
+     * @return content JPanel
+     */
+    private JPanel createContentPane() {
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+        double[] columnSize = {f};
+        double[] rowSize = {p, p, p};
+        Component[][] components = new Component[][]{
+                //数据集列选择
+                new Component[]{this.dataPane},
+                //数据分组设置
+                new Component[]{this.groupPane},
+                //条件过滤
+                new Component[]{this.conditionPane}
+        };
+        return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
+    }
+}

designer/src/com/fr/design/dscolumn/SelectedDataColumnPane.java

@@ -1,22 +1,22 @@
 package com.fr.design.dscolumn;
 
 import com.fr.base.Parameter;
-import com.fr.design.data.DesignTableDataManager;
 import com.fr.data.SimpleDSColumn;
 import com.fr.data.TableDataSource;
+import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.data.datapane.TableDataComboBox;
 import com.fr.design.data.tabledata.wrapper.TableDataWrapper;
+import com.fr.design.dialog.BasicDialog;
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.icombobox.LazyComboBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itableeditorpane.ParameterTableModel;
 import com.fr.design.gui.itableeditorpane.UITableEditorPane;
-import com.fr.design.gui.icombobox.LazyComboBox;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.DesignerContext;
-import com.fr.design.dialog.BasicDialog;
-import com.fr.design.dialog.BasicPane;
-import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.general.Inter;
 import com.fr.general.data.TableDataColumn;
 import com.fr.report.cell.CellElement;
@@ -35,80 +35,188 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
 
+/**
+ * 数据集列动态参数设置组件
+ *
+ * @author yaoh.wu
+ * @version 2017年7月26日
+ * 9.0设计器更新，修改动态参数注入按钮部分,使其显示动态参数按钮时能在右侧边栏正常显示
+ * @since 8.0
+ */
 public class SelectedDataColumnPane extends BasicPane {
-	protected UITableEditorPane<ParameterProvider> editorPane;
+    private UITableEditorPane<ParameterProvider> editorPane;
-	protected Parameter[] ps;
+    private Parameter[] ps;
 
-	protected TableDataComboBox tableNameComboBox;
+    TableDataComboBox tableNameComboBox;
-	protected LazyComboBox columnNameComboBox;
+    LazyComboBox columnNameComboBox;
-	private ItemListener itemListener;
+    private ItemListener itemListener;
 
-	private UIButton paramButton;
+    private UIButton paramButton;
 
-	public SelectedDataColumnPane() {
+    public SelectedDataColumnPane() {
-		this(true);
+        this(true);
-	}
+    }
 
-	public SelectedDataColumnPane(boolean showParameterButton) {
+    SelectedDataColumnPane(boolean showParameterButton) {
-		initComponent(showParameterButton);
+        initComponent(showParameterButton);
-	}
+    }
 
     /**
      * 初始化组件
      *
      * @param showParameterButton 是否显示参数按钮
+     */
+    public void initComponent(boolean showParameterButton) {
+        initTableNameComboBox();
+        if (showParameterButton) {
+            initWithParameterButton();
+        }
+        columnNameComboBox = new LazyComboBox() {
+            @Override
+            public Object[] load() {
+                List<String> 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 label3 = new UILabel(Inter.getLocText("DataColumn"));
+        if (showParameterButton) {
+            //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[] columnSize = {p, f};
+            double[] rowSize = {p, p};
+            Component[][] components = new Component[][]{
+                    new Component[]{label1, tableNameComboBox},
+                    new Component[]{label3, columnNameComboBox}
+            };
+            JPanel jPanel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
+            this.setLayout(new BorderLayout());
+            this.add(jPanel, BorderLayout.CENTER);
+        }
+    }
+
+
+    public void populate(TableDataSource source, TemplateCellElement cellElement) {
+        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);
+        columnNameComboBox.setSelectedItem(TableDataColumn.getColumnName(dsColumn.getColumn()));
+        ps = dsColumn.getParameters();
+
+        addListener(itemListener);
+    }
+
+    public void update(CellElement cellElement) {
+        if (cellElement == null) {
+            return;
+        }
+        Object value = cellElement.getValue();
+        if (this.tableNameComboBox.getSelectedItem() == null && this.columnNameComboBox.getSelectedItem() == null) {
+            return;
+        }
+        DSColumn dsColumn = null;
+        if (value == null || !(value instanceof DSColumn)) {
+            dsColumn = new DSColumn();
+            cellElement.setValue(dsColumn);
+        }
+        dsColumn = (DSColumn) cellElement.getValue();
+
+        SimpleDSColumn simpleDSColumn = updateColumnPane();
+        dsColumn.setDSName(simpleDSColumn.getDsName());
+        dsColumn.setColumn(simpleDSColumn.getColumn());
+
+        dsColumn.setParameters((ps != null && ps.length > 0) ? ps : null);
+    }
+
+    /**
+     * 更新面板
      *
+     * @return 更新后的值
      */
-	public void initComponent(boolean showParameterButton) {
+    public SimpleDSColumn updateColumnPane() {
-		initTableNameComboBox();
+        SimpleDSColumn dsColumn = new SimpleDSColumn();
-		if (showParameterButton) {
+        TableDataWrapper tableDataWrappe = this.tableNameComboBox.getSelectedItem();
-			initWithParameterButton();
+        if (tableDataWrappe == null) {
-		}
+            return null;
-		columnNameComboBox = new LazyComboBox() {
+        }
-
+        dsColumn.setDsName(tableDataWrappe.getTableDataName());
-			@Override
+        TableDataColumn column;
-			public Object[] load() {
+        String columnExp = (String) this.columnNameComboBox.getSelectedItem();
-				List<String> l = calculateColumnNameList();
+        if (isColumnName(columnExp)) {
-				return l.toArray(new String[l.size()]);
+            String number = columnExp.substring(1);
-			}
+            Pattern pattern = Pattern.compile("[^\\d]");
-
+            if (pattern.matcher(number).find()) {
-		};
+                column = TableDataColumn.createColumn(columnExp);
-		columnNameComboBox.setEditable(true);
+            } else {
-		double p = TableLayout.PREFERRED;
+                int serialNumber = Integer.parseInt(columnExp.substring(1));
-		UILabel label1 = new UILabel(Inter.getLocText("TableData") + ":");
+                column = TableDataColumn.createColumn(serialNumber);
-		UILabel label2 = new UILabel(Inter.getLocText("DataColumn") + ":");
+            }
-		if (showParameterButton) {
+        } else {
-			label1.setPreferredSize(new Dimension(200, 25));
+            column = TableDataColumn.createColumn(columnExp);
-			label2.setPreferredSize(new Dimension(200, 25));
+        }
-		}
+        dsColumn.setColumn(column);
-		if (showParameterButton) {
+        return dsColumn;
-			Component[][] comps = {{label1, null, label2}, {tableNameComboBox, paramButton, columnNameComboBox}};
+    }
-			this.add(TableLayoutHelper.createTableLayoutPane(comps, new double[]{p, p}, new double[]{p, p, p}));
+
-		} else {
+    /**
-			double f = TableLayout.FILL;
+     * 添加监听事件
-			double[] columnSize = {p, f};
+     *
-			double[] rowSize = {p, p};
+     * @param i 监听事件
-			Component[][] components = new Component[][]{
+     */
-					new Component[]{label1, tableNameComboBox},
+    public void addListener(ItemListener i) {
-					new Component[]{label2, columnNameComboBox}
+        itemListener = i;
-			};
+        tableNameComboBox.addItemListener(i);
-			JPanel jPanel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
+        columnNameComboBox.addItemListener(i);
-			this.setLayout(new BorderLayout());
+    }
-			this.add(jPanel, BorderLayout.CENTER);
+
-		}
+    /**
-	}
+     * 移除监听事件
-	
+     *
-	protected void initTableNameComboBox() {
+     * @param i 监听事件
-		tableNameComboBox = new TableDataComboBox(DesignTableDataManager.getEditingTableDataSource());
+     */
-		tableNameComboBox.addItemListener(new ItemListener() {
+    public void removeListener(ItemListener i) {
-			@Override
+        tableNameComboBox.removeItemListener(i);
-			public void itemStateChanged(ItemEvent e) {
+        columnNameComboBox.removeItemListener(i);
-				columnNameComboBox.setLoaded(false);
+    }
-//				columnNameComboBox.loadList();
+
-			}
+
-		});
+    protected void initTableNameComboBox() {
-		tableNameComboBox.setPreferredSize(new Dimension(100, 20));
+        tableNameComboBox = new TableDataComboBox(DesignTableDataManager.getEditingTableDataSource());
-	}
+        tableNameComboBox.addItemListener(new ItemListener() {
+            @Override
+            public void itemStateChanged(ItemEvent e) {
+                columnNameComboBox.setLoaded(false);
+            }
+        });
+        tableNameComboBox.setPreferredSize(new Dimension(100, 20));
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return "DSColumn";
+    }
+
 
     private void initWithParameterButton() {
         editorPane = new UITableEditorPane<ParameterProvider>(new ParameterTableModel());
@@ -129,119 +237,16 @@ public class SelectedDataColumnPane extends BasicPane {
         });
     }
 
-	@Override
-	protected String title4PopupWindow() {
-		return "DSColumn";
-	}
-
-	public void populate(TableDataSource source, TemplateCellElement cellElement) {
-		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);
-		columnNameComboBox.setSelectedItem(TableDataColumn.getColumnName(dsColumn.getColumn()));
-		ps = dsColumn.getParameters();
-
-		addListener(itemListener);
-	}
-
-	public void update(CellElement cellElement) {
-		if (cellElement == null) {
-			return;
-		}
-		Object value = cellElement.getValue();
-		if (this.tableNameComboBox.getSelectedItem() == null && this.columnNameComboBox.getSelectedItem() == null) {
-			return;
-		}
-		DSColumn dsColumn = null;
-		if (value == null || !(value instanceof DSColumn)) {
-			dsColumn = new DSColumn();
-			cellElement.setValue(dsColumn);
-		}
-		dsColumn = (DSColumn) cellElement.getValue();
-
-		SimpleDSColumn simpleDSColumn = updateColumnPane();
-		dsColumn.setDSName(simpleDSColumn.getDsName());
-		dsColumn.setColumn(simpleDSColumn.getColumn());
-
-		dsColumn.setParameters((ps != null && ps.length > 0) ? ps : null);
-	}
-
-    /**
-     * 更新面板
-     *
-     * @return 更新后的值
-     *
-     */
-	public SimpleDSColumn updateColumnPane() {
-		SimpleDSColumn dsColumn = new SimpleDSColumn();
-		TableDataWrapper tableDataWrappe = this.tableNameComboBox.getSelectedItem();
-		if (tableDataWrappe == null) {
-			return null;
-		}
-		dsColumn.setDsName(tableDataWrappe.getTableDataName());
-		TableDataColumn column;
-		String columnExp = (String) this.columnNameComboBox.getSelectedItem();
-		if (isColumnName(columnExp)) {
-			String number = columnExp.substring(1);
-			Pattern pattern = Pattern.compile("[^\\d]");
-			if (pattern.matcher(number).find()) {
-				column = TableDataColumn.createColumn(columnExp);
-			} else {
-				int serialNumber = Integer.parseInt(columnExp.substring(1));
-				column = TableDataColumn.createColumn(serialNumber);
-			}
-		} else {
-			column = TableDataColumn.createColumn(columnExp);
-		}
-		dsColumn.setColumn(column);
-		return dsColumn;
-	}
 
     private boolean isColumnName(String columnExp) {
         return StringUtils.isNotBlank(columnExp) && (columnExp.length() > 0 && columnExp.charAt(0) == '#') && !columnExp.endsWith("#");
-
     }
 
-    /**
-     * 添加监听事件
-     *
-     * @param i 监听事件
-     *
-     */
-	public void addListener(ItemListener i) {
-		itemListener = i;
-		tableNameComboBox.addItemListener(i);
-		columnNameComboBox.addItemListener(i);
-	}
 
-    /**
+    private List<String> calculateColumnNameList() {
-     * 移除监听事件
+        if (this.tableNameComboBox.getSelectedItem() != null) {
-     *
+            return this.tableNameComboBox.getSelectedItem().calculateColumnNameList();
-     * @param i 监听事件
+        }
-     *
+        return new ArrayList<String>();
-     */
+    }
-	public void removeListener(ItemListener i) {
-		tableNameComboBox.removeItemListener(i);
-		columnNameComboBox.removeItemListener(i);
-	}
-
-	private List<String> calculateColumnNameList() {
-		if (this.tableNameComboBox.getSelectedItem() != null) {
-			return this.tableNameComboBox.getSelectedItem().calculateColumnNameList();
-		}
-		return new ArrayList<String>();
-	}
 }

designer/src/com/fr/design/mainframe/cell/CellEditorPane.java

@@ -0,0 +1,30 @@
+package com.fr.design.mainframe.cell;
+
+import com.fr.design.dialog.BasicPane;
+import com.fr.report.cell.TemplateCellElement;
+
+/**
+ * 右侧单元格元素面板抽象类
+ *
+ * @author yaoh.wu
+ * @version 2017年7月25日
+ * @since 9.0
+ */
+public abstract class CellEditorPane extends BasicPane {
+
+    public abstract String getIconPath();
+
+    public abstract String title4PopupWindow();
+
+    /**
+     * 从面板拿数据保存
+     */
+    public abstract void update();
+
+    /**
+     * 更新面板数据
+     *
+     * @param cellElement 单元格
+     */
+    public abstract void populate(TemplateCellElement cellElement);
+}

designer/src/com/fr/design/mainframe/cell/QuickEditorRegion.java

@@ -1,57 +1,57 @@
 package com.fr.design.mainframe.cell;
 
-import java.awt.BorderLayout;
-
-import javax.swing.BorderFactory;
-import javax.swing.JPanel;
-
 import com.fr.design.gui.ilable.UILabel;
-import com.fr.general.Inter;
 import com.fr.design.selection.QuickEditor;
+import com.fr.general.Inter;
+
+import javax.swing.*;
+import java.awt.*;
 
 /**
  * QuickEditorRegion
  *
- * @editor zhou
+ * @author zhou, yaoh.wu
- * @since 2012-3-23下午3:21:36
+ * @version 2017年7月25日
+ * @since 8.0
  */
 
 public class QuickEditorRegion extends JPanel {
 
-	public static QuickEditorRegion getInstance() {
+
-		return singleton;
+    private static QuickEditorRegion singleton = new QuickEditorRegion();
-	}
+    private static JPanel EMPTY;
-	
+
-	public static JPanel getEmptyEditor() {
+    private QuickEditorRegion() {
-		if(EMPTY == null) {
+        this.setLayout(new BorderLayout());
-			EMPTY = new JPanel(new BorderLayout());
+    }
-			UILabel content = new UILabel(Inter.getLocText(new String[]{"DataFunction-None", "HJS-Message", "Form-Widget_Property_Table"})+"!");
+
-			content.setBorder(BorderFactory.createEmptyBorder(0, 70, 0, 0));
+    public static QuickEditorRegion getInstance() {
-			EMPTY.add(content, BorderLayout.CENTER);
+        return singleton;
-		}
+    }
-		return EMPTY;
+
-	}
+    public static JPanel getEmptyEditor() {
-
+        if (EMPTY == null) {
-	private static QuickEditorRegion singleton = new QuickEditorRegion();
+            EMPTY = new JPanel(new BorderLayout());
-	private static JPanel EMPTY;
+            UILabel content = new UILabel(Inter.getLocText(new String[]{"DataFunction-None", "HJS-Message", "Form-Widget_Property_Table"}) + "!");
-
+            content.setBorder(BorderFactory.createEmptyBorder(0, 70, 0, 0));
-	public QuickEditorRegion() {
+            EMPTY.add(content, BorderLayout.CENTER);
-		this.setLayout(new BorderLayout());
+        }
-	}
+        return EMPTY;
-
+    }
-	/**
+
-	 * 传值
+    /**
-	 * 
+     * 更新面板显示数据
-	 * @param ePane
+     *
-	 */
+     * @param currentEditor 当前正在编辑的单元格编辑器或者默认的单元格编辑器
-	public void populate(final QuickEditor quickEditor) {
+     */
-		this.removeAll();
+    public void populate(final QuickEditor currentEditor) {
-		if(quickEditor.getComponentCount() == 0) {
+        this.removeAll();
-			this.add(getEmptyEditor(), BorderLayout.CENTER);
+        if (currentEditor.getComponentCount() == 0) {
-		} else {
+            this.add(getEmptyEditor(), BorderLayout.CENTER);
-			this.add(quickEditor, BorderLayout.CENTER);
+        } else {
-		}
+            this.add(currentEditor, BorderLayout.CENTER);
-		validate();
+        }
-		repaint();
+        validate();
-	}
+        repaint();
+    }
 }

designer/src/com/fr/quickeditor/CellQuickEditor.java

@@ -24,100 +24,106 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 
 /**
- * 
  * @author zhou
  * @since 2012-7-23下午5:16:53
  */
 public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> {
 
-	protected  UITextField columnRowTextField;
+    protected UITextField columnRowTextField;
-	protected UIButton cellElementEditButton;
+    private UIButton cellElementEditButton;
-	protected TemplateCellElement cellElement;
+    protected TemplateCellElement cellElement;
-
-	public CellQuickEditor() {
-		double p = TableLayout.PREFERRED;
-		double f = TableLayout.FILL;
-		double[] columnSize = { p, f };
-		double[] rowSize = { p,p,p};
 
+    public CellQuickEditor() {
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+        double[] columnSize = {p, f};
+        double[] rowSize = {p, p, p};
         Component[][] components = new Component[][]{
-                new Component[]{new UILabel("  "+Inter.getLocText("Cell")),columnRowTextField = initColumnRowTextField()},
+                new Component[]{new UILabel("  " + Inter.getLocText("Cell")), columnRowTextField = initColumnRowTextField()},
-                new Component[]{new UILabel(Inter.getLocText("HF-Insert_Content")+" "),cellElementEditButton = initCellElementEditButton()},
+                new Component[]{new UILabel(Inter.getLocText("HF-Insert_Content") + " "), cellElementEditButton = initCellElementEditButton()},
-                new Component[]{createCenterBody(),null}
+                new Component[]{createCenterBody(), null}
         };
-
+        JPanel panel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
-        JPanel panel = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize);
         this.setLayout(new BorderLayout());
         this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
-        this.add(panel,BorderLayout.CENTER);
+        this.add(panel, BorderLayout.CENTER);
-
+    }
-
+
-
+    /**
-	}
+     * 初始化添加按钮
-	
+     * TODO 9.0 换成下拉菜单后原来的快捷键不好处理，先跳过。
-	protected UIButton initCellElementEditButton() {
+     *
-		final UIButton cellElementEditButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png"));
+     * @return UIButton
-		cellElementEditButton.addMouseListener(new MouseAdapter() {
+     */
-
+    private UIButton initCellElementEditButton() {
-			@Override
+        final UIButton cellElementEditButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png"));
-			public void mousePressed(MouseEvent evt) {
+        cellElementEditButton.addMouseListener(new MouseAdapter() {
-				GUICoreUtils.showPopMenuWithParentWidth(DeprecatedActionManager.getCellMenu(tc).createJPopupMenu(), cellElementEditButton, 0, cellElementEditButton.getY() - 6);
+
-			}
+            @Override
-		});
+            public void mousePressed(MouseEvent evt) {
-		return cellElementEditButton;
+                GUICoreUtils.showPopMenuWithParentWidth(DeprecatedActionManager.getCellMenu(tc).createJPopupMenu(), cellElementEditButton, 0, cellElementEditButton.getY() - 6);
-	}
+            }
-
+        });
-	protected UITextField initColumnRowTextField() {
+        return cellElementEditButton;
-		final UITextField columnRowTextField = new UITextField(4);
+    }
-		// barry:输入位置定位单元格
+
-		columnRowTextField.addActionListener(new ActionListener() {
+    /**
-
+     * 初始化单元格域，存储当前选择的单元格，例A3,B4等
-			@Override
+     *
-			public void actionPerformed(ActionEvent e) {
+     * @return 单元格信息文本域
-				ColumnRow columnRowEdit = ColumnRow.valueOf(columnRowTextField.getText());
+     */
-
+    private UITextField initColumnRowTextField() {
-				// barry:检查输入是否正确
+        final UITextField columnRowTextField = new UITextField(4);
-				if (!ColumnRow.validate(columnRowEdit)) {
+
-
+        // barry:输入位置定位单元格
-					Object[] options = { Inter.getLocText("OK") };
+        columnRowTextField.addActionListener(new ActionListener() {
-					JOptionPane.showOptionDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("Please_Input_Letters+Numbers(A1,AA1,A11....)"), Inter.getLocText("Warning"),
+            @Override
-							JOptionPane.DEFAULT_OPTION, JOptionPane.WARNING_MESSAGE, null, options, options[0]);
+            public void actionPerformed(ActionEvent e) {
-
+                ColumnRow columnRowEdit = ColumnRow.valueOf(columnRowTextField.getText());
-					// 重新选中当前的selection,把columnRowTextField
+                // barry:检查输入是否正确
-					tc.setSelection(tc.getSelection());
+                if (!ColumnRow.validate(columnRowEdit)) {
-					return;
+                    Object[] options = {Inter.getLocText("OK")};
-				}
+                    JOptionPane.showOptionDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("Please_Input_Letters+Numbers(A1,AA1,A11....)"), Inter.getLocText("Warning"),
-
+                            JOptionPane.DEFAULT_OPTION, JOptionPane.WARNING_MESSAGE, null, options, options[0]);
-				JScrollBar verticalBar = tc.getVerticalScrollBar(), horizontalBar = tc.getHorizontalScrollBar();
+                    // 重新选中当前的selection,把columnRowTextField
-				int m = columnRowEdit.getColumn(), n = columnRowEdit.getRow();
+                    tc.setSelection(tc.getSelection());
-
+                    return;
-				verticalBar.setMaximum(n);
+                }
-				verticalBar.setValue(n < 21 ? verticalBar.getValue() : n - 20);
+                JScrollBar verticalBar = tc.getVerticalScrollBar(), horizontalBar = tc.getHorizontalScrollBar();
-				horizontalBar.setMaximum(m);
+                int m = columnRowEdit.getColumn(), n = columnRowEdit.getRow();
-				horizontalBar.setValue(m < 13 ? horizontalBar.getValue() : m - 12);
+                verticalBar.setMaximum(n);
-
+                verticalBar.setValue(n < 21 ? verticalBar.getValue() : n - 20);
-				tc.setSelection(new CellSelection(m, n, 1, 1));
+                horizontalBar.setMaximum(m);
-				tc.requestFocus();
+                horizontalBar.setValue(m < 13 ? horizontalBar.getValue() : m - 12);
-			}
+                tc.setSelection(new CellSelection(m, n, 1, 1));
-		});
+                tc.requestFocus();
-		return columnRowTextField;
+            }
-	}
+        });
-
+        return columnRowTextField;
-	public abstract JComponent createCenterBody();
+    }
-
+
-	@Override
+
-	protected void refresh() {
+    /**
-		CellSelection cs = (CellSelection)tc.getSelection();
+     * 初始化详细信息面板
-		ColumnRow columnRow = ColumnRow.valueOf(cs.getColumn(), cs.getRow());
+     *
-		columnRowTextField.setText(columnRow.toString());
+     * @return JComponent 待显示的详细信息面板
-		cellElement = tc.getEditingElementCase().getTemplateCellElement(cs.getColumn(), cs.getRow());
+     */
-		refreshDetails();
+    public abstract JComponent createCenterBody();
-	}
+
-
+    /**
-	protected abstract void refreshDetails();
+     * 刷新
-
+     */
-
+    @Override
-
+    protected void refresh() {
-
+        CellSelection cs = (CellSelection) tc.getSelection();
-
+        ColumnRow columnRow = ColumnRow.valueOf(cs.getColumn(), cs.getRow());
+        columnRowTextField.setText(columnRow.toString());
+        cellElement = tc.getEditingElementCase().getTemplateCellElement(cs.getColumn(), cs.getRow());
+        refreshDetails();
+    }
+
+    /**
+     * 刷新详细信息
+     */
+    protected abstract void refreshDetails();
 }

designer/src/com/fr/quickeditor/cellquick/CellBiasTextPainterEditor.java

@@ -1,61 +1,63 @@
 package com.fr.quickeditor.cellquick;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.BorderFactory;
-import javax.swing.JComponent;
-
 import com.fr.base.BaseUtils;
 import com.fr.design.cell.editor.BiasTextPainterCellEditor.BiasTextPainterPane;
+import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.mainframe.DesignerContext;
-import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.Inter;
 import com.fr.quickeditor.CellQuickEditor;
 import com.fr.report.cell.painter.BiasTextPainter;
 
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+/**
+ * 单元格元素斜线编辑器
+ * TODO 9.0 大体没有改动
+ */
 public class CellBiasTextPainterEditor extends CellQuickEditor {
 
-	@Override
+    @Override
-	public JComponent createCenterBody() {
+    public JComponent createCenterBody() {
-		UIButton editbutton = new UIButton(Inter.getLocText("Edit"), BaseUtils.readIcon("/com/fr/design/images/m_insert/bias.png"));
+        UIButton editbutton = new UIButton(Inter.getLocText("Edit"), BaseUtils.readIcon("/com/fr/design/images/m_insert/bias.png"));
-		editbutton.addActionListener(new ActionListener() {
+        editbutton.addActionListener(new ActionListener() {
-
+
-			@Override
+            @Override
-			public void actionPerformed(ActionEvent e) {
+            public void actionPerformed(ActionEvent e) {
-				showEditingDialog();
+                showEditingDialog();
-			}
+            }
-		});
+        });
-		editbutton.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 0));
+        editbutton.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 0));
-		editbutton.setMargin(null);
+        editbutton.setMargin(null);
-		editbutton.setOpaque(false);
+        editbutton.setOpaque(false);
-		return editbutton;
+        return editbutton;
-	}
+    }
-
+
-	private void showEditingDialog() {
+    private void showEditingDialog() {
-		final BiasTextPainter oldbiasTextPainter = (BiasTextPainter)cellElement.getValue();
+        final BiasTextPainter oldbiasTextPainter = (BiasTextPainter) cellElement.getValue();
-		final BiasTextPainterPane biasTextPainterPane = new BiasTextPainterPane();
+        final BiasTextPainterPane biasTextPainterPane = new BiasTextPainterPane();
-		biasTextPainterPane.populate(oldbiasTextPainter);
+        biasTextPainterPane.populate(oldbiasTextPainter);
-		biasTextPainterPane.showSmallWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
+        biasTextPainterPane.showSmallWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
-
+
-			@Override
+            @Override
-			public void doOk() {
+            public void doOk() {
-				BiasTextPainter newbiasTextPainter = biasTextPainterPane.update();
+                BiasTextPainter newbiasTextPainter = biasTextPainterPane.update();
-				if (!ComparatorUtils.equals(oldbiasTextPainter, newbiasTextPainter)) {
+                if (!ComparatorUtils.equals(oldbiasTextPainter, newbiasTextPainter)) {
-					cellElement.setValue(newbiasTextPainter);
+                    cellElement.setValue(newbiasTextPainter);
-					fireTargetModified();
+                    fireTargetModified();
-				}
+                }
-			}
+            }
-
+
-		}).setVisible(true);
+        }).setVisible(true);
-	}
+    }
-
+
-	@Override
+    @Override
-	protected void refreshDetails() {
+    protected void refreshDetails() {
-		// TODO Auto-generated method stub
+        // TODO Auto-generated method stub
-
+
-	}
+    }
 
 }

designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java

@@ -1,28 +1,52 @@
 package com.fr.quickeditor.cellquick;
 
-import com.fr.design.actions.columnrow.DSColumnAdvancedAction;
-import com.fr.design.actions.columnrow.DSColumnBasicAction;
 import com.fr.design.actions.columnrow.DSColumnConditionAction;
-import com.fr.design.constants.LayoutConstants;
+import com.fr.design.dscolumn.DSColumnAdvancedEditorPane;
+import com.fr.design.dscolumn.DSColumnBasicEditorPane;
 import com.fr.design.dscolumn.ResultSetGroupDockingPane;
 import com.fr.design.dscolumn.SelectedDataColumnPane;
 import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.ibutton.UIHeadGroup;
+import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.mainframe.cell.CellEditorPane;
+import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.quickeditor.CellQuickEditor;
 
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
+import java.util.ArrayList;
 
+/**
+ * 单元格元素 数据列编辑器
+ *
+ * @author yaoh.wu
+ * @version 2017年7月24日
+ * @since 9.0
+ */
 public class CellDSColumnEditor extends CellQuickEditor {
+
     private JPanel dsColumnRegion;
     private JPanel centerPane;
+    //数据集列选择组件
     private SelectedDataColumnPane dataPane;
+    //数据分组设置组件
     private ResultSetGroupDockingPane groupPane;
+    //过滤条件面板
+    private JPanel conditionPane;
+    // 基本和高级设置
+    private ArrayList<CellEditorPane> paneList;
+    // 基本和高级设置 卡片布局
+    private CardLayout card;
+    // 基本和高级设置 容器面板
+    private JPanel center;
+    // 卡片布局TAB切换按钮
+    private UIHeadGroup tabsHeaderIconPane;
+    // 分组设置监听器
     private ItemListener groupListener = new ItemListener() {
-
         @Override
         public void itemStateChanged(ItemEvent e) {
             if (e == null) {
@@ -40,9 +64,8 @@ public class CellDSColumnEditor extends CellQuickEditor {
             }
         }
     };
-
+    //数据集列设置监听器
     private ItemListener dataListener = new ItemListener() {
-
         @Override
         public void itemStateChanged(ItemEvent e) {
             if (e.getStateChange() == ItemEvent.SELECTED) {
@@ -59,53 +82,120 @@ public class CellDSColumnEditor extends CellQuickEditor {
         super();
     }
 
+    /**
+     * Test Main
+     *
+     * @param args 参数
+     */
+    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 BorderLayout());
+        content.add(new CellDSColumnEditor(), BorderLayout.CENTER);
+        GUICoreUtils.centerWindow(jf);
+        jf.setSize(220, 400);
+        jf.setVisible(true);
+    }
+
+    /**
+     * 创建面板占位
+     *
+     * @return JComponent 详细信息面板
+     */
     @Override
     public JComponent createCenterBody() {
-        double p = TableLayout.PREFERRED;
+        this.createPanes();
-        double f = TableLayout.FILL;
+        this.createSwitchTab();
-        double[] columnSize = {p, f};
+        dsColumnRegion = new JPanel(new BorderLayout());
-        double[] rowSize = {p, p, p, p};
+        dsColumnRegion.add(tabsHeaderIconPane, BorderLayout.NORTH);
-        Component[][] components = new Component[][]{};
+        dsColumnRegion.add(center, BorderLayout.CENTER);
-        dsColumnRegion = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
+        centerPane = new JPanel(new BorderLayout());
-        centerPane = new JPanel(new BorderLayout(0, 0));
         centerPane.add(dsColumnRegion, BorderLayout.CENTER);
         return centerPane;
     }
 
-    // august:这里面的东西都全部重新动态生成，不然容易出错
+    /**
+     * 内容全部重新动态生成，不然容易出错
+     * 刷新详细信息面板
+     */
     @Override
     protected void refreshDetails() {
-        JPanel pane = new JPanel(new BorderLayout(LayoutConstants.HGAP_LARGE, 0));
+
-        pane.add(new UIButton(new DSColumnConditionAction(tc)), BorderLayout.WEST);
+        this.createPanes();
-        pane.add(new UIButton(new DSColumnAdvancedAction(tc)), BorderLayout.CENTER);
+        this.createSwitchTab();
-        double p = TableLayout.PREFERRED;
+        dsColumnRegion = new JPanel(new BorderLayout());
-        double f = TableLayout.FILL;
+        dsColumnRegion.add(tabsHeaderIconPane, BorderLayout.NORTH);
-        double[] columnSize = {p, f};
+        dsColumnRegion.add(center, BorderLayout.CENTER);
-        double[] rowSize = {p, p, p, p};
+        //必须removeAll之后再添加；重新再实例化一个centerJPanel，因为对象变了会显示不出来
-        Component[][] components = new Component[][]{
-                new Component[]{new UIButton(new DSColumnBasicAction(tc)), null},
-                new Component[]{pane, null},
-                new Component[]{dataPane = new SelectedDataColumnPane(false), null},
-                new Component[]{groupPane = new ResultSetGroupDockingPane(tc), null}
-        };
         centerPane.removeAll();
-        dsColumnRegion = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
         centerPane.add(dsColumnRegion, BorderLayout.CENTER);
-        dataPane.addListener(dataListener);
+        for (CellEditorPane cellEditorPane : paneList) {
-        groupPane.addListener(groupListener);
+            cellEditorPane.populate(cellElement);
-        dataPane.populate(null, cellElement);
+        }
-        groupPane.populate(cellElement);
         this.validate();
     }
 
 
     /**
-     * for 关闭时候释放
+     * 关闭时候释放
      */
-    public void release () {
+    public void release() {
         super.release();
         dsColumnRegion = null;
         centerPane = null;
     }
 
+
+    /**
+     * 初始化基本和高级设置切换tab
+     */
+    private void createSwitchTab() {
+        String[] iconArray = new String[paneList.size()];
+        card = new CardLayout();
+        center = new JPanel(card);
+        center.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
+        for (int i = 0; i < paneList.size(); i++) {
+            CellEditorPane pane = paneList.get(i);
+            iconArray[i] = pane.getIconPath();
+            center.add(pane, pane.title4PopupWindow());
+        }
+        tabsHeaderIconPane = new UIHeadGroup(iconArray) {
+            @Override
+            public void tabChanged(int index) {
+                card.show(center, paneList.get(index).title4PopupWindow());
+                paneList.get(index).populate(cellElement);
+            }
+        };
+        tabsHeaderIconPane.setNeedLeftRightOutLine(false);
+    }
+
+    /**
+     * 刷新数据列基本和高级设置面板
+     */
+    private void createPanes() {
+        paneList = new ArrayList<>();
+
+        /*基本设置面板*/
+        this.dataPane = new SelectedDataColumnPane();
+        this.groupPane = new ResultSetGroupDockingPane(tc);
+        double p = TableLayout.PREFERRED, f = TableLayout.FILL;
+        double[] rowSize = {p}, columnSize = {p, f};
+        UILabel uiLabel = new UILabel("filter");
+        UIButton uiButton = new UIButton();
+        if (tc != null) {
+            //第一次初始化时tc为空，引发NullPointerException
+            uiButton = new UIButton(new DSColumnConditionAction(tc));
+        }
+        Component[][] components = new Component[][]{
+                new Component[]{uiLabel, uiButton}
+        };
+        this.conditionPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
+        dataPane.addListener(dataListener);
+        groupPane.addListener(groupListener);
+        paneList.add(new DSColumnBasicEditorPane(cellElement, dataPane, groupPane, conditionPane));
+
+        /*高级设置面板*/
+        paneList.add(new DSColumnAdvancedEditorPane());
+    }
 }

designer/src/com/fr/quickeditor/cellquick/CellImageQuickEditor.java

@@ -1,75 +1,77 @@
 package com.fr.quickeditor.cellquick;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.BorderFactory;
-import javax.swing.JComponent;
-
 import com.fr.base.BaseUtils;
 import com.fr.base.Style;
+import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.report.SelectImagePane;
-import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.Inter;
 import com.fr.quickeditor.CellQuickEditor;
 import com.fr.report.cell.cellattr.CellImage;
 
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+/**
+ * 单元格元素图片编辑器
+ * TODO 9.0大体上没有改动
+ */
 public class CellImageQuickEditor extends CellQuickEditor {
-	private static CellImageQuickEditor THIS;
+    private static CellImageQuickEditor THIS;
 
-	public static final CellImageQuickEditor getInstance() {
+    public static final CellImageQuickEditor getInstance() {
-		if(THIS == null) {
+        if (THIS == null) {
-			THIS = new CellImageQuickEditor();
+            THIS = new CellImageQuickEditor();
-		}
+        }
-		return THIS;
+        return THIS;
-	}
+    }
 
-	private CellImageQuickEditor() {
+    private CellImageQuickEditor() {
-		super();
+        super();
-	}
+    }
 
-	@Override
+    @Override
-	public JComponent createCenterBody() {
+    public JComponent createCenterBody() {
-		UIButton editbutton = new UIButton(Inter.getLocText("Edit"), BaseUtils.readIcon("/com/fr/design/images/m_insert/image.png"));
+        UIButton editbutton = new UIButton(Inter.getLocText("Edit"), BaseUtils.readIcon("/com/fr/design/images/m_insert/image.png"));
-		editbutton.addActionListener(new ActionListener() {
+        editbutton.addActionListener(new ActionListener() {
 
-			@Override
+            @Override
-			public void actionPerformed(ActionEvent e) {
+            public void actionPerformed(ActionEvent e) {
-				showEditingDialog();
+                showEditingDialog();
-			}
+            }
-		});
+        });
-		editbutton.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 0));
+        editbutton.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 0));
-		editbutton.setMargin(null);
+        editbutton.setMargin(null);
-		editbutton.setOpaque(false);
+        editbutton.setOpaque(false);
-		return editbutton;
+        return editbutton;
-	}
+    }
 
-	private void showEditingDialog() {
+    private void showEditingDialog() {
-		final SelectImagePane imageEditorPane = new SelectImagePane();
+        final SelectImagePane imageEditorPane = new SelectImagePane();
-		imageEditorPane.populate(cellElement);
+        imageEditorPane.populate(cellElement);
-		final Object oldValue = cellElement.getValue();
+        final Object oldValue = cellElement.getValue();
-		final Style oldStyle = cellElement.getStyle();
+        final Style oldStyle = cellElement.getStyle();
-		imageEditorPane.showWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
+        imageEditorPane.showWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
 
-			@Override
+            @Override
-			public void doOk() {
+            public void doOk() {
-				CellImage cellImage = imageEditorPane.update();
+                CellImage cellImage = imageEditorPane.update();
-				if (!ComparatorUtils.equals(cellImage.getImage(), oldValue) || !ComparatorUtils.equals(cellImage.getStyle(), oldStyle)) {
+                if (!ComparatorUtils.equals(cellImage.getImage(), oldValue) || !ComparatorUtils.equals(cellImage.getStyle(), oldStyle)) {
-					cellElement.setValue(cellImage.getImage());
+                    cellElement.setValue(cellImage.getImage());
-					cellElement.setStyle(cellImage.getStyle());
+                    cellElement.setStyle(cellImage.getStyle());
-					fireTargetModified();
+                    fireTargetModified();
-				}
+                }
-			}
+            }
 
-		}).setVisible(true);
+        }).setVisible(true);
-	}
+    }
 
-	@Override
+    @Override
-	protected void refreshDetails() {
+    protected void refreshDetails() {
 
-	}
+    }
 
 }

designer/src/com/fr/quickeditor/cellquick/CellRichTextEditor.java

@@ -1,50 +1,50 @@
 package com.fr.quickeditor.cellquick;
 
-import javax.swing.BorderFactory;
-import javax.swing.JComponent;
-
 import com.fr.design.actions.insert.cell.RichTextCellAction;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.general.Inter;
 import com.fr.quickeditor.CellQuickEditor;
 
+import javax.swing.*;
+
+/**
+ * 单元格元素富文本编辑器
+ * TODO 9.0 大体上没有改动
+ */
 public class CellRichTextEditor extends CellQuickEditor {
-	private UIButton subReportButton;
+    private UIButton subReportButton;
-	private static CellRichTextEditor THIS;
+    private static CellRichTextEditor THIS;
-	
+
-	public static final CellRichTextEditor getInstance() {
+    public static final CellRichTextEditor getInstance() {
-		if(THIS == null) {
+        if (THIS == null) {
-			THIS = new CellRichTextEditor();
+            THIS = new CellRichTextEditor();
-		}
+        }
-		return THIS;
+        return THIS;
-	}
+    }
-
+
-	private CellRichTextEditor() {
+    private CellRichTextEditor() {
-		super();
+        super();
-	}
+    }
-
+
-	/**
+    /**
-	 * 创建界面上中间的部分
+     * 创建界面上中间的部分
-	 * 
+     *
-	 * @return 界面元素
+     * @return 界面元素
-	 * 
+     * @date 2014-12-7-下午9:41:52
-	 *
+     */
-	 * @date 2014-12-7-下午9:41:52
+    public JComponent createCenterBody() {
-	 * 
+        subReportButton = new UIButton();
-	 */
+        subReportButton.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 0));
-	public JComponent createCenterBody() {
+        subReportButton.setMargin(null);
-		subReportButton = new UIButton();
+        subReportButton.setOpaque(false);
-		subReportButton.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 0));
+        return subReportButton;
-		subReportButton.setMargin(null);
+    }
-		subReportButton.setOpaque(false);
+
-		return subReportButton;
+    @Override
-	}
+    protected void refreshDetails() {
-
+        RichTextCellAction subReportCellAction = new RichTextCellAction(tc);
-	@Override
+        subReportCellAction.setName(Inter.getLocText("FR-Designer_RichTextEditor"));
-	protected void refreshDetails() {
+        subReportButton.setAction(subReportCellAction);
-		RichTextCellAction subReportCellAction = new RichTextCellAction(tc);
+    }
-		subReportCellAction.setName(Inter.getLocText("FR-Designer_RichTextEditor"));
-		subReportButton.setAction(subReportCellAction);
-	}
 
 }

designer/src/com/fr/quickeditor/cellquick/CellStringQuickEditor.java

@@ -1,12 +1,5 @@
 package com.fr.quickeditor.cellquick;
 
-import java.awt.event.KeyAdapter;
-import java.awt.event.KeyEvent;
-
-import javax.swing.JComponent;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-
 import com.fr.base.Formula;
 import com.fr.base.Style;
 import com.fr.base.TextFormat;
@@ -18,71 +11,78 @@ import com.fr.report.cell.DefaultTemplateCellElement;
 import com.fr.stable.ColumnRow;
 import com.fr.stable.StringUtils;
 
-public class CellStringQuickEditor extends CellQuickEditor {
+import javax.swing.*;
-
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
 
+/**
+ *
+ */
+public class CellStringQuickEditor extends CellQuickEditor {
+    //instance
     private static CellStringQuickEditor THIS;
-
+    //文本域
+    //TODO 9.0 文本域要根据具体文本数量自适应大小，比较难搞，先跳过。
     private UITextField stringTextField;
+    //编辑状态
+    private boolean isEditing = false;
 
-	private boolean isEditing = false;
+    public static CellStringQuickEditor getInstance() {
-
-    public static final CellStringQuickEditor getInstance() {
         if (THIS == null) {
             THIS = new CellStringQuickEditor();
         }
         return THIS;
     }
 
-    // august：如果是原来编辑的是公式,要保留公式里的这些属性,不然在公式和字符串转化时,就会丢失这些属性设置
+    //august：如果是原来编辑的是公式,要保留公式里的这些属性,不然在公式和字符串转化时,就会丢失这些属性设置。
     private boolean reserveInResult = false;
     private boolean reserveOnWriteOrAnaly = true;
 
+    private DocumentListener documentListener = new DocumentListener() {
+        @Override
+        public void insertUpdate(DocumentEvent e) {
+            changeReportPaneCell(stringTextField.getText().trim());
+        }
+
+        @Override
+        public void removeUpdate(DocumentEvent e) {
+            changeReportPaneCell(stringTextField.getText().trim());
+        }
+
+        @Override
+        public void changedUpdate(DocumentEvent e) {
+            changeReportPaneCell(stringTextField.getText().trim());
+        }
+
+    };
+
     private CellStringQuickEditor() {
         super();
     }
 
-    @Override
     /**
-     *
+     * 详细信息面板
+     * todo 文本框可自适应大小，公式编辑也是在这边，如果是公式那么要加一个公式编辑器的触发按钮
      */
+    @Override
     public JComponent createCenterBody() {
         stringTextField = new UITextField();
         stringTextField.addKeyListener(new KeyAdapter() {
-
             @Override
             public void keyReleased(KeyEvent e) {
                 if (tc != null) {
                     tc.getGrid().dispatchEvent(e);
                 }
             }
-
         });
-
         return stringTextField;
     }
 
-    DocumentListener documentListener = new DocumentListener() {
 
-        @Override
+    private void changeReportPaneCell(String tmpText) {
-        public void insertUpdate(DocumentEvent e) {
+        isEditing = true;
-            changeReportPaneCell(stringTextField.getText().trim());
-        }
-
-        @Override
-        public void removeUpdate(DocumentEvent e) {
-            changeReportPaneCell(stringTextField.getText().trim());
-        }
-
-        @Override
-        public void changedUpdate(DocumentEvent e) {
-            changeReportPaneCell(stringTextField.getText().trim());
-        }
-
-    };
-
-    protected void changeReportPaneCell(String tmpText) {
-		isEditing = true;
         //refresh一下，如果单元格内有新添加的控件，此时并不知道
         CellSelection cs1 = (CellSelection) tc.getSelection();
         ColumnRow columnRow = ColumnRow.valueOf(cs1.getColumn(), cs1.getRow());
@@ -101,7 +101,7 @@ public class CellStringQuickEditor extends CellQuickEditor {
             cellElement.setValue(textFormula);
         } else {
             Style style = cellElement.getStyle();
-            if (cellElement != null && style != null && style.getFormat() != null && style.getFormat() == TextFormat.getInstance()) {
+            if (style != null && style.getFormat() != null && style.getFormat() == TextFormat.getInstance()) {
                 cellElement.setValue(tmpText);
             } else {
                 cellElement.setValue(ReportHelper.convertGeneralStringAccordingToExcel(tmpText));
@@ -109,12 +109,15 @@ public class CellStringQuickEditor extends CellQuickEditor {
         }
         fireTargetModified();
         stringTextField.requestFocus();
-		isEditing = false;
+        isEditing = false;
     }
 
+    /**
+     * 刷新详细内容
+     */
     @Override
     protected void refreshDetails() {
-        String str = null;
+        String str;
         if (cellElement == null) {
             str = StringUtils.EMPTY;
         } else {
@@ -135,14 +138,15 @@ public class CellStringQuickEditor extends CellQuickEditor {
     }
 
     /**
+     * 显示文本
      *
-     * @param str
+     * @param str 文本
      */
     public void showText(String str) {
-		// 本编辑框在输入过程中引发的后续事件如果还调用了本框的setText方法不能执行
+        // 正在编辑时不处理
-		if (isEditing) {
+        if (isEditing) {
-			return;
+            return;
-		}
+        }
         stringTextField.getDocument().removeDocumentListener(documentListener);
         stringTextField.setText(str);
         stringTextField.getDocument().addDocumentListener(documentListener);

designer/src/com/fr/quickeditor/cellquick/CellSubReportEditor.java

@@ -1,42 +1,45 @@
 package com.fr.quickeditor.cellquick;
 
-import javax.swing.BorderFactory;
-import javax.swing.JComponent;
-
 import com.fr.design.actions.insert.cell.SubReportCellAction;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.general.Inter;
 import com.fr.quickeditor.CellQuickEditor;
 
+import javax.swing.*;
+
+/**
+ * 单元格元素子报表编辑器
+ * TODO 9.0大体上没有改动
+ */
 public class CellSubReportEditor extends CellQuickEditor {
-	private UIButton subReportButton;
+    private UIButton subReportButton;
-	private static CellSubReportEditor THIS;
+    private static CellSubReportEditor THIS;
-	
+
-	public static final CellSubReportEditor getInstance() {
+    public static final CellSubReportEditor getInstance() {
-		if(THIS == null) {
+        if (THIS == null) {
-			THIS = new CellSubReportEditor();
+            THIS = new CellSubReportEditor();
-		}
+        }
-		return THIS;
+        return THIS;
-	}
+    }
-
+
-	private CellSubReportEditor() {
+    private CellSubReportEditor() {
-		super();
+        super();
-	}
+    }
-
+
-	@Override
+    @Override
-	public JComponent createCenterBody() {
+    public JComponent createCenterBody() {
-		subReportButton = new UIButton();
+        subReportButton = new UIButton();
-		subReportButton.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 0));
+        subReportButton.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 0));
-		subReportButton.setMargin(null);
+        subReportButton.setMargin(null);
-		subReportButton.setOpaque(false);
+        subReportButton.setOpaque(false);
-		return subReportButton;
+        return subReportButton;
-	}
+    }
-
+
-	@Override
+    @Override
-	protected void refreshDetails() {
+    protected void refreshDetails() {
-		SubReportCellAction subReportCellAction = new SubReportCellAction(tc);
+        SubReportCellAction subReportCellAction = new SubReportCellAction(tc);
-		subReportCellAction.setName(Inter.getLocText(new String[]{"Edit", "Sub_Report"}));
+        subReportCellAction.setName(Inter.getLocText(new String[]{"Edit", "Sub_Report"}));
-		subReportButton.setAction(subReportCellAction);
+        subReportButton.setAction(subReportCellAction);
-	}
+    }
 
 }