Merge remote-tracking branch 'origin/fbp/master' into fbp/master

designer-realize/src/main/java/com/fanruan/boot/env/function/DesignReportBaseComponent.java

@@ -5,7 +5,10 @@ import com.fanruan.carina.annotions.DependsOn;
 import com.fanruan.carina.annotions.FineComponent;
 import com.fanruan.carina.annotions.Start;
 import com.fanruan.carina.annotions.Stop;
-import com.fr.report.VcsContext;
+import com.fanruan.carina.annotions.Supplemental;
+import com.fr.nx.app.web.StreamAndTemplateReportletCreator;
+import com.fr.nx.app.web.StreamReportletCreator;
+import com.fr.web.factory.WebletFactory;
 
 /**
  * DesignReportBaseComponent
@@ -18,12 +21,21 @@ import com.fr.report.VcsContext;
 @DependsOn(dependencies = "design_function_chart_base")
 public class DesignReportBaseComponent extends ReportBaseComponent {
 
+    /**
+     * prepare
+     */
+    @Supplemental
+    public void supplemental() {
+        WebletFactory.registerWebletCreator(StreamReportletCreator.KEY);
+        WebletFactory.registerWebletCreator(StreamAndTemplateReportletCreator.KEY);
+    }
+
     /**
      * start
      */
     @Start
     public void start() {
-        VcsContext.init();
+        super.start();
     }
 
     /**
@@ -31,6 +43,6 @@ public class DesignReportBaseComponent extends ReportBaseComponent {
      */
     @Stop
     public void stop() {
-        VcsContext.reset();
+        super.stop();
     }
 }