diff --git a/plugin.xml b/plugin.xml
index 879bd29..1019e12 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -4,12 +4,13 @@
yes
no
- 1.1.1
+ 1.1.2
10.0~
2018-08-02
finereport
[2018-01-25] 发布。
[2018-08-02] 插件适配10
]]>
diff --git a/pom.xml b/pom.xml
index 61099db..7938f36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,10 +3,10 @@
4.0.0
com.fr.plugin
starter
- 10.0
+ 11.0
pom
- 10.0-RELEASE-SNAPSHOT
+ 11.0-RELEASE-SNAPSHOT
${project.basedir}/webroot/WEB-INF
@@ -28,6 +28,12 @@
${common-version}
compile
+
+ com.fr.cbb
+ fine-cbb
+ ${common-version}
+ compile
+
com.fr.webui
fine-webui
diff --git a/readme.md b/readme.md
index fd6605a..c6f1ef9 100644
--- a/readme.md
+++ b/readme.md
@@ -19,8 +19,7 @@
## 修改依赖的jar版本
只需要更改pom.xml中的common-version属性即可。
-|common-version|含义|
-|--------------|----|
-|10.0-RELEASE-SNAPSHOT|10.0的测试版本快照|
-|10.0-SNAPSHOT|10.0的正式版本快照|
-|10.0|10.0的正式版本|
\ No newline at end of file
+| common-version | 含义 |
+|-----------------------|-------------|
+| 11.0-RELEASE-SNAPSHOT | 11.0的测试版本快照 |
+| 11.0-PERSIST-SNAPSHOT | 11.0的正式版本快照 |
\ No newline at end of file
diff --git a/src/main/java/com/fr/demo/SimpleReportletDemoFrm.java b/src/main/java/com/fr/demo/SimpleReportletDemoFrm.java
index a3862fd..89edc9d 100644
--- a/src/main/java/com/fr/demo/SimpleReportletDemoFrm.java
+++ b/src/main/java/com/fr/demo/SimpleReportletDemoFrm.java
@@ -1,16 +1,15 @@
package com.fr.demo;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
+import com.fr.form.main.DashboardTemplate;
import com.fr.form.main.Form;
import com.fr.form.main.FormIO;
import com.fr.log.FineLoggerFactory;
import com.fr.web.weblet.Formlet;
-
+import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
public class SimpleReportletDemoFrm extends Formlet {
-
@Override
public void setParameterMap(Map arg0) {
// TODO Auto-generated method stub
@@ -18,17 +17,20 @@ public class SimpleReportletDemoFrm extends Formlet {
}
@Override
- protected Form createForm(HttpServletRequest request) throws Exception {
+ protected DashboardTemplate createDashboard(HttpServletRequest req) throws Exception {
Form form = null;
//模板的相对路径
String tplPath = "//doc//frm//决策报表入门.frm";
this.setTplPath(tplPath);
+
try {
form = FormIO.readForm(tplPath);
} catch (Exception e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
}
+
return form;
}
-}
\ No newline at end of file
+
+}