From 155407309892e96a455a0b1c4d1a0d319ef99ce8 Mon Sep 17 00:00:00 2001
From: richie <richie@finereport.com>
Date: Mon, 28 Mar 2016 16:43:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E9=A1=B5=E6=A1=86=E6=8E=A7=E4=BB=B6?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=BF=81=E7=A7=BB=E5=88=B0solution=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin.xml                                     |  6 +++---
 .../form/widget/conf/RHIframeMarkInForm.java   |  3 +--
 .../fr/plugin/form/widget/core/RHIframe.java   | 18 ++++++++++++++++++
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/plugin.xml b/plugin.xml
index fcfd216..fa19ed9 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><plugin>
-    <id>com.fr.plugin.form.widget.rh.iframe</id>
+    <id>com.fr.solution.plugin.form.widget.rh.iframe</id>
     <name><![CDATA[网页框控件]]></name>
     <active>yes</active>
-    <version>3.2</version>
+    <version>3.3</version>
     <env-version>8.0</env-version>
     <jartime>2016-01-15</jartime>
-    <vendor>洪七公</vendor>
+    <vendor email="solution@finereport.com">solution</vendor>
     <description><![CDATA[网页框控件,仅支持在表单中使用]]></description>
     <change-notes><![CDATA[
        <p>[2015-12-03]修复再次打开地址设置界面时没有正确选择到选项的问题</p>
diff --git a/src/com/fr/plugin/form/widget/conf/RHIframeMarkInForm.java b/src/com/fr/plugin/form/widget/conf/RHIframeMarkInForm.java
index 641916a..650f52c 100644
--- a/src/com/fr/plugin/form/widget/conf/RHIframeMarkInForm.java
+++ b/src/com/fr/plugin/form/widget/conf/RHIframeMarkInForm.java
@@ -11,9 +11,8 @@ import com.fr.plugin.form.widget.ui.XRHIframe;
  */
 public class RHIframeMarkInForm extends AbstractFormWidgetOptionProvider {
 
-    @Override
     public int currentAPILevel() {
-        return CURRENT_LEVEL;
+        return 1;
     }
 
     @Override
diff --git a/src/com/fr/plugin/form/widget/core/RHIframe.java b/src/com/fr/plugin/form/widget/core/RHIframe.java
index e7f17fd..8b00578 100644
--- a/src/com/fr/plugin/form/widget/core/RHIframe.java
+++ b/src/com/fr/plugin/form/widget/core/RHIframe.java
@@ -1,6 +1,7 @@
 package com.fr.plugin.form.widget.core;
 
 import com.fr.form.ui.FieldEditor;
+import com.fr.general.Inter;
 import com.fr.general.xml.GeneralXMLTools;
 import com.fr.json.JSONArray;
 import com.fr.json.JSONException;
@@ -9,7 +10,9 @@ import com.fr.plugin.ExtraClassManager;
 import com.fr.plugin.form.widget.monitor.RHFunctionProcessor;
 import com.fr.script.Calculator;
 import com.fr.stable.core.NodeVisitor;
+import com.fr.stable.fun.FunctionHelper;
 import com.fr.stable.fun.FunctionProcessor;
+import com.fr.stable.fun.impl.AbstractFunctionProcessor;
 import com.fr.stable.script.CalculatorProvider;
 import com.fr.stable.web.Repository;
 import com.fr.stable.xml.XMLPrintWriter;
@@ -23,6 +26,17 @@ import javax.servlet.http.HttpServletRequest;
  */
 public class RHIframe extends FieldEditor {
 
+    private static final FunctionProcessor RH = new AbstractFunctionProcessor() {
+        @Override
+        public int getId() {
+            return FunctionHelper.generateFunctionID(Constants.PLUGIN_ID);
+        }
+
+        public String getLocaleKey() {
+            return Inter.getLocText("Plugin-RH_Iframe_Name");
+        }
+    };
+
 
     private boolean overflowX = true;
     private boolean overflowY = true;
@@ -61,6 +75,10 @@ public class RHIframe extends FieldEditor {
 
     @Override
     public JSONObject createJSONConfig(Repository repo, Calculator c, NodeVisitor nodeVisitor) throws JSONException {
+        FunctionProcessor p = ExtraClassManager.getInstance().getFunctionProcessor();
+        if (p != null) {
+            p.recordFunction(RH);
+        }
         JSONObject jo = super.createJSONConfig(repo, c, nodeVisitor);
         attr.mixConfig(jo, c, repo.getHttpServletRequest());
         jo.put("showOverFlowX", overflowX);