From 271f40fe4d4ac1998ba8f20a4316bb089e163752 Mon Sep 17 00:00:00 2001
From: richie <jihua.me@gmail.com>
Date: Mon, 2 Jul 2018 14:02:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=85=E6=94=AF=E6=8C=819.0=E7=9A=84?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin.xml                                     | 10 ++++++----
 src/com/fr/plugin/widget/grid/ComboGrid.java   |  9 +++++++++
 src/com/fr/plugin/widget/grid/web/combogrid.js |  1 +
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/plugin.xml b/plugin.xml
index 61ec60c..1b3d8fa 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -1,21 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><plugin>
     <id>com.fr.plugin.parameter.widget.grid</id>
+    <main-package>com.fr.plugin.widget.grid</main-package>
     <name><![CDATA[表格选择控件]]></name>
     <active>yes</active>
     <version>2.0</version>
-    <env-version>8.0</env-version>
+    <env-version>9.0</env-version>
     <jartime>2015-08-09</jartime>
-    <vendor>路人丁</vendor>
+    <vendor>richie</vendor>
     <description><![CDATA[类似于下拉框但是弹出的选项是一个表格，可以比下拉框展示更加详细的信息]]></description>
     <change-notes><![CDATA[可以在参数界面、表单、填报控件中使用该控件]]></change-notes>
-    <extra-core>
+    <extra-report>
         <JavaScriptFileHandler class="com.fr.plugin.widget.grid.JavaScriptFile"/>
         <CssFileHandler class="com.fr.plugin.widget.grid.CssFile"/>
-    </extra-core>
+    </extra-report>
     <extra-report/>
     <extra-designer>
         <ParameterWidgetOptionProvider class="com.fr.plugin.widget.grid.GridImpl"/>
         <FormWidgetOptionProvider class="com.fr.plugin.widget.grid.GridImpl"/>
         <CellWidgetOptionProvider class="com.fr.plugin.widget.grid.CellGridImpl"/>
     </extra-designer>
+    <function-recorder class="com.fr.plugin.widget.grid.ComboGrid"/>
 </plugin>
\ 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