fanruan
/
demo-widget-iframe
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Signed-off-by: Palin <Palin@fanruan.com>

master
Palin 5 years ago
parent
25ba10ada5
commit
4edcb837fc
8 changed files with 27 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      src/main/java/com/fr/plugin/form/widget/core/RHIframe.java
  2. 7
      src/main/java/com/fr/plugin/form/widget/core/RHIframeAttr.java
  3. 22
      src/main/java/com/fr/plugin/form/widget/core/TemplateSource.java
  4. 6
      src/main/java/com/fr/plugin/form/widget/core/URLSource.java
  5. 6
      src/main/java/com/fr/plugin/form/widget/monitor/RHFunctionProcessor.java
  6. 4
      src/main/java/com/fr/plugin/form/widget/ui/RHFramePane.java
  7. 2
      src/main/java/com/fr/plugin/form/widget/ui/TemplateSourcePane.java
  8. 2
      src/main/java/com/fr/plugin/form/widget/ui/editor/RHIframeModelWrapper.java

12
src/main/java/com/fr/plugin/form/widget/core/RHIframe.java
Unescape View File

@ -13,13 +13,13 @@ import com.fr.plugin.form.widget.monitor.RHFunctionProcessor;
import com.fr.record.analyzer.EnableMetrics;
import com.fr.script.Calculator;
import com.fanruan.api.util.ArrayKit;
import com.fr.stable.core.NodeVisitor;
import com.fanruan.api.report.analy.data.NodeVisitor;
import com.fr.stable.fun.FunctionProcessor;
import com.fr.stable.script.CalculatorProvider;
import com.fr.stable.web.Repository;
import com.fr.stable.xml.XMLPrintWriter;
import com.fr.stable.xml.XMLableReader;
import com.fr.web.core.TemplateSessionIDInfo;
import com.fr.stable.web.SessionProvider;
import javax.servlet.http.HttpServletRequest;
@ -64,7 +64,7 @@ public class RHIframe extends FieldEditor implements Interactive {
this.overflowY = overflowY;
}
@Override
@Focus(id=Constants.PLUGIN_ID, text = "Plugin-RH_Iframe_Name", source = Original.PLUGIN)
public JSONObject createJSONConfig(Repository repo, Calculator c, NodeVisitor nodeVisitor) throws JSONException {
JSONObject jo = super.createJSONConfig(repo, c, nodeVisitor);
@ -78,10 +78,10 @@ public class RHIframe extends FieldEditor implements Interactive {
return jo;
}
@Override
public JSONArray createJSONData(TemplateSessionIDInfo sessionIDInfor, Calculator c, HttpServletRequest req) throws Exception {
public JSONArray createJSONData(SessionProvider sessionIDInfor, Calculator c, HttpServletRequest req) throws Exception {
JSONArray ja = super.createJSONData(sessionIDInfor, c, req);
attr.mixJSONData(ja, sessionIDInfor, c);
attr.mixJSONData(ja,sessionIDInfor, c);
return ja;
}

7
src/main/java/com/fr/plugin/form/widget/core/RHIframeAttr.java
Unescape View File

@ -12,12 +12,12 @@ import com.fr.stable.ParameterProvider;
import com.fanruan.api.err.UtilEvalError;
import com.fr.stable.script.CalculatorProvider;
import com.fr.stable.script.NameSpace;
import com.fr.stable.web.SessionProvider;
import com.fr.stable.xml.StableXMLUtils;
import com.fr.stable.xml.XMLPrintWriter;
import com.fr.stable.xml.XMLReadable;
import com.fr.stable.xml.XMLable;
import com.fr.stable.xml.XMLableReader;
import com.fr.web.core.TemplateSessionIDInfo;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
@ -77,8 +77,8 @@ public class RHIframeAttr implements XMLable, DependenceProvider {
}
}
public void mixJSONData(JSONArray ja, TemplateSessionIDInfo sessionIDInfor, Calculator c) throws JSONException, UtilEvalError {
NameSpace ns = ParameterMapNameSpace.create(sessionIDInfor.getParameterMap4Execute());
public void mixJSONData(JSONArray ja, SessionProvider sessionIDInfor, Calculator c) throws JSONException, UtilEvalError {
NameSpace ns = ParameterMapNameSpace.create(sessionIDInfor.getParameterMap());
c.pushNameSpace(ns);
if (source != null) {
@ -133,4 +133,5 @@ public class RHIframeAttr implements XMLable, DependenceProvider {
cloned.parameters = parameters;
return cloned;
}
}

22
src/main/java/com/fr/plugin/form/widget/core/TemplateSource.java
Unescape View File

@ -1,11 +1,9 @@
package com.fr.plugin.form.widget.core;
import com.fanruan.api.err.UtilEvalError;
import com.fr.base.Formula;
import com.fr.base.Parameter;
import com.fr.base.ParameterHelper;
import com.fanruan.api.cal.ParameterKit;
import com.fanruan.api.net.NetworkKit;
import com.fanruan.api.util.RenderKit;
import com.fr.data.NetworkHelper;
import com.fr.general.FArray;
import com.fr.json.JSONArray;
import com.fanruan.api.err.JSONException;
@ -64,15 +62,15 @@ public class TemplateSource extends RHIframeSource {
if (realPath.contains(".cpt")) {
if (isNewerThan9()) {
return NetworkHelper.createServletURL(req) + "/view/report?viewlet=" + CodeUtils.encodeURIComponent(realPath) + createQueryString(extraPairs);
return NetworkKit.createServletURL(req) + "/view/report?viewlet=" + CodeUtils.encodeURIComponent(realPath) + createQueryString(extraPairs);
} else {
return NetworkHelper.createServletURL(req) + "?reportlet=" + CodeUtils.encodeURIComponent(realPath) + createQueryString(extraPairs);
return NetworkKit.createServletURL(req) + "?reportlet=" + CodeUtils.encodeURIComponent(realPath) + createQueryString(extraPairs);
}
} else if (realPath.contains(".frm")) {
if (isNewerThan9()) {
return NetworkHelper.createServletURL(req) + "/view/form?viewlet=" + CodeUtils.encodeURIComponent(realPath) + createQueryString(extraPairs);
return NetworkKit.createServletURL(req) + "/view/form?viewlet=" + CodeUtils.encodeURIComponent(realPath) + createQueryString(extraPairs);
}
return NetworkHelper.createServletURL(req) + "?formlet=" + CodeUtils.encodeURIComponent(realPath) + createQueryString(extraPairs);
return NetworkKit.createServletURL(req) + "?formlet=" + CodeUtils.encodeURIComponent(realPath) + createQueryString(extraPairs);
}
} catch (Exception e) {
return null;
@ -106,9 +104,9 @@ public class TemplateSource extends RHIframeSource {
@Override
public String[] dependence(CalculatorProvider ca) {
Parameter[] parameters = ParameterHelper.analyze4Parameters(path, false);
ParameterProvider[] parameters = ParameterKit.analyze4Parameters(path, false);
List<String> collections = new ArrayList<String>();
for (Parameter parameter : parameters) {
for (ParameterProvider parameter : parameters) {
collections.addAll(Arrays.asList(parameter.dependence(ca)));
}
return collections.toArray(new String[collections.size()]);
@ -124,9 +122,9 @@ public class TemplateSource extends RHIframeSource {
JSONObject jo = JSONObject.create();
String key = parameter.getName();
Object obj = parameter.getValue();
if (obj instanceof Formula) {
if (obj instanceof FormulaProvider) {
try{
String content = ((Formula) obj).getContent();
String content = ((FormulaProvider) obj).getContent();
obj = c.evalValue(content);
}catch (Exception e) {
}

6
src/main/java/com/fr/plugin/form/widget/core/URLSource.java
Unescape View File

@ -5,7 +5,7 @@ import com.fr.base.Parameter;
import com.fr.base.ParameterHelper;
import com.fanruan.api.util.RenderKit;
import com.fr.general.FArray;
import com.fr.general.FRLogger;
import com.fanruan.api.log.LogKit;
import com.fr.json.JSONArray;
import com.fanruan.api.err.JSONException;
import com.fr.json.JSONObject;
@ -54,13 +54,13 @@ public class URLSource extends RHIframeSource {
try {
result = GeneralKit.objectToString(calculator.evalValue(new Formula(url)));
} catch (Exception u) {
FRLogger.getLogger().error(u.getMessage(), u);
LogKit.error(u.getMessage(), u);
}
} else {
try {
result = RenderKit.render(url, calculator);
} catch (Exception e) {
FRLogger.getLogger().error(e.getMessage(), e);
LogKit.error(e.getMessage(), e);
}
}

6
src/main/java/com/fr/plugin/form/widget/monitor/RHFunctionProcessor.java
Unescape View File

@ -1,6 +1,5 @@
package com.fr.plugin.form.widget.monitor;
import com.fr.stable.fun.FunctionHelper;
import com.fr.stable.fun.impl.AbstractFunctionProcessor;
/**
@ -14,11 +13,6 @@ public class RHFunctionProcessor extends AbstractFunctionProcessor {
return instance;
}
@Override
public int getId() {
return FunctionHelper.generateFunctionID("com.fr.plugin.form.widget.rh.iframe.v10");
}
@Override
public String getLocaleKey() {
return "Plugin-RH_Iframe_Name";

4
src/main/java/com/fr/plugin/form/widget/ui/RHFramePane.java
Unescape View File

@ -2,8 +2,8 @@ package com.fr.plugin.form.widget.ui;
import com.fr.design.dialog.BasicPane;
import com.fanruan.api.design.ui.component.UIRadioPane;
import com.fr.design.gui.itableeditorpane.ParameterTableModel;
import com.fr.design.gui.itableeditorpane.UITableEditorPane;
import com.fanruan.api.design.ui.component.table.model.ParameterTableModel;
import com.fanruan.api.design.ui.component.table.UITableEditorPane;
import com.fanruan.api.design.DesignKit;
import com.fr.plugin.form.widget.core.RHIframeAttr;
import com.fr.plugin.form.widget.core.RHIframeSource;

2
src/main/java/com/fr/plugin/form/widget/ui/TemplateSourcePane.java
Unescape View File

@ -5,7 +5,7 @@ import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.DialogActionAdapter;
import com.fanruan.api.design.ui.component.UIButton;
import com.fanruan.api.design.ui.component.UITextField;
import com.fr.design.gui.itree.filetree.ReportletPane;
import com.fanruan.api.design.work.ReportletPane;
import com.fr.plugin.form.widget.core.TemplateSource;
import javax.swing.*;

2
src/main/java/com/fr/plugin/form/widget/ui/editor/RHIframeModelWrapper.java
Unescape View File

@ -1,6 +1,6 @@
package com.fr.plugin.form.widget.ui.editor;
import com.fr.design.Exception.ValidationException;
import com.fanruan.api.err.ValidationException;
import com.fr.design.designer.properties.Decoder;
import com.fr.design.designer.properties.Encoder;
import com.fr.plugin.form.widget.core.RHIframeAttr;

Write Preview
Loading…
Cancel
Save