diff --git a/plugin.xml b/plugin.xml index 61ec60c..1b3d8fa 100644 --- a/plugin.xml +++ b/plugin.xml @@ -1,21 +1,23 @@ com.fr.plugin.parameter.widget.grid + com.fr.plugin.widget.grid yes 2.0 - 8.0 + 9.0 2015-08-09 - 路人丁 + richie - + - + + \ No newline at end of file diff --git a/src/com/fr/plugin/widget/grid/ComboGrid.java b/src/com/fr/plugin/widget/grid/ComboGrid.java index 93dc501..4d3ee1c 100644 --- a/src/com/fr/plugin/widget/grid/ComboGrid.java +++ b/src/com/fr/plugin/widget/grid/ComboGrid.java @@ -8,6 +8,8 @@ import com.fr.form.ui.WriteAbleRepeatEditor; import com.fr.general.data.DataModel; import com.fr.json.JSONArray; import com.fr.json.JSONObject; +import com.fr.plugin.transform.ExecuteFunctionRecord; +import com.fr.plugin.transform.FunctionRecorder; import com.fr.script.Calculator; import com.fr.stable.xml.XMLPrintWriter; import com.fr.stable.xml.XMLableReader; @@ -20,6 +22,7 @@ import javax.servlet.http.HttpServletRequest; * @date 2015-03-16 * @since 8.0 */ +@FunctionRecorder public class ComboGrid extends WriteAbleRepeatEditor implements DataControl { private TableData tableData; @@ -65,6 +68,7 @@ public class ComboGrid extends WriteAbleRepeatEditor implements DataControl { * @return 返回数据对象 * @throws Exception 抛出异常 */ + @ExecuteFunctionRecord public JSONArray createJSONData(SessionIDInfor sessionIDInfor, Calculator c, HttpServletRequest req) throws Exception { JSONArray ja = new JSONArray(); @@ -106,6 +110,11 @@ public class ComboGrid extends WriteAbleRepeatEditor implements DataControl { return "combogrid"; } + @Override + public String getFormatText() { + return null; + } + public void readXML(XMLableReader reader) { super.readXML(reader); if (reader.isChildNode()) { diff --git a/src/com/fr/plugin/widget/grid/web/combogrid.js b/src/com/fr/plugin/widget/grid/web/combogrid.js index 5eef3f5..cbfcfc5 100644 --- a/src/com/fr/plugin/widget/grid/web/combogrid.js +++ b/src/com/fr/plugin/widget/grid/web/combogrid.js @@ -1,4 +1,5 @@ (function ($) { + debugger; /** * @class FR.ComboGrid * @extends FR.TriggerEditor