diff --git a/install/fr-plugin-script-formula-3.0.zip b/install/fr-plugin-script-formula-3.0.zip deleted file mode 100644 index 33a1aa7..0000000 Binary files a/install/fr-plugin-script-formula-3.0.zip and /dev/null differ diff --git a/plugin.xml b/plugin.xml index 65ef33e..696e86e 100644 --- a/plugin.xml +++ b/plugin.xml @@ -4,12 +4,13 @@ com.fr.solution.plugin.design.formula.script yes - 3.0 + 3.1 9.0 - 2017-10-10 + 2017-10-20 fanruan.richie [2017-12-10]在公式编辑器中增加实时计算按钮。
[2017-12-09]在公式编辑器中增加JavaScript脚本的支持。
]]>
@@ -19,5 +20,5 @@ - + \ No newline at end of file diff --git a/src/com/fr/solution/plugin/design/formula/FormulaConstants.java b/src/com/fr/solution/plugin/design/formula/FormulaConstants.java new file mode 100644 index 0000000..39460ef --- /dev/null +++ b/src/com/fr/solution/plugin/design/formula/FormulaConstants.java @@ -0,0 +1,6 @@ +package com.fr.solution.plugin.design.formula; + +public class FormulaConstants { + + public static final String PLUGIN_ID = "com.fr.solution.plugin.design.formula.script"; +} diff --git a/src/com/fr/solution/plugin/design/formula/ScriptFormulaLocalFinder.java b/src/com/fr/solution/plugin/design/formula/ScriptFormulaLocalFinder.java index 5349042..5608dc3 100644 --- a/src/com/fr/solution/plugin/design/formula/ScriptFormulaLocalFinder.java +++ b/src/com/fr/solution/plugin/design/formula/ScriptFormulaLocalFinder.java @@ -1,10 +1,14 @@ package com.fr.solution.plugin.design.formula; +import com.fr.plugin.transform.ExecuteFunctionRecord; +import com.fr.plugin.transform.FunctionRecorder; import com.fr.stable.fun.impl.AbstractLocaleFinder; +@FunctionRecorder(id =FormulaConstants.PLUGIN_ID, localeKey = "Script") public class ScriptFormulaLocalFinder extends AbstractLocaleFinder { @Override + @ExecuteFunctionRecord public String find() { return "com/fr/solution/plugin/design/formula/locale/formula"; } diff --git a/src/com/fr/solution/plugin/design/formula/ScriptFormulaUI.java b/src/com/fr/solution/plugin/design/formula/ScriptFormulaUI.java index 195f9a7..7abd91f 100644 --- a/src/com/fr/solution/plugin/design/formula/ScriptFormulaUI.java +++ b/src/com/fr/solution/plugin/design/formula/ScriptFormulaUI.java @@ -7,11 +7,10 @@ import com.fr.plugin.transform.FunctionRecorder; import com.fr.solution.plugin.design.formula.ui.GroupFormulaPane; import com.fr.solution.plugin.design.formula.ui.GroupFormulaPaneWhenReserveFormula; -@FunctionRecorder(localeKey = "Script") +@FunctionRecorder public class ScriptFormulaUI extends AbstractUIFormulaProcessor { @Override - @ExecuteFunctionRecord public UIFormula appearanceFormula() { return new GroupFormulaPane(); }