|
|
@ -38,6 +38,7 @@ import com.fr.report.core.namespace.SimpleCellValueNameSpace; |
|
|
|
import com.fr.script.Calculator; |
|
|
|
import com.fr.script.Calculator; |
|
|
|
import com.fr.script.ScriptConstants; |
|
|
|
import com.fr.script.ScriptConstants; |
|
|
|
import com.fr.script.checker.FunctionCheckerDispatcher; |
|
|
|
import com.fr.script.checker.FunctionCheckerDispatcher; |
|
|
|
|
|
|
|
import com.fr.script.checker.exception.ConditionCheckWrongException; |
|
|
|
import com.fr.script.checker.exception.FunctionCheckWrongException; |
|
|
|
import com.fr.script.checker.exception.FunctionCheckWrongException; |
|
|
|
import com.fr.script.rules.FunctionParameterType; |
|
|
|
import com.fr.script.rules.FunctionParameterType; |
|
|
|
import com.fr.script.rules.FunctionRule; |
|
|
|
import com.fr.script.rules.FunctionRule; |
|
|
@ -663,6 +664,11 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { |
|
|
|
return FunctionCheckerDispatcher.getInstance() |
|
|
|
return FunctionCheckerDispatcher.getInstance() |
|
|
|
.getFunctionChecker(node) |
|
|
|
.getFunctionChecker(node) |
|
|
|
.checkFunction(node) ? VALID_FORMULA : INVALID_FORMULA; |
|
|
|
.checkFunction(node) ? VALID_FORMULA : INVALID_FORMULA; |
|
|
|
|
|
|
|
} catch (ConditionCheckWrongException cce) { |
|
|
|
|
|
|
|
List<FunctionRule> rules = cce.getRules(); |
|
|
|
|
|
|
|
String functionName = cce.getFunctionName(); |
|
|
|
|
|
|
|
StringBuilder errorMsg = new StringBuilder(functionName + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Condition_Tips") + ":"); |
|
|
|
|
|
|
|
return errorMsg.toString(); |
|
|
|
} catch (FunctionCheckWrongException ce) { |
|
|
|
} catch (FunctionCheckWrongException ce) { |
|
|
|
List<FunctionRule> rules = ce.getRules(); |
|
|
|
List<FunctionRule> rules = ce.getRules(); |
|
|
|
String functionName = ce.getFunctionName(); |
|
|
|
String functionName = ce.getFunctionName(); |
|
|
|