From 24c4b94d5ccac6f88db6c8336795cc0452217e93 Mon Sep 17 00:00:00 2001
From: richie <richie@finereport.com>
Date: Wed, 22 Jun 2016 16:10:44 +0800
Subject: [PATCH] =?UTF-8?q?=20=E8=A1=A8=E5=8D=95=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=89=A9=E5=B1=95=E7=9A=84=E6=97=B6=E5=80=99=E9=81=87=E5=88=B0?=
 =?UTF-8?q?=E8=81=94=E5=8A=A8=E7=9A=84=E9=97=AE=E9=A2=98,=E6=94=B9?=
 =?UTF-8?q?=E4=B8=8Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/plugin/form/widget/core/RHIframe.java  | 35 +++++--------------
 .../plugin/form/widget/core/RHIframeAttr.java |  1 +
 2 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/src/com/fr/plugin/form/widget/core/RHIframe.java b/src/com/fr/plugin/form/widget/core/RHIframe.java
index 56e5b8f..130b74b 100644
--- a/src/com/fr/plugin/form/widget/core/RHIframe.java
+++ b/src/com/fr/plugin/form/widget/core/RHIframe.java
@@ -2,6 +2,7 @@ package com.fr.plugin.form.widget.core;
 
 import com.fr.form.ui.DataControl;
 import com.fr.form.ui.FieldEditor;
+import com.fr.form.ui.Interactive;
 import com.fr.form.ui.WidgetValue;
 import com.fr.general.FRLogger;
 import com.fr.general.Inter;
@@ -29,7 +30,7 @@ import javax.servlet.http.HttpServletRequest;
 /**
  * Created by richie on 15/12/2.
  */
-public class RHIframe extends FieldEditor implements DataControl {
+public class RHIframe extends FieldEditor implements Interactive {
 
     private static final FunctionProcessor RH = new AbstractFunctionProcessor() {
         @Override
@@ -79,10 +80,6 @@ public class RHIframe extends FieldEditor implements DataControl {
 
     @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);
@@ -151,27 +148,13 @@ public class RHIframe extends FieldEditor implements DataControl {
     }
 
     @Override
-    public int[] getValueType() {
-        return new int[0];
-    }
-
-    @Override
-    public void setWidgetValue(WidgetValue value) {
-
-    }
-
-    @Override
-    public WidgetValue getWidgetValue() {
-        return null;
-    }
-
-    @Override
-    public void createValueResult(DataControl widget, Calculator widgetCalculator, JSONObject widgetResult, JSONObject attrSourceCache) {
-        try {
-            JSONObject data = JSONObject.create();
-            widgetResult.put(widgetName.toUpperCase(), data);
-        } catch (JSONException e) {
-            FRLogger.getLogger().error(e.getMessage(), e);
+    public void mixinReturnData(HttpServletRequest req, Calculator ca, JSONObject jo) throws JSONException {
+        if (widgetName != null) {
+            RHIframeSource source = attr.getSource();
+            if (source != null) {
+                String url = source.getCalculatedUrl(ca, req);
+                jo.put(widgetName.toUpperCase(), url);
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/src/com/fr/plugin/form/widget/core/RHIframeAttr.java b/src/com/fr/plugin/form/widget/core/RHIframeAttr.java
index 0c50a2c..c0c6390 100644
--- a/src/com/fr/plugin/form/widget/core/RHIframeAttr.java
+++ b/src/com/fr/plugin/form/widget/core/RHIframeAttr.java
@@ -65,6 +65,7 @@ public class RHIframeAttr implements XMLable, DependenceProvider  {
         String[] dependence = dependence(c);
         if (!ArrayUtils.isEmpty(dependence)) {
             jo.put("dependence", dependence);
+            jo.put("valueDependence", dependence);
         }
     }