Browse Source

KERNEL-1117 由于finekit改变,改变相应的地方

pull/1/head
Kalven 5 years ago
parent
commit
315f6fd730
  1. 5
      src/main/java/com/fr/solution/plugin/design/formula/compat/FunctionConstants.java
  2. 4
      src/main/java/com/fr/solution/plugin/design/formula/ui/type/impl/ScriptFormulaPane.java

5
src/main/java/com/fr/solution/plugin/design/formula/compat/FunctionConstants.java

@ -1,7 +1,7 @@
package com.fr.solution.plugin.design.formula.compat; package com.fr.solution.plugin.design.formula.compat;
import com.fanruan.api.util.GeneralKit; import com.fanruan.api.util.GeneralKit;
import com.fanruan.api.util.StableKit; import com.fanruan.api.util.ReflectKit;
import com.fr.design.formula.FunctionDefNAD; import com.fr.design.formula.FunctionDefNAD;
import com.fr.design.formula.FunctionGroup; import com.fr.design.formula.FunctionGroup;
import com.fr.design.formula.NameAndDescription; import com.fr.design.formula.NameAndDescription;
@ -96,8 +96,7 @@ public final class FunctionConstants {
for (String fileName : findClassNamesUnderFilePath(classFilePath)) { for (String fileName : findClassNamesUnderFilePath(classFilePath)) {
try { try {
Class<?> cls = Class.forName(pkgName + "." + fileName.substring(0, fileName.length() - 6)); Class<?> cls = Class.forName(pkgName + "." + fileName.substring(0, fileName.length() - 6));
// if (StableUtils.classInstanceOf(cls, iface)) { if (ReflectKit.classInstanceOf(cls, iface)) {
if (StableKit.classInstanceOf(cls, iface)) {
Function inst; Function inst;
inst = (Function)cls.newInstance(); inst = (Function)cls.newInstance();
for (NameAndTypeAndFunctionList EMBFUNCTION : EMBFUNCTIONS) { for (NameAndTypeAndFunctionList EMBFUNCTION : EMBFUNCTIONS) {

4
src/main/java/com/fr/solution/plugin/design/formula/ui/type/impl/ScriptFormulaPane.java

@ -1,7 +1,7 @@
package com.fr.solution.plugin.design.formula.ui.type.impl; package com.fr.solution.plugin.design.formula.ui.type.impl;
import com.fanruan.api.util.StringKit; import com.fanruan.api.util.StringKit;
import com.fanruan.api.util.TemplateKit; import com.fanruan.api.util.RenderKit;
import com.fr.base.Parameter; import com.fr.base.Parameter;
import com.fr.base.ParameterHelper; import com.fr.base.ParameterHelper;
import com.fr.base.ScriptFormula; import com.fr.base.ScriptFormula;
@ -98,7 +98,7 @@ public class ScriptFormulaPane extends BaseFormulaPane<ScriptFormula> {
} }
try { try {
String content = TemplateKit.renderParameter4Tpl(formula.getPureContent(), map); String content = RenderKit.renderParameter4Tpl(formula.getPureContent(), map);
ScriptFactory.newSingletonScriptEngine().eval(String.format(FUN_TPL, content)); ScriptFactory.newSingletonScriptEngine().eval(String.format(FUN_TPL, content));
} catch (Exception e) { } catch (Exception e) {
FRLogger.getLogger().error(e.getMessage(), e); FRLogger.getLogger().error(e.getMessage(), e);

Loading…
Cancel
Save