Browse Source

切换的一个bUG

RichieJi 8 years ago
parent
commit
1ab541f0a6
  1. 9
      designer/src/com/fr/quickeditor/cellquick/CellFormulaQuickEditor.java

9
designer/src/com/fr/quickeditor/cellquick/CellFormulaQuickEditor.java

@ -46,6 +46,7 @@ import java.awt.event.KeyEvent;
public class CellFormulaQuickEditor extends CellQuickEditor { public class CellFormulaQuickEditor extends CellQuickEditor {
//文本域 //文本域
private UITextField formulaTextField; private UITextField formulaTextField;
private BaseFormula formula;
//编辑状态 //编辑状态
private boolean isEditing = false; private boolean isEditing = false;
@ -104,11 +105,15 @@ public class CellFormulaQuickEditor extends CellQuickEditor {
public void actionPerformed(ActionEvent evt) { public void actionPerformed(ActionEvent evt) {
String text = formulaTextField.getText(); String text = formulaTextField.getText();
final UIFormula formulaPane = FormulaFactory.createFormulaPane(); final UIFormula formulaPane = FormulaFactory.createFormulaPane();
formulaPane.populate(BaseFormula.createFormulaBuilder().build(text)); if (formula != null) {
formula.setContent(text);
}
formulaPane.populate(formula);
formulaPane.showLargeWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() { formulaPane.showLargeWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
@Override @Override
public void doOk() { public void doOk() {
BaseFormula fm = formulaPane.update(); BaseFormula fm = formulaPane.update();
formula = fm;
if (fm.getContent().length() <= 1) { if (fm.getContent().length() <= 1) {
formulaTextField.setText(DEFAULT_FORMULA); formulaTextField.setText(DEFAULT_FORMULA);
} else { } else {
@ -181,7 +186,7 @@ public class CellFormulaQuickEditor extends CellQuickEditor {
if (value == null) { if (value == null) {
str = StringUtils.EMPTY; str = StringUtils.EMPTY;
} else if (value instanceof BaseFormula) { } else if (value instanceof BaseFormula) {
BaseFormula formula = (BaseFormula) value; formula = (BaseFormula) value;
str = formula.getContent(); str = formula.getContent();
reserveInResult = formula.isReserveInResult(); reserveInResult = formula.isReserveInResult();
reserveOnWriteOrAnaly = formula.isReserveOnWriteOrAnaly(); reserveOnWriteOrAnaly = formula.isReserveOnWriteOrAnaly();

Loading…
Cancel
Save