重构

pom.xml

@@ -124,6 +124,12 @@
             <artifactId>sqlite-jdbc</artifactId>
             <version>3.28.0</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.eclipse.birt.runtime.3_7_1/org.mozilla.javascript -->
+        <dependency>
+            <groupId>org.eclipse.birt.runtime.3_7_1</groupId>
+            <artifactId>org.mozilla.javascript</artifactId>
+            <version>1.7.2</version>
+        </dependency>
         <dependency>
             <groupId>javax.servlet.jsp</groupId>
             <artifactId>jsp-api</artifactId>

src/main/java/com/ruisitech/bi/service/bireport/ChartService.java

@@ -2,9 +2,9 @@ package com.ruisitech.bi.service.bireport;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.ruisi.bi.engine.view.context.chart.ChartContext;
-import com.ruisi.bi.engine.view.context.chart.ChartContextImpl;
-import com.ruisi.bi.engine.view.context.chart.ChartKeyContext;
+import com.ruisi.ext.engine.view.context.chart.ChartContext;
+import com.ruisi.ext.engine.view.context.chart.ChartContextImpl;
+import com.ruisi.ext.engine.view.context.chart.ChartKeyContext;
 import com.ruisi.ext.engine.ExtConstants;
 import com.ruisi.ext.engine.init.TemplateManager;
 import com.ruisi.ext.engine.util.IdCreater;

src/main/java/com/ruisitech/bi/service/bireport/ReportService.java

@@ -2,7 +2,7 @@ package com.ruisitech.bi.service.bireport;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.ruisi.bi.engine.view.context.chart.ChartContext;
+import com.ruisi.ext.engine.view.context.chart.ChartContext;
 import com.ruisi.ext.engine.ExtConstants;
 import com.ruisi.ext.engine.init.TemplateManager;
 import com.ruisi.ext.engine.util.IdCreater;

src/main/java/com/ruisitech/bi/service/bireport/TableService.java

@@ -1152,9 +1152,9 @@ public class TableService extends BaseCompService {
 		String funcName = "warn"+ IdCreater.create();
 		scripts.append("function " +funcName+"(val, a, b, c, d){");
 		//先输出值
-		scripts.append("if(d == 'html'){out.print('<span class=\"kpiValue\">');}");
+		//scripts.append("if(d == 'json'){out.print('<span class=\"kpiValue\">');}");
 		scripts.append("if(val == null){out.print('-')}else{out.print(val, '"+kpiFmt+"');}");
-		scripts.append("if(d != 'html'){"); //只在html模式下起作用
+		scripts.append("if(d != 'json'){"); //只在html模式下起作用
 		scripts.append(" return;");
 		scripts.append("}");
 		scripts.append("if(val "+warn.get("logic1")+" "+warn.get("val1")+"){");
@@ -1164,7 +1164,7 @@ public class TableService extends BaseCompService {
 		scripts.append("}else{");
 		scripts.append("out.print(\"<span class='"+warn.get("pic3")+"'></span>\")");
 		scripts.append("}");
-		scripts.append("if(d == 'html'){out.print('</span>');}");
+		//scripts.append("if(d == 'html'){out.print('</span>');}");
 		scripts.append("}");
 		return funcName; 
 	}

src/main/java/com/ruisitech/bi/service/portal/BoxService.java

@@ -10,7 +10,7 @@ import com.ruisi.ext.engine.view.context.MVContext;
 import com.ruisi.ext.engine.view.context.MVContextImpl;
 import com.ruisi.ext.engine.view.context.form.InputField;
 import com.ruisi.ext.engine.view.context.html.*;
-import com.ruisi.ext.engine.view.emitter.highcharts.util.ChartUtils;
+import com.ruisi.ext.engine.view.emitter.chart.ChartUtils;
 import com.ruisitech.bi.entity.bireport.KpiDto;
 import com.ruisitech.bi.entity.portal.BoxQuery;
 import com.ruisitech.bi.service.bireport.BaseCompService;

src/main/java/com/ruisitech/bi/service/portal/PortalChartService.java

@@ -2,15 +2,15 @@ package com.ruisitech.bi.service.portal;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.ruisi.bi.engine.view.context.chart.ChartContext;
-import com.ruisi.bi.engine.view.context.chart.ChartContextImpl;
-import com.ruisi.bi.engine.view.context.chart.ChartKeyContext;
-import com.ruisi.bi.engine.view.context.chart.ChartLinkContext;
 import com.ruisi.ext.engine.ExtConstants;
 import com.ruisi.ext.engine.util.IdCreater;
 import com.ruisi.ext.engine.view.context.Element;
 import com.ruisi.ext.engine.view.context.MVContext;
 import com.ruisi.ext.engine.view.context.MVContextImpl;
+import com.ruisi.ext.engine.view.context.chart.ChartContext;
+import com.ruisi.ext.engine.view.context.chart.ChartContextImpl;
+import com.ruisi.ext.engine.view.context.chart.ChartKeyContext;
+import com.ruisi.ext.engine.view.context.chart.ChartLinkContext;
 import com.ruisi.ext.engine.view.context.dc.grid.GridDataCenterContext;
 import com.ruisi.ext.engine.view.context.form.InputField;
 import com.ruisi.ext.engine.view.emitter.chart.AbstractChartEmitter;
@@ -355,8 +355,6 @@ public class PortalChartService extends BaseCompService {
 	 * 其中第二个参数只用在图形中，当用户没选X轴时(xcol)时，用这个做默认xcol
 	 * 其中第三个参数只用在图形中，当用户没选图例(scol)时，用这个做默认图例
 	 * release 表示当前为发布状态, 0 表示不是发布，1表示发布到多维分析，2表示发布到仪表盘
-	 * @param sqlVO
-	 * @param ser
 	 * @return
 	 * @throws ParseException
 	 */

src/main/java/com/ruisitech/bi/service/portal/PortalPageService.java

@@ -2,8 +2,8 @@ package com.ruisitech.bi.service.portal;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.ruisi.bi.engine.view.context.chart.ChartContext;
-import com.ruisi.bi.engine.view.context.chart.ChartKeyContext;
+import com.ruisi.ext.engine.view.context.chart.ChartContext;
+import com.ruisi.ext.engine.view.context.chart.ChartKeyContext;
 import com.ruisi.ext.engine.ExtConstants;
 import com.ruisi.ext.engine.init.TemplateManager;
 import com.ruisi.ext.engine.util.IdCreater;
@@ -282,7 +282,7 @@ public class PortalPageService extends BaseCompService {
 	
 	/**
 	 * 生成动态参数
-	 * @param params
+	 * @param param
 	 * @param mv
 	 * @param isput 是否把参数放入MV对象，在发布的时候不用
 	 * @throws ExtConfigException
@@ -386,7 +386,7 @@ public class PortalPageService extends BaseCompService {
 			//把参数放入对象
 			if(isput){
 				this.mvParams.put(input.getId(), input);
-				ExtContext.getInstance().putServiceParam(mv.getMvid(), input.getId(), input);
+				mv.setMvParam(input.getId(), input);
 			}
 						
 			//处理样式
@@ -597,7 +597,7 @@ public class PortalPageService extends BaseCompService {
 				linkText.setParent(mv);
 				if(!release){
 					this.mvParams.put(linkText.getId(), linkText);
-					ExtContext.getInstance().putServiceParam(mv.getMvid(), linkText.getId(), linkText);
+					mv.setMvParam(linkText.getId(), linkText);
 					mv.setShowForm(true);
 				}
 			}
@@ -738,7 +738,7 @@ public class PortalPageService extends BaseCompService {
 				linkText.setParent(mv);
 				if(!release){
 					this.mvParams.put(linkText.getId(), linkText);
-					ExtContext.getInstance().putServiceParam(mv.getMvid(), linkText.getId(), linkText);
+					mv.setMvParam(linkText.getId(), linkText);
 					mv.setShowForm(true);
 				}
 			}