10.0下拉表格控件示例

.gitignore

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

README.md

@@ -1,18 +0,0 @@
-# 用于FineReport参数界面的下拉表格控件
-
-## [插件构建指南](https://github.com/FineDevelop/plugin-build/blob/master/README.md)
-
-可以用于参数面板上的弹出表格控件，可以比下拉框控件展示更详细的数据
-使用的第三方表格控件easyui的datagrid控件来做表格展示
-
-## 添加了插件后，参数面板上会多出一个“下拉表格”的控件
-![s](effect/Snip20150317_11.png)
-## 把控件拖拽添加到参数面板上后，在属性表界面，可以选择要使用的数据集
-![ss](effect/Snip20150317_12.png)
-## 在参数界面上的效果如图,把控件名设置为c1,并在报表的一个格子中写上公式：=$c1
-![sss](effect/Snip20150317_13.png)
-## 预览报表并点击下拉按钮看以看到弹出一个表格
-![ssss](effect/Snip20150317_14.png)
-## 选中需要的一行值后，点击查询按钮，可以看到参数值正确的在报表格子中显示了
-![sssss](effect/Snip20150317_15.png)
-

build.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <project basedir="." default="jar" name="plugin">
     <!-- JDK路径，根据自己机器上实际位置修改-->
-    <property name="jdk.home" value="/Library/Java/JavaVirtualMachines/jdk1.8.0_45.jdk/Contents/Home"/>
+    <property name="jdk.home" value="/Library/Java/JavaVirtualMachines/jdk1.8.0_172.jdk/Contents/Home"/>
 
     <property name="libs" value="${basedir}/lib"/>
     <property name="publicLibs" value=""/>
+    <property name="reportLibs" value="${basedir}/lib/report"/>
     <property name="destLoc" value="."/>
     <property name="classes" value="classes"/>
     <xmlproperty file="${basedir}/plugin.xml"/>
@@ -13,7 +14,7 @@
     <!-- 插件版本-->
     <property name="plugin-version" value="${current-version}"/>
     <!-- 插件名字-->
-    <property name="plugin-name" value="parameter-combo-grid"/>
+    <property name="plugin-name" value="demo-paramter-combo-grid"/>
     <property name="plugin-jar" value="fr-plugin-${plugin-name}-${plugin-version}.jar"/>
 
     <target name="prepare">
@@ -29,6 +30,9 @@
         <fileset dir="${publicLibs}">
             <include name="**/*.jar"/>
         </fileset>
+        <fileset dir="${reportLibs}">
+            <include name="**/*.jar"/>
+        </fileset>
     </path>
     <patternset id="resources4Jar">
         <exclude name="**/.settings/**"/>
@@ -44,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>
@@ -59,11 +63,15 @@
                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"/>
         </javac>
+        <taskdef name="pretreatment" classname="com.fr.plugin.pack.PluginPretreatmentTask">
+            <classpath refid="compile.classpath"/>
+        </taskdef>
+        <pretreatment baseDir="${basedir}"/>
     </target>
 
     <target name="jar_classes">
@@ -93,6 +101,7 @@
         <delete dir="${classes}"/>
 
     </target>
+
     <target name="jar" depends="super_jar">
         <antcall target="zip"/>
     </target>
@@ -106,12 +115,16 @@
                 <include name="${plugin-jar}"/>
                 <include name="plugin.xml"/>
             </fileset>
+            <fileset dir="${libs}">
+                <include name="*.jar"/>
+                <include name="*.dll"/>
+            </fileset>
         </copy>
         <zip destfile="${basedir}/${plugin-folder}.zip" basedir=".">
             <include name="${plugin-folder}/*.jar"/>
+            <include name="${plugin-folder}/*.dll"/>
             <include name="${plugin-folder}/plugin.xml"/>
         </zip>
-        <xmlproperty file="${basedir}/plugin.xml"/>
-        <move file="${plugin-folder}.zip" todir="${destLoc}/${plugin.name}"/>
+        <move file="${plugin-folder}.zip" todir="${destLoc}/install"/>
     </target>
-</project>
+</project>

demo-paramter-combo-grid.iml

@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6">
+    <output url="file://$MODULE_DIR$/../../../server/tomcat-8.5.29/webapps/webroot/WEB-INF/plugins/plugin-com.fr.plugin.demo.parameter.combo.grid-1.0/classes" />
+    <output-test url="file://$MODULE_DIR$/../../../server/tomcat-8.5.29/webapps/webroot/WEB-INF/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="module" module-name="fine-report-designer" />
+    <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="module" module-name="fine-activator-sdk" />
+    <orderEntry type="module" module-name="base-activator-conf" />
+    <orderEntry type="module" module-name="fine-core-sdk" />
+    <orderEntry type="module" module-name="base-module-register-sdk" />
+    <orderEntry type="module" module-name="basic-module" />
+    <orderEntry type="module" module-name="base-components-sdk" />
+    <orderEntry type="module" module-name="base-attachments" />
+    <orderEntry type="module" module-name="base-cache-general" />
+    <orderEntry type="module" module-name="core-ehcache" />
+    <orderEntry type="module" module-name="base-cluster-engine" />
+    <orderEntry type="module" module-name="base-message" />
+    <orderEntry type="module" module-name="base-fr-log" />
+    <orderEntry type="module" module-name="base-i18n-loader" />
+    <orderEntry type="module" module-name="base-web-atom" />
+    <orderEntry type="module" module-name="basic-email" />
+    <orderEntry type="module" module-name="basic-plugin" />
+    <orderEntry type="module" module-name="base-transaction" />
+    <orderEntry type="module" module-name="base-repo-ftp" />
+    <orderEntry type="module" module-name="base-workspace-engine" />
+    <orderEntry type="module" module-name="base-plugin-db" />
+    <orderEntry type="module" module-name="base-license" />
+    <orderEntry type="module" module-name="basic-base-application-sdk" />
+    <orderEntry type="module" module-name="basic-barcode" />
+    <orderEntry type="module" module-name="basic-base" />
+    <orderEntry type="module" module-name="core-workspace" />
+    <orderEntry type="module" module-name="basic-headerfooter" />
+    <orderEntry type="module" module-name="basic-market" />
+    <orderEntry type="module" module-name="basic-privilege" />
+    <orderEntry type="module" module-name="basic-record" />
+    <orderEntry type="module" module-name="basic-upload" />
+    <orderEntry type="module" module-name="basic-web" />
+    <orderEntry type="module" module-name="basic-scheduler" />
+    <orderEntry type="module" module-name="base-data-sdk" />
+    <orderEntry type="module" module-name="base-condition" />
+    <orderEntry type="module" module-name="base-data-base" />
+    <orderEntry type="module" module-name="base-db-handler" />
+    <orderEntry type="module" module-name="base-excel" />
+    <orderEntry type="module" module-name="base-write" />
+    <orderEntry type="module" module-name="base-basic-sdk" />
+    <orderEntry type="module" module-name="base-attachments-interface" />
+    <orderEntry type="module" module-name="base-basic-base" />
+    <orderEntry type="module" module-name="base-cache" />
+    <orderEntry type="module" module-name="base-calculate" />
+    <orderEntry type="module" module-name="base-general-base" />
+    <orderEntry type="module" module-name="base-general-data" />
+    <orderEntry type="module" module-name="base-privilege-interface" />
+    <orderEntry type="module" module-name="base-xml-filemanager" />
+    <orderEntry type="module" module-name="core-base-stable-extension-sdk" />
+    <orderEntry type="module" module-name="core-cluster-interface" />
+    <orderEntry type="module" module-name="core-monitor" />
+    <orderEntry type="module" module-name="core-performance" />
+    <orderEntry type="module" module-name="core-plugin-interface" />
+    <orderEntry type="module" module-name="core-project" />
+    <orderEntry type="module" module-name="core-project-base" />
+    <orderEntry type="module" module-name="core-project-plugin-interface" />
+    <orderEntry type="module" module-name="core-resource-io" />
+    <orderEntry type="module" module-name="core-web" />
+    <orderEntry type="module" module-name="core-base-stabe-sdk" />
+    <orderEntry type="module" module-name="core-clone" />
+    <orderEntry type="module" module-name="core-collections" />
+    <orderEntry type="module" module-name="core-common" />
+    <orderEntry type="module" module-name="core-db" />
+    <orderEntry type="module" module-name="core-diff" />
+    <orderEntry type="module" module-name="core-ftp" />
+    <orderEntry type="module" module-name="core-gif" />
+    <orderEntry type="module" module-name="core-intelli" />
+    <orderEntry type="module" module-name="core-http" />
+    <orderEntry type="module" module-name="core-i18n-interface" />
+    <orderEntry type="module" module-name="core-image4j" />
+    <orderEntry type="module" module-name="core-jgroups" />
+    <orderEntry type="module" module-name="core-json" />
+    <orderEntry type="module" module-name="core-jwt" />
+    <orderEntry type="module" module-name="core-security" />
+    <orderEntry type="module" module-name="core-query" />
+    <orderEntry type="module" module-name="core-log4j" />
+    <orderEntry type="module" module-name="core-log-interface" />
+    <orderEntry type="module" module-name="core-module" />
+    <orderEntry type="module" module-name="core-pinyin" />
+    <orderEntry type="module" module-name="core-ssh" />
+    <orderEntry type="module" module-name="core-sqlparser" />
+    <orderEntry type="module" module-name="core-unit" />
+    <orderEntry type="module" module-name="core-xml" />
+    <orderEntry type="module" module-name="core-zip4j" />
+    <orderEntry type="module" module-name="core-web-atom" />
+    <orderEntry type="module" module-name="base-pack-base" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.47" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
+    <orderEntry type="module" module-name="base-datasource-sdk" />
+    <orderEntry type="module" module-name="base-connection" />
+    <orderEntry type="module" module-name="base-dialect" />
+    <orderEntry type="module" module-name="fine-decision-sdk" />
+    <orderEntry type="module" module-name="decision-sdk" />
+    <orderEntry type="module" module-name="decision-web" />
+    <orderEntry type="module" module-name="decision-feature" />
+    <orderEntry type="module" module-name="decision-base" />
+    <orderEntry type="library" name="Maven: com.fr.webui:decision-fineui:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.webui:fine-webui:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="module" module-name="fine-schedule-sdk" />
+    <orderEntry type="module" module-name="schedule-sdk" />
+    <orderEntry type="module" module-name="schedule-web" />
+    <orderEntry type="module" module-name="schedule-feature" />
+    <orderEntry type="module" module-name="schedule-base" />
+    <orderEntry type="module" module-name="fine-report-engine-sdk" />
+    <orderEntry type="module" module-name="engine-platform-sdk" />
+    <orderEntry type="module" module-name="fsworkflow" />
+    <orderEntry type="module" module-name="base-platform" />
+    <orderEntry type="module" module-name="fservice" />
+    <orderEntry type="module" module-name="fschedule" />
+    <orderEntry type="module" module-name="engine" />
+    <orderEntry type="module" module-name="fsmonitor" />
+    <orderEntry type="module" module-name="fsbakrestore" />
+    <orderEntry type="module" module-name="fmobile" />
+    <orderEntry type="module" module-name="engine-chart-sdk" />
+    <orderEntry type="module" module-name="engine-chart-web" />
+    <orderEntry type="module" module-name="engine-chart-base" />
+    <orderEntry type="module" module-name="engine-chart-chartglyph" />
+    <orderEntry type="module" module-name="engine-chart-chartdata" />
+    <orderEntry type="module" module-name="engine-chart-chartattr" />
+    <orderEntry type="module" module-name="engine-report-sdk" />
+    <orderEntry type="module" module-name="engine-cross" />
+    <orderEntry type="module" module-name="form" />
+    <orderEntry type="module" module-name="engine-enhancement" />
+    <orderEntry type="module" module-name="engine-write" />
+    <orderEntry type="module" module-name="engine-view" />
+    <orderEntry type="module" module-name="engine-workspace-server" />
+    <orderEntry type="module" module-name="engine-page" />
+    <orderEntry type="module" module-name="engine-analysis" />
+    <orderEntry type="module" module-name="schedule-report" />
+    <orderEntry type="module" module-name="decision-report-sdk" />
+    <orderEntry type="module" module-name="decision-report-feature" />
+    <orderEntry type="library" name="Maven: org.swingexplorer:swexpl:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat:bootstrap:7.0.86" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jasper:7.0.86" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jdt.core.compiler:ecj:4.4.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jasper-el:7.0.86" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jdbc:7.0.86" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-dbcp:7.0.86" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-websocket-api:7.0.86" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-i18n-fr:7.0.86" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-i18n-es:7.0.86" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-i18n-ja:7.0.86" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-catalina-ha:7.0.86" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.tomcat:tomcat-catalina-ant:7.0.86" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-tribes:7.0.86" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat:commons-daemon:7.0.86" level="project" />
+    <orderEntry type="library" name="Maven: org.swingexplorer:swag:1.0" level="project" />
+    <orderEntry type="module" module-name="designer-base" />
+    <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="module" module-name="designer-realize" />
+    <orderEntry type="module" module-name="designer-form" />
+    <orderEntry type="module" module-name="designer-chart" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.39" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymock:3.5.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.third:fine-third:10.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.third.build:ant:1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.third.driver:ojdbc:14" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.h2database:h2:1.4.197" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.17" level="project" />
+    <orderEntry type="library" name="Maven: com.jcraft:jzlib:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.xerial:sqlite-jdbc:3.23.1" level="project" />
+  </component>
+</module>

plugin-paragrid.iml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../../../env/8.0/WebReport/WEB-INF/classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="lib" level="project" />
-    <orderEntry type="module" module-name="base" />
-    <orderEntry type="module" module-name="base-basic" />
-    <orderEntry type="module" module-name="base-calculate" />
-    <orderEntry type="module" module-name="base-data" />
-    <orderEntry type="module" module-name="base-file" />
-    <orderEntry type="module" module-name="base-performance" />
-    <orderEntry type="module" module-name="base-stable" />
-    <orderEntry type="module" module-name="designer_base" />
-    <orderEntry type="module" module-name="designer_form" />
-  </component>
-</module>

plugin.xml

@@ -1,23 +1,24 @@
 <?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>
+    <id>com.fr.plugin.demo.parameter.combo.grid</id>
+    <main-package>com.fr.plugin.demo.parameter.combo.grid</main-package>
     <name><![CDATA[表格选择控件]]></name>
     <active>yes</active>
     <version>2.0</version>
     <env-version>9.0</env-version>
-    <jartime>2015-08-09</jartime>
-    <vendor>richie</vendor>
+    <jartime>2018-11-05</jartime>
+    <vendor>author</vendor>
     <description><![CDATA[类似于下拉框但是弹出的选项是一个表格，可以比下拉框展示更加详细的信息]]></description>
     <change-notes><![CDATA[可以在参数界面、表单、填报控件中使用该控件]]></change-notes>
+    <extra-core>
+        <LocaleFinder class="com.fr.plugin.demo.parameter.combo.grid.GridLocaleFinderBridge"/>
+    </extra-core>
     <extra-report>
-        <JavaScriptFileHandler class="com.fr.plugin.widget.grid.JavaScriptFile"/>
-        <CssFileHandler class="com.fr.plugin.widget.grid.CssFile"/>
+        <JavaScriptFileHandler class="com.fr.plugin.demo.parameter.combo.grid.GridJavaScriptFileBridge"/>
+        <CssFileHandler class="com.fr.plugin.demo.parameter.combo.grid.GridCssFileBridge"/>
     </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"/>
+        <ParameterWidgetOptionProvider class="com.fr.plugin.demo.parameter.combo.grid.ComboGridBridge"/>
     </extra-designer>
-    <function-recorder class="com.fr.plugin.widget.grid.ComboGrid"/>
+    <function-recorder class="com.fr.plugin.demo.parameter.combo.grid.fun.ComboGrid"/>
 </plugin>

pom.xml

@@ -0,0 +1,44 @@
+<?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>
+    -->
+    <parent>
+         <groupId>com.fr.maven</groupId>
+         <artifactId>finereport-maven</artifactId>
+         <version>10.0</version>
+    </parent>
+    <packaging>jar</packaging>
+    <artifactId>demo-paramter-combo-grid</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>com.fr.report</groupId>
+            <artifactId>fine-report-designer</artifactId>
+            <version>10.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fr.report</groupId>
+            <artifactId>designer-base</artifactId>
+            <version>10.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fr.report</groupId>
+            <artifactId>designer-realize</artifactId>
+            <version>10.0</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <!---如果要更改调试插件，改这里的配置就可以了-->
+        <!--
+        <outputDirectory>${project.basedir}/../webroot/WEB-INF/plugins/plugin-com.fr.plugin.demo.paramter.combo.grid-1.0/classes</outputDirectory>
+        -->
+        <outputDirectory>${web-inf-path}/plugins/plugin-com.fr.plugin.demo.parameter.combo.grid-1.0/classes</outputDirectory>
+    </build>
+</project>

src/com/fr/plugin/widget/grid/CellGridImpl.java

@@ -1,28 +0,0 @@
-package com.fr.plugin.widget.grid;
-
-import com.fr.design.beans.BasicBeanPane;
-import com.fr.design.fun.impl.AbstractCellWidgetOptionProvider;
-import com.fr.form.ui.Widget;
-
-public class CellGridImpl extends AbstractCellWidgetOptionProvider {
-
-    @Override
-    public Class<? extends Widget> classForWidget() {
-        return ComboGrid.class;
-    }
-
-    @Override
-    public Class<? extends BasicBeanPane<? extends Widget>> appearanceForWidget() {
-        return CellGridDefinePane.class;
-    }
-
-    @Override
-    public String iconPathForWidget() {
-        return "/com/fr/plugin/widget/grid/images/table.png";
-    }
-
-    @Override
-    public String nameForWidget() {
-        return "Grid";
-    }
-}

src/com/fr/plugin/widget/grid/CssFile.java

@@ -1,20 +0,0 @@
-package com.fr.plugin.widget.grid;
-
-import com.fr.stable.fun.impl.AbstractCssFileHandler;
-
-/**
- * @author richie
- * @date 2015-03-16
- * @since 8.0
- */
-public class CssFile extends AbstractCssFileHandler {
-
-    @Override
-    public String[] pathsForFiles() {
-        return new String[]{
-                "/com/fr/plugin/widget/grid/easyui/easyui.css",
-                "/com/fr/plugin/widget/grid/easyui/icon.css",
-        };
-    }
-
-}

src/com/fr/plugin/widget/grid/JavaScriptFile.java

@@ -1,19 +0,0 @@
-package com.fr.plugin.widget.grid;
-
-import com.fr.stable.fun.impl.AbstractJavaScriptFileHandler;
-
-/**
- * @author richie
- * @date 2015-03-16
- * @since 8.0
- */
-public class JavaScriptFile extends AbstractJavaScriptFileHandler {
-
-    @Override
-    public String[] pathsForFiles() {
-        return new String[]{
-                "/com/fr/plugin/widget/grid/easyui/jquery.easyui.min.js",
-                "/com/fr/plugin/widget/grid/web/combogrid.js"
-        };
-    }
-}

src/main/java/com/fr/plugin/demo/parameter/combo/grid/ComboGridBridge.java

@@ -1,15 +1,17 @@
-package com.fr.plugin.widget.grid;
+package com.fr.plugin.demo.parameter.combo.grid;
 
 import com.fr.design.fun.ParameterWidgetOptionProvider;
 import com.fr.design.fun.impl.AbstractFormWidgetOptionProvider;
 import com.fr.form.ui.Widget;
+import com.fr.plugin.demo.parameter.combo.grid.fun.ComboGrid;
+import com.fr.plugin.demo.parameter.combo.grid.ui.XComboGrid;
 
 /**
  * @author richie
  * @date 2015-03-16
  * @since 8.0
  */
-public class GridImpl extends AbstractFormWidgetOptionProvider implements ParameterWidgetOptionProvider {
+public class ComboGridBridge extends AbstractFormWidgetOptionProvider implements ParameterWidgetOptionProvider {
 
     @Override
     public int currentAPILevel() {
@@ -28,7 +30,7 @@ public class GridImpl extends AbstractFormWidgetOptionProvider implements Parame
 
     @Override
     public String iconPathForWidget() {
-        return "/com/fr/plugin/widget/grid/images/table.png";
+        return "/com/fr/plugin/demo/parameter/combo/grid/images/table.png";
     }
 
     @Override

src/main/java/com/fr/plugin/demo/parameter/combo/grid/GridCssFileBridge.java

@@ -0,0 +1,20 @@
+package com.fr.plugin.demo.parameter.combo.grid;
+
+import com.fr.stable.fun.impl.AbstractCssFileHandler;
+
+/**
+ * @author richie
+ * @date 2015-03-16
+ * @since 8.0
+ */
+public class GridCssFileBridge extends AbstractCssFileHandler {
+
+    @Override
+    public String[] pathsForFiles() {
+        return new String[]{
+                "/com/fr/plugin/demo/parameter/combo/grid/easyui/easyui.css",
+                "/com/fr/plugin/demo/parameter/combo/grid/easyui/icon.css",
+        };
+    }
+
+}

src/main/java/com/fr/plugin/demo/parameter/combo/grid/GridJavaScriptFileBridge.java

@@ -0,0 +1,19 @@
+package com.fr.plugin.demo.parameter.combo.grid;
+
+import com.fr.stable.fun.impl.AbstractJavaScriptFileHandler;
+
+/**
+ * @author richie
+ * @date 2015-03-16
+ * @since 8.0
+ */
+public class GridJavaScriptFileBridge extends AbstractJavaScriptFileHandler {
+
+    @Override
+    public String[] pathsForFiles() {
+        return new String[]{
+                "/com/fr/plugin/demo/parameter/combo/grid/easyui/jquery.easyui.min.js",
+                "/com/fr/plugin/demo/parameter/combo/grid/web/combogrid.js"
+        };
+    }
+}

src/main/java/com/fr/plugin/demo/parameter/combo/grid/GridLocaleFinderBridge.java

@@ -0,0 +1,10 @@
+package com.fr.plugin.demo.parameter.combo.grid;
+
+import com.fr.stable.fun.impl.AbstractLocaleFinder;
+
+public class GridLocaleFinderBridge extends AbstractLocaleFinder  {
+    @Override
+    public String find() {
+        return "com/fr/plugin/demo/parameter/combo/grid/locale/grid";
+    }
+}

src/main/java/com/fr/plugin/demo/parameter/combo/grid/fun/ComboGrid.java

@@ -1,4 +1,4 @@
-package com.fr.plugin.widget.grid;
+package com.fr.plugin.demo.parameter.combo.grid.fun;
 
 import com.fr.base.TableData;
 import com.fr.data.impl.NameTableData;
@@ -6,14 +6,19 @@ import com.fr.form.ui.DataControl;
 import com.fr.form.ui.WidgetValue;
 import com.fr.form.ui.WriteAbleRepeatEditor;
 import com.fr.general.data.DataModel;
+import com.fr.intelli.record.Focus;
+import com.fr.intelli.record.Original;
+import com.fr.json.JSON;
 import com.fr.json.JSONArray;
+import com.fr.json.JSONFactory;
 import com.fr.json.JSONObject;
 import com.fr.plugin.transform.ExecuteFunctionRecord;
 import com.fr.plugin.transform.FunctionRecorder;
+import com.fr.record.analyzer.EnableMetrics;
 import com.fr.script.Calculator;
 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;
 
@@ -22,7 +27,7 @@ import javax.servlet.http.HttpServletRequest;
  * @date 2015-03-16
  * @since 8.0
  */
-@FunctionRecorder
+@EnableMetrics
 public class ComboGrid extends WriteAbleRepeatEditor implements DataControl {
 
     private TableData tableData;
@@ -68,17 +73,17 @@ 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();
+    @Focus(id="com.fr.plugin.demo.parameter.combo.grid", text = "", source = Original.PLUGIN)
+    public JSONArray createJSONData(TemplateSessionIDInfo sessionIDInfor, Calculator c, HttpServletRequest req) throws Exception {
+        JSONArray ja = JSONFactory.createJSON(JSON.ARRAY);
 
-        JSONObject columnInfo = new JSONObject();
+        JSONObject columnInfo = JSONFactory.createJSON(JSON.OBJECT);
         ja.put(columnInfo);
 
-        JSONArray columnNames = new JSONArray();
+        JSONArray columnNames = JSONFactory.createJSON(JSON.ARRAY);
         columnInfo.put("columnNames", columnNames);
 
-        JSONObject valueInfo = new JSONObject();
+        JSONObject valueInfo = JSONFactory.createJSON(JSON.OBJECT);
         columnInfo.put("valueInfo", valueInfo);
 
 
@@ -92,10 +97,10 @@ public class ComboGrid extends WriteAbleRepeatEditor implements DataControl {
         valueInfo.put("textColumnName", columnNames.length() > valueIndex ? columnNames.getString(valueIndex) : columnNames.getString(0));
 
 
-        JSONArray valueArray = new JSONArray();
+        JSONArray valueArray = JSONFactory.createJSON(JSON.ARRAY);
         ja.put(valueArray);
         for (int j = 0, row = dataModel.getRowCount(); j < row; j ++) {
-            JSONObject jo = new JSONObject();
+            JSONObject jo = JSONFactory.createJSON(JSON.OBJECT);
             valueArray.put(jo);
             for (int i = 0, col = dataModel.getColumnCount(); i < col; i ++) {
                 jo.put(dataModel.getColumnName(i), dataModel.getValueAt(j, i));
@@ -115,6 +120,11 @@ public class ComboGrid extends WriteAbleRepeatEditor implements DataControl {
         return null;
     }
 
+    @Override
+    public String getDataBindDefaultValue(Calculator calculator) {
+        return null;
+    }
+
     public void readXML(XMLableReader reader) {
         super.readXML(reader);
         if (reader.isChildNode()) {

src/main/java/com/fr/plugin/demo/parameter/combo/grid/ui/CellGridDefinePane.java

@@ -1,22 +1,18 @@
-package com.fr.plugin.widget.grid;
+package com.fr.plugin.demo.parameter.combo.grid.ui;
 
 import com.fr.base.TableData;
 import com.fr.data.TableDataSource;
 import com.fr.data.impl.NameTableData;
-import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.data.DesignTableDataManager;
-import com.fr.design.gui.frpane.TreeSettingPane;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.icombobox.UIComboBoxRenderer;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.UINumberField;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
-import com.fr.design.present.dict.DictionaryPane;
-import com.fr.design.widget.DataModify;
 import com.fr.design.widget.ui.AbstractDataModify;
 import com.fr.file.DatasourceManager;
-import com.fr.third.org.apache.poi.hssf.record.formula.functions.Abs;
+import com.fr.plugin.demo.parameter.combo.grid.fun.ComboGrid;
 
 import javax.swing.*;
 import java.awt.*;

src/main/java/com/fr/plugin/demo/parameter/combo/grid/ui/TableDataEditor.java

@@ -1,4 +1,4 @@
-package com.fr.plugin.widget.grid;
+package com.fr.plugin.demo.parameter.combo.grid.ui;
 
 import com.fr.base.TableData;
 import com.fr.data.TableDataSource;

src/main/java/com/fr/plugin/demo/parameter/combo/grid/ui/TableDataRenderer.java

@@ -1,4 +1,4 @@
-package com.fr.plugin.widget.grid;
+package com.fr.plugin.demo.parameter.combo.grid.ui;
 
 import com.fr.design.mainframe.widget.renderer.EncoderCellRenderer;
 

src/main/java/com/fr/plugin/demo/parameter/combo/grid/ui/TableDataWrapper.java

@@ -1,4 +1,4 @@
-package com.fr.plugin.widget.grid;
+package com.fr.plugin.demo.parameter.combo.grid.ui;
 
 import com.fr.data.impl.NameTableData;
 import com.fr.stable.StringUtils;

src/main/java/com/fr/plugin/demo/parameter/combo/grid/ui/XComboGrid.java

@@ -1,13 +1,15 @@
-package com.fr.plugin.widget.grid;
+package com.fr.plugin.demo.parameter.combo.grid.ui;
 
 import com.fr.design.designer.creator.CRPropertyDescriptor;
 import com.fr.design.designer.creator.XLayoutContainer;
 import com.fr.design.designer.creator.XWScaleLayout;
 import com.fr.design.designer.creator.XWriteAbleRepeatEditor;
 import com.fr.design.gui.itextfield.UITextField;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.widget.editors.WidgetValueEditor;
 import com.fr.general.Inter;
+import com.fr.plugin.demo.parameter.combo.grid.fun.ComboGrid;
 import com.fr.stable.ArrayUtils;
 
 import javax.swing.*;
@@ -21,7 +23,7 @@ import java.beans.IntrospectionException;
  */
 public class XComboGrid extends XWriteAbleRepeatEditor {
 
-    LimpidButton btn;
+    private LimpidButton btn;
 
     public XComboGrid(ComboGrid widget, Dimension initSize) {
         super(widget, initSize);
@@ -29,15 +31,15 @@ public class XComboGrid extends XWriteAbleRepeatEditor {
 
     public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
 
-        return (CRPropertyDescriptor[]) ArrayUtils.addAll(
+        return ArrayUtils.addAll(
                 super.supportedDescriptor(),
                 new CRPropertyDescriptor[]{
-                        new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(Inter.getLocText(new String[]{"Widget", "Value"})).setEditorClass(WidgetValueEditor.class),
+                        new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(Toolkit.i18nText("Plugin-Demo_Widget_Value")).setEditorClass(WidgetValueEditor.class),
                         new CRPropertyDescriptor("tableData", this.data.getClass())
-                                .setI18NName("数据集")
+                                .setI18NName(Toolkit.i18nText("Plugin-Demo_Table_Data"))
                                 .setEditorClass(TableDataEditor.class).setRendererClass(TableDataRenderer.class),
-                        new CRPropertyDescriptor("keyIndex", this.data.getClass()).setI18NName("实际值索引"),
-                        new CRPropertyDescriptor("valueIndex", this.data.getClass()).setI18NName("显示值索引")
+                        new CRPropertyDescriptor("keyIndex", this.data.getClass()).setI18NName(Toolkit.i18nText("Plugin-Demo_Value_Index")),
+                        new CRPropertyDescriptor("valueIndex", this.data.getClass()).setI18NName(Toolkit.i18nText("Plugin-Demo_Text_Index"))
                 });
     }
 
@@ -45,8 +47,8 @@ public class XComboGrid extends XWriteAbleRepeatEditor {
         return (ComboGrid) this.data;
     }
 
-    public  String getIconPath() {
-        return "/com/fr/plugin/widget/grid/images/table.png";
+    public String getIconPath() {
+        return "/com/fr/plugin/demo/parameter/combo/grid/images/table.png";
     }
 
     @Override

src/main/resources/com/fr/plugin/demo/parameter/combo/grid/locale/grid.properties

@@ -0,0 +1,5 @@
+Plugin-Demo_Combo_Grid=Combo Grid
+Plugin-Demo_Table_Data=Table Data
+Plugin-Demo_Widget_Value=Widget Value
+Plugin-Demo_Value_Index=Value Index
+Plugin-Demo_Text_Index=Text Index

src/main/resources/com/fr/plugin/demo/parameter/combo/grid/locale/grid_zh_CN.properties

@@ -0,0 +1,5 @@
+Plugin-Demo_Combo_Grid=\u4E0B\u62C9\u8868\u683C
+Plugin-Demo_Table_Data=\u6570\u636E\u96C6
+Plugin-Demo_Widget_Value=\u63A7\u4EF6\u503C
+Plugin-Demo_Value_Index=\u5B9E\u9645\u503C\u7D22\u5F15
+Plugin-Demo_Text_Index=\u663E\u793A\u503C\u7D22\u5F15

src/main/resources/com/fr/plugin/demo/parameter/combo/grid/web/combogrid.js

@@ -59,7 +59,7 @@
         _refreshGrid: function ($t, columns, data) {
             var self = this, opt = this.options;
             FR.showDialog({
-                title: "下拉表格",
+                title: FR.i18nText("Plugin-Demo_Combo_Grid"),
                 width: 500,
                 height: 280,
                 contentHtml: $t