Pull request #67: 合persist11

Merge in PG/plugin-report-doc-demo from release/11.0 to persist/11.0

* commit 'e47c617a344cf39cf3b48707020d42aaec131d59':
  REPORT-109627 导出api使用maven引入jar版本问题
  REPORT-96002【来源客户BUG REPORT-94898】FR11程序网络报表的demo类，更新文档和demo代码

plugin.xml

@@ -4,12 +4,13 @@
     <name><![CDATA[文档demo代码集成]]></name>
     <active>yes</active>
     <hidden>no</hidden>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
     <env-version>10.0~</env-version>
     <jartime>2018-08-02</jartime>
     <vendor>finereport</vendor>
     <description><![CDATA[集成帮助文档中的demo代码]]></description>
     <change-notes><![CDATA[
+        [2023-11-28] 插件适配11<br>
         [2018-01-25] 发布。<br>
         [2018-08-02] 插件适配10
         ]]></change-notes>

pom.xml

@@ -3,10 +3,10 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.fr.plugin</groupId>
     <artifactId>starter</artifactId>
-    <version>10.0</version>
+    <version>11.0</version>
     <packaging>pom</packaging>
     <properties>
-        <common-version>10.0-RELEASE-SNAPSHOT</common-version>
+        <common-version>11.0-RELEASE-SNAPSHOT</common-version>
         <web-inf-bucket>${project.basedir}/webroot/WEB-INF</web-inf-bucket>
     </properties>
     <dependencies>
@@ -28,6 +28,12 @@
             <version>${common-version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.fr.cbb</groupId>
+            <artifactId>fine-cbb</artifactId>
+            <version>${common-version}</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>com.fr.webui</groupId>
             <artifactId>fine-webui</artifactId>

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的正式版本|
+| common-version        | 含义          |
+|-----------------------|-------------|
+| 11.0-RELEASE-SNAPSHOT | 11.0的测试版本快照 |
+| 11.0-PERSIST-SNAPSHOT | 11.0的正式版本快照 |

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;
     }
 
+
 }