p42579631
/
datagear
forked from p85126437/datagear
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

图表/看板JS对象的dataOriginalInfo重命名为originalInfo，看板JS对象的originalInfo支持数组参数

This commit is contained in:
wodezy66 2021-08-23 10:26:31 +08:00
parent 582c4ac840
commit 7220a162ac
3 changed files with 71 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
datagear-web/src/main/resources/org/datagear/web/static/script/datagear-chartFactory.js
View File

@ -2582,7 +2582,7 @@
* 图表事件支持函数：设置图表事件对象的原始图表数据集索引、原始数据、原始数据索引。
*
* @param chartEvent 图表事件对象
* @param originalChartDataSetIndex 原始图表数据集索引数值、原始信息对象（格式参考：chartBase.dataOriginalInfo函数返回值）
* @param originalChartDataSetIndex 原始图表数据集索引数值、原始信息对象（格式参考：chartBase.originalInfo函数返回值）
* @param originalResultDataIndex 可选，当originalChartDataSetIndex是索引数值是必选，原始数据索引，格式允许：数值、数值数组、null
*/
chartBase.eventOriginalInfo = function(chartEvent, originalChartDataSetIndex, originalResultDataIndex)
@ -2868,7 +2868,7 @@
* }
* 当data是数组时，将返回此结构的数组
*/
chartBase.dataOriginalInfo = function(data, chartDataSetIndex, resultDataIndex, autoIncrement)
chartBase.originalInfo = function(data, chartDataSetIndex, resultDataIndex, autoIncrement)
{
var pname = chartFactory.DATA_ORIGINAL_INFO_PROP_NAME;

68
datagear-web/src/main/resources/org/datagear/web/static/script/datagear-chartSupport.js
View File

@ -110,7 +110,7 @@
//使用{value: [name,value]}格式可以更好地兼容category、value、time坐标轴类型
var data = chart.resultValueObjects(result, [ np, vps[j] ]);
chart.dataOriginalInfo(data, chartDataSet);
chart.originalInfo(data, chartDataSet);
var mySeries = {type: "line", name: legendName, data: data};
@ -272,7 +272,7 @@
var vpsMy = (renderOptions.dgHorizontal ? [vps[j], np] : [np, vps[j]]);
var data = chart.resultValueObjects(result, vpsMy);
chart.dataOriginalInfo(data, chartDataSet);
chart.originalInfo(data, chartDataSet);
var mySeries = {type: "bar", name: legendName, data: data};
@ -464,7 +464,7 @@
else
data = chart.resultValueObjects(result, [np, vps[j]]);
chart.dataOriginalInfo(data, chartDataSet);
chart.originalInfo(data, chartDataSet);
var mySeries = {type: "bar", name: legendName, data: data, coordinateSystem: "polar"};
@ -611,7 +611,7 @@
var vp = chart.dataSetPropertyOfSign(chartDataSet, signNameMap.value);
var data = chart.resultNameValueObjects(result, np, vp);
chart.dataOriginalInfo(data, chartDataSet);
chart.originalInfo(data, chartDataSet);
if(dgSplitDataSet)
{
@ -798,7 +798,7 @@
{
var vpn = chart.dataSetPropertyLabel(vps[k]);
var data = { name: vpn, value: vRow[k] };
chart.dataOriginalInfo(data, chartDataSet, j);
chart.originalInfo(data, chartDataSet, j);
seriesData.push(data);
}
@ -981,7 +981,7 @@
//使用{value: [name,value]}格式可以更好地兼容category、value、time坐标轴类型
var data = chart.resultValueObjects(result, [np, vps[j]]);
chart.dataOriginalInfo(data, chartDataSet);
chart.originalInfo(data, chartDataSet);
for(var k=0; k<data.length; k++)
{
@ -1137,7 +1137,7 @@
}
}
chart.dataOriginalInfo(data, chartDataSet);
chart.originalInfo(data, chartDataSet);
series.push({ type: "scatter", name: dataSetName, data: data });
legendData.push(dataSetName);
@ -1311,7 +1311,7 @@
{
var myData = { name: iv[j], value: vpv[j] };
chart.dataOriginalInfo(myData, chartDataSet, j);
chart.originalInfo(myData, chartDataSet, j);
seriesData.push(myData);
}
@ -1352,7 +1352,7 @@
var myData = { name: name, value: vv[i] };
chart.dataOriginalInfo(myData, chartDataSet, resultDataIndex);
chart.originalInfo(myData, chartDataSet, resultDataIndex);
seriesData.push(myData);
}
@ -1470,7 +1470,7 @@
var vp = chart.dataSetPropertyOfSign(chartDataSet, signNameMap.value);
var data = chart.resultNameValueObjects(result, np, vp);
chart.dataOriginalInfo(data, chartDataSet);
chart.originalInfo(data, chartDataSet);
legendData = legendData.concat(npv);
if(!seriesName)
@ -1611,7 +1611,7 @@
var vp = chart.dataSetPropertyOfSign(chartDataSet, signNameMap.value);
var data = chart.resultNameValueObjects(result, np, vp);
chart.dataOriginalInfo(data, chartDataSet);
chart.originalInfo(data, chartDataSet);
if(!seriesName)
seriesName = dataSetName;
@ -1774,7 +1774,7 @@
var data = chart.resultNameValueObjects(result, chart.dataSetPropertyOfSign(chartDataSet, signNameMap.name),
(vp ? [lop, lap, vp] : [lop, lap]));
chart.dataOriginalInfo(data, chartDataSet);
chart.originalInfo(data, chartDataSet);
if(vp)
{
@ -2014,7 +2014,7 @@
//新插入
if(sidx == seriesData.length - 1 && seriesData[seriesData.length - 1] === sd)
{
chart.dataOriginalInfo(sd, chartDataSet, j);
chart.originalInfo(sd, chartDataSet, j);
}
var tidx = chartSupport.appendDistinct(seriesData, td, (tip ? "id" : "name"));
@ -2022,7 +2022,7 @@
//新插入
if(tidx == seriesData.length - 1 && seriesData[seriesData.length - 1] === td)
{
chart.dataOriginalInfo(td, chartDataSet, j);
chart.originalInfo(td, chartDataSet, j);
}
//如果使用id值表示关系，对于数值型id，echarts会误当做数据索引，所以这里直接使用数据索引
@ -2030,7 +2030,7 @@
link.source = sidx;
link.target = tidx;
chart.dataOriginalInfo(link, chartDataSet, j);
chart.originalInfo(link, chartDataSet, j);
seriesLinks.push(link);
}
@ -2216,7 +2216,7 @@
chart.dataSetPropertyOfSign(chartDataSet, signNameMap.max)
]);
chart.dataOriginalInfo(data, chartDataSet);
chart.originalInfo(data, chartDataSet);
chartSupport.appendDistinct(axisData, chart.resultRowArrays(result, np));
@ -2397,7 +2397,7 @@
max = (max == undefined ? dw : Math.max(max, dw));
}
chart.dataOriginalInfo(data, chartDataSet);
chart.originalInfo(data, chartDataSet);
seriesData = seriesData.concat(data);
@ -2796,7 +2796,7 @@
chartSupport.treeNodeEvalValueMark(node);
}
chart.dataOriginalInfo(node, chartDataSet, j);
chart.originalInfo(node, chartDataSet, j);
var added = false;
for(var k=0; k<seriesData.length; k++)
@ -2945,14 +2945,14 @@
if(tvp)
td.value = chart.resultRowCell(data[j], tvp);
chart.dataOriginalInfo(sd, chartDataSet, j);
chart.originalInfo(sd, chartDataSet, j);
var sidx = chartSupport.appendDistinct(seriesData, sd, "name");
//新插入
if(sidx == seriesData.length - 1 && seriesData[seriesData.length - 1] === sd)
{
chart.dataOriginalInfo(sd, chartDataSet, j);
chart.originalInfo(sd, chartDataSet, j);
}
var tidx = chartSupport.appendDistinct(seriesData, td, "name");
@ -2960,7 +2960,7 @@
//新插入
if(tidx == seriesData.length - 1 && seriesData[seriesData.length - 1] === td)
{
chart.dataOriginalInfo(td, chartDataSet, j);
chart.originalInfo(td, chartDataSet, j);
}
var link = {};
@ -2971,7 +2971,7 @@
link._sourceIndex = sidx;
link._targetIndex = tidx;
chart.dataOriginalInfo(link, chartDataSet, j);
chart.originalInfo(link, chartDataSet, j);
seriesLinks.push(link);
}
@ -3231,7 +3231,7 @@
//新插入
if(sidx == seriesData.length - 1 && seriesData[seriesData.length - 1] === sd)
{
chart.dataOriginalInfo(sd, chartDataSet, j);
chart.originalInfo(sd, chartDataSet, j);
}
var tidx = chartSupport.appendDistinct(seriesData, td, (tip ? "id" : "name"));
@ -3239,7 +3239,7 @@
//新插入
if(tidx == seriesData.length - 1 && seriesData[seriesData.length - 1] === td)
{
chart.dataOriginalInfo(td, chartDataSet, j);
chart.originalInfo(td, chartDataSet, j);
}
//如果使用id值表示关系，对于数值型id，echarts会误当做数据索引，所以这里直接使用数据索引
@ -3250,7 +3250,7 @@
if(vp)
link.value = chart.resultRowCell(data[j], vp);
chart.dataOriginalInfo(link, chartDataSet, j);
chart.originalInfo(link, chartDataSet, j);
seriesLinks.push(link);
}
@ -3469,7 +3469,7 @@
];
var data = chart.resultNameValueObjects(result, np, vp);
chart.dataOriginalInfo(data, chartDataSet);
chart.originalInfo(data, chartDataSet);
series.push({ type: "boxplot", name: dataSetName, data: data });
legendData.push(dataSetName);
@ -3486,7 +3486,7 @@
var data = chart.resultValueObjects(result, vpsMy);
chartSupport.evalDataValueSymbolSize(data, 1, 1, symbolSizeMax, symbolSizeMin);
chart.dataOriginalInfo(data, chartDataSet);
chart.originalInfo(data, chartDataSet);
series.push({ type: "scatter", name: legendName, data: data });
legendData.push(legendName);
@ -3671,7 +3671,7 @@
min = (min == undefined ? data[j].value : Math.min(min, data[j].value));
max = (max == undefined ? data[j].value : Math.max(max, data[j].value));
chart.dataOriginalInfo(data[j], chartDataSet, j);
chart.originalInfo(data[j], chartDataSet, j);
}
seriesData = seriesData.concat(data);
@ -3825,7 +3825,7 @@
for(var k=0; k<ra.length; k++)
{
var sv = { name: chart.dataSetPropertyLabel(vps[k]), value: ra[k] };
chart.dataOriginalInfo(sv, chartDataSet, j);
chart.originalInfo(sv, chartDataSet, j);
data.push(sv);
}
}
@ -3843,7 +3843,7 @@
for(var k=0; k<names.length; k++)
{
var sv = { name: names[k], value: values[k] };
chart.dataOriginalInfo(sv, chartDataSet, j);
chart.originalInfo(sv, chartDataSet, j);
data.push(sv);
}
}
@ -4217,7 +4217,7 @@
for(var j=0; j<resultDatas.length; j++)
{
var data = $.extend({}, resultDatas[j]);
chart.dataOriginalInfo(data, chartDataSet, j);
chart.originalInfo(data, chartDataSet, j);
updateOptions.data.push(data);
}
}
@ -4763,7 +4763,7 @@
for(var k=0; k<ra.length; k++)
{
var sv = { name: chart.dataSetPropertyLabel(vps[k]), value: ra[k] };
chart.dataOriginalInfo(sv, chartDataSet, j);
chart.originalInfo(sv, chartDataSet, j);
updateOptions.data.push(sv);
}
@ -4782,7 +4782,7 @@
for(var k=0; k<names.length; k++)
{
var sv = { name: names[k], value: values[k] };
chart.dataOriginalInfo(sv, chartDataSet, j);
chart.originalInfo(sv, chartDataSet, j);
updateOptions.data.push(sv);
}
@ -5302,7 +5302,7 @@
chartSupport.setChartEventOriginalInfo = function(chart, chartEvent, chartInternalData)
{
var originalInfo = chart.dataOriginalInfo(chartInternalData);
var originalInfo = chart.originalInfo(chartInternalData);
chart.eventOriginalInfo(chartEvent, originalInfo);
};

58
datagear-web/src/main/resources/org/datagear/web/static/script/datagear-dashboardFactory.js
View File

@ -2090,11 +2090,11 @@
};
/**
* 获取指定数据对象的原始信息，具体参考chartBase.dataOriginalInfo函数说明。
* 获取指定数据对象的原始信息，具体参考chartBase.originalInfo函数说明。
*
* @param data 数据对象，格式为：{ ... }
* @param data 数据对象、数据对象数组，格式为：{ ... }、[ { ... }, ... ]
* @param inflate 可选，是否在返回原始信息对象中填充图表对象、原始数据信息，默认值为：true
* @returns 原始信息属性值(可能为null），格式为：
* @returns 原始信息属性值(可能为null）、或其数组，格式为：
* {
* //图表ID
* "chartId": "...",
@ -2113,42 +2113,54 @@
* resultData: 结果数据
* }
*/
dashboardBase.dataOriginalInfo = function(data, inflate)
dashboardBase.originalInfo = function(data, inflate)
{
inflate = (inflate === undefined ? true : inflate);
var isArray = $.isArray(data);
if(!isArray)
data = [ data ];
var re = [];
var pname = chartFactory.DATA_ORIGINAL_INFO_PROP_NAME;
var originalInfo = (data == null ? null : data[pname]);
if(inflate && originalInfo != null)
for(var i=0; i<data.length; i++)
{
//不能修改原对象
originalInfo = $.extend(true, {}, originalInfo);
var originalInfo = (data[i] == null ? null : data[i][pname]);
var chart = this.chartOf(originalInfo.chartId);
var resultData = undefined;
if(chart != null && originalInfo.chartDataSetIndex != null && originalInfo.resultDataIndex != null)
if(inflate && originalInfo != null)
{
var result = chart.resultAt(chart.updateResults(), originalInfo.chartDataSetIndex);
var datas = chart.resultDatas(result);
//不能修改原对象
originalInfo = $.extend(true, {}, originalInfo);
if($.isArray(originalInfo.resultDataIndex))
var chart = this.chartOf(originalInfo.chartId);
var resultData = undefined;
if(chart != null && originalInfo.chartDataSetIndex != null && originalInfo.resultDataIndex != null)
{
resultData = [];
var result = chart.resultAt(chart.updateResults(), originalInfo.chartDataSetIndex);
var datas = chart.resultDatas(result);
for(var i=0; i<originalInfo.resultDataIndex.length; i++)
resultData[i] = datas[originalInfo.resultDataIndex[i]];
if($.isArray(originalInfo.resultDataIndex))
{
resultData = [];
for(var j=0; j<originalInfo.resultDataIndex.length; j++)
resultData[j] = datas[originalInfo.resultDataIndex[j]];
}
else
resultData = datas[originalInfo.resultDataIndex];
}
else
resultData = datas[originalInfo.resultDataIndex];
originalInfo.chart = chart;
originalInfo.resultData = resultData;
}
originalInfo.chart = chart;
originalInfo.resultData = resultData;
re[i] = originalInfo;
}
return originalInfo;
return (isArray ? re : re[0]);
};
//-------------