10.0版本

.gitignore

@@ -0,0 +1,4 @@
+*.iml
+.idea/
+target/
+lib/report/*.jar

build.xml

@@ -48,7 +48,7 @@
         <echo message="从${resources_from}拷贝图片,JS,CSS等资源文件"/>
         <delete dir="tmp"/>
         <copy todir="tmp">
-            <fileset dir="${resources_from}\src">
+            <fileset dir="${resources_from}/src/main/resources">
                 <patternset refid="resources4Jar"/>
             </fileset>
         </copy>
@@ -63,7 +63,7 @@
                target="${target_jdk_version}"
                fork="true" memoryMaximumSize="512m" listfiles="false" srcdir="${basedir}"
                executable="${compile_jdk_version}/bin/javac">
-            <src path="${basedir}/src"/>
+            <src path="${basedir}/src/main/java"/>
             <exclude name="**/.svn/**"/>
             <compilerarg line="-encoding UTF8 "/>
             <classpath refid="compile.classpath"/>

plugin-iframe.iml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6">
+    <output url="file://$MODULE_DIR$/../webroot/WEB-INF/plugins/plugin-com.fr.solution.plugin.form.widget.rh.iframe.v10-1.0/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: com.fr.third:fine-third:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.activator:fine-activator:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.core:fine-core:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.17" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.webui:fine-webui:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.datasource:fine-datasource:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.decision:fine-decision:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.decision:fine-decision-report:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.schedule:fine-schedule:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.schedule:fine-schedule-report:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.intelligence:fine-swift:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.fineio:fineio:2.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.third.server:servlet-api:3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.intelligence:fine-accumulator:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.report:fine-report-engine:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.report:fine-report-designer:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: io.socket:socket.io-client:0.7.0" level="project" />
+    <orderEntry type="library" name="Maven: io.socket:engine.io-client:0.7.0" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp-ws:3.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.6.0" level="project" />
+    <orderEntry type="library" name="Maven: org.json:json:20090211" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.6.9" level="project" />
+    <orderEntry type="library" name="Maven: org.swingexplorer:swexpl:2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.swingexplorer:swag:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-catalina:8.5.32" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-servlet-api:8.5.32" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jsp-api:8.5.32" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-el-api:8.5.32" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-juli:8.5.32" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-annotations-api:8.5.32" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-api:8.5.32" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jni:8.5.32" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-coyote:8.5.32" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-util:8.5.32" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-util-scan:8.5.32" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jaspic-api:8.5.32" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.44" level="project" />
+  </component>
+</module>

plugin.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><plugin>
-    <id>com.fr.solution.plugin.form.widget.rh.iframe</id>
+    <id>com.fr.solution.plugin.form.widget.rh.iframe.v10</id>
     <name><![CDATA[网页框控件]]></name>
     <active>yes</active>
-    <version>7.0</version>
-    <env-version>8.0</env-version>
-    <jartime>2016-06-30</jartime>
-    <vendor email="solution@finereport.com">solution</vendor>
+    <version>7.1</version>
+    <env-version>10.0</env-version>
+    <jartime>2018-08-30</jartime>
+    <vendor>richie</vendor>
     <description><![CDATA[网页框控件,仅支持在表单中使用]]></description>
     <change-notes><![CDATA[
-        [2018-07-30]适配10.0。<br/>
+        [2018-10-07]适配10.0和国际化问题。<br/>
         [2018-06-15]修复决策报表无法正确传递参数给网页框中的报表的问题。<br/>
         [2018-06-15]增加网页框设计器模板的显示信息。<br/>
         [2017-06-20]修复模板类型的网页框参数为中文时候的问题。<br/>
@@ -37,4 +37,5 @@
         <FormWidgetOptionProvider class="com.fr.plugin.form.widget.conf.RHIframeMarkInForm"/>
         <CellWidgetOptionProvider class="com.fr.plugin.form.widget.conf.RHIframeMarkInCell"/>
     </extra-designer>
+    <function-recorder class="com.fr.plugin.form.widget.core.RHIframe"/>
 </plugin>

pom.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.fr.plugin</groupId>
+        <artifactId>starter</artifactId>
+        <version>10.0</version>
+    </parent>
+
+    <packaging>jar</packaging>
+    <artifactId>plugin-iframe</artifactId>
+    <build>
+        <!---如果要更改调试插件，改这里的配置就可以了-->
+        <outputDirectory>${project.basedir}/../webroot/WEB-INF/plugins/plugin-com.fr.solution.plugin.form.widget.rh.iframe.v10-1.0/classes</outputDirectory>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>6</source>
+                    <target>6</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

src/com/fr/plugin/form/widget/locale/iframe.properties

@@ -1,4 +0,0 @@
-Plugin-RH_Iframe_Name=Iframe
-Plugin-RH_Iframe_Value=Address
-Plugin_RH_Iframe_Template_Path=Template Path
-Plugin_RH_Iframe_Url=URL

src/com/fr/plugin/form/widget/locale/iframe_zh_CN.properties

@@ -1,4 +0,0 @@
-Plugin-RH_Iframe_Name=\u7F51\u9875\u6846
-Plugin-RH_Iframe_Value=\u5730\u5740\u548C\u53C2\u6570
-Plugin_RH_Iframe_Template_Path=\u6A21\u677F\u8DEF\u5F84
-Plugin_RH_Iframe_Url=\u7F51\u7EDC\u8DEF\u5F84

src/main/java/com/fr/plugin/form/widget/core/Constants.java

@@ -5,5 +5,5 @@ package com.fr.plugin.form.widget.core;
  */
 public class Constants {
 
-    public static final String PLUGIN_ID = "com.fr.solution.plugin.form.widget.rh.iframe";
+    public static final String PLUGIN_ID = "com.fr.solution.plugin.form.widget.rh.iframe.v10";
 }

src/main/java/com/fr/plugin/form/widget/core/RHIframe.java

@@ -1,48 +1,34 @@
 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;
 import com.fr.general.xml.GeneralXMLTools;
+import com.fr.intelli.record.Focus;
+import com.fr.intelli.record.Original;
 import com.fr.json.JSONArray;
 import com.fr.json.JSONException;
 import com.fr.json.JSONObject;
 import com.fr.plugin.ExtraClassManager;
 import com.fr.plugin.form.widget.monitor.RHFunctionProcessor;
+import com.fr.record.analyzer.EnableMetrics;
 import com.fr.script.Calculator;
 import com.fr.stable.ArrayUtils;
-import com.fr.stable.DependenceProvider;
 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;
 import com.fr.stable.xml.XMLableReader;
-import com.fr.web.core.SessionIDInfor;
+import com.fr.web.core.TemplateSessionIDInfo;
 
 import javax.servlet.http.HttpServletRequest;
 
 /**
  * Created by richie on 15/12/2.
  */
+@EnableMetrics
 public class RHIframe extends FieldEditor implements Interactive {
 
-    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;
@@ -79,6 +65,7 @@ public class RHIframe extends FieldEditor implements Interactive {
     }
 
     @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);
         attr.mixConfig(jo, c, repo.getHttpServletRequest());
@@ -92,7 +79,7 @@ public class RHIframe extends FieldEditor implements Interactive {
     }
 
     @Override
-    public JSONArray createJSONData(SessionIDInfor sessionIDInfor, Calculator c, HttpServletRequest req) throws Exception {
+    public JSONArray createJSONData(TemplateSessionIDInfo sessionIDInfor, Calculator c, HttpServletRequest req) throws Exception {
         JSONArray ja = super.createJSONData(sessionIDInfor, c, req);
         attr.mixJSONData(ja, sessionIDInfor, c);
         return ja;

src/main/java/com/fr/plugin/form/widget/core/RHIframeAttr.java

@@ -17,7 +17,7 @@ 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.SessionIDInfor;
+import com.fr.web.core.TemplateSessionIDInfo;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
@@ -77,7 +77,7 @@ public class RHIframeAttr implements XMLable, DependenceProvider  {
         }
     }
 
-    public void mixJSONData(JSONArray ja, SessionIDInfor sessionIDInfor, Calculator c) throws JSONException, UtilEvalError {
+    public void mixJSONData(JSONArray ja, TemplateSessionIDInfo sessionIDInfor, Calculator c) throws JSONException, UtilEvalError {
         NameSpace ns = ParameterMapNameSpace.create(sessionIDInfor.getParameterMap4Execute());
         c.pushNameSpace(ns);
 

src/main/java/com/fr/plugin/form/widget/monitor/RHFunctionProcessor.java

@@ -16,7 +16,7 @@ public class RHFunctionProcessor extends AbstractFunctionProcessor {
 
     @Override
     public int getId() {
-        return FunctionHelper.generateFunctionID("com.fr.plugin.form.widget.rh.iframe");
+        return FunctionHelper.generateFunctionID("com.fr.plugin.form.widget.rh.iframe.v10");
     }
 
     @Override

src/main/java/com/fr/plugin/form/widget/ui/XRHIframe.java

@@ -5,7 +5,6 @@ import com.fr.design.designer.creator.XWidgetCreator;
 import com.fr.design.form.util.XCreatorConstants;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.mainframe.widget.editors.WidgetValueEditor;
 import com.fr.general.Inter;
 import com.fr.plugin.form.widget.core.RHIframe;
 import com.fr.plugin.form.widget.core.RHIframeAttr;
@@ -32,17 +31,17 @@ public class XRHIframe extends XWidgetCreator {
 
     @Override
     public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
-        return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(), new CRPropertyDescriptor[]{
+        return ArrayUtils.addAll(super.supportedDescriptor(), new CRPropertyDescriptor[]{
                 new CRPropertyDescriptor("attr", this.toData().getClass())
                         .setI18NName(Inter.getLocText("Plugin-RH_Iframe_Value"))
                         .setEditorClass(RHIframeModelEditor.class)
                         .setRendererClass(RHIframeModelRenderer.class),
                 new CRPropertyDescriptor("overflowX", this.data.getClass()).setI18NName(
-                        Inter.getLocText("Preference-Horizontal_Scroll_Bar_Visible")).putKeyValue(
+                        Inter.getLocText("Plugin-Preference_Horizontal_Scroll_Bar_Visible")).putKeyValue(
                         XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
                 new CRPropertyDescriptor("overflowY", this.data.getClass()).setI18NName(
-                        Inter.getLocText("Preference-Vertical_Scroll_Bar_Visible")).putKeyValue(
-                        XCreatorConstants.PROPERTY_CATEGORY, "Advanced")});
+                        Inter.getLocText("Plugin-Preference_Vertical_Scroll_Bar_Visible")).putKeyValue(
+                        XCreatorConstants.PROPERTY_CATEGORY, "Plugin-RH_Iframe_Advanced")});
     }
 
     @Override

src/main/resources/com/fr/plugin/form/widget/locale/iframe.properties

@@ -0,0 +1,7 @@
+Plugin-RH_Iframe_Name=Iframe
+Plugin-RH_Iframe_Value=Address
+Plugin_RH_Iframe_Template_Path=Template Path
+Plugin_RH_Iframe_Url=URL
+Plugin-RH_Iframe_Advanced=Advanced
+Plugin-Preference_Horizontal_Scroll_Bar_Visible=Horizontal Scroll Bar Visible
+Plugin-Preference_Vertical_Scroll_Bar_Visible=Vertical Scroll Bar Visible

src/main/resources/com/fr/plugin/form/widget/locale/iframe_zh_CN.properties

@@ -0,0 +1,7 @@
+Plugin-RH_Iframe_Name=\u7F51\u9875\u6846
+Plugin-RH_Iframe_Value=\u5730\u5740\u548C\u53C2\u6570
+Plugin_RH_Iframe_Template_Path=\u6A21\u677F\u8DEF\u5F84
+Plugin_RH_Iframe_Url=\u7F51\u7EDC\u8DEF\u5F84
+Plugin-RH_Iframe_Advanced=\u9AD8\u7EA7
+Plugin-Preference_Horizontal_Scroll_Bar_Visible=\u6C34\u5E73\u6EDA\u52A8\u6761\u53EF\u89C1
+Plugin-Preference_Vertical_Scroll_Bar_Visible=\u5782\u76F4\u6EDA\u52A8\u6761\u53EF\u89C1