Compare commits

..

No commits in common. 'master' and 'master' have entirely different histories.

  1. 7
      build.gradle
  2. 5
      plugin-demo/build.gradle
  3. 9
      plugin-demo/plugin.xml
  4. 2
      plugin-demo/pom.xml
  5. 3
      plugin-demo/readme.md
  6. 2
      plugin-demo/src/main/java/com/finebi/plugin/BIDesignBoxPlotChart.java
  7. 8
      plugin-demo/src/main/resources/com/finebi/plugin/web/js/chart.js
  8. 8
      plugin-demo/src/main/resources/com/finebi/plugin/web/scripts/bi.chart.provider.js
  9. 12
      pom.xml
  10. 7
      readme.md
  11. BIN
      tip/version.png

7
build.gradle

@ -4,11 +4,11 @@ apply plugin: 'java'
/**
*
*/
def fineVersion = '11.0.12.2023.02.01'
def finebiVersion = '6.0.7'
def fineVersion = '10.0.19.2021.09.18'
def finebiVersion = '5.1.17.2021.10.16'
group = 'com.fr.plugin'
version = '11.0'
version = '10.0'
repositories {
mavenLocal()
@ -31,7 +31,6 @@ dependencies {
implementation 'com.fr.third:fine-third:' + fineVersion
implementation 'com.fr.activator:fine-activator:' + fineVersion
implementation 'com.fr.core:fine-core:' + fineVersion
implementation 'com.fr.cbb:fine-cbb:' + fineVersion
implementation 'com.fr.webui:fine-webui:' + fineVersion
implementation 'com.fr.datasource:fine-datasource:' + fineVersion
implementation 'com.fr.decision:fine-decision:' + fineVersion

5
plugin-demo/build.gradle

@ -21,11 +21,10 @@ ext {
pluginVersion = pluginInfo.version
outputPath = "$projectDir/../webroot/WEB-INF/plugins/plugin-" + pluginName + "-1.0/classes"
webPath = "$projectDir/../plugin-demo/src/main/resources/com/finebi/plugin/web"
}
group = 'com.fr.plugin'
version = '11.0'
version = '10.0'
sourceCompatibility = '8'
sourceSets {
@ -46,8 +45,6 @@ ant.references["compile.classpath"] = ant.path {
classes.dependsOn('clean')
task copyFiles(type: Copy,dependsOn: 'classes'){
(new File("$webPath/js/chart.js")).text = files("$webPath/scripts/bi.chart.provider.js", "$webPath/scripts/echarts.js").collect{it.getText()}.join("\n")
from outputPath
into "$projectDir/classes"
}

9
plugin-demo/plugin.xml

@ -1,19 +1,18 @@
<?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.1</version>
<env-version>11.0~11.0</env-version>
<jartime>2021-08-30</jartime>
<version>1.0</version>
<env-version>10.0</env-version>
<jartime>2019-02-27</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>

2
plugin-demo/pom.xml

@ -7,7 +7,7 @@
<parent>
<groupId>com.fr.plugin</groupId>
<artifactId>starter</artifactId>
<version>11.0</version>
<version>10.0</version>
</parent>
<packaging>jar</packaging>
<artifactId>plugin-demo</artifactId>

3
plugin-demo/readme.md

@ -10,6 +10,3 @@
![联动效果](./screenshots/link.png)
+ 前端代码结构
com/finebi/plugin/web/js/chart.js在插件打包过程中由com/finebi/plugin/web/js/scripts中的js拼接得到

2
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.getSubjectPageComponent();
return AssembleComponentFactory.getReportComponent();
}
@Override

8
plugin-demo/src/main/resources/com/finebi/plugin/web/js/chart.js

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

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

12
pom.xml

@ -4,11 +4,11 @@
<groupId>com.fr.plugin</groupId>
<artifactId>starter</artifactId>
<!-- 这里的版本用依赖的SDK版本来表示,不表示产品本身的版本 -->
<version>11.0</version>
<version>10.0</version>
<packaging>pom</packaging>
<properties>
<univeral-framework-version>11.0.12.2023.02.01</univeral-framework-version>
<specific-framework-version>6.0.7</specific-framework-version>
<univeral-framework-version>10.0.19.2021.09.18</univeral-framework-version>
<specific-framework-version>5.1.17.2021.10.16</specific-framework-version>
<web-inf-bucket>${project.basedir}/webroot/WEB-INF</web-inf-bucket>
</properties>
<modules>
@ -33,12 +33,6 @@
<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>

7
readme.md

@ -34,9 +34,12 @@
## 修改依赖的jar版本
只需要更改build.gradle中的fineVersion和finebiVersion变量即可。
版本查看:CRM-环境信息-报表&BI jar包下载
![对应版本](./tip/version.png)
Maven仓库确认[版本jar包](http://mvn.finedevelop.com/#browse/browse:fanruan-release)
fineVersion=11.0.6.2022.07.16
finebiVersion=6.0.1.2022.07.22
fineVersion=10.0.2020.06.08
finebiVersion=5.1.2020.06.15
## 新增插件项目

BIN
tip/version.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 102 KiB

After

Width:  |  Height:  |  Size: 526 KiB

Loading…
Cancel
Save