Browse Source

Pull request #7577: REPORT-65194 公式模拟计算计算异常的提示框内的图标不正确

Merge in DESIGN/design from ~HOKY.HE/design-hoky:release/11.0 to release/11.0

* commit 'f7ee5493b14b35af3a9a39466f3d372cc7bdadf8':
  REPORT-65194 公式模拟计算计算异常的提示框内的图标不正确 1.计算异常的时候给warn图标
  REPORT-65515【稳定共创】公式编辑器-存在插件函数时,选择数据集参数函数显示跳转显示有问题 1.选中参数时,返回默认的值
bugfix/11.0
Hoky.He 3 years ago
parent
commit
c853c0bcc8
  1. 12
      designer-base/src/main/java/com/fr/design/formula/FormulaPane.java

12
designer-base/src/main/java/com/fr/design/formula/FormulaPane.java

@ -814,10 +814,11 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
String formulaText = formulaTextArea.getText().trim(); String formulaText = formulaTextArea.getText().trim();
String unSupportFormula = containsUnsupportedSimulationFormulas(formulaText); String unSupportFormula = containsUnsupportedSimulationFormulas(formulaText);
if (unSupportFormula != null) { if (unSupportFormula != null) {
showMessageDialog(Toolkit.i18nText("Fine-Design_Basic_Formula_Unsupported_Formulas") + ":" + unSupportFormula, false); showMessageDialog(Toolkit.i18nText("Fine-Design_Basic_Formula_Unsupported_Formulas") + ":" + unSupportFormula, false, true);
return; return;
} }
boolean calException = false;
String messageTips; String messageTips;
FormulaCheckResult checkResult = FormulaChecker.check(formulaText); FormulaCheckResult checkResult = FormulaChecker.check(formulaText);
if (checkResult.grammarValid()) { if (checkResult.grammarValid()) {
@ -846,6 +847,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
} catch (Exception ce) { } catch (Exception ce) {
//模拟计算如果出现错误,则抛出错误 //模拟计算如果出现错误,则抛出错误
calResult = ce.getMessage(); calResult = ce.getMessage();
calException = true;
FineLoggerFactory.getLogger().error(ce.getMessage(), ce); FineLoggerFactory.getLogger().error(ce.getMessage(), ce);
messageTips = messageTips + Toolkit.i18nText("Fine-Design_Basic_Formula_Cal_Error") + ":" + calResult; messageTips = messageTips + Toolkit.i18nText("Fine-Design_Basic_Formula_Cal_Error") + ":" + calResult;
} }
@ -854,7 +856,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
messageTips = checkResult.getTips(); messageTips = checkResult.getTips();
} }
if (checkResult.isValid()) { if (checkResult.isValid()) {
showMessageDialog(messageTips, checkResult.isValid()); showMessageDialog(messageTips, checkResult.isValid(), calException);
} else { } else {
confirmCheckResult(checkResult, messageTips); confirmCheckResult(checkResult, messageTips);
} }
@ -871,7 +873,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
private boolean confirmCheckResult(FormulaCheckResult checkResult, String messageTips) { private boolean confirmCheckResult(FormulaCheckResult checkResult, String messageTips) {
if (checkResult.isValid()) { if (checkResult.isValid()) {
showMessageDialog(checkResult.getTips(), checkResult.isValid()); showMessageDialog(checkResult.getTips(), checkResult.isValid(), false);
} else { } else {
int columns = checkResult.getFormulaCoordinates().getColumns(); int columns = checkResult.getFormulaCoordinates().getColumns();
String position = StringUtils.EMPTY; String position = StringUtils.EMPTY;
@ -897,8 +899,8 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
return true; return true;
} }
private void showMessageDialog(String message, boolean formulaValid) { private void showMessageDialog(String message, boolean formulaValid, boolean calException) {
if (formulaValid) { if (formulaValid && !calException) {
FineJOptionPane.showMessageDialog( FineJOptionPane.showMessageDialog(
FormulaPane.this, FormulaPane.this,
message); message);

Loading…
Cancel
Save