Merge pull request '无jira任务，版本升级' (#13) from Jimmy.Zheng/bi-starter-latest:master into master

Reviewed-on: fanruan/bi-starter-latest#13

build.gradle

@@ -4,8 +4,8 @@ apply plugin: 'java'
 /**
  * 可以修改这个变量以依赖不同的开发版本
  */
-def fineVersion = '11.0.3.2022.03.02'
-def finebiVersion = '5.1.21.2022.03.01'
+def fineVersion = '11.0.12.2023.02.01'
+def finebiVersion = '6.0.7'
 
 group = 'com.fr.plugin'
 version = '11.0'

plugin-demo/plugin.xml

@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <plugin>
     <id>com.finebi.plugin.boxplotchart</id>
-    <main-package>com.finebi</main-package>
     <name><![CDATA[BI箱线图]]></name>
     <active>yes</active>
-    <version>1.0</version>
-    <env-version>11.0</env-version>
-    <jartime>2019-02-27</jartime>
+    <version>1.1</version>
+    <env-version>11.0~11.0</env-version>
+    <jartime>2021-08-30</jartime>
     <vendor>imp</vendor>
     <description><![CDATA[BI箱线图图表插件]]></description>
+    <bi-env-version>6.0~</bi-env-version>
     <extra-decision>
         <WebResourceProvider class="com.finebi.plugin.BIShowBoxPlotChart"/>
         <WebResourceProvider class="com.finebi.plugin.BIDesignBoxPlotChart"/>
     </extra-decision>
     <function-recorder class="com.finebi.plugin.BIShowBoxPlotChart"/>
     <function-recorder class="com.finebi.plugin.BIDesignBoxPlotChart"/>
+    <main-package>com.finebi</main-package>
 </plugin>

plugin-demo/src/main/java/com/finebi/plugin/BIDesignBoxPlotChart.java

@@ -12,7 +12,7 @@ public class BIDesignBoxPlotChart extends AbstractWebResourceProvider {
 
     @Override
     public Atom attach() {
-		return  AssembleComponentFactory.getReportComponent();
+		return  AssembleComponentFactory.getSubjectPageComponent();
     }
 
     @Override

plugin-demo/src/main/resources/com/finebi/plugin/web/scripts/bi.chart.provider.js

@@ -102,11 +102,11 @@
             var maxMap = {};
             var minMap = {};
             BI.each(header, function(i, header) {
-                if (!dimId && BI.Utils.isDimDimensionById(header.dId)) {
+                if (!dimId && data.widgetHelper.isDimDimensionById(header.dId)) {
                     dimId = header.dId;
                     seriesName = header.text;
                 }
-                if (!targetId && BI.Utils.isTargetById(header.dId)) {
+                if (!targetId && data.widgetHelper.isTargetById(header.dId)) {
                     targetId = header.dId;
                 }
             });
@@ -178,7 +178,7 @@
             var dataGroup = {};
 
             BI.each(header, function(i, header) {
-                if (BI.Utils.isDimDimensionById(header.dId)) {
+                if (data.widgetHelper.isDimDimensionById(header.dId)) {
                     dimId = header.dId;
                     seriesName = header.text;
                 }
@@ -240,7 +240,7 @@
         this.render = function(el, d) {
             var self = this;
             // 获取WID
-            var configObj = BI.Utils.getReportInjectionById(this.model.wId);
+            var configObj = d.widgetHelper.getInjection();
             console.log(d);
             console.log(configObj);
             var series;

pom.xml

@@ -7,8 +7,8 @@
     <version>11.0</version>
     <packaging>pom</packaging>
     <properties>
-        <univeral-framework-version>11.0.3.2022.03.02</univeral-framework-version>
-        <specific-framework-version>5.1.21.2022.03.01</specific-framework-version>
+        <univeral-framework-version>11.0.12.2023.02.01</univeral-framework-version>
+        <specific-framework-version>6.0.7</specific-framework-version>
         <web-inf-bucket>${project.basedir}/webroot/WEB-INF</web-inf-bucket>
     </properties>
     <modules>
@@ -33,6 +33,12 @@
             <version>${univeral-framework-version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.fr.cbb</groupId>
+            <artifactId>fine-cbb</artifactId>
+            <version>${univeral-framework-version}</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>com.fr.webui</groupId>
             <artifactId>fine-webui</artifactId>

readme.md

@@ -34,14 +34,9 @@
 ## 修改依赖的jar版本
 只需要更改build.gradle中的fineVersion和finebiVersion变量即可。
 
-官网BI下载，5.1.22和5.1.23有问题，可以从CRM上下载5.1.21或5.24之后的版本
-
-版本查看：CRM-环境信息-报表&BI jar包下载
-![对应版本](./tip/version.png)
-
 Maven仓库确认[版本jar包](http://mvn.finedevelop.com/#browse/browse:fanruan-release)
-fineVersion=11.0.3.2022.03.02
-finebiVersion=5.1.21.2022.03.01
+fineVersion=11.0.6.2022.07.16
+finebiVersion=6.0.1.2022.07.22
 
 ## 新增插件项目