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

REPORT-54887 公式编辑器优化一期 

1.国际化；
2.修改一些提示逻辑。
research/11.0
Hoky 3 years ago
parent
508d9d7cfb
commit
b24ab29cd6
1 changed files with 32 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 57
      designer-base/src/main/java/com/fr/design/formula/FormulaPane.java

57
designer-base/src/main/java/com/fr/design/formula/FormulaPane.java
Unescape View File

@ -665,7 +665,6 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
.getFunctionChecker(node) .getFunctionChecker(node)
.checkFunction(node) ? VALID_FORMULA : INVALID_FORMULA; .checkFunction(node) ? VALID_FORMULA : INVALID_FORMULA;
} catch (ConditionCheckWrongException cce) { } catch (ConditionCheckWrongException cce) {
List<FunctionRule> rules = cce.getRules();
String functionName = cce.getFunctionName(); String functionName = cce.getFunctionName();
StringBuilder errorMsg = new StringBuilder(functionName + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Condition_Tips") + ":"); StringBuilder errorMsg = new StringBuilder(functionName + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Condition_Tips") + ":");
return errorMsg.toString(); return errorMsg.toString();
@ -716,31 +715,39 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
String formulaText = formulaTextArea.getText().trim(); String formulaText = formulaTextArea.getText().trim();
String messageTips = getFormulaValidMessage(formulaText).equals(VALID_FORMULA) ? " " : getFormulaValidMessage(formulaText) + "\n"; String formulaValidMessage = getFormulaValidMessage(formulaText);
Map<String, Object> paramsMap = setParamsIfExist(formulaText); if (formulaValidMessage.equals(INVALID_FORMULA)) {
Calculator calculator = Calculator.createCalculator(); FineJOptionPane.showMessageDialog(
ParameterMapNameSpace parameterMapNameSpace = ParameterMapNameSpace.create(paramsMap); FormulaPane.this,
calculator.pushNameSpace(parameterMapNameSpace); formulaValidMessage,
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
WorkBook workBook = (WorkBook) HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getTarget(); JOptionPane.INFORMATION_MESSAGE);
calculator.pushNameSpace(SimpleCellValueNameSpace.getInstance()); } else {
TableDataSource tableDataSource = workBook.getReport(0).getTableDataSource(); String messageTips = formulaValidMessage.equals(VALID_FORMULA) ? "" : formulaValidMessage + "\n";
calculator.setAttribute(TableDataSource.KEY, tableDataSource); Map<String, Object> paramsMap = setParamsIfExist(formulaText);
calculator.pushNameSpace(TableDataNameSpace.getInstance()); Calculator calculator = Calculator.createCalculator();
BaseFormula baseFormula = BaseFormula.createFormulaBuilder().build(formulaText); ParameterMapNameSpace parameterMapNameSpace = ParameterMapNameSpace.create(paramsMap);
try { calculator.pushNameSpace(parameterMapNameSpace);
Object value = calculator.evalValue(baseFormula);
messageTips = messageTips + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_Cal_Result") + ":" + value; WorkBook workBook = (WorkBook) HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getTarget();
FineLoggerFactory.getLogger().info("value:{}", value); calculator.pushNameSpace(SimpleCellValueNameSpace.getInstance());
} catch (UtilEvalError utilEvalError) { TableDataSource tableDataSource = workBook.getReport(0).getTableDataSource();
FineLoggerFactory.getLogger().error("", utilEvalError); calculator.setAttribute(TableDataSource.KEY, tableDataSource);
calculator.pushNameSpace(TableDataNameSpace.getInstance());
BaseFormula baseFormula = BaseFormula.createFormulaBuilder().build(formulaText);
try {
Object value = calculator.evalValue(baseFormula);
messageTips = messageTips + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_Cal_Result") + ":" + value;
FineLoggerFactory.getLogger().info("value:{}", value);
} catch (UtilEvalError utilEvalError) {
FineLoggerFactory.getLogger().error("", utilEvalError);
}
FineJOptionPane.showMessageDialog(
FormulaPane.this,
messageTips,
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
JOptionPane.INFORMATION_MESSAGE);
} }
FineJOptionPane.showMessageDialog(
FormulaPane.this,
messageTips,
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
JOptionPane.INFORMATION_MESSAGE);
} }
}; };

Write Preview
Loading…
Cancel
Save