fanruan
/
design
6
1
Fork 2
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

Merge pull request #1051 in BA/design from ~VITO/design:9.0 to 9.0 

* commit '65c38b21d2e1e3b01ebd47f753b2724eabb7259e':
  刚发现添加了一个CellFormulaQuickEditor，这样文字和公式可以分开了
  REPORT-3564 9.0设计器单元格元素插入内容控件
master
superman 7 years ago
parent
d4cb7639c5 65c38b21d2
commit
93c8210f4a
22 changed files with 405 additions and 198 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 55
      designer/src/com/fr/design/actions/CellSelectionAction.java
  2. 16
      designer/src/com/fr/design/actions/ElementCaseAction.java
  3. 5
      designer/src/com/fr/design/actions/SelectionListenerAction.java
  4. 38
      designer/src/com/fr/design/actions/insert/cell/AbstractCellAction.java
  5. 17
      designer/src/com/fr/design/actions/insert/cell/BiasCellAction.java
  6. 14
      designer/src/com/fr/design/actions/insert/cell/ChartCellAction.java
  7. 16
      designer/src/com/fr/design/actions/insert/cell/DSColumnCellAction.java
  8. 16
      designer/src/com/fr/design/actions/insert/cell/FormulaCellAction.java
  9. 16
      designer/src/com/fr/design/actions/insert/cell/GeneralCellAction.java
  10. 16
      designer/src/com/fr/design/actions/insert/cell/ImageCellAction.java
  11. 93
      designer/src/com/fr/design/actions/insert/cell/RichTextCellAction.java
  12. 99
      designer/src/com/fr/design/actions/insert/cell/SubReportCellAction.java
  13. 79
      designer/src/com/fr/quickeditor/CellQuickEditor.java
  14. 7
      designer/src/com/fr/quickeditor/cellquick/CellBiasTextPainterEditor.java
  15. 7
      designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java
  16. 7
      designer/src/com/fr/quickeditor/cellquick/CellFormulaQuickEditor.java
  17. 6
      designer/src/com/fr/quickeditor/cellquick/CellImageQuickEditor.java
  18. 6
      designer/src/com/fr/quickeditor/cellquick/CellRichTextEditor.java
  19. 8
      designer/src/com/fr/quickeditor/cellquick/CellStringQuickEditor.java
  20. 6
      designer/src/com/fr/quickeditor/cellquick/CellSubReportEditor.java
  21. 42
      designer_base/src/com/fr/design/actions/TemplateComponentAction.java
  22. 34
      designer_base/src/com/fr/design/actions/core/ActionFactory.java

55
designer/src/com/fr/design/actions/CellSelectionAction.java
Unescape View File

@ -5,30 +5,33 @@ import com.fr.grid.selection.CellSelection;
import com.fr.grid.selection.Selection;
public abstract class CellSelectionAction extends ElementCaseAction {
protected CellSelectionAction(ElementCasePane t) {
super(t);
}
@Override
public boolean executeActionReturnUndoRecordNeeded() {
ElementCasePane ePane = this.getEditingComponent();
Selection s = ePane.getSelection();
// TODO ALEX_SEP instanceof i hate it
if (s instanceof CellSelection) {
return executeActionReturnUndoRecordNeededWithCellSelection((CellSelection)s);
}
return false;
}
protected abstract boolean executeActionReturnUndoRecordNeededWithCellSelection(CellSelection cs);
@Override
public void update() {
super.update();
if (this.isEnabled()) {
this.setEnabled(this.getEditingComponent().getSelection() instanceof CellSelection);
}
}
protected CellSelectionAction() {
}
protected CellSelectionAction(ElementCasePane t) {
super(t);
}
@Override
public boolean executeActionReturnUndoRecordNeeded() {
ElementCasePane ePane = this.getEditingComponent();
Selection s = ePane.getSelection();
// TODO ALEX_SEP instanceof i hate it
if (s instanceof CellSelection) {
return executeActionReturnUndoRecordNeededWithCellSelection((CellSelection) s);
}
return false;
}
protected abstract boolean executeActionReturnUndoRecordNeededWithCellSelection(CellSelection cs);
@Override
public void update() {
super.update();
if (this.isEnabled()) {
this.setEnabled(this.getEditingComponent().getSelection() instanceof CellSelection);
}
}
}

16
designer/src/com/fr/design/actions/ElementCaseAction.java
Unescape View File

@ -3,17 +3,15 @@ package com.fr.design.actions;
//ElementCaseAction应该有GridSelectionChangeListener，就从悬浮元素和单元格来讲，就必须有了，用来判断这些ElementCaseAction是否可以编辑,当然还可以做些其他事情
//
import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.ElementCasePane;
import com.fr.grid.selection.CellSelection;
import com.fr.grid.selection.Selection;
import com.fr.design.selection.SelectionEvent;
import com.fr.design.selection.SelectionListener;
public abstract class ElementCaseAction extends SelectionListenerAction {
protected ElementCaseAction(ElementCasePane t) {
super(t);
t.addSelectionChangeListener(createSelectionListener());
}
protected ElementCaseAction() {
}
protected ElementCaseAction(ElementCasePane t) {
super(t);
t.addSelectionChangeListener(createSelectionListener());
}
}

5
designer/src/com/fr/design/actions/SelectionListenerAction.java
Unescape View File

@ -12,11 +12,14 @@ import com.fr.grid.selection.Selection;
*/
public abstract class SelectionListenerAction extends TemplateComponentAction<ElementCasePane> {
protected SelectionListenerAction() {
}
protected SelectionListenerAction(ElementCasePane elementCasePane) {
super(elementCasePane);
}
protected SelectionListener createSelectionListener () {
protected SelectionListener createSelectionListener() {
return new SelectionListener() {
@Override

38
designer/src/com/fr/design/actions/insert/cell/AbstractCellAction.java
Unescape View File

@ -13,12 +13,15 @@ import com.fr.report.elementcase.TemplateElementCase;
* Cell.
*/
public abstract class AbstractCellAction extends CellSelectionAction {
protected AbstractCellAction(ElementCasePane t) {
super(t);
}
protected AbstractCellAction() {
}
protected AbstractCellAction(ElementCasePane t) {
super(t);
}
public abstract Class getCellValueClass();
/*
* TODO ALEX_SEP 这里的返回boolean量表示模板是否改变,导致很多很多的方法的boolean返回值都是这个意思
*
@ -26,8 +29,8 @@ public abstract class AbstractCellAction extends CellSelectionAction {
*/
@Override
protected boolean executeActionReturnUndoRecordNeededWithCellSelection(
CellSelection cs) {
ElementCasePane ePane = this.getEditingComponent();
CellSelection cs) {
ElementCasePane ePane = this.getEditingComponent();
//got simple cell element from column and row.
TemplateElementCase report = ePane.getEditingElementCase();
@ -35,17 +38,18 @@ public abstract class AbstractCellAction extends CellSelectionAction {
if (report != null && this instanceof DSColumnCellAction) {
SheetUtils.calculateDefaultParent(report);
}
return ePane.getGrid().startCellEditingAt_DEC(
cs.getColumn(),
cs.getRow(),
this.getCellValueClass(), false
cs.getColumn(),
cs.getRow(),
this.getCellValueClass(), false
);
}
@Override
public void update() {
super.update();
ElementCasePane ePane = this.getEditingComponent();
this.setEnabled(ePane.isSelectedOneCell());
}
@Override
public void update() {
super.update();
ElementCasePane ePane = this.getEditingComponent();
this.setEnabled(ePane.isSelectedOneCell());
}
}

17
designer/src/com/fr/design/actions/insert/cell/BiasCellAction.java
Unescape View File

@ -3,8 +3,6 @@
*/
package com.fr.design.actions.insert.cell;
import javax.swing.KeyStroke;
import com.fr.base.BaseUtils;
import com.fr.design.actions.core.WorkBookSupportable;
import com.fr.design.mainframe.ElementCasePane;
@ -12,12 +10,23 @@ import com.fr.design.menu.MenuKeySet;
import com.fr.general.Inter;
import com.fr.report.cell.painter.BiasTextPainter;
import javax.swing.KeyStroke;
/**
* Bias
*/
public class BiasCellAction extends AbstractCellAction implements WorkBookSupportable {
public BiasCellAction(ElementCasePane t) {
super(t);
public BiasCellAction() {
initAction();
}
public BiasCellAction(ElementCasePane t) {
super(t);
initAction();
}
private void initAction() {
this.setMenuKeySet(INSERT_SLOPE_LINE);
this.setName(getMenuKeySet().getMenuKeySetName()+ "...");
this.setMnemonic(getMenuKeySet().getMnemonic());

14
designer/src/com/fr/design/actions/insert/cell/ChartCellAction.java
Unescape View File

@ -16,11 +16,19 @@ import javax.swing.*;
* .
*/
public class ChartCellAction extends AbstractCellAction implements WorkBookSupportable {
public ChartCellAction(){
initAction();
}
public ChartCellAction(ElementCasePane t) {
super(t);
this.setMenuKeySet(INSERT_CHART);
this.setName(getMenuKeySet().getMenuKeySetName()+ "...");
this.setMnemonic(getMenuKeySet().getMnemonic());
initAction();
}
private void initAction() {
this.setMenuKeySet(INSERT_CHART);
this.setName(getMenuKeySet().getMenuKeySetName()+ "...");
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_insert/chart.png"));
}

16
designer/src/com/fr/design/actions/insert/cell/DSColumnCellAction.java
Unescape View File

@ -8,13 +8,21 @@ import com.fr.general.IOUtils;
import com.fr.report.cell.cellattr.core.group.DSColumn;
public class DSColumnCellAction extends AbstractCellAction implements WorkBookSupportable {
public DSColumnCellAction(ElementCasePane t) {
super(t);
public DSColumnCellAction() {
initAction();
}
public DSColumnCellAction(ElementCasePane t) {
super(t);
initAction();
this.setSearchText(new DSColumnPane());
}
private void initAction() {
this.setMenuKeySet(KeySetUtils.INSERT_DATA_COLUMN);
this.setName(getMenuKeySet().getMenuKeySetName()+ "...");
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/m_insert/bindColumn.png"));
this.setSearchText(new DSColumnPane());
}
@Override

16
designer/src/com/fr/design/actions/insert/cell/FormulaCellAction.java
Unescape View File

@ -13,10 +13,18 @@ import com.fr.general.Inter;
import javax.swing.*;
public class FormulaCellAction extends AbstractCellAction implements WorkBookSupportable {
public FormulaCellAction(ElementCasePane t) {
super(t);
public FormulaCellAction() {
initAction();
}
public FormulaCellAction(ElementCasePane t) {
super(t);
initAction();
}
private void initAction() {
this.setMenuKeySet(INSERT_FORMULA);
this.setName(getMenuKeySet().getMenuKeySetName()+ "...");
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_insert/formula.png"));
}
@ -39,7 +47,7 @@ public class FormulaCellAction extends AbstractCellAction implements WorkBookSup
};
@Override
public Class getCellValueClass() {
public Class getCellValueClass() {
return Formula.class;
}
}

16
designer/src/com/fr/design/actions/insert/cell/GeneralCellAction.java
Unescape View File

@ -15,10 +15,18 @@ import javax.swing.*;
*
*/
public class GeneralCellAction extends AbstractCellAction implements WorkBookSupportable {
public GeneralCellAction(ElementCasePane t) {
super(t);
public GeneralCellAction() {
initAction();
}
public GeneralCellAction(ElementCasePane t) {
super(t);
initAction();
}
private void initAction() {
this.setMenuKeySet(INSERT_TEXT);
this.setName(getMenuKeySet().getMenuKeySetName()+ "...");
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_insert/text.png"));
}
@ -41,7 +49,7 @@ public class GeneralCellAction extends AbstractCellAction implements WorkBookSup
};
@Override
public Class getCellValueClass() {
public Class getCellValueClass() {
return String.class;
}
}

16
designer/src/com/fr/design/actions/insert/cell/ImageCellAction.java
Unescape View File

@ -16,10 +16,18 @@ import java.awt.*;
* Image
*/
public class ImageCellAction extends AbstractCellAction implements WorkBookSupportable {
public ImageCellAction(ElementCasePane t) {
super(t);
public ImageCellAction() {
initAction();
}
public ImageCellAction(ElementCasePane t) {
super(t);
initAction();
}
private void initAction() {
this.setMenuKeySet(INSERT_IMAGE);
this.setName(getMenuKeySet().getMenuKeySetName()+ "...");
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_insert/image.png"));
}
@ -42,7 +50,7 @@ public class ImageCellAction extends AbstractCellAction implements WorkBookSuppo
};
@Override
public Class getCellValueClass() {
public Class getCellValueClass() {
return Image.class;
}
}

93
designer/src/com/fr/design/actions/insert/cell/RichTextCellAction.java
Unescape View File

@ -1,7 +1,5 @@
package com.fr.design.actions.insert.cell;
import javax.swing.KeyStroke;
import com.fr.base.BaseUtils;
import com.fr.design.actions.core.WorkBookSupportable;
import com.fr.design.mainframe.ElementCasePane;
@ -10,53 +8,64 @@ import com.fr.general.ComparatorUtils;
import com.fr.general.Inter;
import com.fr.report.cell.cellattr.core.RichText;
import javax.swing.KeyStroke;
public class RichTextCellAction extends AbstractCellAction implements WorkBookSupportable {
public RichTextCellAction(ElementCasePane t) {
super(t);
public RichTextCellAction() {
initAction();
}
public RichTextCellAction(ElementCasePane t) {
super(t);
initAction();
}
private void initAction() {
this.setMenuKeySet(INSERT_RICHTEXT);
this.setName(getMenuKeySet().getMenuKeySetName()+ "...");
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon(
"/com/fr/design/images/m_insert/richtext.png"));
}
@Override
public Class getCellValueClass() {
return RichText.class;
}
/**
* equals 比较
* @param object
* @return true false
*/
@Override
public boolean equals(Object object) {
if (this == object){
return true;
}
if (!(object instanceof RichTextCellAction)){
return false;
}
return ComparatorUtils.equals(this.getEditingComponent(),((RichTextCellAction)object).getEditingComponent());
}
}
@Override
public Class getCellValueClass() {
return RichText.class;
}
/**
* equals 比较
*
* @param object
* @return true false
*/
@Override
public boolean equals(Object object) {
if (this == object) {
return true;
}
if (!(object instanceof RichTextCellAction)) {
return false;
}
return ComparatorUtils.equals(this.getEditingComponent(), ((RichTextCellAction) object).getEditingComponent());
}
private static final MenuKeySet INSERT_RICHTEXT = new MenuKeySet() {
@Override
public char getMnemonic() {
return 'R';
}
@Override
public String getMenuName() {
return Inter.getLocText("FR-Designer_RichText");
}
@Override
public KeyStroke getKeyStroke() {
return null;
}
@Override
public char getMnemonic() {
return 'R';
}
@Override
public String getMenuName() {
return Inter.getLocText("FR-Designer_RichText");
}
@Override
public KeyStroke getKeyStroke() {
return null;
}
};
}

99
designer/src/com/fr/design/actions/insert/cell/SubReportCellAction.java
Unescape View File

@ -1,7 +1,5 @@
package com.fr.design.actions.insert.cell;
import javax.swing.KeyStroke;
import com.fr.base.BaseUtils;
import com.fr.design.mainframe.ElementCasePane;
import com.fr.design.menu.MenuKeySet;
@ -9,54 +7,65 @@ import com.fr.general.ComparatorUtils;
import com.fr.general.Inter;
import com.fr.report.cell.cellattr.core.SubReport;
import javax.swing.KeyStroke;
public class SubReportCellAction extends AbstractCellAction {
public SubReportCellAction(ElementCasePane t) {
super(t);
public SubReportCellAction() {
initAction();
}
public SubReportCellAction(ElementCasePane t) {
super(t);
initAction();
}
private void initAction() {
this.setMenuKeySet(INSERT_SUB_REPORT);
this.setName(getMenuKeySet().getMenuKeySetName()+ "...");
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon(
"/com/fr/design/images/m_insert/subReport.png"));
}
public static final MenuKeySet INSERT_SUB_REPORT = new MenuKeySet() {
@Override
public char getMnemonic() {
return 'S';
}
@Override
public String getMenuName() {
return Inter.getLocText("M_Insert-Sub_Report");
}
@Override
public KeyStroke getKeyStroke() {
return null;
}
};
/**
* equals 比较
* @param object
* @return true false
*/
@Override
public boolean equals(Object object) {
if (this == object){
return true;
}
if (!(object instanceof SubReportCellAction)){
return false;
}
return ComparatorUtils.equals(this.getEditingComponent(),((SubReportCellAction)object).getEditingComponent());
}
@Override
public Class getCellValueClass() {
return SubReport.class;
}
}
public static final MenuKeySet INSERT_SUB_REPORT = new MenuKeySet() {
@Override
public char getMnemonic() {
return 'S';
}
@Override
public String getMenuName() {
return Inter.getLocText("M_Insert-Sub_Report");
}
@Override
public KeyStroke getKeyStroke() {
return null;
}
};
/**
* equals 比较
*
* @param object
* @return true false
*/
@Override
public boolean equals(Object object) {
if (this == object) {
return true;
}
if (!(object instanceof SubReportCellAction)) {
return false;
}
return ComparatorUtils.equals(this.getEditingComponent(), ((SubReportCellAction) object).getEditingComponent());
}
@Override
public Class getCellValueClass() {
return SubReport.class;
}
}

79
designer/src/com/fr/quickeditor/CellQuickEditor.java
Unescape View File

@ -1,27 +1,29 @@
package com.fr.quickeditor;
import com.fr.design.actions.utils.DeprecatedActionManager;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.actions.UpdateAction;
import com.fr.design.actions.core.ActionFactory;
import com.fr.design.gui.icombobox.UIComboBox;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.ElementCasePane;
import com.fr.design.menu.MenuKeySet;
import com.fr.design.menu.ShortCut;
import com.fr.design.selection.QuickEditor;
import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.general.IOUtils;
import com.fr.general.Inter;
import com.fr.grid.selection.CellSelection;
import com.fr.report.cell.TemplateCellElement;
import com.fr.stable.ColumnRow;
import javax.swing.*;
import javax.swing.event.PopupMenuEvent;
import javax.swing.event.PopupMenuListener;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.ArrayList;
/**
* @author zhou, yaoh.wu
@ -32,6 +34,10 @@ public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> {
protected UITextField columnRowTextField;
protected TemplateCellElement cellElement;
protected UIComboBox comboBox;
private UpdateAction[] cellInsertActions;
private MenuKeySet[] cellInsertActionNames;
private int selectedIndex;
public CellQuickEditor() {
double p = TableLayout.PREFERRED;
@ -58,7 +64,7 @@ public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> {
cellLabel.setPreferredSize(new Dimension(60, 20));
UILabel insertContentLabel = new UILabel(Inter.getLocText("HF-Insert_Content"));
insertContentLabel.setPreferredSize(new Dimension(60, 20));
UIButton cellElementEditButton = initCellElementEditButton();
UIComboBox cellElementEditButton = initCellElementEditComboBox();
Component[][] components = new Component[][]{
new Component[]{cellLabel, columnRowTextField = initColumnRowTextField()},
new Component[]{insertContentLabel, cellElementEditButton},
@ -71,20 +77,57 @@ public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> {
/**
* 初始化添加按钮
* TODO 9.0 换成下拉菜单后原来的快捷键不好处理，先跳过。
*
* @return UIButton
*/
private UIButton initCellElementEditButton() {
final UIButton cellElementEditButton = new UIButton(IOUtils.readIcon("/com/fr/design/images/buttonicon/add.png"));
cellElementEditButton.addMouseListener(new MouseAdapter() {
private UIComboBox initCellElementEditComboBox() {
final String[] items = getDefaultComboBoxItems();
comboBox = new UIComboBox(items);
final Object comboBoxSelected = getComboBoxSelected();
if (comboBoxSelected != null) {
comboBox.setSelectedItem(((ShortCut) comboBoxSelected).getMenuKeySet().getMenuKeySetName());
} else {
comboBox.setSelectedIndex(1);
}
comboBox.addPopupMenuListener(new PopupMenuListener() {
@Override
public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
if (cellInsertActions == null) {
cellInsertActions = ActionFactory.createCellInsertAction(ElementCasePane.class, tc);
}
// 这边重新获取是因为要根据JTemplate做一个过滤
ArrayList<String> arrayList = new ArrayList<String>();
for (UpdateAction action : cellInsertActions) {
arrayList.add(action.getMenuKeySet().getMenuKeySetName());
}
comboBox.setModel(new DefaultComboBoxModel(arrayList.toArray(new String[arrayList.size()])));
}
@Override
public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
}
@Override
public void mousePressed(MouseEvent evt) {
GUICoreUtils.showPopMenuWithParentWidth(DeprecatedActionManager.getCellMenu(tc).createJPopupMenu(), cellElementEditButton, 0, cellElementEditButton.getY() - 6);
public void popupMenuCanceled(PopupMenuEvent e) {
}
});
return cellElementEditButton;
comboBox.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
selectedIndex = comboBox.getSelectedIndex();
cellInsertActions[selectedIndex].actionPerformed(e);
}
});
return comboBox;
}
private String[] getDefaultComboBoxItems() {
cellInsertActionNames = ActionFactory.createCellInsertActionName();
ArrayList<String> names = new ArrayList<>();
for (MenuKeySet cellInsertActionName : cellInsertActionNames) {
names.add(cellInsertActionName.getMenuKeySetName());
}
return names.toArray(new String[names.size()]);
}
/**
@ -130,6 +173,14 @@ public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> {
*/
public abstract JComponent createCenterBody();
/**
* 初始化下拉框中的类型
*
* @return JComponent 待显示的详细信息面板
*/
public abstract Object getComboBoxSelected();
/**
* 刷新
*/

7
designer/src/com/fr/quickeditor/cellquick/CellBiasTextPainterEditor.java
Unescape View File

@ -1,5 +1,7 @@
package com.fr.quickeditor.cellquick;
import com.fr.design.actions.core.ActionFactory;
import com.fr.design.actions.insert.cell.BiasCellAction;
import com.fr.design.cell.editor.BiasTextPainterCellEditor.BiasTextPainterPane;
import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.gui.ibutton.UIButton;
@ -36,6 +38,11 @@ public class CellBiasTextPainterEditor extends CellQuickEditor {
return content;
}
@Override
public Object getComboBoxSelected() {
return ActionFactory.createAction(BiasCellAction.class);
}
private void showEditingDialog() {
final BiasTextPainter oldbiasTextPainter = (BiasTextPainter) cellElement.getValue();
final BiasTextPainterPane biasTextPainterPane = new BiasTextPainterPane();

7
designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java
Unescape View File

@ -2,6 +2,8 @@ package com.fr.quickeditor.cellquick;
import com.fr.base.Formula;
import com.fr.design.actions.columnrow.DSColumnConditionAction;
import com.fr.design.actions.core.ActionFactory;
import com.fr.design.actions.insert.cell.DSColumnCellAction;
import com.fr.design.data.DesignTableDataManager;
import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.dscolumn.DSColumnAdvancedPane;
@ -981,4 +983,9 @@ public class CellDSColumnEditor extends CellQuickEditor {
}
}
}
@Override
public Object getComboBoxSelected() {
return ActionFactory.createAction(DSColumnCellAction.class);
}
}

7
designer/src/com/fr/quickeditor/cellquick/CellFormulaQuickEditor.java
Unescape View File

@ -3,6 +3,8 @@ package com.fr.quickeditor.cellquick;
import com.fr.base.Formula;
import com.fr.base.Style;
import com.fr.base.TextFormat;
import com.fr.design.actions.core.ActionFactory;
import com.fr.design.actions.insert.cell.FormulaCellAction;
import com.fr.design.gui.itextfield.UITextField;
import com.fr.grid.selection.CellSelection;
import com.fr.quickeditor.CellQuickEditor;
@ -77,6 +79,11 @@ public class CellFormulaQuickEditor extends CellQuickEditor {
return content;
}
@Override
public Object getComboBoxSelected() {
return ActionFactory.createAction(FormulaCellAction.class);
}
private void changeReportPaneCell(String tmpText) {
isEditing = true;

6
designer/src/com/fr/quickeditor/cellquick/CellImageQuickEditor.java
Unescape View File

@ -1,6 +1,8 @@
package com.fr.quickeditor.cellquick;
import com.fr.base.Style;
import com.fr.design.actions.core.ActionFactory;
import com.fr.design.actions.insert.cell.ImageCellAction;
import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.mainframe.DesignerContext;
@ -68,4 +70,8 @@ public class CellImageQuickEditor extends CellQuickEditor {
}
@Override
public Object getComboBoxSelected() {
return ActionFactory.createAction(ImageCellAction.class);
}
}

6
designer/src/com/fr/quickeditor/cellquick/CellRichTextEditor.java
Unescape View File

@ -1,5 +1,6 @@
package com.fr.quickeditor.cellquick;
import com.fr.design.actions.core.ActionFactory;
import com.fr.design.actions.insert.cell.RichTextCellAction;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.general.Inter;
@ -32,6 +33,11 @@ public class CellRichTextEditor extends CellQuickEditor {
return content;
}
@Override
public Object getComboBoxSelected() {
return ActionFactory.createAction(RichTextCellAction.class);
}
@Override
protected void refreshDetails() {
RichTextCellAction subReportCellAction = new RichTextCellAction(tc);

8
designer/src/com/fr/quickeditor/cellquick/CellStringQuickEditor.java
Unescape View File

@ -22,6 +22,9 @@ import java.awt.event.KeyEvent;
*
*/
public class CellStringQuickEditor extends CellQuickEditor {
//instance
private static CellStringQuickEditor THIS;
//文本域
//TODO 9.0 文本域要根据具体文本数量自适应大小，比较难搞，先跳过。
private UITextField stringTextField;
@ -148,4 +151,9 @@ public class CellStringQuickEditor extends CellQuickEditor {
stringTextField.getDocument().addDocumentListener(documentListener);
}
@Override
public Object getComboBoxSelected() {
return null;
}
}

6
designer/src/com/fr/quickeditor/cellquick/CellSubReportEditor.java
Unescape View File

@ -1,5 +1,6 @@
package com.fr.quickeditor.cellquick;
import com.fr.design.actions.core.ActionFactory;
import com.fr.design.actions.insert.cell.SubReportCellAction;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.general.Inter;
@ -40,4 +41,9 @@ public class CellSubReportEditor extends CellQuickEditor {
subReportButton.setAction(subReportCellAction);
}
@Override
public Object getComboBoxSelected() {
return ActionFactory.createAction(SubReportCellAction.class);
}
}

42
designer_base/src/com/fr/design/actions/TemplateComponentAction.java
Unescape View File

@ -4,30 +4,34 @@ package com.fr.design.actions;
import com.fr.design.designer.TargetComponent;
public abstract class TemplateComponentAction<T extends TargetComponent> extends UndoableAction implements TemplateComponentActionInterface<T> {
private T t;
protected TemplateComponentAction(T t) {
this.t = t;
}
protected void setEditingComponent(T t) {
this.t = t;
}
@Override
public T getEditingComponent() {
return t;
}
@Override
public void prepare4Undo() {
this.getEditingComponent().fireTargetModified();
private T t;
protected TemplateComponentAction() {
}
protected TemplateComponentAction(T t) {
this.t = t;
}
protected void setEditingComponent(T t) {
this.t = t;
}
@Override
public T getEditingComponent() {
return t;
}
@Override
public void prepare4Undo() {
this.getEditingComponent().fireTargetModified();
T component = getEditingComponent();
if (component == null) {
return;
}
component.requestFocus();
}
}
/**
* update enable
@ -35,6 +39,6 @@ public abstract class TemplateComponentAction<T extends TargetComponent> extends
*/
@Override
public void update() {
this.setEnabled(this.getEditingComponent() != null);
this.setEnabled(this.getEditingComponent() != null);
}
}

34
designer_base/src/com/fr/design/actions/core/ActionFactory.java
Unescape View File

@ -5,6 +5,7 @@ import com.fr.base.Utils;
import com.fr.design.actions.UpdateAction;
import com.fr.design.file.HistoryTemplateListPane;
import com.fr.design.mainframe.JTemplate;
import com.fr.design.menu.MenuKeySet;
import com.fr.design.selection.QuickEditor;
import javax.swing.*;
@ -132,6 +133,17 @@ public class ActionFactory {
return createEditor(clazz, cellEditor);
}
public static UpdateAction createAction(Class clazz) {
try {
Constructor<? extends UpdateAction> c = clazz.getDeclaredConstructor();
c.setAccessible(true);
return c.newInstance();
} catch (Exception e) {
FRContext.getLogger().error(e.getMessage(), e);
}
return null;
}
/**
* peter:从Action来产生ToolTipText.
*
@ -190,7 +202,7 @@ public class ActionFactory {
}
if (jTemplate.acceptToolbarItem(clazz)) {
try {
Constructor<? extends UpdateAction> c = (Constructor<? extends UpdateAction>)clazz.getConstructor(cls);
Constructor<? extends UpdateAction> c = (Constructor<? extends UpdateAction>) clazz.getConstructor(cls);
actions.add(c.newInstance(obj));
} catch (Exception e) {
FRContext.getLogger().error(e.getMessage(), e);
@ -200,6 +212,24 @@ public class ActionFactory {
return actions.toArray(new UpdateAction[actions.size()]);
}
public static MenuKeySet[] createCellInsertActionName() {
List<MenuKeySet> actionNames = new ArrayList<>();
for (Class<?> clazz : actionClasses) {
if (clazz == null) {
continue;
}
try {
Constructor<? extends UpdateAction> c = (Constructor<? extends UpdateAction>) clazz.getConstructor();
actionNames.add(c.newInstance().getMenuKeySet());
} catch (Exception e) {
FRContext.getLogger().error(e.getMessage(), e);
}
}
return actionNames.toArray(new MenuKeySet[actionNames.size()]);
}
/**
* 登记悬浮元素插入类型
*
@ -225,7 +255,7 @@ public class ActionFactory {
continue;
}
try {
Constructor<? extends UpdateAction> c = (Constructor<? extends UpdateAction>)clazz.getConstructor(cls);
Constructor<? extends UpdateAction> c = (Constructor<? extends UpdateAction>) clazz.getConstructor(cls);
actions.add(c.newInstance(obj));
} catch (Exception e) {
FRContext.getLogger().error(e.getMessage(), e);

Write Preview
Loading…
Cancel
Save