Browse Source

Merge pull request '6.0适配' (#10) from imp/bi-starter-latest:master into master

Reviewed-on: fanruan/bi-starter-latest#10
master
imp 2 years ago
parent
commit
b9e0a979e1
  1. 8
      plugin-demo/src/main/resources/com/finebi/plugin/web/js/chart.js
  2. 8
      plugin-demo/src/main/resources/com/finebi/plugin/web/scripts/bi.chart.provider.js

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

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

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

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

Loading…
Cancel
Save