diff --git a/src/components/charts/u-charts.js b/src/components/charts/u-charts.js
index 6d49fad..6cfd894 100644
--- a/src/components/charts/u-charts.js
+++ b/src/components/charts/u-charts.js
@@ -4,31 +4,51 @@
* Copyright (C) 2018-2022 QIUN (R) 秋云 https://www.ucharts.cn All rights reserved.
* Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
* 复制使用请保留本段注释，感谢支持开源！
- *
+ *
* uCharts (R) 官方网站
* https://www.uCharts.cn
- *
+ *
* 开源地址:
* https://gitee.com/uCharts/uCharts
- *
+ *
* uni-app插件市场地址：
* http://ext.dcloud.net.cn/plugin?id=271
- *
+ *
*/
-'use strict';
+"use strict";
var config = {
- version: 'v2.5.0-20230101',
+ version: "v2.5.0-20230101",
yAxisWidth: 15,
xAxisHeight: 22,
padding: [10, 10, 10, 10],
rotate: false,
fontSize: 13,
- fontColor: '#666666',
- dataPointShape: ['circle', 'circle', 'circle', 'circle'],
- color: ['#1890FF', '#91CB74', '#FAC858', '#EE6666', '#73C0DE', '#3CA272', '#FC8452', '#9A60B4', '#ea7ccc'],
- linearColor: ['#0EE2F8', '#2BDCA8', '#FA7D8D', '#EB88E2', '#2AE3A0', '#0EE2F8', '#EB88E2', '#6773E3', '#F78A85'],
+ fontColor: "#666666",
+ dataPointShape: ["circle", "circle", "circle", "circle"],
+ color: [
+ "#1890FF",
+ "#91CB74",
+ "#FAC858",
+ "#EE6666",
+ "#73C0DE",
+ "#3CA272",
+ "#FC8452",
+ "#9A60B4",
+ "#ea7ccc",
+ ],
+ linearColor: [
+ "#0EE2F8",
+ "#2BDCA8",
+ "#FA7D8D",
+ "#EB88E2",
+ "#2AE3A0",
+ "#0EE2F8",
+ "#EB88E2",
+ "#6773E3",
+ "#F78A85",
+ ],
pieChartLinePadding: 15,
pieChartTextPadding: 5,
titleFontSize: 20,
@@ -36,9 +56,9 @@ var config = {
radarLabelTextMargin: 13,
};
-var assign = function(target, ...varArgs) {
+var assign = function (target, ...varArgs) {
if (target == null) {
- throw new TypeError('[uCharts] Cannot convert undefined or null to object');
+ throw new TypeError("[uCharts] Cannot convert undefined or null to object");
}
if (!varArgs || varArgs.length <= 0) {
return target;
@@ -46,12 +66,14 @@ var assign = function(target, ...varArgs) {
// 深度合并对象
function deepAssign(obj1, obj2) {
for (let key in obj2) {
- obj1[key] = obj1[key] && obj1[key].toString() === "[object Object]" ?
- deepAssign(obj1[key], obj2[key]) : obj1[key] = obj2[key];
+ obj1[key] =
+ obj1[key] && obj1[key].toString() === "[object Object]"
+ ? deepAssign(obj1[key], obj2[key])
+ : (obj1[key] = obj2[key]);
}
return obj1;
}
- varArgs.forEach(val => {
+ varArgs.forEach((val) => {
target = deepAssign(target, val);
});
return target;
@@ -72,7 +94,10 @@ var util = {
return Math.abs(num1 - num2) < 1e-10;
},
isSameSign: function isSameSign(num1, num2) {
- return Math.abs(num1) === num1 && Math.abs(num2) === num2 || Math.abs(num1) !== num1 && Math.abs(num2) !== num2;
+ return (
+ (Math.abs(num1) === num1 && Math.abs(num2) === num2) ||
+ (Math.abs(num1) !== num1 && Math.abs(num2) !== num2)
+ );
},
isSameXCoordinateArea: function isSameXCoordinateArea(p1, p2) {
return this.isSameSign(p1.x, p2.x);
@@ -84,19 +109,23 @@ var util = {
obj2.end = {};
obj2.end.x = obj2.start.x + obj2.width;
obj2.end.y = obj2.start.y - obj2.height;
- var flag = obj2.start.x > obj1.end.x || obj2.end.x < obj1.start.x || obj2.end.y > obj1.start.y || obj2.start.y < obj1.end.y;
+ var flag =
+ obj2.start.x > obj1.end.x ||
+ obj2.end.x < obj1.start.x ||
+ obj2.end.y > obj1.start.y ||
+ obj2.start.y < obj1.end.y;
return !flag;
- }
+ },
};
//兼容H5点击事件
function getH5Offset(e) {
e.mp = {
- changedTouches: []
+ changedTouches: [],
};
e.mp.changedTouches.push({
x: e.offsetX,
- y: e.offsetY
+ y: e.offsetY,
});
return e;
}
@@ -104,35 +133,36 @@ function getH5Offset(e) {
// hex 转 rgba
function hexToRgb(hexValue, opc) {
var rgx = /^#?([a-f\d])([a-f\d])([a-f\d])$/i;
- var hex = hexValue.replace(rgx, function(m, r, g, b) {
+ var hex = hexValue.replace(rgx, function (m, r, g, b) {
return r + r + g + g + b + b;
});
var rgb = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
var r = parseInt(rgb[1], 16);
var g = parseInt(rgb[2], 16);
var b = parseInt(rgb[3], 16);
- return 'rgba(' + r + ',' + g + ',' + b + ',' + opc + ')';
+ return "rgba(" + r + "," + g + "," + b + "," + opc + ")";
}
function findRange(num, type, limit) {
if (isNaN(num)) {
- throw new Error('[uCharts] series数据需为Number格式');
+ throw new Error("[uCharts] series数据需为Number格式");
}
limit = limit || 10;
- type = type ? type : 'upper';
+ type = type ? type : "upper";
var multiple = 1;
while (limit < 1) {
limit *= 10;
multiple *= 10;
}
- if (type === 'upper') {
+ if (type === "upper") {
num = Math.ceil(num * multiple);
} else {
num = Math.floor(num * multiple);
}
while (num % limit !== 0) {
- if (type === 'upper') {
- if (num == num + 1) { //修复数据值过大num++无效的bug by 向日葵 @xrk_jy
+ if (type === "upper") {
+ if (num == num + 1) {
+ //修复数据值过大num++无效的bug by 向日葵 @xrk_jy
break;
}
num++;
@@ -149,7 +179,7 @@ function calCandleMA(dayArr, nameArr, colorArr, kdata) {
let seriesItem = {
data: [],
name: nameArr[k],
- color: colorArr[k]
+ color: colorArr[k],
};
for (let i = 0, len = kdata.length; i < len; i++) {
if (i < dayArr[k]) {
@@ -169,24 +199,31 @@ function calCandleMA(dayArr, nameArr, colorArr, kdata) {
function calValidDistance(self, distance, chartData, config, opts) {
var dataChartAreaWidth = opts.width - opts.area[1] - opts.area[3];
- var dataChartWidth = chartData.eachSpacing * (opts.chartData.xAxisData.xAxisPoints.length - 1);
- if(opts.type == 'mount' && opts.extra && opts.extra.mount && opts.extra.mount.widthRatio && opts.extra.mount.widthRatio > 1){
- if(opts.extra.mount.widthRatio>2) opts.extra.mount.widthRatio = 2
- dataChartWidth += (opts.extra.mount.widthRatio - 1)*chartData.eachSpacing;
+ var dataChartWidth =
+ chartData.eachSpacing * (opts.chartData.xAxisData.xAxisPoints.length - 1);
+ if (
+ opts.type == "mount" &&
+ opts.extra &&
+ opts.extra.mount &&
+ opts.extra.mount.widthRatio &&
+ opts.extra.mount.widthRatio > 1
+ ) {
+ if (opts.extra.mount.widthRatio > 2) opts.extra.mount.widthRatio = 2;
+ dataChartWidth += (opts.extra.mount.widthRatio - 1) * chartData.eachSpacing;
}
var validDistance = distance;
if (distance >= 0) {
validDistance = 0;
- self.uevent.trigger('scrollLeft');
- self.scrollOption.position = 'left'
- opts.xAxis.scrollPosition = 'left';
+ self.uevent.trigger("scrollLeft");
+ self.scrollOption.position = "left";
+ opts.xAxis.scrollPosition = "left";
} else if (Math.abs(distance) >= dataChartWidth - dataChartAreaWidth) {
validDistance = dataChartAreaWidth - dataChartWidth;
- self.uevent.trigger('scrollRight');
- self.scrollOption.position = 'right'
- opts.xAxis.scrollPosition = 'right';
+ self.uevent.trigger("scrollRight");
+ self.scrollOption.position = "right";
+ opts.xAxis.scrollPosition = "right";
} else {
- self.scrollOption.position = distance
+ self.scrollOption.position = distance;
opts.xAxis.scrollPosition = distance;
}
return validDistance;
@@ -217,16 +254,20 @@ function isInAngleRange(angle, startAngle, endAngle) {
function createCurveControlPoints(points, i) {
function isNotMiddlePoint(points, i) {
if (points[i - 1] && points[i + 1]) {
- return points[i].y >= Math.max(points[i - 1].y, points[i + 1].y) || points[i].y <= Math.min(points[i - 1].y,
- points[i + 1].y);
+ return (
+ points[i].y >= Math.max(points[i - 1].y, points[i + 1].y) ||
+ points[i].y <= Math.min(points[i - 1].y, points[i + 1].y)
+ );
} else {
return false;
}
}
function isNotMiddlePointX(points, i) {
if (points[i - 1] && points[i + 1]) {
- return points[i].x >= Math.max(points[i - 1].x, points[i + 1].x) || points[i].x <= Math.min(points[i - 1].x,
- points[i + 1].x);
+ return (
+ points[i].x >= Math.max(points[i - 1].x, points[i + 1].x) ||
+ points[i].x <= Math.min(points[i - 1].x, points[i + 1].x)
+ );
} else {
return false;
}
@@ -265,35 +306,46 @@ function createCurveControlPoints(points, i) {
if (isNotMiddlePointX(points, i)) {
pAx = points[i].x;
}
- if (pAy >= Math.max(points[i].y, points[i + 1].y) || pAy <= Math.min(points[i].y, points[i + 1].y)) {
+ if (
+ pAy >= Math.max(points[i].y, points[i + 1].y) ||
+ pAy <= Math.min(points[i].y, points[i + 1].y)
+ ) {
pAy = points[i].y;
}
- if (pBy >= Math.max(points[i].y, points[i + 1].y) || pBy <= Math.min(points[i].y, points[i + 1].y)) {
+ if (
+ pBy >= Math.max(points[i].y, points[i + 1].y) ||
+ pBy <= Math.min(points[i].y, points[i + 1].y)
+ ) {
pBy = points[i + 1].y;
}
- if (pAx >= Math.max(points[i].x, points[i + 1].x) || pAx <= Math.min(points[i].x, points[i + 1].x)) {
+ if (
+ pAx >= Math.max(points[i].x, points[i + 1].x) ||
+ pAx <= Math.min(points[i].x, points[i + 1].x)
+ ) {
pAx = points[i].x;
}
- if (pBx >= Math.max(points[i].x, points[i + 1].x) || pBx <= Math.min(points[i].x, points[i + 1].x)) {
+ if (
+ pBx >= Math.max(points[i].x, points[i + 1].x) ||
+ pBx <= Math.min(points[i].x, points[i + 1].x)
+ ) {
pBx = points[i + 1].x;
}
return {
ctrA: {
x: pAx,
- y: pAy
+ y: pAy,
},
ctrB: {
x: pBx,
- y: pBy
- }
+ y: pBy,
+ },
};
}
-
function convertCoordinateOrigin(x, y, center) {
return {
x: center.x + x,
- y: center.y - y
+ y: center.y - y,
};
}
@@ -317,9 +369,12 @@ function avoidCollision(obj, target) {
return obj;
}
-function fixPieSeries(series, opts, config){
+function fixPieSeries(series, opts, config) {
let pieSeriesArr = [];
- if(series.length>0 && series[0].data.constructor.toString().indexOf('Array') > -1){
+ if (
+ series.length > 0 &&
+ series[0].data.constructor.toString().indexOf("Array") > -1
+ ) {
opts._pieSeries_ = series;
let oldseries = series[0].data;
for (var i = 0; i < oldseries.length; i++) {
@@ -328,7 +383,7 @@ function fixPieSeries(series, opts, config){
pieSeriesArr.push(oldseries[i]);
}
opts.series = pieSeriesArr;
- }else{
+ } else {
pieSeriesArr = series;
}
return pieSeriesArr;
@@ -362,15 +417,15 @@ function fillSeries(series, opts, config) {
}
if (!item.legendShape) {
switch (item.type) {
- case 'line':
+ case "line":
item.legendShape = "line";
break;
- case 'column':
- case 'bar':
+ case "column":
+ case "bar":
item.legendShape = "rect";
break;
- case 'area':
- case 'mount':
+ case "area":
+ case "mount":
item.legendShape = "triangle";
break;
default:
@@ -383,10 +438,10 @@ function fillSeries(series, opts, config) {
function fillCustomColor(linearType, customColor, series, config) {
var newcolor = customColor || [];
- if (linearType == 'custom' && newcolor.length == 0 ) {
+ if (linearType == "custom" && newcolor.length == 0) {
newcolor = config.linearColor;
}
- if (linearType == 'custom' && newcolor.length < series.length) {
+ if (linearType == "custom" && newcolor.length < series.length) {
let chazhi = series.length - newcolor.length;
for (var i = 0; i < chazhi; i++) {
newcolor.push(config.linearColor[(i + 1) % config.linearColor.length]);
@@ -422,8 +477,8 @@ function getDataRange(minData, maxData) {
limit = 0.000001;
}
return {
- minRange: findRange(minData, 'lower', limit),
- maxRange: findRange(maxData, 'upper', limit)
+ minRange: findRange(minData, "lower", limit),
+ maxRange: findRange(maxData, "upper", limit),
};
}
@@ -433,11 +488,16 @@ function measureText(text, fontSize, context) {
// #ifdef MP-ALIPAY || MP-BAIDU || APP-NVUE
context = false;
// #endif
- if (context !== false && context !== undefined && context.setFontSize && context.measureText) {
+ if (
+ context !== false &&
+ context !== undefined &&
+ context.setFontSize &&
+ context.measureText
+ ) {
context.setFontSize(fontSize);
return context.measureText(text).width;
} else {
- var text = text.split('');
+ var text = text.split("");
for (let i = 0; i < text.length; i++) {
let item = text[i];
if (/[a-zA-Z]/.test(item)) {
@@ -462,12 +522,12 @@ function measureText(text, fontSize, context) {
width += 10;
}
}
- return width * fontSize / 10;
+ return (width * fontSize) / 10;
}
}
function dataCombine(series) {
- return series.reduce(function(a, b) {
+ return series.reduce(function (a, b) {
return (a.data ? a.data : a).concat(b.data);
}, []);
}
@@ -482,7 +542,7 @@ function dataCombineStack(series, len) {
sum[j] += series[i].data[j];
}
}
- return series.reduce(function(a, b) {
+ return series.reduce(function (a, b) {
return (a.data ? a.data : a).concat(b.data).concat(sum);
}, []);
}
@@ -492,10 +552,18 @@ function getTouches(touches, opts, e) {
if (touches.clientX) {
if (opts.rotate) {
y = opts.height - touches.clientX * opts.pix;
- x = (touches.pageY - e.currentTarget.offsetTop - (opts.height / opts.pix / 2) * (opts.pix - 1)) * opts.pix;
+ x =
+ (touches.pageY -
+ e.currentTarget.offsetTop -
+ (opts.height / opts.pix / 2) * (opts.pix - 1)) *
+ opts.pix;
} else {
x = touches.clientX * opts.pix;
- y = (touches.pageY - e.currentTarget.offsetTop - (opts.height / opts.pix / 2) * (opts.pix - 1)) * opts.pix;
+ y =
+ (touches.pageY -
+ e.currentTarget.offsetTop -
+ (opts.height / opts.pix / 2) * (opts.pix - 1)) *
+ opts.pix;
}
} else {
if (opts.rotate) {
@@ -508,31 +576,35 @@ function getTouches(touches, opts, e) {
}
return {
x: x,
- y: y
- }
+ y: y,
+ };
}
function getSeriesDataItem(series, index, group) {
var data = [];
var newSeries = [];
- var indexIsArr = index.constructor.toString().indexOf('Array') > -1;
- if(indexIsArr){
+ var indexIsArr = index.constructor.toString().indexOf("Array") > -1;
+ if (indexIsArr) {
let tempSeries = filterSeries(series);
for (var i = 0; i < group.length; i++) {
newSeries.push(tempSeries[group[i]]);
}
- }else{
+ } else {
newSeries = series;
- };
+ }
for (let i = 0; i < newSeries.length; i++) {
let item = newSeries[i];
let tmpindex = -1;
- if(indexIsArr){
+ if (indexIsArr) {
tmpindex = index[i];
- }else{
+ } else {
tmpindex = index;
}
- if (item.data[tmpindex] !== null && typeof item.data[tmpindex] !== 'undefined' && item.show) {
+ if (
+ item.data[tmpindex] !== null &&
+ typeof item.data[tmpindex] !== "undefined" &&
+ item.show
+ ) {
let seriesItem = {};
seriesItem.color = item.color;
seriesItem.type = item.type;
@@ -542,7 +614,9 @@ function getSeriesDataItem(series, index, group) {
seriesItem.legendShape = item.legendShape;
seriesItem.name = item.name;
seriesItem.show = item.show;
- seriesItem.data = item.formatter ? item.formatter(item.data[tmpindex]) : item.data[tmpindex];
+ seriesItem.data = item.formatter
+ ? item.formatter(item.data[tmpindex])
+ : item.data[tmpindex];
data.push(seriesItem);
}
}
@@ -550,97 +624,118 @@ function getSeriesDataItem(series, index, group) {
}
function getMaxTextListLength(list, fontSize, context) {
- var lengthList = list.map(function(item) {
+ var lengthList = list.map(function (item) {
return measureText(item, fontSize, context);
});
return Math.max.apply(null, lengthList);
}
function getRadarCoordinateSeries(length) {
- var eachAngle = 2 * Math.PI / length;
+ var eachAngle = (2 * Math.PI) / length;
var CoordinateSeries = [];
for (var i = 0; i < length; i++) {
CoordinateSeries.push(eachAngle * i);
}
- return CoordinateSeries.map(function(item) {
+ return CoordinateSeries.map(function (item) {
return -1 * item + Math.PI / 2;
});
}
function getToolTipData(seriesData, opts, index, group, categories) {
- var option = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : {};
- var calPoints = opts.chartData.calPoints?opts.chartData.calPoints:[];
+ var option =
+ arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : {};
+ var calPoints = opts.chartData.calPoints ? opts.chartData.calPoints : [];
let points = {};
- if(group.length > 0){
+ if (group.length > 0) {
let filterPoints = [];
for (let i = 0; i < group.length; i++) {
- filterPoints.push(calPoints[group[i]])
+ filterPoints.push(calPoints[group[i]]);
}
points = filterPoints[0][index[0]];
- }else{
+ } else {
for (let i = 0; i < calPoints.length; i++) {
- if(calPoints[i][index]){
+ if (calPoints[i][index]) {
points = calPoints[i][index];
break;
}
}
- };
- var textList = seriesData.map(function(item) {
+ }
+ var textList = seriesData.map(function (item) {
let titleText = null;
- if (opts.categories && opts.categories.length>0) {
+ if (opts.categories && opts.categories.length > 0) {
titleText = categories[index];
- };
+ }
return {
- text: option.formatter ? option.formatter(item, titleText, index, opts) : item.name + ': ' + item.data,
+ text: option.formatter
+ ? option.formatter(item, titleText, index, opts)
+ : item.name + ": " + item.data,
color: item.color,
- legendShape: opts.extra.tooltip.legendShape == 'auto'? item.legendShape : opts.extra.tooltip.legendShape
+ legendShape:
+ opts.extra.tooltip.legendShape == "auto"
+ ? item.legendShape
+ : opts.extra.tooltip.legendShape,
};
});
var offset = {
x: Math.round(points.x),
- y: Math.round(points.y)
+ y: Math.round(points.y),
};
return {
textList: textList,
- offset: offset
+ offset: offset,
};
}
function getMixToolTipData(seriesData, opts, index, categories) {
- var option = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
- var points = opts.chartData.xAxisPoints[index] + opts.chartData.eachSpacing / 2;
- var textList = seriesData.map(function(item) {
+ var option =
+ arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
+ var points =
+ opts.chartData.xAxisPoints[index] + opts.chartData.eachSpacing / 2;
+ var textList = seriesData.map(function (item) {
return {
- text: option.formatter ? option.formatter(item, categories[index], index, opts) : item.name + ': ' + item.data,
+ text: option.formatter
+ ? option.formatter(item, categories[index], index, opts)
+ : item.name + ": " + item.data,
color: item.color,
disableLegend: item.disableLegend ? true : false,
- legendShape: opts.extra.tooltip.legendShape == 'auto'? item.legendShape : opts.extra.tooltip.legendShape
+ legendShape:
+ opts.extra.tooltip.legendShape == "auto"
+ ? item.legendShape
+ : opts.extra.tooltip.legendShape,
};
});
- textList = textList.filter(function(item) {
+ textList = textList.filter(function (item) {
if (item.disableLegend !== true) {
return item;
}
});
var offset = {
x: Math.round(points),
- y: 0
+ y: 0,
};
return {
textList: textList,
- offset: offset
+ offset: offset,
};
}
-function getCandleToolTipData(series, seriesData, opts, index, categories, extra) {
- var option = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : {};
+function getCandleToolTipData(
+ series,
+ seriesData,
+ opts,
+ index,
+ categories,
+ extra
+) {
+ var option =
+ arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : {};
var calPoints = opts.chartData.calPoints;
let upColor = extra.color.upFill;
let downColor = extra.color.downFill;
//颜色顺序为开盘，收盘，最低，最高
let color = [upColor, upColor, downColor, upColor];
var textList = [];
- seriesData.map(function(item) {
+ seriesData.map(function (item) {
if (index == 0) {
if (item.data[1] - item.data[0] < 0) {
color[1] = downColor;
@@ -662,42 +757,54 @@ function getCandleToolTipData(series, seriesData, opts, index, categories, extra
}
}
let text1 = {
- text: '开盘：' + item.data[0],
+ text: "开盘：" + item.data[0],
color: color[0],
- legendShape: opts.extra.tooltip.legendShape == 'auto'? item.legendShape : opts.extra.tooltip.legendShape
+ legendShape:
+ opts.extra.tooltip.legendShape == "auto"
+ ? item.legendShape
+ : opts.extra.tooltip.legendShape,
};
let text2 = {
- text: '收盘：' + item.data[1],
+ text: "收盘：" + item.data[1],
color: color[1],
- legendShape: opts.extra.tooltip.legendShape == 'auto'? item.legendShape : opts.extra.tooltip.legendShape
+ legendShape:
+ opts.extra.tooltip.legendShape == "auto"
+ ? item.legendShape
+ : opts.extra.tooltip.legendShape,
};
let text3 = {
- text: '最低：' + item.data[2],
+ text: "最低：" + item.data[2],
color: color[2],
- legendShape: opts.extra.tooltip.legendShape == 'auto'? item.legendShape : opts.extra.tooltip.legendShape
+ legendShape:
+ opts.extra.tooltip.legendShape == "auto"
+ ? item.legendShape
+ : opts.extra.tooltip.legendShape,
};
let text4 = {
- text: '最高：' + item.data[3],
+ text: "最高：" + item.data[3],
color: color[3],
- legendShape: opts.extra.tooltip.legendShape == 'auto'? item.legendShape : opts.extra.tooltip.legendShape
+ legendShape:
+ opts.extra.tooltip.legendShape == "auto"
+ ? item.legendShape
+ : opts.extra.tooltip.legendShape,
};
textList.push(text1, text2, text3, text4);
});
var validCalPoints = [];
var offset = {
x: 0,
- y: 0
+ y: 0,
};
for (let i = 0; i < calPoints.length; i++) {
let points = calPoints[i];
- if (typeof points[index] !== 'undefined' && points[index] !== null) {
+ if (typeof points[index] !== "undefined" && points[index] !== null) {
validCalPoints.push(points[index]);
}
}
offset.x = Math.round(validCalPoints[0][0].x);
return {
textList: textList,
- offset: offset
+ offset: offset,
};
}
@@ -705,25 +812,29 @@ function filterSeries(series) {
let tempSeries = [];
for (let i = 0; i < series.length; i++) {
if (series[i].show == true) {
- tempSeries.push(series[i])
+ tempSeries.push(series[i]);
}
}
return tempSeries;
}
function findCurrentIndex(currentPoints, calPoints, opts, config) {
- var offset = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
- var current={ index:-1, group:[] };
+ var offset =
+ arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
+ var current = { index: -1, group: [] };
var spacing = opts.chartData.eachSpacing / 2;
let xAxisPoints = [];
if (calPoints && calPoints.length > 0) {
if (!opts.categories) {
spacing = 0;
- }else{
+ } else {
for (let i = 1; i < opts.chartData.xAxisPoints.length; i++) {
xAxisPoints.push(opts.chartData.xAxisPoints[i] - spacing);
}
- if ((opts.type == 'line' || opts.type == 'area') && opts.xAxis.boundaryGap == 'justify') {
+ if (
+ (opts.type == "line" || opts.type == "area") &&
+ opts.xAxis.boundaryGap == "justify"
+ ) {
xAxisPoints = opts.chartData.xAxisPoints;
}
}
@@ -731,13 +842,13 @@ function findCurrentIndex(currentPoints, calPoints, opts, config) {
if (!opts.categories) {
let timePoints = Array(calPoints.length);
for (let i = 0; i < calPoints.length; i++) {
- timePoints[i] = Array(calPoints[i].length)
+ timePoints[i] = Array(calPoints[i].length);
for (let j = 0; j < calPoints[i].length; j++) {
- timePoints[i][j] = (Math.abs(calPoints[i][j].x - currentPoints.x));
+ timePoints[i][j] = Math.abs(calPoints[i][j].x - currentPoints.x);
}
- };
- let pointValue = Array(timePoints.length);
- let pointIndex = Array(timePoints.length);
+ }
+ let pointValue = Array(timePoints.length);
+ let pointIndex = Array(timePoints.length);
for (let i = 0; i < timePoints.length; i++) {
pointValue[i] = Math.min.apply(null, timePoints[i]);
pointIndex[i] = timePoints[i].indexOf(pointValue[i]);
@@ -745,13 +856,13 @@ function findCurrentIndex(currentPoints, calPoints, opts, config) {
let minValue = Math.min.apply(null, pointValue);
current.index = [];
for (let i = 0; i < pointValue.length; i++) {
- if(pointValue[i] == minValue){
+ if (pointValue[i] == minValue) {
current.group.push(i);
current.index.push(pointIndex[i]);
}
- };
- }else{
- xAxisPoints.forEach(function(item, index) {
+ }
+ } else {
+ xAxisPoints.forEach(function (item, index) {
if (currentPoints.x + offset + spacing > item) {
current.index = index;
}
@@ -763,13 +874,14 @@ function findCurrentIndex(currentPoints, calPoints, opts, config) {
}
function findBarChartCurrentIndex(currentPoints, calPoints, opts, config) {
- var offset = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
- var current={ index:-1, group:[] };
+ var offset =
+ arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
+ var current = { index: -1, group: [] };
var spacing = opts.chartData.eachSpacing / 2;
let yAxisPoints = opts.chartData.yAxisPoints;
if (calPoints && calPoints.length > 0) {
if (isInExactChartArea(currentPoints, opts, config)) {
- yAxisPoints.forEach(function(item, index) {
+ yAxisPoints.forEach(function (item, index) {
if (currentPoints.y + offset + spacing > item) {
current.index = index;
}
@@ -789,8 +901,14 @@ function findLegendIndex(currentPoints, legendData, opts) {
let item = points[i];
for (let j = 0; j < item.length; j++) {
index += 1;
- let area = item[j]['area'];
- if (area && currentPoints.x > area[0] - gap && currentPoints.x < area[2] + gap && currentPoints.y > area[1] - gap && currentPoints.y < area[3] + gap) {
+ let area = item[j]["area"];
+ if (
+ area &&
+ currentPoints.x > area[0] - gap &&
+ currentPoints.x < area[2] + gap &&
+ currentPoints.y > area[1] - gap &&
+ currentPoints.y < area[3] + gap
+ ) {
currentIndex = index;
break;
}
@@ -802,17 +920,29 @@ function findLegendIndex(currentPoints, legendData, opts) {
}
function isInExactLegendArea(currentPoints, area) {
- return currentPoints.x > area.start.x && currentPoints.x < area.end.x && currentPoints.y > area.start.y && currentPoints.y < area.end.y;
+ return (
+ currentPoints.x > area.start.x &&
+ currentPoints.x < area.end.x &&
+ currentPoints.y > area.start.y &&
+ currentPoints.y < area.end.y
+ );
}
function isInExactChartArea(currentPoints, opts, config) {
- return currentPoints.x <= opts.width - opts.area[1] + 10 && currentPoints.x >= opts.area[3] - 10 && currentPoints.y >= opts.area[0] && currentPoints.y <= opts.height - opts.area[2];
+ return (
+ currentPoints.x <= opts.width - opts.area[1] + 10 &&
+ currentPoints.x >= opts.area[3] - 10 &&
+ currentPoints.y >= opts.area[0] &&
+ currentPoints.y <= opts.height - opts.area[2]
+ );
}
function findRadarChartCurrentIndex(currentPoints, radarData, count) {
- var eachAngleArea = 2 * Math.PI / count;
+ var eachAngleArea = (2 * Math.PI) / count;
var currentIndex = -1;
- if (isInExactPieChartArea(currentPoints, radarData.center, radarData.radius)) {
+ if (
+ isInExactPieChartArea(currentPoints, radarData.center, radarData.radius)
+ ) {
var fixAngle = function fixAngle(angle) {
if (angle < 0) {
angle += 2 * Math.PI;
@@ -822,22 +952,28 @@ function findRadarChartCurrentIndex(currentPoints, radarData, count) {
}
return angle;
};
- var angle = Math.atan2(radarData.center.y - currentPoints.y, currentPoints.x - radarData.center.x);
+ var angle = Math.atan2(
+ radarData.center.y - currentPoints.y,
+ currentPoints.x - radarData.center.x
+ );
angle = -1 * angle;
if (angle < 0) {
angle += 2 * Math.PI;
}
- var angleList = radarData.angleList.map(function(item) {
+ var angleList = radarData.angleList.map(function (item) {
item = fixAngle(-1 * item);
return item;
});
- angleList.forEach(function(item, index) {
+ angleList.forEach(function (item, index) {
var rangeStart = fixAngle(item - eachAngleArea / 2);
var rangeEnd = fixAngle(item + eachAngleArea / 2);
if (rangeEnd < rangeStart) {
rangeEnd += 2 * Math.PI;
}
- if (angle >= rangeStart && angle <= rangeEnd || angle + 2 * Math.PI >= rangeStart && angle + 2 * Math.PI <= rangeEnd) {
+ if (
+ (angle >= rangeStart && angle <= rangeEnd) ||
+ (angle + 2 * Math.PI >= rangeStart && angle + 2 * Math.PI <= rangeEnd)
+ ) {
currentIndex = index;
}
});
@@ -849,7 +985,12 @@ function findFunnelChartCurrentIndex(currentPoints, funnelData) {
var currentIndex = -1;
for (var i = 0, len = funnelData.series.length; i < len; i++) {
var item = funnelData.series[i];
- if (currentPoints.x > item.funnelArea[0] && currentPoints.x < item.funnelArea[2] && currentPoints.y > item.funnelArea[1] && currentPoints.y < item.funnelArea[3]) {
+ if (
+ currentPoints.x > item.funnelArea[0] &&
+ currentPoints.x < item.funnelArea[2] &&
+ currentPoints.y > item.funnelArea[1] &&
+ currentPoints.y < item.funnelArea[3]
+ ) {
currentIndex = i;
break;
}
@@ -861,7 +1002,12 @@ function findWordChartCurrentIndex(currentPoints, wordData) {
var currentIndex = -1;
for (var i = 0, len = wordData.length; i < len; i++) {
var item = wordData[i];
- if (currentPoints.x > item.area[0] && currentPoints.x < item.area[2] && currentPoints.y > item.area[1] && currentPoints.y < item.area[3]) {
+ if (
+ currentPoints.x > item.area[0] &&
+ currentPoints.x < item.area[2] &&
+ currentPoints.y > item.area[1] &&
+ currentPoints.y < item.area[3]
+ ) {
currentIndex = i;
break;
}
@@ -873,7 +1019,14 @@ function findMapChartCurrentIndex(currentPoints, opts) {
var currentIndex = -1;
var cData = opts.chartData.mapData;
var data = opts.series;
- var tmp = pointToCoordinate(currentPoints.y, currentPoints.x, cData.bounds, cData.scale, cData.xoffset, cData.yoffset);
+ var tmp = pointToCoordinate(
+ currentPoints.y,
+ currentPoints.x,
+ cData.bounds,
+ cData.scale,
+ cData.xoffset,
+ cData.yoffset
+ );
var poi = [tmp.x, tmp.y];
for (var i = 0, len = data.length; i < len; i++) {
var item = data[i].geometry.coordinates;
@@ -887,15 +1040,33 @@ function findMapChartCurrentIndex(currentPoints, opts) {
function findRoseChartCurrentIndex(currentPoints, pieData, opts) {
var currentIndex = -1;
- var series = getRoseDataPoints(opts._series_, opts.extra.rose.type, pieData.radius, pieData.radius);
- if (pieData && pieData.center && isInExactPieChartArea(currentPoints, pieData.center, pieData.radius)) {
- var angle = Math.atan2(pieData.center.y - currentPoints.y, currentPoints.x - pieData.center.x);
+ var series = getRoseDataPoints(
+ opts._series_,
+ opts.extra.rose.type,
+ pieData.radius,
+ pieData.radius
+ );
+ if (
+ pieData &&
+ pieData.center &&
+ isInExactPieChartArea(currentPoints, pieData.center, pieData.radius)
+ ) {
+ var angle = Math.atan2(
+ pieData.center.y - currentPoints.y,
+ currentPoints.x - pieData.center.x
+ );
angle = -angle;
- if(opts.extra.rose && opts.extra.rose.offsetAngle){
- angle = angle - opts.extra.rose.offsetAngle * Math.PI / 180;
+ if (opts.extra.rose && opts.extra.rose.offsetAngle) {
+ angle = angle - (opts.extra.rose.offsetAngle * Math.PI) / 180;
}
for (var i = 0, len = series.length; i < len; i++) {
- if (isInAngleRange(angle, series[i]._start_, series[i]._start_ + series[i]._rose_proportion_ * 2 * Math.PI)) {
+ if (
+ isInAngleRange(
+ angle,
+ series[i]._start_,
+ series[i]._start_ + series[i]._rose_proportion_ * 2 * Math.PI
+ )
+ ) {
currentIndex = i;
break;
}
@@ -907,17 +1078,30 @@ function findRoseChartCurrentIndex(currentPoints, pieData, opts) {
function findPieChartCurrentIndex(currentPoints, pieData, opts) {
var currentIndex = -1;
var series = getPieDataPoints(pieData.series);
- if (pieData && pieData.center && isInExactPieChartArea(currentPoints, pieData.center, pieData.radius)) {
- var angle = Math.atan2(pieData.center.y - currentPoints.y, currentPoints.x - pieData.center.x);
+ if (
+ pieData &&
+ pieData.center &&
+ isInExactPieChartArea(currentPoints, pieData.center, pieData.radius)
+ ) {
+ var angle = Math.atan2(
+ pieData.center.y - currentPoints.y,
+ currentPoints.x - pieData.center.x
+ );
angle = -angle;
- if(opts.extra.pie && opts.extra.pie.offsetAngle){
- angle = angle - opts.extra.pie.offsetAngle * Math.PI / 180;
+ if (opts.extra.pie && opts.extra.pie.offsetAngle) {
+ angle = angle - (opts.extra.pie.offsetAngle * Math.PI) / 180;
}
- if(opts.extra.ring && opts.extra.ring.offsetAngle){
- angle = angle - opts.extra.ring.offsetAngle * Math.PI / 180;
+ if (opts.extra.ring && opts.extra.ring.offsetAngle) {
+ angle = angle - (opts.extra.ring.offsetAngle * Math.PI) / 180;
}
for (var i = 0, len = series.length; i < len; i++) {
- if (isInAngleRange(angle, series[i]._start_, series[i]._start_ + series[i]._proportion_ * 2 * Math.PI)) {
+ if (
+ isInAngleRange(
+ angle,
+ series[i]._start_,
+ series[i]._start_ + series[i]._proportion_ * 2 * Math.PI
+ )
+ ) {
currentIndex = i;
break;
}
@@ -927,19 +1111,22 @@ function findPieChartCurrentIndex(currentPoints, pieData, opts) {
}
function isInExactPieChartArea(currentPoints, center, radius) {
- return Math.pow(currentPoints.x - center.x, 2) + Math.pow(currentPoints.y - center.y, 2) <= Math.pow(radius, 2);
+ return (
+ Math.pow(currentPoints.x - center.x, 2) +
+ Math.pow(currentPoints.y - center.y, 2) <=
+ Math.pow(radius, 2)
+ );
}
-
-function splitPoints(points,eachSeries) {
+function splitPoints(points, eachSeries) {
var newPoints = [];
var items = [];
- points.forEach(function(item, index) {
- if(eachSeries.connectNulls){
+ points.forEach(function (item, index) {
+ if (eachSeries.connectNulls) {
if (item !== null) {
items.push(item);
}
- }else{
+ } else {
if (item !== null) {
items.push(item);
} else {
@@ -949,7 +1136,6 @@ function splitPoints(points,eachSeries) {
items = [];
}
}
-
});
if (items.length) {
newPoints.push(items);
@@ -957,26 +1143,25 @@ function splitPoints(points,eachSeries) {
return newPoints;
}
-
function calLegendData(series, opts, config, chartData, context) {
let legendData = {
area: {
start: {
x: 0,
- y: 0
+ y: 0,
},
end: {
x: 0,
- y: 0
+ y: 0,
},
width: 0,
height: 0,
wholeWidth: 0,
- wholeHeight: 0
+ wholeHeight: 0,
},
points: [],
widthArr: [],
- heightArr: []
+ heightArr: [],
};
if (opts.legend.show === false) {
chartData.legendData = legendData;
@@ -984,11 +1169,13 @@ function calLegendData(series, opts, config, chartData, context) {
}
let padding = opts.legend.padding * opts.pix;
let margin = opts.legend.margin * opts.pix;
- let fontSize = opts.legend.fontSize ? opts.legend.fontSize * opts.pix : config.fontSize;
+ let fontSize = opts.legend.fontSize
+ ? opts.legend.fontSize * opts.pix
+ : config.fontSize;
let shapeWidth = 15 * opts.pix;
let shapeRight = 5 * opts.pix;
let lineHeight = Math.max(opts.legend.lineHeight * opts.pix, fontSize);
- if (opts.legend.position == 'top' || opts.legend.position == 'bottom') {
+ if (opts.legend.position == "top" || opts.legend.position == "bottom") {
let legendList = [];
let widthCount = 0;
let widthCountArr = [];
@@ -996,7 +1183,11 @@ function calLegendData(series, opts, config, chartData, context) {
for (let i = 0; i < series.length; i++) {
let item = series[i];
const legendText = item.legendText ? item.legendText : item.name;
- let itemWidth = shapeWidth + shapeRight + measureText(legendText || 'undefined', fontSize, context) + opts.legend.itemGap * opts.pix;
+ let itemWidth =
+ shapeWidth +
+ shapeRight +
+ measureText(legendText || "undefined", fontSize, context) +
+ opts.legend.itemGap * opts.pix;
if (widthCount + itemWidth > opts.width - opts.area[1] - opts.area[3]) {
legendList.push(currentRow);
widthCountArr.push(widthCount - opts.legend.itemGap * opts.pix);
@@ -1013,12 +1204,13 @@ function calLegendData(series, opts, config, chartData, context) {
legendData.widthArr = widthCountArr;
let legendWidth = Math.max.apply(null, widthCountArr);
switch (opts.legend.float) {
- case 'left':
+ case "left":
legendData.area.start.x = opts.area[3];
legendData.area.end.x = opts.area[3] + legendWidth + 2 * padding;
break;
- case 'right':
- legendData.area.start.x = opts.width - opts.area[1] - legendWidth - 2 * padding;
+ case "right":
+ legendData.area.start.x =
+ opts.width - opts.area[1] - legendWidth - 2 * padding;
legendData.area.end.x = opts.width - opts.area[1];
break;
default:
@@ -1028,29 +1220,33 @@ function calLegendData(series, opts, config, chartData, context) {
legendData.area.width = legendWidth + 2 * padding;
legendData.area.wholeWidth = legendWidth + 2 * padding;
legendData.area.height = legendList.length * lineHeight + 2 * padding;
- legendData.area.wholeHeight = legendList.length * lineHeight + 2 * padding + 2 * margin;
+ legendData.area.wholeHeight =
+ legendList.length * lineHeight + 2 * padding + 2 * margin;
legendData.points = legendList;
}
} else {
let len = series.length;
- let maxHeight = opts.height - opts.area[0] - opts.area[2] - 2 * margin - 2 * padding;
+ let maxHeight =
+ opts.height - opts.area[0] - opts.area[2] - 2 * margin - 2 * padding;
let maxLength = Math.min(Math.floor(maxHeight / lineHeight), len);
legendData.area.height = maxLength * lineHeight + padding * 2;
legendData.area.wholeHeight = maxLength * lineHeight + padding * 2;
switch (opts.legend.float) {
- case 'top':
+ case "top":
legendData.area.start.y = opts.area[0] + margin;
legendData.area.end.y = opts.area[0] + margin + legendData.area.height;
break;
- case 'bottom':
- legendData.area.start.y = opts.height - opts.area[2] - margin - legendData.area.height;
+ case "bottom":
+ legendData.area.start.y =
+ opts.height - opts.area[2] - margin - legendData.area.height;
legendData.area.end.y = opts.height - opts.area[2] - margin;
break;
default:
legendData.area.start.y = (opts.height - legendData.area.height) / 2;
legendData.area.end.y = (opts.height + legendData.area.height) / 2;
}
- let lineNum = len % maxLength === 0 ? len / maxLength : Math.floor((len / maxLength) + 1);
+ let lineNum =
+ len % maxLength === 0 ? len / maxLength : Math.floor(len / maxLength + 1);
let currentRow = [];
for (let i = 0; i < lineNum; i++) {
let temp = series.slice(i * maxLength, i * maxLength + maxLength);
@@ -1062,7 +1258,11 @@ function calLegendData(series, opts, config, chartData, context) {
let item = currentRow[i];
let maxWidth = 0;
for (let j = 0; j < item.length; j++) {
- let itemWidth = shapeWidth + shapeRight + measureText(item[j].name || 'undefined', fontSize, context) + opts.legend.itemGap * opts.pix;
+ let itemWidth =
+ shapeWidth +
+ shapeRight +
+ measureText(item[j].name || "undefined", fontSize, context) +
+ opts.legend.itemGap * opts.pix;
if (itemWidth > maxWidth) {
maxWidth = itemWidth;
}
@@ -1070,29 +1270,32 @@ function calLegendData(series, opts, config, chartData, context) {
legendData.widthArr.push(maxWidth);
legendData.heightArr.push(item.length * lineHeight + padding * 2);
}
- let legendWidth = 0
+ let legendWidth = 0;
for (let i = 0; i < legendData.widthArr.length; i++) {
legendWidth += legendData.widthArr[i];
}
- legendData.area.width = legendWidth - opts.legend.itemGap * opts.pix + 2 * padding;
+ legendData.area.width =
+ legendWidth - opts.legend.itemGap * opts.pix + 2 * padding;
legendData.area.wholeWidth = legendData.area.width + padding;
}
}
switch (opts.legend.position) {
- case 'top':
+ case "top":
legendData.area.start.y = opts.area[0] + margin;
legendData.area.end.y = opts.area[0] + margin + legendData.area.height;
break;
- case 'bottom':
- legendData.area.start.y = opts.height - opts.area[2] - legendData.area.height - margin;
+ case "bottom":
+ legendData.area.start.y =
+ opts.height - opts.area[2] - legendData.area.height - margin;
legendData.area.end.y = opts.height - opts.area[2] - margin;
break;
- case 'left':
+ case "left":
legendData.area.start.x = opts.area[3];
legendData.area.end.x = opts.area[3] + legendData.area.width;
break;
- case 'right':
- legendData.area.start.x = opts.width - opts.area[1] - legendData.area.width;
+ case "right":
+ legendData.area.start.x =
+ opts.width - opts.area[1] - legendData.area.width;
legendData.area.end.x = opts.width - opts.area[1];
break;
}
@@ -1103,43 +1306,52 @@ function calLegendData(series, opts, config, chartData, context) {
function calCategoriesData(categories, opts, config, eachSpacing, context) {
var result = {
angle: 0,
- xAxisHeight: opts.xAxis.lineHeight * opts.pix + opts.xAxis.marginTop * opts.pix
+ xAxisHeight:
+ opts.xAxis.lineHeight * opts.pix + opts.xAxis.marginTop * opts.pix,
};
var fontSize = opts.xAxis.fontSize * opts.pix;
- var categoriesTextLenth = categories.map(function(item,index) {
- var xitem = opts.xAxis.formatter ? opts.xAxis.formatter(item,index,opts) : item;
+ var categoriesTextLenth = categories.map(function (item, index) {
+ var xitem = opts.xAxis.formatter
+ ? opts.xAxis.formatter(item, index, opts)
+ : item;
return measureText(String(xitem), fontSize, context);
});
var maxTextLength = Math.max.apply(this, categoriesTextLenth);
if (opts.xAxis.rotateLabel == true) {
- result.angle = opts.xAxis.rotateAngle * Math.PI / 180;
- let tempHeight = opts.xAxis.marginTop * opts.pix * 2 + Math.abs(maxTextLength * Math.sin(result.angle))
- tempHeight = tempHeight < fontSize + opts.xAxis.marginTop * opts.pix * 2 ? tempHeight + opts.xAxis.marginTop * opts.pix * 2 : tempHeight;
+ result.angle = (opts.xAxis.rotateAngle * Math.PI) / 180;
+ let tempHeight =
+ opts.xAxis.marginTop * opts.pix * 2 +
+ Math.abs(maxTextLength * Math.sin(result.angle));
+ tempHeight =
+ tempHeight < fontSize + opts.xAxis.marginTop * opts.pix * 2
+ ? tempHeight + opts.xAxis.marginTop * opts.pix * 2
+ : tempHeight;
result.xAxisHeight = tempHeight;
}
if (opts.enableScroll && opts.xAxis.scrollShow) {
result.xAxisHeight += 6 * opts.pix;
}
- if (opts.xAxis.disabled){
+ if (opts.xAxis.disabled) {
result.xAxisHeight = 0;
}
return result;
}
function getXAxisTextList(series, opts, config, stack) {
- var index = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : -1;
+ var index =
+ arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : -1;
var data;
- if (stack == 'stack') {
+ if (stack == "stack") {
data = dataCombineStack(series, opts.categories.length);
} else {
data = dataCombine(series);
}
var sorted = [];
// remove null from data
- data = data.filter(function(item) {
+ data = data.filter(function (item) {
//return item !== null;
- if (typeof item === 'object' && item !== null) {
- if (item.constructor.toString().indexOf('Array') > -1) {
+ if (typeof item === "object" && item !== null) {
+ if (item.constructor.toString().indexOf("Array") > -1) {
return item !== null;
} else {
return item.value !== null;
@@ -1148,13 +1360,13 @@ function getXAxisTextList(series, opts, config, stack) {
return item !== null;
}
});
- data.map(function(item) {
- if (typeof item === 'object') {
- if (item.constructor.toString().indexOf('Array') > -1) {
- if (opts.type == 'candle') {
- item.map(function(subitem) {
+ data.map(function (item) {
+ if (typeof item === "object") {
+ if (item.constructor.toString().indexOf("Array") > -1) {
+ if (opts.type == "candle") {
+ item.map(function (subitem) {
sorted.push(subitem);
- })
+ });
} else {
sorted.push(item[0]);
}
@@ -1164,7 +1376,7 @@ function getXAxisTextList(series, opts, config, stack) {
} else {
sorted.push(item);
}
- })
+ });
var minData = 0;
var maxData = 0;
@@ -1174,17 +1386,17 @@ function getXAxisTextList(series, opts, config, stack) {
}
//为了兼容v1.9.0之前的项目
if (index > -1) {
- if (typeof opts.xAxis.data[index].min === 'number') {
+ if (typeof opts.xAxis.data[index].min === "number") {
minData = Math.min(opts.xAxis.data[index].min, minData);
}
- if (typeof opts.xAxis.data[index].max === 'number') {
+ if (typeof opts.xAxis.data[index].max === "number") {
maxData = Math.max(opts.xAxis.data[index].max, maxData);
}
} else {
- if (typeof opts.xAxis.min === 'number') {
+ if (typeof opts.xAxis.min === "number") {
minData = Math.min(opts.xAxis.min, minData);
}
- if (typeof opts.xAxis.max === 'number') {
+ if (typeof opts.xAxis.max === "number") {
maxData = Math.max(opts.xAxis.max, maxData);
}
}
@@ -1205,30 +1417,38 @@ function getXAxisTextList(series, opts, config, stack) {
function calXAxisData(series, opts, config, context) {
//堆叠图重算Y轴
- var columnstyle = assign({}, {
- type: ""
- }, opts.extra.bar);
+ var columnstyle = assign(
+ {},
+ {
+ type: "",
+ },
+ opts.extra.bar
+ );
var result = {
angle: 0,
- xAxisHeight: opts.xAxis.lineHeight * opts.pix + opts.xAxis.marginTop * opts.pix
+ xAxisHeight:
+ opts.xAxis.lineHeight * opts.pix + opts.xAxis.marginTop * opts.pix,
};
result.ranges = getXAxisTextList(series, opts, config, columnstyle.type);
- result.rangesFormat = result.ranges.map(function(item) {
+ result.rangesFormat = result.ranges.map(function (item) {
//item = opts.xAxis.formatter ? opts.xAxis.formatter(item) : util.toFixed(item, 2);
item = util.toFixed(item, 2);
return item;
});
- var xAxisScaleValues = result.ranges.map(function(item) {
+ var xAxisScaleValues = result.ranges.map(function (item) {
// 如果刻度值是浮点数,则保留两位小数
item = util.toFixed(item, 2);
// 若有自定义格式则调用自定义的格式化函数
//item = opts.xAxis.formatter ? opts.xAxis.formatter(Number(item)) : item;
return item;
});
- result = Object.assign(result, getXAxisPoints(xAxisScaleValues, opts, config));
+ result = Object.assign(
+ result,
+ getXAxisPoints(xAxisScaleValues, opts, config)
+ );
// 计算X轴刻度的属性譬如每个刻度的间隔,刻度的起始点\结束点以及总长
var eachSpacing = result.eachSpacing;
- var textLength = xAxisScaleValues.map(function(item) {
+ var textLength = xAxisScaleValues.map(function (item) {
return measureText(item, opts.xAxis.fontSize * opts.pix, context);
});
if (opts.xAxis.disabled === true) {
@@ -1238,10 +1458,14 @@ function calXAxisData(series, opts, config, context) {
}
function getRadarDataPoints(angleList, center, radius, series, opts) {
- var process = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 1;
+ var process =
+ arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 1;
var radarOption = opts.extra.radar || {};
radarOption.max = radarOption.max || 0;
- var maxData = Math.max(radarOption.max, Math.max.apply(null, dataCombine(series)));
+ var maxData = Math.max(
+ radarOption.max,
+ Math.max.apply(null, dataCombine(series))
+ );
var data = [];
for (let i = 0; i < series.length; i++) {
let each = series[i];
@@ -1250,12 +1474,16 @@ function getRadarDataPoints(angleList, center, radius, series, opts) {
listItem.legendShape = each.legendShape;
listItem.pointShape = each.pointShape;
listItem.data = [];
- each.data.forEach(function(item, index) {
+ each.data.forEach(function (item, index) {
let tmp = {};
tmp.angle = angleList[index];
tmp.proportion = item / maxData;
tmp.value = item;
- tmp.position = convertCoordinateOrigin(radius * tmp.proportion * process * Math.cos(tmp.angle), radius * tmp.proportion * process * Math.sin(tmp.angle), center);
+ tmp.position = convertCoordinateOrigin(
+ radius * tmp.proportion * process * Math.cos(tmp.angle),
+ radius * tmp.proportion * process * Math.sin(tmp.angle),
+ center
+ );
listItem.data.push(tmp);
});
data.push(listItem);
@@ -1264,7 +1492,8 @@ function getRadarDataPoints(angleList, center, radius, series, opts) {
}
function getPieDataPoints(series, radius) {
- var process = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+ var process =
+ arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
var count = 0;
var _start_ = 0;
for (let i = 0; i < series.length; i++) {
@@ -1276,9 +1505,9 @@ function getPieDataPoints(series, radius) {
let item = series[i];
item.data = item.data === null ? 0 : item.data;
if (count === 0) {
- item._proportion_ = 1 / series.length * process;
+ item._proportion_ = (1 / series.length) * process;
} else {
- item._proportion_ = item.data / count * process;
+ item._proportion_ = (item.data / count) * process;
}
item._radius_ = radius;
}
@@ -1291,12 +1520,16 @@ function getPieDataPoints(series, radius) {
}
function getFunnelDataPoints(series, radius, option, eachSpacing) {
- var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+ var process =
+ arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
for (let i = 0; i < series.length; i++) {
- if(option.type == 'funnel'){
- series[i].radius = series[i].data / series[0].data * radius * process;
- }else{
- series[i].radius = (eachSpacing * (series.length - i)) / (eachSpacing * series.length) * radius * process;
+ if (option.type == "funnel") {
+ series[i].radius = (series[i].data / series[0].data) * radius * process;
+ } else {
+ series[i].radius =
+ ((eachSpacing * (series.length - i)) / (eachSpacing * series.length)) *
+ radius *
+ process;
}
series[i]._proportion_ = series[i].data / series[0].data;
}
@@ -1307,7 +1540,8 @@ function getFunnelDataPoints(series, radius, option, eachSpacing) {
}
function getRoseDataPoints(series, type, minRadius, radius) {
- var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+ var process =
+ arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
var count = 0;
var _start_ = 0;
var dataArr = [];
@@ -1324,17 +1558,19 @@ function getRoseDataPoints(series, type, minRadius, radius) {
let item = series[i];
item.data = item.data === null ? 0 : item.data;
if (count === 0) {
- item._proportion_ = 1 / series.length * process;
- item._rose_proportion_ = 1 / series.length * process;
+ item._proportion_ = (1 / series.length) * process;
+ item._rose_proportion_ = (1 / series.length) * process;
} else {
- item._proportion_ = item.data / count * process;
- if(type == 'area'){
- item._rose_proportion_ = 1 / series.length * process;
- }else{
- item._rose_proportion_ = item.data / count * process;
+ item._proportion_ = (item.data / count) * process;
+ if (type == "area") {
+ item._rose_proportion_ = (1 / series.length) * process;
+ } else {
+ item._rose_proportion_ = (item.data / count) * process;
}
}
- item._radius_ = minRadius + radiusLength * ((item.data - minData) / (maxData - minData)) || radius;
+ item._radius_ =
+ minRadius +
+ radiusLength * ((item.data - minData) / (maxData - minData)) || radius;
}
for (let i = 0; i < series.length; i++) {
let item = series[i];
@@ -1345,7 +1581,8 @@ function getRoseDataPoints(series, type, minRadius, radius) {
}
function getArcbarDataPoints(series, arcbarOption) {
- var process = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+ var process =
+ arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
if (process == 1) {
process = 0.999999;
}
@@ -1353,16 +1590,16 @@ function getArcbarDataPoints(series, arcbarOption) {
let item = series[i];
item.data = item.data === null ? 0 : item.data;
let totalAngle;
- if (arcbarOption.type == 'circle') {
+ if (arcbarOption.type == "circle") {
totalAngle = 2;
} else {
- if(arcbarOption.direction == 'ccw'){
+ if (arcbarOption.direction == "ccw") {
if (arcbarOption.startAngle < arcbarOption.endAngle) {
totalAngle = 2 + arcbarOption.startAngle - arcbarOption.endAngle;
} else {
totalAngle = arcbarOption.startAngle - arcbarOption.endAngle;
}
- }else{
+ } else {
if (arcbarOption.endAngle < arcbarOption.startAngle) {
totalAngle = 2 + arcbarOption.endAngle - arcbarOption.startAngle;
} else {
@@ -1370,9 +1607,11 @@ function getArcbarDataPoints(series, arcbarOption) {
}
}
}
- item._proportion_ = totalAngle * item.data * process + arcbarOption.startAngle;
- if(arcbarOption.direction == 'ccw'){
- item._proportion_ = arcbarOption.startAngle - totalAngle * item.data * process ;
+ item._proportion_ =
+ totalAngle * item.data * process + arcbarOption.startAngle;
+ if (arcbarOption.direction == "ccw") {
+ item._proportion_ =
+ arcbarOption.startAngle - totalAngle * item.data * process;
}
if (item._proportion_ >= 2) {
item._proportion_ = item._proportion_ % 2;
@@ -1382,7 +1621,8 @@ function getArcbarDataPoints(series, arcbarOption) {
}
function getGaugeArcbarDataPoints(series, arcbarOption) {
- var process = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+ var process =
+ arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
if (process == 1) {
process = 0.999999;
}
@@ -1390,7 +1630,7 @@ function getGaugeArcbarDataPoints(series, arcbarOption) {
let item = series[i];
item.data = item.data === null ? 0 : item.data;
let totalAngle;
- if (arcbarOption.type == 'circle') {
+ if (arcbarOption.type == "circle") {
totalAngle = 2;
} else {
if (arcbarOption.endAngle < arcbarOption.startAngle) {
@@ -1399,7 +1639,8 @@ function getGaugeArcbarDataPoints(series, arcbarOption) {
totalAngle = arcbarOption.startAngle - arcbarOption.endAngle;
}
}
- item._proportion_ = totalAngle * item.data * process + arcbarOption.startAngle;
+ item._proportion_ =
+ totalAngle * item.data * process + arcbarOption.startAngle;
if (item._proportion_ >= 2) {
item._proportion_ = item._proportion_ % 2;
}
@@ -1416,7 +1657,8 @@ function getGaugeAxisPoints(categories, startAngle, endAngle) {
}
let tempStartAngle = startAngle;
for (let i = 0; i < categories.length; i++) {
- categories[i].value = categories[i].value === null ? 0 : categories[i].value;
+ categories[i].value =
+ categories[i].value === null ? 0 : categories[i].value;
categories[i]._startAngle_ = tempStartAngle;
categories[i]._endAngle_ = totalAngle * categories[i].value + startAngle;
if (categories[i]._endAngle_ >= 2) {
@@ -1428,11 +1670,12 @@ function getGaugeAxisPoints(categories, startAngle, endAngle) {
}
function getGaugeDataPoints(series, categories, gaugeOption) {
- let process = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 1;
+ let process =
+ arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 1;
for (let i = 0; i < series.length; i++) {
let item = series[i];
item.data = item.data === null ? 0 : item.data;
- if (gaugeOption.pointer.color == 'auto') {
+ if (gaugeOption.pointer.color == "auto") {
for (let i = 0; i < categories.length; i++) {
if (item.data <= categories[i].value) {
item.color = categories[i].color;
@@ -1454,9 +1697,11 @@ function getGaugeDataPoints(series, categories, gaugeOption) {
item._oldAngle_ += 2;
}
if (item.data >= gaugeOption.oldData) {
- item._proportion_ = (item._endAngle_ - item._oldAngle_) * process + gaugeOption.oldAngle;
+ item._proportion_ =
+ (item._endAngle_ - item._oldAngle_) * process + gaugeOption.oldAngle;
} else {
- item._proportion_ = item._oldAngle_ - (item._oldAngle_ - item._endAngle_) * process;
+ item._proportion_ =
+ item._oldAngle_ - (item._oldAngle_ - item._endAngle_) * process;
}
if (item._proportion_ >= 2) {
item._proportion_ = item._proportion_ % 2;
@@ -1470,33 +1715,51 @@ function getPieTextMaxLength(series, config, context, opts) {
let maxLength = 0;
for (let i = 0; i < series.length; i++) {
let item = series[i];
- let text = item.formatter ? item.formatter(+item._proportion_.toFixed(2)) : util.toFixed(item._proportion_ * 100) + '%';
- maxLength = Math.max(maxLength, measureText(text, item.textSize * opts.pix || config.fontSize, context));
+ let text = item.formatter
+ ? item.formatter(+item._proportion_.toFixed(2))
+ : util.toFixed(item._proportion_ * 100) + "%";
+ maxLength = Math.max(
+ maxLength,
+ measureText(text, item.textSize * opts.pix || config.fontSize, context)
+ );
}
return maxLength;
}
function fixColumeData(points, eachSpacing, columnLen, index, config, opts) {
- return points.map(function(item) {
+ return points.map(function (item) {
if (item === null) {
return null;
}
var seriesGap = 0;
var categoryGap = 0;
- if (opts.type == 'mix') {
+ if (opts.type == "mix") {
seriesGap = opts.extra.mix.column.seriesGap * opts.pix || 0;
categoryGap = opts.extra.mix.column.categoryGap * opts.pix || 0;
} else {
seriesGap = opts.extra.column.seriesGap * opts.pix || 0;
categoryGap = opts.extra.column.categoryGap * opts.pix || 0;
}
- seriesGap = Math.min(seriesGap, eachSpacing / columnLen)
- categoryGap = Math.min(categoryGap, eachSpacing / columnLen)
- item.width = Math.ceil((eachSpacing - 2 * categoryGap - seriesGap * (columnLen - 1)) / columnLen);
- if (opts.extra.mix && opts.extra.mix.column.width && +opts.extra.mix.column.width > 0) {
- item.width = Math.min(item.width, +opts.extra.mix.column.width * opts.pix);
+ seriesGap = Math.min(seriesGap, eachSpacing / columnLen);
+ categoryGap = Math.min(categoryGap, eachSpacing / columnLen);
+ item.width = Math.ceil(
+ (eachSpacing - 2 * categoryGap - seriesGap * (columnLen - 1)) / columnLen
+ );
+ if (
+ opts.extra.mix &&
+ opts.extra.mix.column.width &&
+ +opts.extra.mix.column.width > 0
+ ) {
+ item.width = Math.min(
+ item.width,
+ +opts.extra.mix.column.width * opts.pix
+ );
}
- if (opts.extra.column && opts.extra.column.width && +opts.extra.column.width > 0) {
+ if (
+ opts.extra.column &&
+ opts.extra.column.width &&
+ +opts.extra.column.width > 0
+ ) {
item.width = Math.min(item.width, +opts.extra.column.width * opts.pix);
}
if (item.width <= 0) {
@@ -1508,7 +1771,7 @@ function fixColumeData(points, eachSpacing, columnLen, index, config, opts) {
}
function fixBarData(points, eachSpacing, columnLen, index, config, opts) {
- return points.map(function(item) {
+ return points.map(function (item) {
if (item === null) {
return null;
}
@@ -1516,9 +1779,11 @@ function fixBarData(points, eachSpacing, columnLen, index, config, opts) {
var categoryGap = 0;
seriesGap = opts.extra.bar.seriesGap * opts.pix || 0;
categoryGap = opts.extra.bar.categoryGap * opts.pix || 0;
- seriesGap = Math.min(seriesGap, eachSpacing / columnLen)
- categoryGap = Math.min(categoryGap, eachSpacing / columnLen)
- item.width = Math.ceil((eachSpacing - 2 * categoryGap - seriesGap * (columnLen - 1)) / columnLen);
+ seriesGap = Math.min(seriesGap, eachSpacing / columnLen);
+ categoryGap = Math.min(categoryGap, eachSpacing / columnLen);
+ item.width = Math.ceil(
+ (eachSpacing - 2 * categoryGap - seriesGap * (columnLen - 1)) / columnLen
+ );
if (opts.extra.bar && opts.extra.bar.width && +opts.extra.bar.width > 0) {
item.width = Math.min(item.width, +opts.extra.bar.width * opts.pix);
}
@@ -1530,14 +1795,26 @@ function fixBarData(points, eachSpacing, columnLen, index, config, opts) {
});
}
-function fixColumeMeterData(points, eachSpacing, columnLen, index, config, opts, border) {
+function fixColumeMeterData(
+ points,
+ eachSpacing,
+ columnLen,
+ index,
+ config,
+ opts,
+ border
+) {
var categoryGap = opts.extra.column.categoryGap * opts.pix || 0;
- return points.map(function(item) {
+ return points.map(function (item) {
if (item === null) {
return null;
}
item.width = eachSpacing - 2 * categoryGap;
- if (opts.extra.column && opts.extra.column.width && +opts.extra.column.width > 0) {
+ if (
+ opts.extra.column &&
+ opts.extra.column.width &&
+ +opts.extra.column.width > 0
+ ) {
item.width = Math.min(item.width, +opts.extra.column.width * opts.pix);
}
if (index > 0) {
@@ -1547,14 +1824,26 @@ function fixColumeMeterData(points, eachSpacing, columnLen, index, config, opts,
});
}
-function fixColumeStackData(points, eachSpacing, columnLen, index, config, opts, series) {
+function fixColumeStackData(
+ points,
+ eachSpacing,
+ columnLen,
+ index,
+ config,
+ opts,
+ series
+) {
var categoryGap = opts.extra.column.categoryGap * opts.pix || 0;
- return points.map(function(item, indexn) {
+ return points.map(function (item, indexn) {
if (item === null) {
return null;
}
item.width = Math.ceil(eachSpacing - 2 * categoryGap);
- if (opts.extra.column && opts.extra.column.width && +opts.extra.column.width > 0) {
+ if (
+ opts.extra.column &&
+ opts.extra.column.width &&
+ +opts.extra.column.width > 0
+ ) {
item.width = Math.min(item.width, +opts.extra.column.width * opts.pix);
}
if (item.width <= 0) {
@@ -1564,9 +1853,17 @@ function fixColumeStackData(points, eachSpacing, columnLen, index, config, opts,
});
}
-function fixBarStackData(points, eachSpacing, columnLen, index, config, opts, series) {
+function fixBarStackData(
+ points,
+ eachSpacing,
+ columnLen,
+ index,
+ config,
+ opts,
+ series
+) {
var categoryGap = opts.extra.bar.categoryGap * opts.pix || 0;
- return points.map(function(item, indexn) {
+ return points.map(function (item, indexn) {
if (item === null) {
return null;
}
@@ -1583,13 +1880,29 @@ function fixBarStackData(points, eachSpacing, columnLen, index, config, opts, se
function getXAxisPoints(categories, opts, config) {
var spacingValid = opts.width - opts.area[1] - opts.area[3];
- var dataCount = opts.enableScroll ? Math.min(opts.xAxis.itemCount, categories.length) : categories.length;
- if ((opts.type == 'line' || opts.type == 'area' || opts.type == 'scatter' || opts.type == 'bubble' || opts.type == 'bar') && dataCount > 1 && opts.xAxis.boundaryGap == 'justify') {
+ var dataCount = opts.enableScroll
+ ? Math.min(opts.xAxis.itemCount, categories.length)
+ : categories.length;
+ if (
+ (opts.type == "line" ||
+ opts.type == "area" ||
+ opts.type == "scatter" ||
+ opts.type == "bubble" ||
+ opts.type == "bar") &&
+ dataCount > 1 &&
+ opts.xAxis.boundaryGap == "justify"
+ ) {
dataCount -= 1;
}
var widthRatio = 0;
- if(opts.type == 'mount' && opts.extra && opts.extra.mount && opts.extra.mount.widthRatio && opts.extra.mount.widthRatio > 1){
- if(opts.extra.mount.widthRatio>2) opts.extra.mount.widthRatio = 2
+ if (
+ opts.type == "mount" &&
+ opts.extra &&
+ opts.extra.mount &&
+ opts.extra.mount.widthRatio &&
+ opts.extra.mount.widthRatio > 1
+ ) {
+ if (opts.extra.mount.widthRatio > 2) opts.extra.mount.widthRatio = 2;
widthRatio = opts.extra.mount.widthRatio - 1;
dataCount += widthRatio;
}
@@ -1597,12 +1910,16 @@ function getXAxisPoints(categories, opts, config) {
var xAxisPoints = [];
var startX = opts.area[3];
var endX = opts.width - opts.area[1];
- categories.forEach(function(item, index) {
- xAxisPoints.push(startX + widthRatio / 2 * eachSpacing + index * eachSpacing);
+ categories.forEach(function (item, index) {
+ xAxisPoints.push(
+ startX + (widthRatio / 2) * eachSpacing + index * eachSpacing
+ );
});
- if (opts.xAxis.boundaryGap !== 'justify') {
+ if (opts.xAxis.boundaryGap !== "justify") {
if (opts.enableScroll === true) {
- xAxisPoints.push(startX + widthRatio * eachSpacing + categories.length * eachSpacing);
+ xAxisPoints.push(
+ startX + widthRatio * eachSpacing + categories.length * eachSpacing
+ );
} else {
xAxisPoints.push(endX);
}
@@ -1611,24 +1928,33 @@ function getXAxisPoints(categories, opts, config) {
xAxisPoints: xAxisPoints,
startX: startX,
endX: endX,
- eachSpacing: eachSpacing
+ eachSpacing: eachSpacing,
};
}
-function getCandleDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config) {
- var process = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : 1;
+function getCandleDataPoints(
+ data,
+ minRange,
+ maxRange,
+ xAxisPoints,
+ eachSpacing,
+ opts,
+ config
+) {
+ var process =
+ arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : 1;
var points = [];
var validHeight = opts.height - opts.area[0] - opts.area[2];
- data.forEach(function(item, index) {
+ data.forEach(function (item, index) {
if (item === null) {
points.push(null);
} else {
var cPoints = [];
- item.forEach(function(items, indexs) {
+ item.forEach(function (items, indexs) {
var point = {};
point.x = xAxisPoints[index] + Math.round(eachSpacing / 2);
var value = items.value || items;
- var height = validHeight * (value - minRange) / (maxRange - minRange);
+ var height = (validHeight * (value - minRange)) / (maxRange - minRange);
height *= process;
point.y = opts.height - Math.round(height) - opts.area[2];
cPoints.push(point);
@@ -1639,16 +1965,30 @@ function getCandleDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing,
return points;
}
-function getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config) {
- var process = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : 1;
- var boundaryGap = 'center';
- if (opts.type == 'line' || opts.type == 'area' || opts.type == 'scatter' || opts.type == 'bubble' ) {
+function getDataPoints(
+ data,
+ minRange,
+ maxRange,
+ xAxisPoints,
+ eachSpacing,
+ opts,
+ config
+) {
+ var process =
+ arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : 1;
+ var boundaryGap = "center";
+ if (
+ opts.type == "line" ||
+ opts.type == "area" ||
+ opts.type == "scatter" ||
+ opts.type == "bubble"
+ ) {
boundaryGap = opts.xAxis.boundaryGap;
}
var points = [];
var validHeight = opts.height - opts.area[0] - opts.area[2];
var validWidth = opts.width - opts.area[1] - opts.area[3];
- data.forEach(function(item, index) {
+ data.forEach(function (item, index) {
if (item === null) {
points.push(null);
} else {
@@ -1656,15 +1996,17 @@ function getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts,
point.color = item.color;
point.x = xAxisPoints[index];
var value = item;
- if (typeof item === 'object' && item !== null) {
- if (item.constructor.toString().indexOf('Array') > -1) {
+ if (typeof item === "object" && item !== null) {
+ if (item.constructor.toString().indexOf("Array") > -1) {
let xranges, xminRange, xmaxRange;
xranges = [].concat(opts.chartData.xAxisData.ranges);
xminRange = xranges.shift();
xmaxRange = xranges.pop();
value = item[1];
- point.x = opts.area[3] + validWidth * (item[0] - xminRange) / (xmaxRange - xminRange);
- if(opts.type == 'bubble'){
+ point.x =
+ opts.area[3] +
+ (validWidth * (item[0] - xminRange)) / (xmaxRange - xminRange);
+ if (opts.type == "bubble") {
point.r = item[2];
point.t = item[3];
}
@@ -1672,10 +2014,10 @@ function getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts,
value = item.value;
}
}
- if (boundaryGap == 'center') {
+ if (boundaryGap == "center") {
point.x += eachSpacing / 2;
}
- var height = validHeight * (value - minRange) / (maxRange - minRange);
+ var height = (validHeight * (value - minRange)) / (maxRange - minRange);
height *= process;
point.y = opts.height - height - opts.area[2];
points.push(point);
@@ -1684,47 +2026,60 @@ function getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts,
return points;
}
-function getLineDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, lineOption, process){
- var process = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : 1;
+function getLineDataPoints(
+ data,
+ minRange,
+ maxRange,
+ xAxisPoints,
+ eachSpacing,
+ opts,
+ config,
+ lineOption,
+ process
+) {
+ var process =
+ arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : 1;
var boundaryGap = opts.xAxis.boundaryGap;
var points = [];
var validHeight = opts.height - opts.area[0] - opts.area[2];
var validWidth = opts.width - opts.area[1] - opts.area[3];
- data.forEach(function(item, index) {
+ data.forEach(function (item, index) {
if (item === null) {
points.push(null);
} else {
var point = {};
point.color = item.color;
- if(lineOption.animation == 'vertical'){
+ if (lineOption.animation == "vertical") {
point.x = xAxisPoints[index];
var value = item;
- if (typeof item === 'object' && item !== null) {
- if (item.constructor.toString().indexOf('Array') > -1) {
+ if (typeof item === "object" && item !== null) {
+ if (item.constructor.toString().indexOf("Array") > -1) {
let xranges, xminRange, xmaxRange;
xranges = [].concat(opts.chartData.xAxisData.ranges);
xminRange = xranges.shift();
xmaxRange = xranges.pop();
value = item[1];
- point.x = opts.area[3] + validWidth * (item[0] - xminRange) / (xmaxRange - xminRange);
+ point.x =
+ opts.area[3] +
+ (validWidth * (item[0] - xminRange)) / (xmaxRange - xminRange);
} else {
value = item.value;
}
}
- if (boundaryGap == 'center') {
+ if (boundaryGap == "center") {
point.x += eachSpacing / 2;
}
- var height = validHeight * (value - minRange) / (maxRange - minRange);
+ var height = (validHeight * (value - minRange)) / (maxRange - minRange);
height *= process;
point.y = opts.height - height - opts.area[2];
points.push(point);
- }else{
+ } else {
point.x = xAxisPoints[0] + eachSpacing * index * process;
var value = item;
- if (boundaryGap == 'center') {
+ if (boundaryGap == "center") {
point.x += eachSpacing / 2;
}
- var height = validHeight * (value - minRange) / (maxRange - minRange);
+ var height = (validHeight * (value - minRange)) / (maxRange - minRange);
point.y = opts.height - height - opts.area[2];
points.push(point);
}
@@ -1733,12 +2088,23 @@ function getLineDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, o
return points;
}
-function getColumnDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, zeroPoints, process){
- var process = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : 1;
+function getColumnDataPoints(
+ data,
+ minRange,
+ maxRange,
+ xAxisPoints,
+ eachSpacing,
+ opts,
+ config,
+ zeroPoints,
+ process
+) {
+ var process =
+ arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : 1;
var points = [];
var validHeight = opts.height - opts.area[0] - opts.area[2];
var validWidth = opts.width - opts.area[1] - opts.area[3];
- data.forEach(function(item, index) {
+ data.forEach(function (item, index) {
if (item === null) {
points.push(null);
} else {
@@ -1746,20 +2112,23 @@ function getColumnDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing,
point.color = item.color;
point.x = xAxisPoints[index];
var value = item;
- if (typeof item === 'object' && item !== null) {
- if (item.constructor.toString().indexOf('Array') > -1) {
+ if (typeof item === "object" && item !== null) {
+ if (item.constructor.toString().indexOf("Array") > -1) {
let xranges, xminRange, xmaxRange;
xranges = [].concat(opts.chartData.xAxisData.ranges);
xminRange = xranges.shift();
xmaxRange = xranges.pop();
value = item[1];
- point.x = opts.area[3] + validWidth * (item[0] - xminRange) / (xmaxRange - xminRange);
+ point.x =
+ opts.area[3] +
+ (validWidth * (item[0] - xminRange)) / (xmaxRange - xminRange);
} else {
value = item.value;
}
}
point.x += eachSpacing / 2;
- var height = validHeight * (value * process - minRange) / (maxRange - minRange);
+ var height =
+ (validHeight * (value * process - minRange)) / (maxRange - minRange);
point.y = opts.height - height - opts.area[2];
points.push(point);
}
@@ -1767,13 +2136,23 @@ function getColumnDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing,
return points;
}
-function getMountDataPoints(series, minRange, maxRange, xAxisPoints, eachSpacing, opts, mountOption, zeroPoints) {
- var process = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : 1;
+function getMountDataPoints(
+ series,
+ minRange,
+ maxRange,
+ xAxisPoints,
+ eachSpacing,
+ opts,
+ mountOption,
+ zeroPoints
+) {
+ var process =
+ arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : 1;
var points = [];
var validHeight = opts.height - opts.area[0] - opts.area[2];
var validWidth = opts.width - opts.area[1] - opts.area[3];
var mountWidth = eachSpacing * mountOption.widthRatio;
- series.forEach(function(item, index) {
+ series.forEach(function (item, index) {
if (item === null) {
points.push(null);
} else {
@@ -1782,7 +2161,8 @@ function getMountDataPoints(series, minRange, maxRange, xAxisPoints, eachSpacing
point.x = xAxisPoints[index];
point.x += eachSpacing / 2;
var value = item.data;
- var height = validHeight * (value * process - minRange) / (maxRange - minRange);
+ var height =
+ (validHeight * (value * process - minRange)) / (maxRange - minRange);
point.y = opts.height - height - opts.area[2];
point.value = value;
point.width = mountWidth;
@@ -1792,12 +2172,21 @@ function getMountDataPoints(series, minRange, maxRange, xAxisPoints, eachSpacing
return points;
}
-function getBarDataPoints(data, minRange, maxRange, yAxisPoints, eachSpacing, opts, config) {
- var process = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : 1;
+function getBarDataPoints(
+ data,
+ minRange,
+ maxRange,
+ yAxisPoints,
+ eachSpacing,
+ opts,
+ config
+) {
+ var process =
+ arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : 1;
var points = [];
var validHeight = opts.height - opts.area[0] - opts.area[2];
var validWidth = opts.width - opts.area[1] - opts.area[3];
- data.forEach(function(item, index) {
+ data.forEach(function (item, index) {
if (item === null) {
points.push(null);
} else {
@@ -1805,10 +2194,10 @@ function getBarDataPoints(data, minRange, maxRange, yAxisPoints, eachSpacing, op
point.color = item.color;
point.y = yAxisPoints[index];
var value = item;
- if (typeof item === 'object' && item !== null) {
+ if (typeof item === "object" && item !== null) {
value = item.value;
}
- var height = validWidth * (value - minRange) / (maxRange - minRange);
+ var height = (validWidth * (value - minRange)) / (maxRange - minRange);
height *= process;
point.height = height;
point.value = value;
@@ -1819,11 +2208,22 @@ function getBarDataPoints(data, minRange, maxRange, yAxisPoints, eachSpacing, op
return points;
}
-function getStackDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, seriesIndex, stackSeries) {
- var process = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : 1;
+function getStackDataPoints(
+ data,
+ minRange,
+ maxRange,
+ xAxisPoints,
+ eachSpacing,
+ opts,
+ config,
+ seriesIndex,
+ stackSeries
+) {
+ var process =
+ arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : 1;
var points = [];
var validHeight = opts.height - opts.area[0] - opts.area[2];
- data.forEach(function(item, index) {
+ data.forEach(function (item, index) {
if (item === null) {
points.push(null);
} else {
@@ -1837,14 +2237,15 @@ function getStackDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing,
value += stackSeries[i].data[index];
}
var value0 = value - item;
- var height = validHeight * (value - minRange) / (maxRange - minRange);
- var height0 = validHeight * (value0 - minRange) / (maxRange - minRange);
+ var height = (validHeight * (value - minRange)) / (maxRange - minRange);
+ var height0 =
+ (validHeight * (value0 - minRange)) / (maxRange - minRange);
} else {
var value = item;
- if (typeof item === 'object' && item !== null) {
+ if (typeof item === "object" && item !== null) {
value = item.value;
}
- var height = validHeight * (value - minRange) / (maxRange - minRange);
+ var height = (validHeight * (value - minRange)) / (maxRange - minRange);
var height0 = 0;
}
var heightc = height0;
@@ -1858,11 +2259,22 @@ function getStackDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing,
return points;
}
-function getBarStackDataPoints(data, minRange, maxRange, yAxisPoints, eachSpacing, opts, config, seriesIndex, stackSeries) {
- var process = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : 1;
+function getBarStackDataPoints(
+ data,
+ minRange,
+ maxRange,
+ yAxisPoints,
+ eachSpacing,
+ opts,
+ config,
+ seriesIndex,
+ stackSeries
+) {
+ var process =
+ arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : 1;
var points = [];
var validHeight = opts.width - opts.area[1] - opts.area[3];
- data.forEach(function(item, index) {
+ data.forEach(function (item, index) {
if (item === null) {
points.push(null);
} else {
@@ -1875,14 +2287,15 @@ function getBarStackDataPoints(data, minRange, maxRange, yAxisPoints, eachSpacin
value += stackSeries[i].data[index];
}
var value0 = value - item;
- var height = validHeight * (value - minRange) / (maxRange - minRange);
- var height0 = validHeight * (value0 - minRange) / (maxRange - minRange);
+ var height = (validHeight * (value - minRange)) / (maxRange - minRange);
+ var height0 =
+ (validHeight * (value0 - minRange)) / (maxRange - minRange);
} else {
var value = item;
- if (typeof item === 'object' && item !== null) {
+ if (typeof item === "object" && item !== null) {
value = item.value;
}
- var height = validHeight * (value - minRange) / (maxRange - minRange);
+ var height = (validHeight * (value - minRange)) / (maxRange - minRange);
var height0 = 0;
}
var heightc = height0;
@@ -1898,19 +2311,20 @@ function getBarStackDataPoints(data, minRange, maxRange, yAxisPoints, eachSpacin
}
function getYAxisTextList(series, opts, config, stack, yData) {
- var index = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : -1;
+ var index =
+ arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : -1;
var data;
- if (stack == 'stack') {
+ if (stack == "stack") {
data = dataCombineStack(series, opts.categories.length);
} else {
data = dataCombine(series);
}
var sorted = [];
// remove null from data
- data = data.filter(function(item) {
+ data = data.filter(function (item) {
//return item !== null;
- if (typeof item === 'object' && item !== null) {
- if (item.constructor.toString().indexOf('Array') > -1) {
+ if (typeof item === "object" && item !== null) {
+ if (item.constructor.toString().indexOf("Array") > -1) {
return item !== null;
} else {
return item.value !== null;
@@ -1919,13 +2333,13 @@ function getYAxisTextList(series, opts, config, stack, yData) {
return item !== null;
}
});
- data.map(function(item) {
- if (typeof item === 'object') {
- if (item.constructor.toString().indexOf('Array') > -1) {
- if (opts.type == 'candle') {
- item.map(function(subitem) {
+ data.map(function (item) {
+ if (typeof item === "object") {
+ if (item.constructor.toString().indexOf("Array") > -1) {
+ if (opts.type == "candle") {
+ item.map(function (subitem) {
sorted.push(subitem);
- })
+ });
} else {
sorted.push(item[1]);
}
@@ -1935,7 +2349,7 @@ function getYAxisTextList(series, opts, config, stack, yData) {
} else {
sorted.push(item);
}
- })
+ });
var minData = yData.min || 0;
var maxData = yData.max || 0;
if (sorted.length > 0) {
@@ -1943,15 +2357,21 @@ function getYAxisTextList(series, opts, config, stack, yData) {
maxData = Math.max.apply(this, sorted);
}
if (minData === maxData) {
- if(maxData == 0){
+ if (maxData == 0) {
maxData = 10;
- }else{
+ } else {
minData = 0;
}
}
var dataRange = getDataRange(minData, maxData);
- var minRange = (yData.min === undefined || yData.min === null) ? dataRange.minRange : yData.min;
- var maxRange = (yData.max === undefined || yData.max === null) ? dataRange.maxRange : yData.max;
+ var minRange =
+ yData.min === undefined || yData.min === null
+ ? dataRange.minRange
+ : yData.min;
+ var maxRange =
+ yData.max === undefined || yData.max === null
+ ? dataRange.maxRange
+ : yData.max;
var eachRange = (maxRange - minRange) / opts.yAxis.splitNumber;
var range = [];
for (var i = 0; i <= opts.yAxis.splitNumber; i++) {
@@ -1962,9 +2382,13 @@ function getYAxisTextList(series, opts, config, stack, yData) {
function calYAxisData(series, opts, config, context) {
//堆叠图重算Y轴
- var columnstyle = assign({}, {
- type: ""
- }, opts.extra.column);
+ var columnstyle = assign(
+ {},
+ {
+ type: "",
+ },
+ opts.extra.column
+ );
//如果是多Y轴，重新计算
var YLength = opts.yAxis.data.length;
var newSeries = new Array(YLength);
@@ -1987,26 +2411,40 @@ function calYAxisData(series, opts, config, context) {
if (opts.yAxis.disabled == true) {
yData.disabled = true;
}
- if(yData.type === 'categories'){
- if(!yData.formatter){
- yData.formatter = (val,index,opts) => {return val + (yData.unit || '')};
+ if (yData.type === "categories") {
+ if (!yData.formatter) {
+ yData.formatter = (val, index, opts) => {
+ return val + (yData.unit || "");
+ };
}
yData.categories = yData.categories || opts.categories;
rangesArr[i] = yData.categories;
- }else{
- if(!yData.formatter){
- yData.formatter = (val,index,opts) => {return util.toFixed(val, yData.tofix || 0) + (yData.unit || '')};
+ } else {
+ if (!yData.formatter) {
+ yData.formatter = (val, index, opts) => {
+ return util.toFixed(val, yData.tofix || 0) + (yData.unit || "");
+ };
}
- rangesArr[i] = getYAxisTextList(newSeries[i], opts, config, columnstyle.type, yData, i);
+ rangesArr[i] = getYAxisTextList(
+ newSeries[i],
+ opts,
+ config,
+ columnstyle.type,
+ yData,
+ i
+ );
}
let yAxisFontSizes = yData.fontSize * opts.pix || config.fontSize;
yAxisWidthArr[i] = {
- position: yData.position ? yData.position : 'left',
- width: 0
+ position: yData.position ? yData.position : "left",
+ width: 0,
};
- rangesFormatArr[i] = rangesArr[i].map(function(items,index) {
- items = yData.formatter(items,index,opts);
- yAxisWidthArr[i].width = Math.max(yAxisWidthArr[i].width, measureText(items, yAxisFontSizes, context) + 5);
+ rangesFormatArr[i] = rangesArr[i].map(function (items, index) {
+ items = yData.formatter(items, index, opts);
+ yAxisWidthArr[i].width = Math.max(
+ yAxisWidthArr[i].width,
+ measureText(items, yAxisFontSizes, context) + 5
+ );
return items;
});
let calibration = yData.calibration ? 4 * opts.pix : 0;
@@ -2019,54 +2457,67 @@ function calYAxisData(series, opts, config, context) {
var rangesArr = new Array(1);
var rangesFormatArr = new Array(1);
var yAxisWidthArr = new Array(1);
- if(opts.type === 'bar'){
+ if (opts.type === "bar") {
rangesArr[0] = opts.categories;
- if(!opts.yAxis.formatter){
- opts.yAxis.formatter = (val,index,opts) => {return val + (opts.yAxis.unit || '')}
+ if (!opts.yAxis.formatter) {
+ opts.yAxis.formatter = (val, index, opts) => {
+ return val + (opts.yAxis.unit || "");
+ };
}
- }else{
- if(!opts.yAxis.formatter){
- opts.yAxis.formatter = (val,index,opts) => {return val.toFixed(opts.yAxis.tofix ) + (opts.yAxis.unit || '')}
+ } else {
+ if (!opts.yAxis.formatter) {
+ opts.yAxis.formatter = (val, index, opts) => {
+ return val.toFixed(opts.yAxis.tofix) + (opts.yAxis.unit || "");
+ };
}
- rangesArr[0] = getYAxisTextList(series, opts, config, columnstyle.type, {});
+ rangesArr[0] = getYAxisTextList(
+ series,
+ opts,
+ config,
+ columnstyle.type,
+ {}
+ );
}
yAxisWidthArr[0] = {
- position: 'left',
- width: 0
+ position: "left",
+ width: 0,
};
var yAxisFontSize = opts.yAxis.fontSize * opts.pix || config.fontSize;
- rangesFormatArr[0] = rangesArr[0].map(function(item,index) {
- item = opts.yAxis.formatter(item,index,opts);
- yAxisWidthArr[0].width = Math.max(yAxisWidthArr[0].width, measureText(item, yAxisFontSize, context) + 5);
+ rangesFormatArr[0] = rangesArr[0].map(function (item, index) {
+ item = opts.yAxis.formatter(item, index, opts);
+ yAxisWidthArr[0].width = Math.max(
+ yAxisWidthArr[0].width,
+ measureText(item, yAxisFontSize, context) + 5
+ );
return item;
});
yAxisWidthArr[0].width += 3 * opts.pix;
if (opts.yAxis.disabled === true) {
yAxisWidthArr[0] = {
- position: 'left',
- width: 0
+ position: "left",
+ width: 0,
};
opts.yAxis.data[0] = {
- disabled: true
+ disabled: true,
};
} else {
opts.yAxis.data[0] = {
disabled: false,
- position: 'left',
+ position: "left",
max: opts.yAxis.max,
min: opts.yAxis.min,
- formatter: opts.yAxis.formatter
+ formatter: opts.yAxis.formatter,
};
- if(opts.type === 'bar'){
+ if (opts.type === "bar") {
opts.yAxis.data[0].categories = opts.categories;
- opts.yAxis.data[0].type = 'categories';
+ opts.yAxis.data[0].type = "categories";
}
}
}
return {
rangesFormat: rangesFormatArr,
ranges: rangesArr,
- yAxisWidth: yAxisWidthArr
+ yAxisWidth: yAxisWidthArr,
};
}
@@ -2078,9 +2529,12 @@ function calTooltipYAxisData(point, series, opts, config, eachSpacing) {
for (let i = 0; i < ranges.length; i++) {
let maxVal = Math.max.apply(this, ranges[i]);
let minVal = Math.min.apply(this, ranges[i]);
- let item = maxVal - (maxVal - minVal) * (point - minAxis) / spacingValid;
- item = opts.yAxis.data && opts.yAxis.data[i].formatter ? opts.yAxis.data[i].formatter(item, i, opts) : item.toFixed(0);
- items.push(String(item))
+ let item = maxVal - ((maxVal - minVal) * (point - minAxis)) / spacingValid;
+ item =
+ opts.yAxis.data && opts.yAxis.data[i].formatter
+ ? opts.yAxis.data[i].formatter(item, i, opts)
+ : item.toFixed(0);
+ items.push(String(item));
}
return items;
}
@@ -2090,10 +2544,13 @@ function calMarkLineData(points, opts) {
let spacingValid = opts.height - opts.area[0] - opts.area[2];
for (let i = 0; i < points.length; i++) {
points[i].yAxisIndex = points[i].yAxisIndex ? points[i].yAxisIndex : 0;
- let range = [].concat(opts.chartData.yAxisData.ranges[points[i].yAxisIndex]);
+ let range = [].concat(
+ opts.chartData.yAxisData.ranges[points[i].yAxisIndex]
+ );
minRange = range.pop();
maxRange = range.shift();
- let height = spacingValid * (points[i].value - minRange) / (maxRange - minRange);
+ let height =
+ (spacingValid * (points[i].value - minRange)) / (maxRange - minRange);
points[i].y = opts.height - Math.round(height) - opts.area[2];
}
return points;
@@ -2102,17 +2559,17 @@ function calMarkLineData(points, opts) {
function contextRotate(context, opts) {
if (opts.rotateLock !== true) {
context.translate(opts.height, 0);
- context.rotate(90 * Math.PI / 180);
+ context.rotate((90 * Math.PI) / 180);
} else if (opts._rotate_ !== true) {
context.translate(opts.height, 0);
- context.rotate(90 * Math.PI / 180);
+ context.rotate((90 * Math.PI) / 180);
opts._rotate_ = true;
}
}
function drawPointShape(points, color, shape, context, opts) {
context.beginPath();
- if (opts.dataPointShapeType == 'hollow') {
+ if (opts.dataPointShapeType == "hollow") {
context.setStrokeStyle(color);
context.setFillStyle(opts.background);
context.setLineWidth(2 * opts.pix);
@@ -2121,8 +2578,8 @@ function drawPointShape(points, color, shape, context, opts) {
context.setFillStyle(color);
context.setLineWidth(1 * opts.pix);
}
- if (shape === 'diamond') {
- points.forEach(function(item, index) {
+ if (shape === "diamond") {
+ points.forEach(function (item, index) {
if (item !== null) {
context.moveTo(item.x, item.y - 4.5);
context.lineTo(item.x - 4.5, item.y);
@@ -2131,22 +2588,22 @@ function drawPointShape(points, color, shape, context, opts) {
context.lineTo(item.x, item.y - 4.5);
}
});
- } else if (shape === 'circle') {
- points.forEach(function(item, index) {
+ } else if (shape === "circle") {
+ points.forEach(function (item, index) {
if (item !== null) {
context.moveTo(item.x + 2.5 * opts.pix, item.y);
context.arc(item.x, item.y, 3 * opts.pix, 0, 2 * Math.PI, false);
}
});
- } else if (shape === 'square') {
- points.forEach(function(item, index) {
+ } else if (shape === "square") {
+ points.forEach(function (item, index) {
if (item !== null) {
context.moveTo(item.x - 3.5, item.y - 3.5);
context.rect(item.x - 3.5, item.y - 3.5, 7, 7);
}
});
- } else if (shape === 'triangle') {
- points.forEach(function(item, index) {
+ } else if (shape === "triangle") {
+ points.forEach(function (item, index) {
if (item !== null) {
context.moveTo(item.x, item.y - 4.5);
context.lineTo(item.x - 4.5, item.y + 4.5);
@@ -2154,7 +2611,7 @@ function drawPointShape(points, color, shape, context, opts) {
context.lineTo(item.x, item.y - 4.5);
}
});
- } else if (shape === 'none') {
+ } else if (shape === "none") {
return;
}
context.closePath();
@@ -2162,16 +2619,30 @@ function drawPointShape(points, color, shape, context, opts) {
context.stroke();
}
-function drawActivePoint(points, color, shape, context, opts, option, seriesIndex) {
- if(!opts.tooltip){
- return
+function drawActivePoint(
+ points,
+ color,
+ shape,
+ context,
+ opts,
+ option,
+ seriesIndex
+) {
+ if (!opts.tooltip) {
+ return;
}
- if(opts.tooltip.group.length>0 && opts.tooltip.group.includes(seriesIndex) == false){
- return
+ if (
+ opts.tooltip.group.length > 0 &&
+ opts.tooltip.group.includes(seriesIndex) == false
+ ) {
+ return;
}
- var pointIndex = typeof opts.tooltip.index === 'number' ? opts.tooltip.index : opts.tooltip.index[opts.tooltip.group.indexOf(seriesIndex)];
+ var pointIndex =
+ typeof opts.tooltip.index === "number"
+ ? opts.tooltip.index
+ : opts.tooltip.index[opts.tooltip.group.indexOf(seriesIndex)];
context.beginPath();
- if (option.activeType == 'hollow') {
+ if (option.activeType == "hollow") {
context.setStrokeStyle(color);
context.setFillStyle(opts.background);
context.setLineWidth(2 * opts.pix);
@@ -2180,9 +2651,9 @@ function drawActivePoint(points, color, shape, context, opts, option, seriesInde
context.setFillStyle(color);
context.setLineWidth(1 * opts.pix);
}
- if (shape === 'diamond') {
- points.forEach(function(item, index) {
- if (item !== null && pointIndex == index ) {
+ if (shape === "diamond") {
+ points.forEach(function (item, index) {
+ if (item !== null && pointIndex == index) {
context.moveTo(item.x, item.y - 4.5);
context.lineTo(item.x - 4.5, item.y);
context.lineTo(item.x, item.y + 4.5);
@@ -2190,22 +2661,22 @@ function drawActivePoint(points, color, shape, context, opts, option, seriesInde
context.lineTo(item.x, item.y - 4.5);
}
});
- } else if (shape === 'circle') {
- points.forEach(function(item, index) {
+ } else if (shape === "circle") {
+ points.forEach(function (item, index) {
if (item !== null && pointIndex == index) {
context.moveTo(item.x + 2.5 * opts.pix, item.y);
context.arc(item.x, item.y, 3 * opts.pix, 0, 2 * Math.PI, false);
}
});
- } else if (shape === 'square') {
- points.forEach(function(item, index) {
+ } else if (shape === "square") {
+ points.forEach(function (item, index) {
if (item !== null && pointIndex == index) {
context.moveTo(item.x - 3.5, item.y - 3.5);
context.rect(item.x - 3.5, item.y - 3.5, 7, 7);
}
});
- } else if (shape === 'triangle') {
- points.forEach(function(item, index) {
+ } else if (shape === "triangle") {
+ points.forEach(function (item, index) {
if (item !== null && pointIndex == index) {
context.moveTo(item.x, item.y - 4.5);
context.lineTo(item.x - 4.5, item.y + 4.5);
@@ -2213,7 +2684,7 @@ function drawActivePoint(points, color, shape, context, opts, option, seriesInde
context.lineTo(item.x, item.y - 4.5);
}
});
- } else if (shape === 'none') {
+ } else if (shape === "none") {
return;
}
context.closePath();
@@ -2224,8 +2695,8 @@ function drawActivePoint(points, color, shape, context, opts, option, seriesInde
function drawRingTitle(opts, config, context, center) {
var titlefontSize = opts.title.fontSize || config.titleFontSize;
var subtitlefontSize = opts.subtitle.fontSize || config.subtitleFontSize;
- var title = opts.title.name || '';
- var subtitle = opts.subtitle.name || '';
+ var title = opts.title.name || "";
+ var subtitle = opts.subtitle.name || "";
var titleFontColor = opts.title.color || opts.fontColor;
var subtitleFontColor = opts.subtitle.color || opts.fontColor;
var titleHeight = title ? titlefontSize : 0;
@@ -2233,8 +2704,12 @@ function drawRingTitle(opts, config, context, center) {
var margin = 5;
if (subtitle) {
var textWidth = measureText(subtitle, subtitlefontSize * opts.pix, context);
- var startX = center.x - textWidth / 2 + (opts.subtitle.offsetX|| 0) * opts.pix ;
- var startY = center.y + subtitlefontSize * opts.pix / 2 + (opts.subtitle.offsetY || 0) * opts.pix;
+ var startX =
+ center.x - textWidth / 2 + (opts.subtitle.offsetX || 0) * opts.pix;
+ var startY =
+ center.y +
+ (subtitlefontSize * opts.pix) / 2 +
+ (opts.subtitle.offsetY || 0) * opts.pix;
if (title) {
startY += (titleHeight * opts.pix + margin) / 2;
}
@@ -2248,7 +2723,10 @@ function drawRingTitle(opts, config, context, center) {
if (title) {
var _textWidth = measureText(title, titlefontSize * opts.pix, context);
var _startX = center.x - _textWidth / 2 + (opts.title.offsetX || 0);
- var _startY = center.y + titlefontSize * opts.pix / 2 + (opts.title.offsetY || 0) * opts.pix;
+ var _startY =
+ center.y +
+ (titlefontSize * opts.pix) / 2 +
+ (opts.title.offsetY || 0) * opts.pix;
if (subtitle) {
_startY -= (subtitleHeight * opts.pix + margin) / 2;
}
@@ -2265,26 +2743,45 @@ function drawPointText(points, series, config, context, opts) {
// 绘制数据文案
var data = series.data;
var textOffset = series.textOffset ? series.textOffset : 0;
- points.forEach(function(item, index) {
+ points.forEach(function (item, index) {
if (item !== null) {
context.beginPath();
- var fontSize = series.textSize ? series.textSize * opts.pix : config.fontSize;
+ var fontSize = series.textSize
+ ? series.textSize * opts.pix
+ : config.fontSize;
context.setFontSize(fontSize);
- context.setFillStyle(series.textColor || opts.fontColor);
- var value = data[index]
- if (typeof data[index] === 'object' && data[index] !== null) {
- if (data[index].constructor.toString().indexOf('Array')>-1) {
- value = data[index][1];
- } else {
- value = data[index].value
+ // 添加颜色格式化逻辑
+ var textColor = series.textColor || opts.fontColor;
+ if (
+ series.textColorFormatter &&
+ typeof series.textColorFormatter === "function"
+ ) {
+ var customColor = series.textColorFormatter(item, index, opts);
+ if (customColor) {
+ textColor = customColor;
}
}
- var formatVal = series.formatter ? series.formatter(value,index,series,opts) : value;
- context.setTextAlign('center');
- context.fillText(String(formatVal), item.x, item.y - 4 + textOffset * opts.pix);
+ context.setFillStyle(textColor);
+ var value = data[index];
+ if (typeof data[index] === "object" && data[index] !== null) {
+ if (data[index].constructor.toString().indexOf("Array") > -1) {
+ value = data[index][1];
+ } else {
+ value = data[index].value;
+ }
+ }
+ var formatVal = series.formatter
+ ? series.formatter(value, index, series, opts)
+ : value;
+ context.setTextAlign("center");
+ context.fillText(
+ String(formatVal),
+ item.x,
+ item.y - 4 + textOffset * opts.pix
+ );
context.closePath();
context.stroke();
- context.setTextAlign('left');
+ context.setTextAlign("left");
}
});
}
@@ -2294,60 +2791,76 @@ function drawColumePointText(points, series, config, context, opts) {
var data = series.data;
var textOffset = series.textOffset ? series.textOffset : 0;
var Position = opts.extra.column.labelPosition;
- points.forEach(function(item, index) {
+ points.forEach(function (item, index) {
if (item !== null) {
context.beginPath();
- var fontSize = series.textSize ? series.textSize * opts.pix : config.fontSize;
+ var fontSize = series.textSize
+ ? series.textSize * opts.pix
+ : config.fontSize;
context.setFontSize(fontSize);
context.setFillStyle(series.textColor || opts.fontColor);
- var value = data[index]
- if (typeof data[index] === 'object' && data[index] !== null) {
- if (data[index].constructor.toString().indexOf('Array')>-1) {
+ var value = data[index];
+ if (typeof data[index] === "object" && data[index] !== null) {
+ if (data[index].constructor.toString().indexOf("Array") > -1) {
value = data[index][1];
} else {
- value = data[index].value
+ value = data[index].value;
}
}
- var formatVal = series.formatter ? series.formatter(value,index,series,opts) : value;
- context.setTextAlign('center');
+ var formatVal = series.formatter
+ ? series.formatter(value, index, series, opts)
+ : value;
+ context.setTextAlign("center");
var startY = item.y - 4 * opts.pix + textOffset * opts.pix;
- if(item.y > series.zeroPoints){
+ if (item.y > series.zeroPoints) {
startY = item.y + textOffset * opts.pix + fontSize;
}
- if(Position == 'insideTop'){
+ if (Position == "insideTop") {
startY = item.y + fontSize + textOffset * opts.pix;
- if(item.y > series.zeroPoints){
+ if (item.y > series.zeroPoints) {
startY = item.y - textOffset * opts.pix - 4 * opts.pix;
}
}
- if(Position == 'center'){
- startY = item.y + textOffset * opts.pix + (opts.height - opts.area[2] - item.y + fontSize)/2;
- if(series.zeroPoints < opts.height - opts.area[2]){
- startY = item.y + textOffset * opts.pix + (series.zeroPoints - item.y + fontSize)/2;
+ if (Position == "center") {
+ startY =
+ item.y +
+ textOffset * opts.pix +
+ (opts.height - opts.area[2] - item.y + fontSize) / 2;
+ if (series.zeroPoints < opts.height - opts.area[2]) {
+ startY =
+ item.y +
+ textOffset * opts.pix +
+ (series.zeroPoints - item.y + fontSize) / 2;
}
- if(item.y > series.zeroPoints){
- startY = item.y - textOffset * opts.pix - (item.y - series.zeroPoints - fontSize)/2;
+ if (item.y > series.zeroPoints) {
+ startY =
+ item.y -
+ textOffset * opts.pix -
+ (item.y - series.zeroPoints - fontSize) / 2;
}
- if(opts.extra.column.type == 'stack'){
- startY = item.y + textOffset * opts.pix + (item.y0 - item.y + fontSize)/2;
+ if (opts.extra.column.type == "stack") {
+ startY =
+ item.y + textOffset * opts.pix + (item.y0 - item.y + fontSize) / 2;
}
}
- if(Position == 'bottom'){
- startY = opts.height - opts.area[2] + textOffset * opts.pix - 4 * opts.pix;
- if(series.zeroPoints < opts.height - opts.area[2]){
+ if (Position == "bottom") {
+ startY =
+ opts.height - opts.area[2] + textOffset * opts.pix - 4 * opts.pix;
+ if (series.zeroPoints < opts.height - opts.area[2]) {
startY = series.zeroPoints + textOffset * opts.pix - 4 * opts.pix;
}
- if(item.y > series.zeroPoints){
- startY = series.zeroPoints - textOffset * opts.pix + fontSize + 2 * opts.pix;
+ if (item.y > series.zeroPoints) {
+ startY =
+ series.zeroPoints - textOffset * opts.pix + fontSize + 2 * opts.pix;
}
- if(opts.extra.column.type == 'stack'){
+ if (opts.extra.column.type == "stack") {
startY = item.y0 + textOffset * opts.pix - 4 * opts.pix;
}
}
context.fillText(String(formatVal), item.x, startY);
context.closePath();
context.stroke();
- context.setTextAlign('left');
+ context.setTextAlign("left");
}
});
}
@@ -2357,23 +2870,27 @@ function drawMountPointText(points, series, config, context, opts, zeroPoints) {
var data = series.data;
var textOffset = series.textOffset ? series.textOffset : 0;
var Position = opts.extra.mount.labelPosition;
- points.forEach(function(item, index) {
+ points.forEach(function (item, index) {
if (item !== null) {
context.beginPath();
- var fontSize = series[index].textSize ? series[index].textSize * opts.pix : config.fontSize;
+ var fontSize = series[index].textSize
+ ? series[index].textSize * opts.pix
+ : config.fontSize;
context.setFontSize(fontSize);
context.setFillStyle(series[index].textColor || opts.fontColor);
- var value = item.value
- var formatVal = series[index].formatter ? series[index].formatter(value,index,series,opts) : value;
- context.setTextAlign('center');
+ var value = item.value;
+ var formatVal = series[index].formatter
+ ? series[index].formatter(value, index, series, opts)
+ : value;
+ context.setTextAlign("center");
var startY = item.y - 4 * opts.pix + textOffset * opts.pix;
- if(item.y > zeroPoints){
+ if (item.y > zeroPoints) {
startY = item.y + textOffset * opts.pix + fontSize;
}
context.fillText(String(formatVal), item.x, startY);
context.closePath();
context.stroke();
- context.setTextAlign('left');
+ context.setTextAlign("left");
}
});
}
@@ -2382,26 +2899,41 @@ function drawBarPointText(points, series, config, context, opts) {
// 绘制数据文案
var data = series.data;
var textOffset = series.textOffset ? series.textOffset : 0;
- points.forEach(function(item, index) {
+ points.forEach(function (item, index) {
if (item !== null) {
context.beginPath();
- var fontSize = series.textSize ? series.textSize * opts.pix : config.fontSize;
+ var fontSize = series.textSize
+ ? series.textSize * opts.pix
+ : config.fontSize;
context.setFontSize(fontSize);
context.setFillStyle(series.textColor || opts.fontColor);
- var value = data[index]
- if (typeof data[index] === 'object' && data[index] !== null) {
- value = data[index].value ;
+ var value = data[index];
+ if (typeof data[index] === "object" && data[index] !== null) {
+ value = data[index].value;
}
- var formatVal = series.formatter ? series.formatter(value,index,series,opts) : value;
- context.setTextAlign('left');
- context.fillText(String(formatVal), item.x + 4 * opts.pix , item.y + fontSize / 2 - 3 );
+ var formatVal = series.formatter
+ ? series.formatter(value, index, series, opts)
+ : value;
+ context.setTextAlign("left");
+ context.fillText(
+ String(formatVal),
+ item.x + 4 * opts.pix,
+ item.y + fontSize / 2 - 3
+ );
context.closePath();
context.stroke();
}
});
}
-function drawGaugeLabel(gaugeOption, radius, centerPosition, opts, config, context) {
+function drawGaugeLabel(
+ gaugeOption,
+ radius,
+ centerPosition,
+ opts,
+ config,
+ context
+) {
radius -= gaugeOption.width / 2 + gaugeOption.labelOffset * opts.pix;
radius = radius < 10 ? 10 : radius;
let totalAngle;
@@ -2418,10 +2950,13 @@ function drawGaugeLabel(gaugeOption, radius, centerPosition, opts, config, conte
for (let i = 0; i < gaugeOption.splitLine.splitNumber + 1; i++) {
var pos = {
x: radius * Math.cos(nowAngle * Math.PI),
- y: radius * Math.sin(nowAngle * Math.PI)
+ y: radius * Math.sin(nowAngle * Math.PI),
};
- var labelText = gaugeOption.formatter ? gaugeOption.formatter(nowNumber,i,opts) : nowNumber;
- pos.x += centerPosition.x - measureText(labelText, config.fontSize, context) / 2;
+ var labelText = gaugeOption.formatter
+ ? gaugeOption.formatter(nowNumber, i, opts)
+ : nowNumber;
+ pos.x +=
+ centerPosition.x - measureText(labelText, config.fontSize, context) / 2;
pos.y += centerPosition.y;
var startX = pos.x;
var startY = pos.y;
@@ -2439,55 +2974,91 @@ function drawGaugeLabel(gaugeOption, radius, centerPosition, opts, config, conte
}
}
-function drawRadarLabel(angleList, radius, centerPosition, opts, config, context) {
+function drawRadarLabel(
+ angleList,
+ radius,
+ centerPosition,
+ opts,
+ config,
+ context
+) {
var radarOption = opts.extra.radar || {};
- angleList.forEach(function(angle, index) {
- if(radarOption.labelPointShow === true && opts.categories[index] !== ''){
+ angleList.forEach(function (angle, index) {
+ if (radarOption.labelPointShow === true && opts.categories[index] !== "") {
var posPoint = {
x: radius * Math.cos(angle),
- y: radius * Math.sin(angle)
+ y: radius * Math.sin(angle),
};
- var posPointAxis = convertCoordinateOrigin(posPoint.x, posPoint.y, centerPosition);
+ var posPointAxis = convertCoordinateOrigin(
+ posPoint.x,
+ posPoint.y,
+ centerPosition
+ );
context.setFillStyle(radarOption.labelPointColor);
context.beginPath();
- context.arc(posPointAxis.x, posPointAxis.y, radarOption.labelPointRadius * opts.pix, 0, 2 * Math.PI, false);
+ context.arc(
+ posPointAxis.x,
+ posPointAxis.y,
+ radarOption.labelPointRadius * opts.pix,
+ 0,
+ 2 * Math.PI,
+ false
+ );
context.closePath();
context.fill();
}
- if(radarOption.labelShow === true){
+ if (radarOption.labelShow === true) {
var pos = {
x: (radius + config.radarLabelTextMargin * opts.pix) * Math.cos(angle),
- y: (radius + config.radarLabelTextMargin * opts.pix) * Math.sin(angle)
+ y: (radius + config.radarLabelTextMargin * opts.pix) * Math.sin(angle),
};
- var posRelativeCanvas = convertCoordinateOrigin(pos.x, pos.y, centerPosition);
+ var posRelativeCanvas = convertCoordinateOrigin(
+ pos.x,
+ pos.y,
+ centerPosition
+ );
var startX = posRelativeCanvas.x;
var startY = posRelativeCanvas.y;
if (util.approximatelyEqual(pos.x, 0)) {
- startX -= measureText(opts.categories[index] || '', config.fontSize, context) / 2;
+ startX -=
+ measureText(opts.categories[index] || "", config.fontSize, context) /
+ 2;
} else if (pos.x < 0) {
- startX -= measureText(opts.categories[index] || '', config.fontSize, context);
+ startX -= measureText(
+ opts.categories[index] || "",
+ config.fontSize,
+ context
+ );
}
context.beginPath();
context.setFontSize(config.fontSize);
context.setFillStyle(radarOption.labelColor || opts.fontColor);
- context.fillText(opts.categories[index] || '', startX, startY + config.fontSize / 2);
+ context.fillText(
+ opts.categories[index] || "",
+ startX,
+ startY + config.fontSize / 2
+ );
context.closePath();
context.stroke();
}
});
-
}
function drawPieText(series, opts, config, context, radius, center) {
var lineRadius = config.pieChartLinePadding;
var textObjectCollection = [];
var lastTextObject = null;
- var seriesConvert = series.map(function(item,index) {
- var text = item.formatter ? item.formatter(item,index,series,opts) : util.toFixed(item._proportion_.toFixed(4) * 100) + '%';
+ var seriesConvert = series.map(function (item, index) {
+ var text = item.formatter
+ ? item.formatter(item, index, series, opts)
+ : util.toFixed(item._proportion_.toFixed(4) * 100) + "%";
text = item.labelText ? item.labelText : text;
- var arc = 2 * Math.PI - (item._start_ + 2 * Math.PI * item._proportion_ / 2);
+ var arc =
+ 2 * Math.PI - (item._start_ + (2 * Math.PI * item._proportion_) / 2);
if (item._rose_proportion_) {
- arc = 2 * Math.PI - (item._start_ + 2 * Math.PI * item._rose_proportion_ / 2);
+ arc =
+ 2 * Math.PI -
+ (item._start_ + (2 * Math.PI * item._rose_proportion_) / 2);
}
var color = item.color;
var radius = item._radius_;
@@ -2498,7 +3069,7 @@ function drawPieText(series, opts, config, context, radius, center) {
radius: radius,
textColor: item.textColor,
textSize: item.textSize,
- labelShow: item.labelShow
+ labelShow: item.labelShow,
};
});
for (let i = 0; i < seriesConvert.length; i++) {
@@ -2510,13 +3081,23 @@ function drawPieText(series, opts, config, context, radius, center) {
let orginX2 = Math.cos(item.arc) * item.radius;
let orginY2 = Math.sin(item.arc) * item.radius;
// text start
- let orginX3 = orginX1 >= 0 ? orginX1 + config.pieChartTextPadding : orginX1 - config.pieChartTextPadding;
+ let orginX3 =
+ orginX1 >= 0
+ ? orginX1 + config.pieChartTextPadding
+ : orginX1 - config.pieChartTextPadding;
let orginY3 = orginY1;
- let textWidth = measureText(item.text, item.textSize * opts.pix || config.fontSize, context);
+ let textWidth = measureText(
+ item.text,
+ item.textSize * opts.pix || config.fontSize,
+ context
+ );
let startY = orginY3;
- if (lastTextObject && util.isSameXCoordinateArea(lastTextObject.start, {
- x: orginX3
- })) {
+ if (
+ lastTextObject &&
+ util.isSameXCoordinateArea(lastTextObject.start, {
+ x: orginX3,
+ })
+ ) {
if (orginX3 > 0) {
startY = Math.min(orginY3, lastTextObject.start.y);
} else if (orginX1 < 0) {
@@ -2535,43 +3116,61 @@ function drawPieText(series, opts, config, context, radius, center) {
let textObject = {
lineStart: {
x: orginX2,
- y: orginY2
+ y: orginY2,
},
lineEnd: {
x: orginX1,
- y: orginY1
+ y: orginY1,
},
start: {
x: orginX3,
- y: startY
+ y: startY,
},
width: textWidth,
height: config.fontSize,
text: item.text,
color: item.color,
textColor: item.textColor,
- textSize: item.textSize
+ textSize: item.textSize,
};
lastTextObject = avoidCollision(textObject, lastTextObject);
textObjectCollection.push(lastTextObject);
}
for (let i = 0; i < textObjectCollection.length; i++) {
- if(seriesConvert[i].labelShow === false){
+ if (seriesConvert[i].labelShow === false) {
continue;
}
let item = textObjectCollection[i];
- let lineStartPoistion = convertCoordinateOrigin(item.lineStart.x, item.lineStart.y, center);
- let lineEndPoistion = convertCoordinateOrigin(item.lineEnd.x, item.lineEnd.y, center);
- let textPosition = convertCoordinateOrigin(item.start.x, item.start.y, center);
+ let lineStartPoistion = convertCoordinateOrigin(
+ item.lineStart.x,
+ item.lineStart.y,
+ center
+ );
+ let lineEndPoistion = convertCoordinateOrigin(
+ item.lineEnd.x,
+ item.lineEnd.y,
+ center
+ );
+ let textPosition = convertCoordinateOrigin(
+ item.start.x,
+ item.start.y,
+ center
+ );
context.setLineWidth(1 * opts.pix);
context.setFontSize(item.textSize * opts.pix || config.fontSize);
context.beginPath();
context.setStrokeStyle(item.color);
context.setFillStyle(item.color);
context.moveTo(lineStartPoistion.x, lineStartPoistion.y);
- let curveStartX = item.start.x < 0 ? textPosition.x + item.width : textPosition.x;
+ let curveStartX =
+ item.start.x < 0 ? textPosition.x + item.width : textPosition.x;
let textStartX = item.start.x < 0 ? textPosition.x - 5 : textPosition.x + 5;
- context.quadraticCurveTo(lineEndPoistion.x, lineEndPoistion.y, curveStartX, textPosition.y);
+ context.quadraticCurveTo(
+ lineEndPoistion.x,
+ lineEndPoistion.y,
+ curveStartX,
+ textPosition.y
+ );
context.moveTo(lineStartPoistion.x, lineStartPoistion.y);
context.stroke();
context.closePath();
@@ -2592,14 +3191,16 @@ function drawPieText(series, opts, config, context, radius, center) {
function drawToolTipSplitLine(offsetX, opts, config, context) {
var toolTipOption = opts.extra.tooltip || {};
- toolTipOption.gridType = toolTipOption.gridType == undefined ? 'solid' : toolTipOption.gridType;
- toolTipOption.dashLength = toolTipOption.dashLength == undefined ? 4 : toolTipOption.dashLength;
+ toolTipOption.gridType =
+ toolTipOption.gridType == undefined ? "solid" : toolTipOption.gridType;
+ toolTipOption.dashLength =
+ toolTipOption.dashLength == undefined ? 4 : toolTipOption.dashLength;
var startY = opts.area[0];
var endY = opts.height - opts.area[2];
- if (toolTipOption.gridType == 'dash') {
+ if (toolTipOption.gridType == "dash") {
context.setLineDash([toolTipOption.dashLength, toolTipOption.dashLength]);
}
- context.setStrokeStyle(toolTipOption.gridColor || '#cccccc');
+ context.setStrokeStyle(toolTipOption.gridColor || "#cccccc");
context.setLineWidth(1 * opts.pix);
context.beginPath();
context.moveTo(offsetX, startY);
@@ -2613,46 +3214,73 @@ function drawToolTipSplitLine(offsetX, opts, config, context) {
let textX = offsetX - 0.5 * textWidth;
let textY = endY + 2 * opts.pix;
context.beginPath();
- context.setFillStyle(hexToRgb(toolTipOption.labelBgColor || config.toolTipBackground, toolTipOption.labelBgOpacity || config.toolTipOpacity));
- context.setStrokeStyle(toolTipOption.labelBgColor || config.toolTipBackground);
+ context.setFillStyle(
+ hexToRgb(
+ toolTipOption.labelBgColor || config.toolTipBackground,
+ toolTipOption.labelBgOpacity || config.toolTipOpacity
+ )
+ );
+ context.setStrokeStyle(
+ toolTipOption.labelBgColor || config.toolTipBackground
+ );
context.setLineWidth(1 * opts.pix);
- context.rect(textX - toolTipOption.boxPadding * opts.pix, textY, textWidth + 2 * toolTipOption.boxPadding * opts.pix, config.fontSize + 2 * toolTipOption.boxPadding * opts.pix);
+ context.rect(
+ textX - toolTipOption.boxPadding * opts.pix,
+ textY,
+ textWidth + 2 * toolTipOption.boxPadding * opts.pix,
+ config.fontSize + 2 * toolTipOption.boxPadding * opts.pix
+ );
context.closePath();
context.stroke();
context.fill();
context.beginPath();
context.setFontSize(config.fontSize);
context.setFillStyle(toolTipOption.labelFontColor || opts.fontColor);
- context.fillText(String(labelText), textX, textY + toolTipOption.boxPadding * opts.pix + config.fontSize);
+ context.fillText(
+ String(labelText),
+ textX,
+ textY + toolTipOption.boxPadding * opts.pix + config.fontSize
+ );
context.closePath();
context.stroke();
}
}
function drawMarkLine(opts, config, context) {
- let markLineOption = assign({}, {
- type: 'solid',
- dashLength: 4,
- data: []
- }, opts.extra.markLine);
+ let markLineOption = assign(
+ {},
+ {
+ type: "solid",
+ dashLength: 4,
+ data: [],
+ },
+ opts.extra.markLine
+ );
let startX = opts.area[3];
let endX = opts.width - opts.area[1];
let points = calMarkLineData(markLineOption.data, opts);
for (let i = 0; i < points.length; i++) {
- let item = assign({}, {
- lineColor: '#DE4A42',
- showLabel: false,
- labelFontSize: 13,
- labelPadding: 6,
- labelFontColor: '#666666',
- labelBgColor: '#DFE8FF',
- labelBgOpacity: 0.8,
- labelAlign: 'left',
- labelOffsetX: 0,
- labelOffsetY: 0,
- }, points[i]);
- if (markLineOption.type == 'dash') {
- context.setLineDash([markLineOption.dashLength, markLineOption.dashLength]);
+ let item = assign(
+ {},
+ {
+ lineColor: "#DE4A42",
+ showLabel: false,
+ labelFontSize: 13,
+ labelPadding: 6,
+ labelFontColor: "#666666",
+ labelBgColor: "#DFE8FF",
+ labelBgOpacity: 0.8,
+ labelAlign: "left",
+ labelOffsetX: 0,
+ labelOffsetY: 0,
+ },
+ points[i]
+ );
+ if (markLineOption.type == "dash") {
+ context.setLineDash([
+ markLineOption.dashLength,
+ markLineOption.dashLength,
+ ]);
}
context.setStrokeStyle(item.lineColor);
context.setLineWidth(1 * opts.pix);
@@ -2667,7 +3295,10 @@ function drawMarkLine(opts, config, context) {
context.setFontSize(fontSize);
let textWidth = measureText(labelText, fontSize, context);
let bgWidth = textWidth + item.labelPadding * opts.pix * 2;
- let bgStartX = item.labelAlign == 'left' ? opts.area[3] - bgWidth : opts.width - opts.area[1];
+ let bgStartX =
+ item.labelAlign == "left"
+ ? opts.area[3] - bgWidth
+ : opts.width - opts.area[1];
bgStartX += item.labelOffsetX;
let bgStartY = item.y - 0.5 * fontSize - item.labelPadding * opts.pix;
bgStartY += item.labelOffsetY;
@@ -2677,31 +3308,50 @@ function drawMarkLine(opts, config, context) {
context.setStrokeStyle(item.labelBgColor);
context.setLineWidth(1 * opts.pix);
context.beginPath();
- context.rect(bgStartX, bgStartY, bgWidth, fontSize + 2 * item.labelPadding * opts.pix);
+ context.rect(
+ bgStartX,
+ bgStartY,
+ bgWidth,
+ fontSize + 2 * item.labelPadding * opts.pix
+ );
context.closePath();
context.stroke();
context.fill();
context.setFontSize(fontSize);
- context.setTextAlign('left');
+ context.setTextAlign("left");
context.setFillStyle(item.labelFontColor);
- context.fillText(String(labelText), textX, bgStartY + fontSize + item.labelPadding * opts.pix/2);
+ context.fillText(
+ String(labelText),
+ textX,
+ bgStartY + fontSize + (item.labelPadding * opts.pix) / 2
+ );
context.stroke();
- context.setTextAlign('left');
+ context.setTextAlign("left");
}
}
}
-function drawToolTipHorizentalLine(opts, config, context, eachSpacing, xAxisPoints) {
- var toolTipOption = assign({}, {
- gridType: 'solid',
- dashLength: 4
- }, opts.extra.tooltip);
+function drawToolTipHorizentalLine(
+ opts,
+ config,
+ context,
+ eachSpacing,
+ xAxisPoints
+) {
+ var toolTipOption = assign(
+ {},
+ {
+ gridType: "solid",
+ dashLength: 4,
+ },
+ opts.extra.tooltip
+ );
var startX = opts.area[3];
var endX = opts.width - opts.area[1];
- if (toolTipOption.gridType == 'dash') {
+ if (toolTipOption.gridType == "dash") {
context.setLineDash([toolTipOption.dashLength, toolTipOption.dashLength]);
}
- context.setStrokeStyle(toolTipOption.gridColor || '#cccccc');
+ context.setStrokeStyle(toolTipOption.gridColor || "#cccccc");
context.setLineWidth(1 * opts.pix);
context.beginPath();
context.moveTo(startX, opts.tooltip.offset.y);
@@ -2710,29 +3360,54 @@ function drawToolTipHorizentalLine(opts, config, context, eachSpacing, xAxisPoin
context.setLineDash([]);
if (toolTipOption.yAxisLabel) {
let boxPadding = toolTipOption.boxPadding * opts.pix;
- let labelText = calTooltipYAxisData(opts.tooltip.offset.y, opts.series, opts, config, eachSpacing);
+ let labelText = calTooltipYAxisData(
+ opts.tooltip.offset.y,
+ opts.series,
+ opts,
+ config,
+ eachSpacing
+ );
let widthArr = opts.chartData.yAxisData.yAxisWidth;
let tStartLeft = opts.area[3];
let tStartRight = opts.width - opts.area[1];
for (let i = 0; i < labelText.length; i++) {
context.setFontSize(toolTipOption.fontSize * opts.pix);
- let textWidth = measureText(labelText[i], toolTipOption.fontSize * opts.pix, context);
+ let textWidth = measureText(
+ labelText[i],
+ toolTipOption.fontSize * opts.pix,
+ context
+ );
let bgStartX, bgEndX, bgWidth;
- if (widthArr[i].position == 'left') {
+ if (widthArr[i].position == "left") {
bgStartX = tStartLeft - (textWidth + boxPadding * 2) - 2 * opts.pix;
bgEndX = Math.max(bgStartX, bgStartX + textWidth + boxPadding * 2);
} else {
bgStartX = tStartRight + 2 * opts.pix;
- bgEndX = Math.max(bgStartX + widthArr[i].width, bgStartX + textWidth + boxPadding * 2);
+ bgEndX = Math.max(
+ bgStartX + widthArr[i].width,
+ bgStartX + textWidth + boxPadding * 2
+ );
}
bgWidth = bgEndX - bgStartX;
let textX = bgStartX + (bgWidth - textWidth) / 2;
let textY = opts.tooltip.offset.y;
context.beginPath();
- context.setFillStyle(hexToRgb(toolTipOption.labelBgColor || config.toolTipBackground, toolTipOption.labelBgOpacity || config.toolTipOpacity));
- context.setStrokeStyle(toolTipOption.labelBgColor || config.toolTipBackground);
+ context.setFillStyle(
+ hexToRgb(
+ toolTipOption.labelBgColor || config.toolTipBackground,
+ toolTipOption.labelBgOpacity || config.toolTipOpacity
+ )
+ );
+ context.setStrokeStyle(
+ toolTipOption.labelBgColor || config.toolTipBackground
+ );
context.setLineWidth(1 * opts.pix);
- context.rect(bgStartX, textY - 0.5 * config.fontSize - boxPadding, bgWidth, config.fontSize + 2 * boxPadding);
+ context.rect(
+ bgStartX,
+ textY - 0.5 * config.fontSize - boxPadding,
+ bgWidth,
+ config.fontSize + 2 * boxPadding
+ );
context.closePath();
context.stroke();
context.fill();
@@ -2742,8 +3417,8 @@ function drawToolTipHorizentalLine(opts, config, context, eachSpacing, xAxisPoin
context.fillText(labelText[i], textX, textY + 0.5 * config.fontSize);
context.closePath();
context.stroke();
- if (widthArr[i].position == 'left') {
- tStartLeft -= (widthArr[i].width + opts.yAxis.padding * opts.pix);
+ if (widthArr[i].position == "left") {
+ tStartLeft -= widthArr[i].width + opts.yAxis.padding * opts.pix;
} else {
tStartRight += widthArr[i].width + opts.yAxis.padding * opts.pix;
}
@@ -2752,91 +3427,144 @@ function drawToolTipHorizentalLine(opts, config, context, eachSpacing, xAxisPoin
}
function drawToolTipSplitArea(offsetX, opts, config, context, eachSpacing) {
- var toolTipOption = assign({}, {
- activeBgColor: '#000000',
- activeBgOpacity: 0.08,
- activeWidth: eachSpacing
- }, opts.extra.column);
- toolTipOption.activeWidth = toolTipOption.activeWidth > eachSpacing ? eachSpacing : toolTipOption.activeWidth;
+ var toolTipOption = assign(
+ {},
+ {
+ activeBgColor: "#000000",
+ activeBgOpacity: 0.08,
+ activeWidth: eachSpacing,
+ },
+ opts.extra.column
+ );
+ toolTipOption.activeWidth =
+ toolTipOption.activeWidth > eachSpacing
+ ? eachSpacing
+ : toolTipOption.activeWidth;
var startY = opts.area[0];
var endY = opts.height - opts.area[2];
context.beginPath();
- context.setFillStyle(hexToRgb(toolTipOption.activeBgColor, toolTipOption.activeBgOpacity));
- context.rect(offsetX - toolTipOption.activeWidth / 2, startY, toolTipOption.activeWidth, endY - startY);
+ context.setFillStyle(
+ hexToRgb(toolTipOption.activeBgColor, toolTipOption.activeBgOpacity)
+ );
+ context.rect(
+ offsetX - toolTipOption.activeWidth / 2,
+ startY,
+ toolTipOption.activeWidth,
+ endY - startY
+ );
context.closePath();
context.fill();
context.setFillStyle("#FFFFFF");
}
function drawBarToolTipSplitArea(offsetX, opts, config, context, eachSpacing) {
- var toolTipOption = assign({}, {
- activeBgColor: '#000000',
- activeBgOpacity: 0.08
- }, opts.extra.bar);
+ var toolTipOption = assign(
+ {},
+ {
+ activeBgColor: "#000000",
+ activeBgOpacity: 0.08,
+ },
+ opts.extra.bar
+ );
var startX = opts.area[3];
var endX = opts.width - opts.area[1];
context.beginPath();
- context.setFillStyle(hexToRgb(toolTipOption.activeBgColor, toolTipOption.activeBgOpacity));
- context.rect( startX ,offsetX - eachSpacing / 2 , endX - startX,eachSpacing);
+ context.setFillStyle(
+ hexToRgb(toolTipOption.activeBgColor, toolTipOption.activeBgOpacity)
+ );
+ context.rect(startX, offsetX - eachSpacing / 2, endX - startX, eachSpacing);
context.closePath();
context.fill();
context.setFillStyle("#FFFFFF");
}
-
-function drawToolTip(textList, offset, opts, config, context, eachSpacing, xAxisPoints) {
- var toolTipOption = assign({}, {
- showBox: true,
- showArrow: true,
- showCategory: false,
- bgColor: '#000000',
- bgOpacity: 0.7,
- borderColor: '#000000',
- borderWidth: 0,
- borderRadius: 0,
- borderOpacity: 0.7,
- boxPadding: 3,
- fontColor: '#FFFFFF',
- fontSize: 13,
- lineHeight: 20,
- legendShow: true,
- legendShape: 'auto',
- splitLine: true,
- }, opts.extra.tooltip);
- if(toolTipOption.showCategory==true && opts.categories){
- textList.unshift({text:opts.categories[opts.tooltip.index],color:null})
+function drawToolTip(
+ textList,
+ offset,
+ opts,
+ config,
+ context,
+ eachSpacing,
+ xAxisPoints
+) {
+ var toolTipOption = assign(
+ {},
+ {
+ showBox: true,
+ showArrow: true,
+ showCategory: false,
+ bgColor: "#000000",
+ bgOpacity: 0.7,
+ borderColor: "#000000",
+ borderWidth: 0,
+ borderRadius: 0,
+ borderOpacity: 0.7,
+ boxPadding: 3,
+ fontColor: "#FFFFFF",
+ fontSize: 13,
+ lineHeight: 20,
+ legendShow: true,
+ legendShape: "auto",
+ splitLine: true,
+ },
+ opts.extra.tooltip
+ );
+ if (toolTipOption.showCategory == true && opts.categories) {
+ textList.unshift({
+ text: opts.categories[opts.tooltip.index],
+ color: null,
+ });
}
var fontSize = toolTipOption.fontSize * opts.pix;
var lineHeight = toolTipOption.lineHeight * opts.pix;
var boxPadding = toolTipOption.boxPadding * opts.pix;
var legendWidth = fontSize;
var legendMarginRight = 5 * opts.pix;
- if(toolTipOption.legendShow == false){
+ if (toolTipOption.legendShow == false) {
legendWidth = 0;
legendMarginRight = 0;
}
var arrowWidth = toolTipOption.showArrow ? 8 * opts.pix : 0;
var isOverRightBorder = false;
- if (opts.type == 'line' || opts.type == 'mount' || opts.type == 'area' || opts.type == 'candle' || opts.type == 'mix') {
+ if (
+ opts.type == "line" ||
+ opts.type == "mount" ||
+ opts.type == "area" ||
+ opts.type == "candle" ||
+ opts.type == "mix"
+ ) {
if (toolTipOption.splitLine == true) {
drawToolTipSplitLine(opts.tooltip.offset.x, opts, config, context);
}
}
- offset = assign({
- x: 0,
- y: 0
- }, offset);
+ offset = assign(
+ {
+ x: 0,
+ y: 0,
+ },
+ offset
+ );
offset.y -= 8 * opts.pix;
- var textWidth = textList.map(function(item) {
+ var textWidth = textList.map(function (item) {
return measureText(item.text, fontSize, context);
});
- var toolTipWidth = legendWidth + legendMarginRight + 4 * boxPadding + Math.max.apply(null, textWidth);
+ var toolTipWidth =
+ legendWidth +
+ legendMarginRight +
+ 4 * boxPadding +
+ Math.max.apply(null, textWidth);
var toolTipHeight = 2 * boxPadding + textList.length * lineHeight;
if (toolTipOption.showBox == false) {
- return
+ return;
}
// if beyond the right border
- if (offset.x - Math.abs(opts._scrollDistance_ || 0) + arrowWidth + toolTipWidth > opts.width) {
+ if (
+ offset.x -
+ Math.abs(opts._scrollDistance_ || 0) +
+ arrowWidth +
+ toolTipWidth >
+ opts.width
+ ) {
isOverRightBorder = true;
}
if (toolTipHeight + offset.y > opts.height) {
@@ -2844,44 +3572,121 @@ function drawToolTip(textList, offset, opts, config, context, eachSpacing, xAxis
}
// draw background rect
context.beginPath();
- context.setFillStyle(hexToRgb(toolTipOption.bgColor, toolTipOption.bgOpacity));
+ context.setFillStyle(
+ hexToRgb(toolTipOption.bgColor, toolTipOption.bgOpacity)
+ );
context.setLineWidth(toolTipOption.borderWidth * opts.pix);
- context.setStrokeStyle(hexToRgb(toolTipOption.borderColor, toolTipOption.borderOpacity));
+ context.setStrokeStyle(
+ hexToRgb(toolTipOption.borderColor, toolTipOption.borderOpacity)
+ );
var radius = toolTipOption.borderRadius;
if (isOverRightBorder) {
// 增加左侧仍然超出的判断
- if(toolTipWidth + arrowWidth > opts.width){
- offset.x = opts.width + Math.abs(opts._scrollDistance_ || 0) + arrowWidth + (toolTipWidth - opts.width)
+ if (toolTipWidth + arrowWidth > opts.width) {
+ offset.x =
+ opts.width +
+ Math.abs(opts._scrollDistance_ || 0) +
+ arrowWidth +
+ (toolTipWidth - opts.width);
}
- if(toolTipWidth > offset.x){
- offset.x = opts.width + Math.abs(opts._scrollDistance_ || 0) + arrowWidth + (toolTipWidth - opts.width)
+ if (toolTipWidth > offset.x) {
+ offset.x =
+ opts.width +
+ Math.abs(opts._scrollDistance_ || 0) +
+ arrowWidth +
+ (toolTipWidth - opts.width);
}
if (toolTipOption.showArrow) {
context.moveTo(offset.x, offset.y + 10 * opts.pix);
- context.lineTo(offset.x - arrowWidth, offset.y + 10 * opts.pix + 5 * opts.pix);
+ context.lineTo(
+ offset.x - arrowWidth,
+ offset.y + 10 * opts.pix + 5 * opts.pix
+ );
}
- context.arc(offset.x - arrowWidth - radius, offset.y + toolTipHeight - radius, radius, 0, Math.PI / 2, false);
- context.arc(offset.x - arrowWidth - Math.round(toolTipWidth) + radius, offset.y + toolTipHeight - radius, radius,
- Math.PI / 2, Math.PI, false);
- context.arc(offset.x - arrowWidth - Math.round(toolTipWidth) + radius, offset.y + radius, radius, -Math.PI, -Math.PI / 2, false);
- context.arc(offset.x - arrowWidth - radius, offset.y + radius, radius, -Math.PI / 2, 0, false);
+ context.arc(
+ offset.x - arrowWidth - radius,
+ offset.y + toolTipHeight - radius,
+ radius,
+ 0,
+ Math.PI / 2,
+ false
+ );
+ context.arc(
+ offset.x - arrowWidth - Math.round(toolTipWidth) + radius,
+ offset.y + toolTipHeight - radius,
+ radius,
+ Math.PI / 2,
+ Math.PI,
+ false
+ );
+ context.arc(
+ offset.x - arrowWidth - Math.round(toolTipWidth) + radius,
+ offset.y + radius,
+ radius,
+ -Math.PI,
+ -Math.PI / 2,
+ false
+ );
+ context.arc(
+ offset.x - arrowWidth - radius,
+ offset.y + radius,
+ radius,
+ -Math.PI / 2,
+ 0,
+ false
+ );
if (toolTipOption.showArrow) {
- context.lineTo(offset.x - arrowWidth, offset.y + 10 * opts.pix - 5 * opts.pix);
+ context.lineTo(
+ offset.x - arrowWidth,
+ offset.y + 10 * opts.pix - 5 * opts.pix
+ );
context.lineTo(offset.x, offset.y + 10 * opts.pix);
}
} else {
if (toolTipOption.showArrow) {
context.moveTo(offset.x, offset.y + 10 * opts.pix);
- context.lineTo(offset.x + arrowWidth, offset.y + 10 * opts.pix - 5 * opts.pix);
+ context.lineTo(
+ offset.x + arrowWidth,
+ offset.y + 10 * opts.pix - 5 * opts.pix
+ );
}
- context.arc(offset.x + arrowWidth + radius, offset.y + radius, radius, -Math.PI, -Math.PI / 2, false);
- context.arc(offset.x + arrowWidth + Math.round(toolTipWidth) - radius, offset.y + radius, radius, -Math.PI / 2, 0,
- false);
- context.arc(offset.x + arrowWidth + Math.round(toolTipWidth) - radius, offset.y + toolTipHeight - radius, radius, 0,
- Math.PI / 2, false);
- context.arc(offset.x + arrowWidth + radius, offset.y + toolTipHeight - radius, radius, Math.PI / 2, Math.PI, false);
+ context.arc(
+ offset.x + arrowWidth + radius,
+ offset.y + radius,
+ radius,
+ -Math.PI,
+ -Math.PI / 2,
+ false
+ );
+ context.arc(
+ offset.x + arrowWidth + Math.round(toolTipWidth) - radius,
+ offset.y + radius,
+ radius,
+ -Math.PI / 2,
+ 0,
+ false
+ );
+ context.arc(
+ offset.x + arrowWidth + Math.round(toolTipWidth) - radius,
+ offset.y + toolTipHeight - radius,
+ radius,
+ 0,
+ Math.PI / 2,
+ false
+ );
+ context.arc(
+ offset.x + arrowWidth + radius,
+ offset.y + toolTipHeight - radius,
+ radius,
+ Math.PI / 2,
+ Math.PI,
+ false
+ );
if (toolTipOption.showArrow) {
- context.lineTo(offset.x + arrowWidth, offset.y + 10 * opts.pix + 5 * opts.pix);
+ context.lineTo(
+ offset.x + arrowWidth,
+ offset.y + 10 * opts.pix + 5 * opts.pix
+ );
context.lineTo(offset.x, offset.y + 10 * opts.pix);
}
}
@@ -2891,66 +3696,137 @@ function drawToolTip(textList, offset, opts, config, context, eachSpacing, xAxis
context.stroke();
}
// draw legend
- if(toolTipOption.legendShow){
- textList.forEach(function(item, index) {
+ if (toolTipOption.legendShow) {
+ textList.forEach(function (item, index) {
if (item.color !== null) {
context.beginPath();
context.setFillStyle(item.color);
var startX = offset.x + arrowWidth + 2 * boxPadding;
- var startY = offset.y + (lineHeight - fontSize) / 2 + lineHeight * index + boxPadding + 1;
+ var startY =
+ offset.y +
+ (lineHeight - fontSize) / 2 +
+ lineHeight * index +
+ boxPadding +
+ 1;
if (isOverRightBorder) {
startX = offset.x - toolTipWidth - arrowWidth + 2 * boxPadding;
}
switch (item.legendShape) {
- case 'line':
+ case "line":
context.moveTo(startX, startY + 0.5 * legendWidth - 2 * opts.pix);
- context.fillRect(startX, startY + 0.5 * legendWidth - 2 * opts.pix, legendWidth, 4 * opts.pix);
+ context.fillRect(
+ startX,
+ startY + 0.5 * legendWidth - 2 * opts.pix,
+ legendWidth,
+ 4 * opts.pix
+ );
break;
- case 'triangle':
- context.moveTo(startX + 7.5 * opts.pix, startY + 0.5 * legendWidth - 5 * opts.pix);
- context.lineTo(startX + 2.5 * opts.pix, startY + 0.5 * legendWidth + 5 * opts.pix);
- context.lineTo(startX + 12.5 * opts.pix, startY + 0.5 * legendWidth + 5 * opts.pix);
- context.lineTo(startX + 7.5 * opts.pix, startY + 0.5 * legendWidth - 5 * opts.pix);
+ case "triangle":
+ context.moveTo(
+ startX + 7.5 * opts.pix,
+ startY + 0.5 * legendWidth - 5 * opts.pix
+ );
+ context.lineTo(
+ startX + 2.5 * opts.pix,
+ startY + 0.5 * legendWidth + 5 * opts.pix
+ );
+ context.lineTo(
+ startX + 12.5 * opts.pix,
+ startY + 0.5 * legendWidth + 5 * opts.pix
+ );
+ context.lineTo(
+ startX + 7.5 * opts.pix,
+ startY + 0.5 * legendWidth - 5 * opts.pix
+ );
break;
- case 'diamond':
- context.moveTo(startX + 7.5 * opts.pix, startY + 0.5 * legendWidth - 5 * opts.pix);
+ case "diamond":
+ context.moveTo(
+ startX + 7.5 * opts.pix,
+ startY + 0.5 * legendWidth - 5 * opts.pix
+ );
context.lineTo(startX + 2.5 * opts.pix, startY + 0.5 * legendWidth);
- context.lineTo(startX + 7.5 * opts.pix, startY + 0.5 * legendWidth + 5 * opts.pix);
- context.lineTo(startX + 12.5 * opts.pix, startY + 0.5 * legendWidth);
- context.lineTo(startX + 7.5 * opts.pix, startY + 0.5 * legendWidth - 5 * opts.pix);
+ context.lineTo(
+ startX + 7.5 * opts.pix,
+ startY + 0.5 * legendWidth + 5 * opts.pix
+ );
+ context.lineTo(
+ startX + 12.5 * opts.pix,
+ startY + 0.5 * legendWidth
+ );
+ context.lineTo(
+ startX + 7.5 * opts.pix,
+ startY + 0.5 * legendWidth - 5 * opts.pix
+ );
break;
- case 'circle':
+ case "circle":
context.moveTo(startX + 7.5 * opts.pix, startY + 0.5 * legendWidth);
- context.arc(startX + 7.5 * opts.pix, startY + 0.5 * legendWidth, 5 * opts.pix, 0, 2 * Math.PI);
+ context.arc(
+ startX + 7.5 * opts.pix,
+ startY + 0.5 * legendWidth,
+ 5 * opts.pix,
+ 0,
+ 2 * Math.PI
+ );
break;
- case 'rect':
+ case "rect":
context.moveTo(startX, startY + 0.5 * legendWidth - 5 * opts.pix);
- context.fillRect(startX, startY + 0.5 * legendWidth - 5 * opts.pix, 15 * opts.pix, 10 * opts.pix);
+ context.fillRect(
+ startX,
+ startY + 0.5 * legendWidth - 5 * opts.pix,
+ 15 * opts.pix,
+ 10 * opts.pix
+ );
break;
- case 'square':
- context.moveTo(startX + 2 * opts.pix, startY + 0.5 * legendWidth - 5 * opts.pix);
- context.fillRect(startX + 2 * opts.pix, startY + 0.5 * legendWidth - 5 * opts.pix, 10 * opts.pix, 10 * opts.pix);
+ case "square":
+ context.moveTo(
+ startX + 2 * opts.pix,
+ startY + 0.5 * legendWidth - 5 * opts.pix
+ );
+ context.fillRect(
+ startX + 2 * opts.pix,
+ startY + 0.5 * legendWidth - 5 * opts.pix,
+ 10 * opts.pix,
+ 10 * opts.pix
+ );
break;
default:
context.moveTo(startX, startY + 0.5 * legendWidth - 5 * opts.pix);
- context.fillRect(startX, startY + 0.5 * legendWidth - 5 * opts.pix, 15 * opts.pix, 10 * opts.pix);
+ context.fillRect(
+ startX,
+ startY + 0.5 * legendWidth - 5 * opts.pix,
+ 15 * opts.pix,
+ 10 * opts.pix
+ );
}
context.closePath();
context.fill();
}
});
}
-
+
// draw text list
- textList.forEach(function(item, index) {
- var startX = offset.x + arrowWidth + 2 * boxPadding + legendWidth + legendMarginRight;
+ textList.forEach(function (item, index) {
+ var startX =
+ offset.x + arrowWidth + 2 * boxPadding + legendWidth + legendMarginRight;
if (isOverRightBorder) {
- startX = offset.x - toolTipWidth - arrowWidth + 2 * boxPadding + legendWidth + legendMarginRight;
+ startX =
+ offset.x -
+ toolTipWidth -
+ arrowWidth +
+ 2 * boxPadding +
+ legendWidth +
+ legendMarginRight;
}
- var startY = offset.y + lineHeight * index + (lineHeight - fontSize)/2 - 1 + boxPadding + fontSize;
+ var startY =
+ offset.y +
+ lineHeight * index +
+ (lineHeight - fontSize) / 2 -
+ 1 +
+ boxPadding +
+ fontSize;
context.beginPath();
context.setFontSize(fontSize);
- context.setTextBaseline('normal');
+ context.setTextBaseline("normal");
context.setFillStyle(toolTipOption.fontColor);
context.fillText(item.text, startX, startY);
context.closePath();
@@ -2959,55 +3835,108 @@ function drawToolTip(textList, offset, opts, config, context, eachSpacing, xAxis
}
function drawColumnDataPoints(series, opts, config, context) {
- let process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+ let process =
+ arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
let xAxisData = opts.chartData.xAxisData,
xAxisPoints = xAxisData.xAxisPoints,
eachSpacing = xAxisData.eachSpacing;
- let columnOption = assign({}, {
- type: 'group',
- width: eachSpacing / 2,
- meterBorder: 4,
- meterFillColor: '#FFFFFF',
- barBorderCircle: false,
- barBorderRadius: [],
- seriesGap: 2,
- linearType: 'none',
- linearOpacity: 1,
- customColor: [],
- colorStop: 0,
- labelPosition: 'outside'
- }, opts.extra.column);
+ let columnOption = assign(
+ {},
+ {
+ type: "group",
+ width: eachSpacing / 2,
+ meterBorder: 4,
+ meterFillColor: "#FFFFFF",
+ barBorderCircle: false,
+ barBorderRadius: [],
+ seriesGap: 2,
+ linearType: "none",
+ linearOpacity: 1,
+ customColor: [],
+ colorStop: 0,
+ labelPosition: "outside",
+ },
+ opts.extra.column
+ );
let calPoints = [];
context.save();
let leftNum = -2;
let rightNum = xAxisPoints.length + 2;
- if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
+ if (
+ opts._scrollDistance_ &&
+ opts._scrollDistance_ !== 0 &&
+ opts.enableScroll === true
+ ) {
context.translate(opts._scrollDistance_, 0);
leftNum = Math.floor(-opts._scrollDistance_ / eachSpacing) - 2;
rightNum = leftNum + opts.xAxis.itemCount + 4;
}
- if (opts.tooltip && opts.tooltip.textList && opts.tooltip.textList.length && process === 1) {
- drawToolTipSplitArea(opts.tooltip.offset.x, opts, config, context, eachSpacing);
+ if (
+ opts.tooltip &&
+ opts.tooltip.textList &&
+ opts.tooltip.textList.length &&
+ process === 1
+ ) {
+ drawToolTipSplitArea(
+ opts.tooltip.offset.x,
+ opts,
+ config,
+ context,
+ eachSpacing
+ );
}
- columnOption.customColor = fillCustomColor(columnOption.linearType, columnOption.customColor, series, config);
- series.forEach(function(eachSeries, seriesIndex) {
+ columnOption.customColor = fillCustomColor(
+ columnOption.linearType,
+ columnOption.customColor,
+ series,
+ config
+ );
+ series.forEach(function (eachSeries, seriesIndex) {
let ranges, minRange, maxRange;
ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
minRange = ranges.pop();
maxRange = ranges.shift();
-
+
// 计算0轴坐标
let spacingValid = opts.height - opts.area[0] - opts.area[2];
- let zeroHeight = spacingValid * (0 - minRange) / (maxRange - minRange);
+ let zeroHeight = (spacingValid * (0 - minRange)) / (maxRange - minRange);
let zeroPoints = opts.height - Math.round(zeroHeight) - opts.area[2];
eachSeries.zeroPoints = zeroPoints;
var data = eachSeries.data;
switch (columnOption.type) {
- case 'group':
- var points = getColumnDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, zeroPoints, process);
- var tooltipPoints = getStackDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, seriesIndex, series, process);
+ case "group":
+ var points = getColumnDataPoints(
+ data,
+ minRange,
+ maxRange,
+ xAxisPoints,
+ eachSpacing,
+ opts,
+ config,
+ zeroPoints,
+ process
+ );
+ var tooltipPoints = getStackDataPoints(
+ data,
+ minRange,
+ maxRange,
+ xAxisPoints,
+ eachSpacing,
+ opts,
+ config,
+ seriesIndex,
+ series,
+ process
+ );
calPoints.push(tooltipPoints);
- points = fixColumeData(points, eachSpacing, series.length, seriesIndex, config, opts);
+ points = fixColumeData(
+ points,
+ eachSpacing,
+ series.length,
+ seriesIndex,
+ config,
+ opts
+ );
for (let i = 0; i < points.length; i++) {
let item = points[i];
//fix issues/I27B1N yyoinge & Joeshu
@@ -3015,23 +3944,47 @@ function drawColumnDataPoints(series, opts, config, context) {
var startX = item.x - item.width / 2;
var height = opts.height - item.y - opts.area[2];
context.beginPath();
- var fillColor = item.color || eachSeries.color
- var strokeColor = item.color || eachSeries.color
- if (columnOption.linearType !== 'none') {
- var grd = context.createLinearGradient(startX, item.y, startX, zeroPoints);
+ var fillColor = item.color || eachSeries.color;
+ var strokeColor = item.color || eachSeries.color;
+ if (columnOption.linearType !== "none") {
+ var grd = context.createLinearGradient(
+ startX,
+ item.y,
+ startX,
+ zeroPoints
+ );
//透明渐变
- if (columnOption.linearType == 'opacity') {
- grd.addColorStop(0, hexToRgb(fillColor, columnOption.linearOpacity));
+ if (columnOption.linearType == "opacity") {
+ grd.addColorStop(
+ 0,
+ hexToRgb(fillColor, columnOption.linearOpacity)
+ );
grd.addColorStop(1, hexToRgb(fillColor, 1));
} else {
- grd.addColorStop(0, hexToRgb(columnOption.customColor[eachSeries.linearIndex], columnOption.linearOpacity));
- grd.addColorStop(columnOption.colorStop, hexToRgb(columnOption.customColor[eachSeries.linearIndex],columnOption.linearOpacity));
+ grd.addColorStop(
+ 0,
+ hexToRgb(
+ columnOption.customColor[eachSeries.linearIndex],
+ columnOption.linearOpacity
+ )
+ );
+ grd.addColorStop(
+ columnOption.colorStop,
+ hexToRgb(
+ columnOption.customColor[eachSeries.linearIndex],
+ columnOption.linearOpacity
+ )
+ );
grd.addColorStop(1, hexToRgb(fillColor, 1));
}
- fillColor = grd
+ fillColor = grd;
}
// 圆角边框
- if ((columnOption.barBorderRadius && columnOption.barBorderRadius.length === 4) || columnOption.barBorderCircle === true) {
+ if (
+ (columnOption.barBorderRadius &&
+ columnOption.barBorderRadius.length === 4) ||
+ columnOption.barBorderCircle === true
+ ) {
const left = startX;
const top = item.y > zeroPoints ? zeroPoints : item.y;
const width = item.width;
@@ -3039,11 +3992,11 @@ function drawColumnDataPoints(series, opts, config, context) {
if (columnOption.barBorderCircle) {
columnOption.barBorderRadius = [width / 2, width / 2, 0, 0];
}
- if(item.y > zeroPoints){
- columnOption.barBorderRadius = [0, 0,width / 2, width / 2];
+ if (item.y > zeroPoints) {
+ columnOption.barBorderRadius = [0, 0, width / 2, width / 2];
}
let [r0, r1, r2, r3] = columnOption.barBorderRadius;
- let minRadius = Math.min(width/2,height/2);
+ let minRadius = Math.min(width / 2, height / 2);
r0 = r0 > minRadius ? minRadius : r0;
r1 = r1 > minRadius ? minRadius : r1;
r2 = r2 > minRadius ? minRadius : r2;
@@ -3054,15 +4007,27 @@ function drawColumnDataPoints(series, opts, config, context) {
r3 = r3 < 0 ? 0 : r3;
context.arc(left + r0, top + r0, r0, -Math.PI, -Math.PI / 2);
context.arc(left + width - r1, top + r1, r1, -Math.PI / 2, 0);
- context.arc(left + width - r2, top + height - r2, r2, 0, Math.PI / 2);
- context.arc(left + r3, top + height - r3, r3, Math.PI / 2, Math.PI);
+ context.arc(
+ left + width - r2,
+ top + height - r2,
+ r2,
+ 0,
+ Math.PI / 2
+ );
+ context.arc(
+ left + r3,
+ top + height - r3,
+ r3,
+ Math.PI / 2,
+ Math.PI
+ );
} else {
context.moveTo(startX, item.y);
context.lineTo(startX + item.width, item.y);
context.lineTo(startX + item.width, zeroPoints);
context.lineTo(startX, zeroPoints);
context.lineTo(startX, item.y);
- context.setLineWidth(1)
+ context.setLineWidth(1);
context.setStrokeStyle(strokeColor);
}
context.setFillStyle(fillColor);
@@ -3070,13 +4035,32 @@ function drawColumnDataPoints(series, opts, config, context) {
//context.stroke();
context.fill();
}
- };
+ }
break;
- case 'stack':
+ case "stack":
// 绘制堆叠数据图
- var points = getStackDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, seriesIndex, series, process);
+ var points = getStackDataPoints(
+ data,
+ minRange,
+ maxRange,
+ xAxisPoints,
+ eachSpacing,
+ opts,
+ config,
+ seriesIndex,
+ series,
+ process
+ );
calPoints.push(points);
- points = fixColumeStackData(points, eachSpacing, series.length, seriesIndex, config, opts, series);
+ points = fixColumeStackData(
+ points,
+ eachSpacing,
+ series.length,
+ seriesIndex,
+ config,
+ opts,
+ series
+ );
for (let i = 0; i < points.length; i++) {
let item = points[i];
if (item !== null && i > leftNum && i < rightNum) {
@@ -3094,178 +4078,60 @@ function drawColumnDataPoints(series, opts, config, context) {
context.closePath();
context.fill();
}
- };
+ }
break;
- case 'meter':
+ case "meter":
// 绘制温度计数据图
- var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+ var points = getDataPoints(
+ data,
+ minRange,
+ maxRange,
+ xAxisPoints,
+ eachSpacing,
+ opts,
+ config,
+ process
+ );
calPoints.push(points);
- points = fixColumeMeterData(points, eachSpacing, series.length, seriesIndex, config, opts, columnOption.meterBorder);
- for (let i = 0; i < points.length; i++) {
- let item = points[i];
- if (item !== null && i > leftNum && i < rightNum) {
- //画背景颜色
- context.beginPath();
- if (seriesIndex == 0 && columnOption.meterBorder > 0) {
- context.setStrokeStyle(eachSeries.color);
- context.setLineWidth(columnOption.meterBorder * opts.pix);
- }
- if(seriesIndex == 0){
- context.setFillStyle(columnOption.meterFillColor);
- }else{
- context.setFillStyle(item.color || eachSeries.color);
- }
- var startX = item.x - item.width / 2;
- var height = opts.height - item.y - opts.area[2];
- if ((columnOption.barBorderRadius && columnOption.barBorderRadius.length === 4) || columnOption.barBorderCircle === true) {
- const left = startX;
- const top = item.y;
- const width = item.width;
- const height = zeroPoints - item.y;
- if (columnOption.barBorderCircle) {
- columnOption.barBorderRadius = [width / 2, width / 2, 0, 0];
- }
- let [r0, r1, r2, r3] = columnOption.barBorderRadius;
- let minRadius = Math.min(width/2,height/2);
- r0 = r0 > minRadius ? minRadius : r0;
- r1 = r1 > minRadius ? minRadius : r1;
- r2 = r2 > minRadius ? minRadius : r2;
- r3 = r3 > minRadius ? minRadius : r3;
- r0 = r0 < 0 ? 0 : r0;
- r1 = r1 < 0 ? 0 : r1;
- r2 = r2 < 0 ? 0 : r2;
- r3 = r3 < 0 ? 0 : r3;
- context.arc(left + r0, top + r0, r0, -Math.PI, -Math.PI / 2);
- context.arc(left + width - r1, top + r1, r1, -Math.PI / 2, 0);
- context.arc(left + width - r2, top + height - r2, r2, 0, Math.PI / 2);
- context.arc(left + r3, top + height - r3, r3, Math.PI / 2, Math.PI);
- context.fill();
- }else{
- context.moveTo(startX, item.y);
- context.lineTo(startX + item.width, item.y);
- context.lineTo(startX + item.width, zeroPoints);
- context.lineTo(startX, zeroPoints);
- context.lineTo(startX, item.y);
- context.fill();
- }
- if (seriesIndex == 0 && columnOption.meterBorder > 0) {
- context.closePath();
- context.stroke();
- }
- }
- }
- break;
- }
- });
-
- if (opts.dataLabel !== false && process === 1) {
- series.forEach(function(eachSeries, seriesIndex) {
- let ranges, minRange, maxRange;
- ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
- minRange = ranges.pop();
- maxRange = ranges.shift();
- var data = eachSeries.data;
- switch (columnOption.type) {
- case 'group':
- var points = getColumnDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
- points = fixColumeData(points, eachSpacing, series.length, seriesIndex, config, opts);
- drawColumePointText(points, eachSeries, config, context, opts);
- break;
- case 'stack':
- var points = getStackDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, seriesIndex, series, process);
- drawColumePointText(points, eachSeries, config, context, opts);
- break;
- case 'meter':
- var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
- drawColumePointText(points, eachSeries, config, context, opts);
- break;
- }
- });
- }
- context.restore();
- return {
- xAxisPoints: xAxisPoints,
- calPoints: calPoints,
- eachSpacing: eachSpacing
- };
-}
-
-function drawMountDataPoints(series, opts, config, context) {
- let process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
- let xAxisData = opts.chartData.xAxisData,
- xAxisPoints = xAxisData.xAxisPoints,
- eachSpacing = xAxisData.eachSpacing;
- let mountOption = assign({}, {
- type: 'mount',
- widthRatio: 1,
- borderWidth: 1,
- barBorderCircle: false,
- barBorderRadius: [],
- linearType: 'none',
- linearOpacity: 1,
- customColor: [],
- colorStop: 0,
- }, opts.extra.mount);
- mountOption.widthRatio = mountOption.widthRatio <= 0 ? 0 : mountOption.widthRatio;
- mountOption.widthRatio = mountOption.widthRatio >= 2 ? 2 : mountOption.widthRatio;
- let calPoints = [];
- context.save();
- let leftNum = -2;
- let rightNum = xAxisPoints.length + 2;
- if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
- context.translate(opts._scrollDistance_, 0);
- leftNum = Math.floor(-opts._scrollDistance_ / eachSpacing) - 2;
- rightNum = leftNum + opts.xAxis.itemCount + 4;
- }
- mountOption.customColor = fillCustomColor(mountOption.linearType, mountOption.customColor, series, config);
- let ranges, minRange, maxRange;
- ranges = [].concat(opts.chartData.yAxisData.ranges[0]);
- minRange = ranges.pop();
- maxRange = ranges.shift();
-
- // 计算0轴坐标
- let spacingValid = opts.height - opts.area[0] - opts.area[2];
- let zeroHeight = spacingValid * (0 - minRange) / (maxRange - minRange);
- let zeroPoints = opts.height - Math.round(zeroHeight) - opts.area[2];
-
- var points = getMountDataPoints(series, minRange, maxRange, xAxisPoints, eachSpacing, opts, mountOption, zeroPoints, process);
- switch (mountOption.type) {
- case 'bar':
+ points = fixColumeMeterData(
+ points,
+ eachSpacing,
+ series.length,
+ seriesIndex,
+ config,
+ opts,
+ columnOption.meterBorder
+ );
for (let i = 0; i < points.length; i++) {
let item = points[i];
if (item !== null && i > leftNum && i < rightNum) {
- var startX = item.x - eachSpacing*mountOption.widthRatio/2;
- var height = opts.height - item.y - opts.area[2];
+ //画背景颜色
context.beginPath();
- var fillColor = item.color || series[i].color
- var strokeColor = item.color || series[i].color
- if (mountOption.linearType !== 'none') {
- var grd = context.createLinearGradient(startX, item.y, startX, zeroPoints);
- //透明渐变
- if (mountOption.linearType == 'opacity') {
- grd.addColorStop(0, hexToRgb(fillColor, mountOption.linearOpacity));
- grd.addColorStop(1, hexToRgb(fillColor, 1));
- } else {
- grd.addColorStop(0, hexToRgb(mountOption.customColor[series[i].linearIndex], mountOption.linearOpacity));
- grd.addColorStop(mountOption.colorStop, hexToRgb(mountOption.customColor[series[i].linearIndex],mountOption.linearOpacity));
- grd.addColorStop(1, hexToRgb(fillColor, 1));
- }
- fillColor = grd
+ if (seriesIndex == 0 && columnOption.meterBorder > 0) {
+ context.setStrokeStyle(eachSeries.color);
+ context.setLineWidth(columnOption.meterBorder * opts.pix);
}
- // 圆角边框
- if ((mountOption.barBorderRadius && mountOption.barBorderRadius.length === 4) || mountOption.barBorderCircle === true) {
+ if (seriesIndex == 0) {
+ context.setFillStyle(columnOption.meterFillColor);
+ } else {
+ context.setFillStyle(item.color || eachSeries.color);
+ }
+ var startX = item.x - item.width / 2;
+ var height = opts.height - item.y - opts.area[2];
+ if (
+ (columnOption.barBorderRadius &&
+ columnOption.barBorderRadius.length === 4) ||
+ columnOption.barBorderCircle === true
+ ) {
const left = startX;
- const top = item.y > zeroPoints ? zeroPoints : item.y;
+ const top = item.y;
const width = item.width;
- const height = Math.abs(zeroPoints - item.y);
- if (mountOption.barBorderCircle) {
- mountOption.barBorderRadius = [width / 2, width / 2, 0, 0];
+ const height = zeroPoints - item.y;
+ if (columnOption.barBorderCircle) {
+ columnOption.barBorderRadius = [width / 2, width / 2, 0, 0];
}
- if(item.y > zeroPoints){
- mountOption.barBorderRadius = [0, 0,width / 2, width / 2];
- }
- let [r0, r1, r2, r3] = mountOption.barBorderRadius;
- let minRadius = Math.min(width/2,height/2);
+ let [r0, r1, r2, r3] = columnOption.barBorderRadius;
+ let minRadius = Math.min(width / 2, height / 2);
r0 = r0 > minRadius ? minRadius : r0;
r1 = r1 > minRadius ? minRadius : r1;
r2 = r2 > minRadius ? minRadius : r2;
@@ -3276,189 +4142,575 @@ function drawMountDataPoints(series, opts, config, context) {
r3 = r3 < 0 ? 0 : r3;
context.arc(left + r0, top + r0, r0, -Math.PI, -Math.PI / 2);
context.arc(left + width - r1, top + r1, r1, -Math.PI / 2, 0);
- context.arc(left + width - r2, top + height - r2, r2, 0, Math.PI / 2);
- context.arc(left + r3, top + height - r3, r3, Math.PI / 2, Math.PI);
+ context.arc(
+ left + width - r2,
+ top + height - r2,
+ r2,
+ 0,
+ Math.PI / 2
+ );
+ context.arc(
+ left + r3,
+ top + height - r3,
+ r3,
+ Math.PI / 2,
+ Math.PI
+ );
+ context.fill();
} else {
context.moveTo(startX, item.y);
context.lineTo(startX + item.width, item.y);
context.lineTo(startX + item.width, zeroPoints);
context.lineTo(startX, zeroPoints);
context.lineTo(startX, item.y);
+ context.fill();
}
- context.setStrokeStyle(strokeColor);
- context.setFillStyle(fillColor);
- if(mountOption.borderWidth > 0){
- context.setLineWidth(mountOption.borderWidth * opts.pix);
+ if (seriesIndex == 0 && columnOption.meterBorder > 0) {
context.closePath();
context.stroke();
}
- context.fill();
}
- };
- break;
- case 'triangle':
- for (let i = 0; i < points.length; i++) {
- let item = points[i];
- if (item !== null && i > leftNum && i < rightNum) {
- var startX = item.x - eachSpacing*mountOption.widthRatio/2;
- var height = opts.height - item.y - opts.area[2];
- context.beginPath();
- var fillColor = item.color || series[i].color
- var strokeColor = item.color || series[i].color
- if (mountOption.linearType !== 'none') {
- var grd = context.createLinearGradient(startX, item.y, startX, zeroPoints);
- //透明渐变
- if (mountOption.linearType == 'opacity') {
- grd.addColorStop(0, hexToRgb(fillColor, mountOption.linearOpacity));
- grd.addColorStop(1, hexToRgb(fillColor, 1));
- } else {
- grd.addColorStop(0, hexToRgb(mountOption.customColor[series[i].linearIndex], mountOption.linearOpacity));
- grd.addColorStop(mountOption.colorStop, hexToRgb(mountOption.customColor[series[i].linearIndex],mountOption.linearOpacity));
- grd.addColorStop(1, hexToRgb(fillColor, 1));
- }
- fillColor = grd
- }
- context.moveTo(startX, zeroPoints);
- context.lineTo(item.x, item.y);
- context.lineTo(startX + item.width, zeroPoints);
- context.setStrokeStyle(strokeColor);
- context.setFillStyle(fillColor);
- if(mountOption.borderWidth > 0){
- context.setLineWidth(mountOption.borderWidth * opts.pix);
- context.stroke();
- }
- context.fill();
- }
- };
- break;
- case 'mount':
- for (let i = 0; i < points.length; i++) {
- let item = points[i];
- if (item !== null && i > leftNum && i < rightNum) {
- var startX = item.x - eachSpacing*mountOption.widthRatio/2;
- var height = opts.height - item.y - opts.area[2];
- context.beginPath();
- var fillColor = item.color || series[i].color
- var strokeColor = item.color || series[i].color
- if (mountOption.linearType !== 'none') {
- var grd = context.createLinearGradient(startX, item.y, startX, zeroPoints);
- //透明渐变
- if (mountOption.linearType == 'opacity') {
- grd.addColorStop(0, hexToRgb(fillColor, mountOption.linearOpacity));
- grd.addColorStop(1, hexToRgb(fillColor, 1));
- } else {
- grd.addColorStop(0, hexToRgb(mountOption.customColor[series[i].linearIndex], mountOption.linearOpacity));
- grd.addColorStop(mountOption.colorStop, hexToRgb(mountOption.customColor[series[i].linearIndex],mountOption.linearOpacity));
- grd.addColorStop(1, hexToRgb(fillColor, 1));
- }
- fillColor = grd
- }
- context.moveTo(startX, zeroPoints);
- context.bezierCurveTo(item.x - item.width/4, zeroPoints, item.x - item.width/4, item.y, item.x, item.y);
- context.bezierCurveTo(item.x + item.width/4, item.y, item.x + item.width/4, zeroPoints, startX + item.width, zeroPoints);
- context.setStrokeStyle(strokeColor);
- context.setFillStyle(fillColor);
- if(mountOption.borderWidth > 0){
- context.setLineWidth(mountOption.borderWidth * opts.pix);
- context.stroke();
- }
- context.fill();
- }
- };
- break;
- case 'sharp':
- for (let i = 0; i < points.length; i++) {
- let item = points[i];
- if (item !== null && i > leftNum && i < rightNum) {
- var startX = item.x - eachSpacing*mountOption.widthRatio/2;
- var height = opts.height - item.y - opts.area[2];
- context.beginPath();
- var fillColor = item.color || series[i].color
- var strokeColor = item.color || series[i].color
- if (mountOption.linearType !== 'none') {
- var grd = context.createLinearGradient(startX, item.y, startX, zeroPoints);
- //透明渐变
- if (mountOption.linearType == 'opacity') {
- grd.addColorStop(0, hexToRgb(fillColor, mountOption.linearOpacity));
- grd.addColorStop(1, hexToRgb(fillColor, 1));
- } else {
- grd.addColorStop(0, hexToRgb(mountOption.customColor[series[i].linearIndex], mountOption.linearOpacity));
- grd.addColorStop(mountOption.colorStop, hexToRgb(mountOption.customColor[series[i].linearIndex],mountOption.linearOpacity));
- grd.addColorStop(1, hexToRgb(fillColor, 1));
- }
- fillColor = grd
- }
- context.moveTo(startX, zeroPoints);
- context.quadraticCurveTo(item.x - 0, zeroPoints - height/4, item.x, item.y);
- context.quadraticCurveTo(item.x + 0, zeroPoints - height/4, startX + item.width, zeroPoints)
- context.setStrokeStyle(strokeColor);
- context.setFillStyle(fillColor);
- if(mountOption.borderWidth > 0){
- context.setLineWidth(mountOption.borderWidth * opts.pix);
- context.stroke();
- }
- context.fill();
- }
- };
+ }
break;
}
+ });
+
+ if (opts.dataLabel !== false && process === 1) {
+ series.forEach(function (eachSeries, seriesIndex) {
+ let ranges, minRange, maxRange;
+ ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
+ minRange = ranges.pop();
+ maxRange = ranges.shift();
+ var data = eachSeries.data;
+ switch (columnOption.type) {
+ case "group":
+ var points = getColumnDataPoints(
+ data,
+ minRange,
+ maxRange,
+ xAxisPoints,
+ eachSpacing,
+ opts,
+ config,
+ process
+ );
+ points = fixColumeData(
+ points,
+ eachSpacing,
+ series.length,
+ seriesIndex,
+ config,
+ opts
+ );
+ drawColumePointText(points, eachSeries, config, context, opts);
+ break;
+ case "stack":
+ var points = getStackDataPoints(
+ data,
+ minRange,
+ maxRange,
+ xAxisPoints,
+ eachSpacing,
+ opts,
+ config,
+ seriesIndex,
+ series,
+ process
+ );
+ drawColumePointText(points, eachSeries, config, context, opts);
+ break;
+ case "meter":
+ var points = getDataPoints(
+ data,
+ minRange,
+ maxRange,
+ xAxisPoints,
+ eachSpacing,
+ opts,
+ config,
+ process
+ );
+ drawColumePointText(points, eachSeries, config, context, opts);
+ break;
+ }
+ });
+ }
+ context.restore();
+ return {
+ xAxisPoints: xAxisPoints,
+ calPoints: calPoints,
+ eachSpacing: eachSpacing,
+ };
+}
+
+function drawMountDataPoints(series, opts, config, context) {
+ let process =
+ arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+ let xAxisData = opts.chartData.xAxisData,
+ xAxisPoints = xAxisData.xAxisPoints,
+ eachSpacing = xAxisData.eachSpacing;
+ let mountOption = assign(
+ {},
+ {
+ type: "mount",
+ widthRatio: 1,
+ borderWidth: 1,
+ barBorderCircle: false,
+ barBorderRadius: [],
+ linearType: "none",
+ linearOpacity: 1,
+ customColor: [],
+ colorStop: 0,
+ },
+ opts.extra.mount
+ );
+ mountOption.widthRatio =
+ mountOption.widthRatio <= 0 ? 0 : mountOption.widthRatio;
+ mountOption.widthRatio =
+ mountOption.widthRatio >= 2 ? 2 : mountOption.widthRatio;
+ let calPoints = [];
+ context.save();
+ let leftNum = -2;
+ let rightNum = xAxisPoints.length + 2;
+ if (
+ opts._scrollDistance_ &&
+ opts._scrollDistance_ !== 0 &&
+ opts.enableScroll === true
+ ) {
+ context.translate(opts._scrollDistance_, 0);
+ leftNum = Math.floor(-opts._scrollDistance_ / eachSpacing) - 2;
+ rightNum = leftNum + opts.xAxis.itemCount + 4;
+ }
+ mountOption.customColor = fillCustomColor(
+ mountOption.linearType,
+ mountOption.customColor,
+ series,
+ config
+ );
+ let ranges, minRange, maxRange;
+ ranges = [].concat(opts.chartData.yAxisData.ranges[0]);
+ minRange = ranges.pop();
+ maxRange = ranges.shift();
+
+ // 计算0轴坐标
+ let spacingValid = opts.height - opts.area[0] - opts.area[2];
+ let zeroHeight = (spacingValid * (0 - minRange)) / (maxRange - minRange);
+ let zeroPoints = opts.height - Math.round(zeroHeight) - opts.area[2];
+
+ var points = getMountDataPoints(
+ series,
+ minRange,
+ maxRange,
+ xAxisPoints,
+ eachSpacing,
+ opts,
+ mountOption,
+ zeroPoints,
+ process
+ );
+ switch (mountOption.type) {
+ case "bar":
+ for (let i = 0; i < points.length; i++) {
+ let item = points[i];
+ if (item !== null && i > leftNum && i < rightNum) {
+ var startX = item.x - (eachSpacing * mountOption.widthRatio) / 2;
+ var height = opts.height - item.y - opts.area[2];
+ context.beginPath();
+ var fillColor = item.color || series[i].color;
+ var strokeColor = item.color || series[i].color;
+ if (mountOption.linearType !== "none") {
+ var grd = context.createLinearGradient(
+ startX,
+ item.y,
+ startX,
+ zeroPoints
+ );
+ //透明渐变
+ if (mountOption.linearType == "opacity") {
+ grd.addColorStop(
+ 0,
+ hexToRgb(fillColor, mountOption.linearOpacity)
+ );
+ grd.addColorStop(1, hexToRgb(fillColor, 1));
+ } else {
+ grd.addColorStop(
+ 0,
+ hexToRgb(
+ mountOption.customColor[series[i].linearIndex],
+ mountOption.linearOpacity
+ )
+ );
+ grd.addColorStop(
+ mountOption.colorStop,
+ hexToRgb(
+ mountOption.customColor[series[i].linearIndex],
+ mountOption.linearOpacity
+ )
+ );
+ grd.addColorStop(1, hexToRgb(fillColor, 1));
+ }
+ fillColor = grd;
+ }
+ // 圆角边框
+ if (
+ (mountOption.barBorderRadius &&
+ mountOption.barBorderRadius.length === 4) ||
+ mountOption.barBorderCircle === true
+ ) {
+ const left = startX;
+ const top = item.y > zeroPoints ? zeroPoints : item.y;
+ const width = item.width;
+ const height = Math.abs(zeroPoints - item.y);
+ if (mountOption.barBorderCircle) {
+ mountOption.barBorderRadius = [width / 2, width / 2, 0, 0];
+ }
+ if (item.y > zeroPoints) {
+ mountOption.barBorderRadius = [0, 0, width / 2, width / 2];
+ }
+ let [r0, r1, r2, r3] = mountOption.barBorderRadius;
+ let minRadius = Math.min(width / 2, height / 2);
+ r0 = r0 > minRadius ? minRadius : r0;
+ r1 = r1 > minRadius ? minRadius : r1;
+ r2 = r2 > minRadius ? minRadius : r2;
+ r3 = r3 > minRadius ? minRadius : r3;
+ r0 = r0 < 0 ? 0 : r0;
+ r1 = r1 < 0 ? 0 : r1;
+ r2 = r2 < 0 ? 0 : r2;
+ r3 = r3 < 0 ? 0 : r3;
+ context.arc(left + r0, top + r0, r0, -Math.PI, -Math.PI / 2);
+ context.arc(left + width - r1, top + r1, r1, -Math.PI / 2, 0);
+ context.arc(
+ left + width - r2,
+ top + height - r2,
+ r2,
+ 0,
+ Math.PI / 2
+ );
+ context.arc(left + r3, top + height - r3, r3, Math.PI / 2, Math.PI);
+ } else {
+ context.moveTo(startX, item.y);
+ context.lineTo(startX + item.width, item.y);
+ context.lineTo(startX + item.width, zeroPoints);
+ context.lineTo(startX, zeroPoints);
+ context.lineTo(startX, item.y);
+ }
+ context.setStrokeStyle(strokeColor);
+ context.setFillStyle(fillColor);
+ if (mountOption.borderWidth > 0) {
+ context.setLineWidth(mountOption.borderWidth * opts.pix);
+ context.closePath();
+ context.stroke();
+ }
+ context.fill();
+ }
+ }
+ break;
+ case "triangle":
+ for (let i = 0; i < points.length; i++) {
+ let item = points[i];
+ if (item !== null && i > leftNum && i < rightNum) {
+ var startX = item.x - (eachSpacing * mountOption.widthRatio) / 2;
+ var height = opts.height - item.y - opts.area[2];
+ context.beginPath();
+ var fillColor = item.color || series[i].color;
+ var strokeColor = item.color || series[i].color;
+ if (mountOption.linearType !== "none") {
+ var grd = context.createLinearGradient(
+ startX,
+ item.y,
+ startX,
+ zeroPoints
+ );
+ //透明渐变
+ if (mountOption.linearType == "opacity") {
+ grd.addColorStop(
+ 0,
+ hexToRgb(fillColor, mountOption.linearOpacity)
+ );
+ grd.addColorStop(1, hexToRgb(fillColor, 1));
+ } else {
+ grd.addColorStop(
+ 0,
+ hexToRgb(
+ mountOption.customColor[series[i].linearIndex],
+ mountOption.linearOpacity
+ )
+ );
+ grd.addColorStop(
+ mountOption.colorStop,
+ hexToRgb(
+ mountOption.customColor[series[i].linearIndex],
+ mountOption.linearOpacity
+ )
+ );
+ grd.addColorStop(1, hexToRgb(fillColor, 1));
+ }
+ fillColor = grd;
+ }
+ context.moveTo(startX, zeroPoints);
+ context.lineTo(item.x, item.y);
+ context.lineTo(startX + item.width, zeroPoints);
+ context.setStrokeStyle(strokeColor);
+ context.setFillStyle(fillColor);
+ if (mountOption.borderWidth > 0) {
+ context.setLineWidth(mountOption.borderWidth * opts.pix);
+ context.stroke();
+ }
+ context.fill();
+ }
+ }
+ break;
+ case "mount":
+ for (let i = 0; i < points.length; i++) {
+ let item = points[i];
+ if (item !== null && i > leftNum && i < rightNum) {
+ var startX = item.x - (eachSpacing * mountOption.widthRatio) / 2;
+ var height = opts.height - item.y - opts.area[2];
+ context.beginPath();
+ var fillColor = item.color || series[i].color;
+ var strokeColor = item.color || series[i].color;
+ if (mountOption.linearType !== "none") {
+ var grd = context.createLinearGradient(
+ startX,
+ item.y,
+ startX,
+ zeroPoints
+ );
+ //透明渐变
+ if (mountOption.linearType == "opacity") {
+ grd.addColorStop(
+ 0,
+ hexToRgb(fillColor, mountOption.linearOpacity)
+ );
+ grd.addColorStop(1, hexToRgb(fillColor, 1));
+ } else {
+ grd.addColorStop(
+ 0,
+ hexToRgb(
+ mountOption.customColor[series[i].linearIndex],
+ mountOption.linearOpacity
+ )
+ );
+ grd.addColorStop(
+ mountOption.colorStop,
+ hexToRgb(
+ mountOption.customColor[series[i].linearIndex],
+ mountOption.linearOpacity
+ )
+ );
+ grd.addColorStop(1, hexToRgb(fillColor, 1));
+ }
+ fillColor = grd;
+ }
+ context.moveTo(startX, zeroPoints);
+ context.bezierCurveTo(
+ item.x - item.width / 4,
+ zeroPoints,
+ item.x - item.width / 4,
+ item.y,
+ item.x,
+ item.y
+ );
+ context.bezierCurveTo(
+ item.x + item.width / 4,
+ item.y,
+ item.x + item.width / 4,
+ zeroPoints,
+ startX + item.width,
+ zeroPoints
+ );
+ context.setStrokeStyle(strokeColor);
+ context.setFillStyle(fillColor);
+ if (mountOption.borderWidth > 0) {
+ context.setLineWidth(mountOption.borderWidth * opts.pix);
+ context.stroke();
+ }
+ context.fill();
+ }
+ }
+ break;
+ case "sharp":
+ for (let i = 0; i < points.length; i++) {
+ let item = points[i];
+ if (item !== null && i > leftNum && i < rightNum) {
+ var startX = item.x - (eachSpacing * mountOption.widthRatio) / 2;
+ var height = opts.height - item.y - opts.area[2];
+ context.beginPath();
+ var fillColor = item.color || series[i].color;
+ var strokeColor = item.color || series[i].color;
+ if (mountOption.linearType !== "none") {
+ var grd = context.createLinearGradient(
+ startX,
+ item.y,
+ startX,
+ zeroPoints
+ );
+ //透明渐变
+ if (mountOption.linearType == "opacity") {
+ grd.addColorStop(
+ 0,
+ hexToRgb(fillColor, mountOption.linearOpacity)
+ );
+ grd.addColorStop(1, hexToRgb(fillColor, 1));
+ } else {
+ grd.addColorStop(
+ 0,
+ hexToRgb(
+ mountOption.customColor[series[i].linearIndex],
+ mountOption.linearOpacity
+ )
+ );
+ grd.addColorStop(
+ mountOption.colorStop,
+ hexToRgb(
+ mountOption.customColor[series[i].linearIndex],
+ mountOption.linearOpacity
+ )
+ );
+ grd.addColorStop(1, hexToRgb(fillColor, 1));
+ }
+ fillColor = grd;
+ }
+ context.moveTo(startX, zeroPoints);
+ context.quadraticCurveTo(
+ item.x - 0,
+ zeroPoints - height / 4,
+ item.x,
+ item.y
+ );
+ context.quadraticCurveTo(
+ item.x + 0,
+ zeroPoints - height / 4,
+ startX + item.width,
+ zeroPoints
+ );
+ context.setStrokeStyle(strokeColor);
+ context.setFillStyle(fillColor);
+ if (mountOption.borderWidth > 0) {
+ context.setLineWidth(mountOption.borderWidth * opts.pix);
+ context.stroke();
+ }
+ context.fill();
+ }
+ }
+ break;
+ }
if (opts.dataLabel !== false && process === 1) {
let ranges, minRange, maxRange;
ranges = [].concat(opts.chartData.yAxisData.ranges[0]);
minRange = ranges.pop();
maxRange = ranges.shift();
- var points = getMountDataPoints(series, minRange, maxRange, xAxisPoints, eachSpacing, opts, mountOption, zeroPoints, process);
+ var points = getMountDataPoints(
+ series,
+ minRange,
+ maxRange,
+ xAxisPoints,
+ eachSpacing,
+ opts,
+ mountOption,
+ zeroPoints,
+ process
+ );
drawMountPointText(points, series, config, context, opts, zeroPoints);
}
context.restore();
return {
xAxisPoints: xAxisPoints,
calPoints: points,
- eachSpacing: eachSpacing
+ eachSpacing: eachSpacing,
};
}
function drawBarDataPoints(series, opts, config, context) {
- let process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+ let process =
+ arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
let yAxisPoints = [];
- let eachSpacing = (opts.height - opts.area[0] - opts.area[2])/opts.categories.length;
+ let eachSpacing =
+ (opts.height - opts.area[0] - opts.area[2]) / opts.categories.length;
for (let i = 0; i < opts.categories.length; i++) {
yAxisPoints.push(opts.area[0] + eachSpacing / 2 + eachSpacing * i);
}
- let columnOption = assign({}, {
- type: 'group',
- width: eachSpacing / 2,
- meterBorder: 4,
- meterFillColor: '#FFFFFF',
- barBorderCircle: false,
- barBorderRadius: [],
- seriesGap: 2,
- linearType: 'none',
- linearOpacity: 1,
- customColor: [],
- colorStop: 0,
- }, opts.extra.bar);
+ let columnOption = assign(
+ {},
+ {
+ type: "group",
+ width: eachSpacing / 2,
+ meterBorder: 4,
+ meterFillColor: "#FFFFFF",
+ barBorderCircle: false,
+ barBorderRadius: [],
+ seriesGap: 2,
+ linearType: "none",
+ linearOpacity: 1,
+ customColor: [],
+ colorStop: 0,
+ },
+ opts.extra.bar
+ );
let calPoints = [];
context.save();
let leftNum = -2;
let rightNum = yAxisPoints.length + 2;
- if (opts.tooltip && opts.tooltip.textList && opts.tooltip.textList.length && process === 1) {
- drawBarToolTipSplitArea(opts.tooltip.offset.y, opts, config, context, eachSpacing);
+ if (
+ opts.tooltip &&
+ opts.tooltip.textList &&
+ opts.tooltip.textList.length &&
+ process === 1
+ ) {
+ drawBarToolTipSplitArea(
+ opts.tooltip.offset.y,
+ opts,
+ config,
+ context,
+ eachSpacing
+ );
}
- columnOption.customColor = fillCustomColor(columnOption.linearType, columnOption.customColor, series, config);
- series.forEach(function(eachSeries, seriesIndex) {
+ columnOption.customColor = fillCustomColor(
+ columnOption.linearType,
+ columnOption.customColor,
+ series,
+ config
+ );
+ series.forEach(function (eachSeries, seriesIndex) {
let ranges, minRange, maxRange;
ranges = [].concat(opts.chartData.xAxisData.ranges);
maxRange = ranges.pop();
minRange = ranges.shift();
var data = eachSeries.data;
switch (columnOption.type) {
- case 'group':
- var points = getBarDataPoints(data, minRange, maxRange, yAxisPoints, eachSpacing, opts, config, process);
- var tooltipPoints = getBarStackDataPoints(data, minRange, maxRange, yAxisPoints, eachSpacing, opts, config, seriesIndex, series, process);
+ case "group":
+ var points = getBarDataPoints(
+ data,
+ minRange,
+ maxRange,
+ yAxisPoints,
+ eachSpacing,
+ opts,
+ config,
+ process
+ );
+ var tooltipPoints = getBarStackDataPoints(
+ data,
+ minRange,
+ maxRange,
+ yAxisPoints,
+ eachSpacing,
+ opts,
+ config,
+ seriesIndex,
+ series,
+ process
+ );
calPoints.push(tooltipPoints);
- points = fixBarData(points, eachSpacing, series.length, seriesIndex, config, opts);
+ points = fixBarData(
+ points,
+ eachSpacing,
+ series.length,
+ seriesIndex,
+ config,
+ opts
+ );
for (let i = 0; i < points.length; i++) {
let item = points[i];
//fix issues/I27B1N yyoinge & Joeshu
@@ -3468,23 +4720,47 @@ function drawBarDataPoints(series, opts, config, context) {
var startY = item.y - item.width / 2;
var height = item.height;
context.beginPath();
- var fillColor = item.color || eachSeries.color
- var strokeColor = item.color || eachSeries.color
- if (columnOption.linearType !== 'none') {
- var grd = context.createLinearGradient(startX, item.y, item.x, item.y);
+ var fillColor = item.color || eachSeries.color;
+ var strokeColor = item.color || eachSeries.color;
+ if (columnOption.linearType !== "none") {
+ var grd = context.createLinearGradient(
+ startX,
+ item.y,
+ item.x,
+ item.y
+ );
//透明渐变
- if (columnOption.linearType == 'opacity') {
- grd.addColorStop(0, hexToRgb(fillColor, columnOption.linearOpacity));
+ if (columnOption.linearType == "opacity") {
+ grd.addColorStop(
+ 0,
+ hexToRgb(fillColor, columnOption.linearOpacity)
+ );
grd.addColorStop(1, hexToRgb(fillColor, 1));
} else {
- grd.addColorStop(0, hexToRgb(columnOption.customColor[eachSeries.linearIndex], columnOption.linearOpacity));
- grd.addColorStop(columnOption.colorStop, hexToRgb(columnOption.customColor[eachSeries.linearIndex],columnOption.linearOpacity));
+ grd.addColorStop(
+ 0,
+ hexToRgb(
+ columnOption.customColor[eachSeries.linearIndex],
+ columnOption.linearOpacity
+ )
+ );
+ grd.addColorStop(
+ columnOption.colorStop,
+ hexToRgb(
+ columnOption.customColor[eachSeries.linearIndex],
+ columnOption.linearOpacity
+ )
+ );
grd.addColorStop(1, hexToRgb(fillColor, 1));
}
- fillColor = grd
+ fillColor = grd;
}
// 圆角边框
- if ((columnOption.barBorderRadius && columnOption.barBorderRadius.length === 4) || columnOption.barBorderCircle === true) {
+ if (
+ (columnOption.barBorderRadius &&
+ columnOption.barBorderRadius.length === 4) ||
+ columnOption.barBorderCircle === true
+ ) {
const left = startX;
const width = item.width;
const top = item.y - item.width / 2;
@@ -3493,7 +4769,7 @@ function drawBarDataPoints(series, opts, config, context) {
columnOption.barBorderRadius = [width / 2, width / 2, 0, 0];
}
let [r0, r1, r2, r3] = columnOption.barBorderRadius;
- let minRadius = Math.min(width/2,height/2);
+ let minRadius = Math.min(width / 2, height / 2);
r0 = r0 > minRadius ? minRadius : r0;
r1 = r1 > minRadius ? minRadius : r1;
r2 = r2 > minRadius ? minRadius : r2;
@@ -3502,18 +4778,24 @@ function drawBarDataPoints(series, opts, config, context) {
r1 = r1 < 0 ? 0 : r1;
r2 = r2 < 0 ? 0 : r2;
r3 = r3 < 0 ? 0 : r3;
-
+
context.arc(left + r3, top + r3, r3, -Math.PI, -Math.PI / 2);
context.arc(item.x - r0, top + r0, r0, -Math.PI / 2, 0);
context.arc(item.x - r1, top + width - r1, r1, 0, Math.PI / 2);
- context.arc(left + r2, top + width - r2, r2, Math.PI / 2, Math.PI);
+ context.arc(
+ left + r2,
+ top + width - r2,
+ r2,
+ Math.PI / 2,
+ Math.PI
+ );
} else {
context.moveTo(startX, startY);
context.lineTo(item.x, startY);
context.lineTo(item.x, startY + item.width);
context.lineTo(startX, startY + item.width);
context.lineTo(startX, startY);
- context.setLineWidth(1)
+ context.setLineWidth(1);
context.setStrokeStyle(strokeColor);
}
context.setFillStyle(fillColor);
@@ -3521,13 +4803,32 @@ function drawBarDataPoints(series, opts, config, context) {
//context.stroke();
context.fill();
}
- };
+ }
break;
- case 'stack':
+ case "stack":
// 绘制堆叠数据图
- var points = getBarStackDataPoints(data, minRange, maxRange, yAxisPoints, eachSpacing, opts, config, seriesIndex, series, process);
+ var points = getBarStackDataPoints(
+ data,
+ minRange,
+ maxRange,
+ yAxisPoints,
+ eachSpacing,
+ opts,
+ config,
+ seriesIndex,
+ series,
+ process
+ );
calPoints.push(points);
- points = fixBarStackData(points, eachSpacing, series.length, seriesIndex, config, opts, series);
+ points = fixBarStackData(
+ points,
+ eachSpacing,
+ series.length,
+ seriesIndex,
+ config,
+ opts,
+ series
+ );
for (let i = 0; i < points.length; i++) {
let item = points[i];
if (item !== null && i > leftNum && i < rightNum) {
@@ -3535,31 +4836,63 @@ function drawBarDataPoints(series, opts, config, context) {
var fillColor = item.color || eachSeries.color;
var startX = item.x0;
context.setFillStyle(fillColor);
- context.moveTo(startX, item.y - item.width/2);
- context.fillRect(startX, item.y - item.width/2, item.height , item.width);
+ context.moveTo(startX, item.y - item.width / 2);
+ context.fillRect(
+ startX,
+ item.y - item.width / 2,
+ item.height,
+ item.width
+ );
context.closePath();
context.fill();
}
- };
+ }
break;
}
});
if (opts.dataLabel !== false && process === 1) {
- series.forEach(function(eachSeries, seriesIndex) {
+ series.forEach(function (eachSeries, seriesIndex) {
let ranges, minRange, maxRange;
ranges = [].concat(opts.chartData.xAxisData.ranges);
maxRange = ranges.pop();
minRange = ranges.shift();
var data = eachSeries.data;
switch (columnOption.type) {
- case 'group':
- var points = getBarDataPoints(data, minRange, maxRange, yAxisPoints, eachSpacing, opts, config, process);
- points = fixBarData(points, eachSpacing, series.length, seriesIndex, config, opts);
+ case "group":
+ var points = getBarDataPoints(
+ data,
+ minRange,
+ maxRange,
+ yAxisPoints,
+ eachSpacing,
+ opts,
+ config,
+ process
+ );
+ points = fixBarData(
+ points,
+ eachSpacing,
+ series.length,
+ seriesIndex,
+ config,
+ opts
+ );
drawBarPointText(points, eachSeries, config, context, opts);
break;
- case 'stack':
- var points = getBarStackDataPoints(data, minRange, maxRange, yAxisPoints, eachSpacing, opts, config, seriesIndex, series, process);
+ case "stack":
+ var points = getBarStackDataPoints(
+ data,
+ minRange,
+ maxRange,
+ yAxisPoints,
+ eachSpacing,
+ opts,
+ config,
+ seriesIndex,
+ series,
+ process
+ );
drawBarPointText(points, eachSeries, config, context, opts);
break;
}
@@ -3568,28 +4901,41 @@ function drawBarDataPoints(series, opts, config, context) {
return {
yAxisPoints: yAxisPoints,
calPoints: calPoints,
- eachSpacing: eachSpacing
+ eachSpacing: eachSpacing,
};
}
function drawCandleDataPoints(series, seriesMA, opts, config, context) {
- var process = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 1;
- var candleOption = assign({}, {
- color: {},
- average: {}
- }, opts.extra.candle);
- candleOption.color = assign({}, {
- upLine: '#f04864',
- upFill: '#f04864',
- downLine: '#2fc25b',
- downFill: '#2fc25b'
- }, candleOption.color);
- candleOption.average = assign({}, {
- show: false,
- name: [],
- day: [],
- color: config.color
- }, candleOption.average);
+ var process =
+ arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 1;
+ var candleOption = assign(
+ {},
+ {
+ color: {},
+ average: {},
+ },
+ opts.extra.candle
+ );
+ candleOption.color = assign(
+ {},
+ {
+ upLine: "#f04864",
+ upFill: "#f04864",
+ downLine: "#2fc25b",
+ downFill: "#2fc25b",
+ },
+ candleOption.color
+ );
+ candleOption.average = assign(
+ {},
+ {
+ show: false,
+ name: [],
+ day: [],
+ color: config.color,
+ },
+ candleOption.average
+ );
opts.extra.candle = candleOption;
let xAxisData = opts.chartData.xAxisData,
xAxisPoints = xAxisData.xAxisPoints,
@@ -3600,7 +4946,11 @@ function drawCandleDataPoints(series, seriesMA, opts, config, context) {
let rightNum = xAxisPoints.length + 2;
let leftSpace = 0;
let rightSpace = opts.width + eachSpacing;
- if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
+ if (
+ opts._scrollDistance_ &&
+ opts._scrollDistance_ !== 0 &&
+ opts.enableScroll === true
+ ) {
context.translate(opts._scrollDistance_, 0);
leftNum = Math.floor(-opts._scrollDistance_ / eachSpacing) - 2;
rightNum = leftNum + opts.xAxis.itemCount + 4;
@@ -3608,15 +4958,25 @@ function drawCandleDataPoints(series, seriesMA, opts, config, context) {
rightSpace = leftSpace + (opts.xAxis.itemCount + 4) * eachSpacing;
}
//画均线
- if (candleOption.average.show || seriesMA) { //Merge pull request !12 from 邱贵翔
- seriesMA.forEach(function(eachSeries, seriesIndex) {
+ if (candleOption.average.show || seriesMA) {
+ //Merge pull request !12 from 邱贵翔
+ seriesMA.forEach(function (eachSeries, seriesIndex) {
let ranges, minRange, maxRange;
ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
minRange = ranges.pop();
maxRange = ranges.shift();
var data = eachSeries.data;
- var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
- var splitPointList = splitPoints(points,eachSeries);
+ var points = getDataPoints(
+ data,
+ minRange,
+ maxRange,
+ xAxisPoints,
+ eachSpacing,
+ opts,
+ config,
+ process
+ );
+ var splitPointList = splitPoints(points, eachSeries);
for (let i = 0; i < splitPointList.length; i++) {
let points = splitPointList[i];
context.beginPath();
@@ -3636,8 +4996,14 @@ function drawCandleDataPoints(series, seriesMA, opts, config, context) {
}
if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
var ctrlPoint = createCurveControlPoints(points, j - 1);
- context.bezierCurveTo(ctrlPoint.ctrA.x, ctrlPoint.ctrA.y, ctrlPoint.ctrB.x, ctrlPoint.ctrB.y, item.x,
- item.y);
+ context.bezierCurveTo(
+ ctrlPoint.ctrA.x,
+ ctrlPoint.ctrA.y,
+ ctrlPoint.ctrB.x,
+ ctrlPoint.ctrB.y,
+ item.x,
+ item.y
+ );
}
}
context.moveTo(points[0].x, points[0].y);
@@ -3648,15 +5014,24 @@ function drawCandleDataPoints(series, seriesMA, opts, config, context) {
});
}
//画K线
- series.forEach(function(eachSeries, seriesIndex) {
+ series.forEach(function (eachSeries, seriesIndex) {
let ranges, minRange, maxRange;
ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
minRange = ranges.pop();
maxRange = ranges.shift();
var data = eachSeries.data;
- var points = getCandleDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+ var points = getCandleDataPoints(
+ data,
+ minRange,
+ maxRange,
+ xAxisPoints,
+ eachSpacing,
+ opts,
+ config,
+ process
+ );
calPoints.push(points);
- var splitPointList = splitPoints(points,eachSeries);
+ var splitPointList = splitPoints(points, eachSeries);
for (let i = 0; i < splitPointList[0].length; i++) {
if (i > leftNum && i < rightNum) {
let item = splitPointList[0][i];
@@ -3703,20 +5078,25 @@ function drawCandleDataPoints(series, seriesMA, opts, config, context) {
return {
xAxisPoints: xAxisPoints,
calPoints: calPoints,
- eachSpacing: eachSpacing
+ eachSpacing: eachSpacing,
};
}
function drawAreaDataPoints(series, opts, config, context) {
- var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
- var areaOption = assign({}, {
- type: 'straight',
- opacity: 0.2,
- addLine: false,
- width: 2,
- gradient: false,
- activeType: 'none'
- }, opts.extra.area);
+ var process =
+ arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+ var areaOption = assign(
+ {},
+ {
+ type: "straight",
+ opacity: 0.2,
+ addLine: false,
+ width: 2,
+ gradient: false,
+ activeType: "none",
+ },
+ opts.extra.area
+ );
let xAxisData = opts.chartData.xAxisData,
xAxisPoints = xAxisData.xAxisPoints,
eachSpacing = xAxisData.eachSpacing;
@@ -3725,29 +5105,50 @@ function drawAreaDataPoints(series, opts, config, context) {
context.save();
let leftSpace = 0;
let rightSpace = opts.width + eachSpacing;
- if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
+ if (
+ opts._scrollDistance_ &&
+ opts._scrollDistance_ !== 0 &&
+ opts.enableScroll === true
+ ) {
context.translate(opts._scrollDistance_, 0);
leftSpace = -opts._scrollDistance_ - eachSpacing * 2 + opts.area[3];
rightSpace = leftSpace + (opts.xAxis.itemCount + 4) * eachSpacing;
}
- series.forEach(function(eachSeries, seriesIndex) {
+ series.forEach(function (eachSeries, seriesIndex) {
let ranges, minRange, maxRange;
ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
minRange = ranges.pop();
maxRange = ranges.shift();
let data = eachSeries.data;
- let points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+ let points = getDataPoints(
+ data,
+ minRange,
+ maxRange,
+ xAxisPoints,
+ eachSpacing,
+ opts,
+ config,
+ process
+ );
calPoints.push(points);
- let splitPointList = splitPoints(points,eachSeries);
+ let splitPointList = splitPoints(points, eachSeries);
for (let i = 0; i < splitPointList.length; i++) {
let points = splitPointList[i];
// 绘制区域数
context.beginPath();
context.setStrokeStyle(hexToRgb(eachSeries.color, areaOption.opacity));
if (areaOption.gradient) {
- let gradient = context.createLinearGradient(0, opts.area[0], 0, opts.height - opts.area[2]);
- gradient.addColorStop('0', hexToRgb(eachSeries.color, areaOption.opacity));
- gradient.addColorStop('1.0', hexToRgb("#FFFFFF", 0.1));
+ let gradient = context.createLinearGradient(
+ 0,
+ opts.area[0],
+ 0,
+ opts.height - opts.area[2]
+ );
+ gradient.addColorStop(
+ "0",
+ hexToRgb(eachSeries.color, areaOption.opacity)
+ );
+ gradient.addColorStop("1.0", hexToRgb("#FFFFFF", 0.1));
context.setFillStyle(gradient);
} else {
context.setFillStyle(hexToRgb(eachSeries.color, areaOption.opacity));
@@ -3758,7 +5159,7 @@ function drawAreaDataPoints(series, opts, config, context) {
let lastPoint = points[points.length - 1];
context.moveTo(firstPoint.x, firstPoint.y);
let startPoint = 0;
- if (areaOption.type === 'curve') {
+ if (areaOption.type === "curve") {
for (let j = 0; j < points.length; j++) {
let item = points[j];
if (startPoint == 0 && item.x > leftSpace) {
@@ -3767,11 +5168,18 @@ function drawAreaDataPoints(series, opts, config, context) {
}
if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
let ctrlPoint = createCurveControlPoints(points, j - 1);
- context.bezierCurveTo(ctrlPoint.ctrA.x, ctrlPoint.ctrA.y, ctrlPoint.ctrB.x, ctrlPoint.ctrB.y, item.x, item.y);
+ context.bezierCurveTo(
+ ctrlPoint.ctrA.x,
+ ctrlPoint.ctrA.y,
+ ctrlPoint.ctrB.x,
+ ctrlPoint.ctrB.y,
+ item.x,
+ item.y
+ );
}
- };
- }
- if (areaOption.type === 'straight') {
+ }
+ }
+ if (areaOption.type === "straight") {
for (let j = 0; j < points.length; j++) {
let item = points[j];
if (startPoint == 0 && item.x > leftSpace) {
@@ -3781,9 +5189,9 @@ function drawAreaDataPoints(series, opts, config, context) {
if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
context.lineTo(item.x, item.y);
}
- };
+ }
}
- if (areaOption.type === 'step') {
+ if (areaOption.type === "step") {
for (let j = 0; j < points.length; j++) {
let item = points[j];
if (startPoint == 0 && item.x > leftSpace) {
@@ -3794,7 +5202,7 @@ function drawAreaDataPoints(series, opts, config, context) {
context.lineTo(item.x, points[j - 1].y);
context.lineTo(item.x, item.y);
}
- };
+ }
}
context.lineTo(lastPoint.x, endY);
context.lineTo(firstPoint.x, endY);
@@ -3811,7 +5219,7 @@ function drawAreaDataPoints(series, opts, config, context) {
context.fill();
//画连线
if (areaOption.addLine) {
- if (eachSeries.lineType == 'dash') {
+ if (eachSeries.lineType == "dash") {
let dashLength = eachSeries.dashLength ? eachSeries.dashLength : 8;
dashLength *= opts.pix;
context.setLineDash([dashLength, dashLength]);
@@ -3825,7 +5233,7 @@ function drawAreaDataPoints(series, opts, config, context) {
} else {
context.moveTo(points[0].x, points[0].y);
let startPoint = 0;
- if (areaOption.type === 'curve') {
+ if (areaOption.type === "curve") {
for (let j = 0; j < points.length; j++) {
let item = points[j];
if (startPoint == 0 && item.x > leftSpace) {
@@ -3834,11 +5242,18 @@ function drawAreaDataPoints(series, opts, config, context) {
}
if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
let ctrlPoint = createCurveControlPoints(points, j - 1);
- context.bezierCurveTo(ctrlPoint.ctrA.x, ctrlPoint.ctrA.y, ctrlPoint.ctrB.x, ctrlPoint.ctrB.y, item.x, item.y);
+ context.bezierCurveTo(
+ ctrlPoint.ctrA.x,
+ ctrlPoint.ctrA.y,
+ ctrlPoint.ctrB.x,
+ ctrlPoint.ctrB.y,
+ item.x,
+ item.y
+ );
}
- };
+ }
}
- if (areaOption.type === 'straight') {
+ if (areaOption.type === "straight") {
for (let j = 0; j < points.length; j++) {
let item = points[j];
if (startPoint == 0 && item.x > leftSpace) {
@@ -3848,9 +5263,9 @@ function drawAreaDataPoints(series, opts, config, context) {
if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
context.lineTo(item.x, item.y);
}
- };
+ }
}
- if (areaOption.type === 'step') {
+ if (areaOption.type === "step") {
for (let j = 0; j < points.length; j++) {
let item = points[j];
if (startPoint == 0 && item.x > leftSpace) {
@@ -3861,7 +5276,7 @@ function drawAreaDataPoints(series, opts, config, context) {
context.lineTo(item.x, points[j - 1].y);
context.lineTo(item.x, item.y);
}
- };
+ }
}
context.moveTo(points[0].x, points[0].y);
}
@@ -3871,19 +5286,42 @@ function drawAreaDataPoints(series, opts, config, context) {
}
//画点
if (opts.dataPointShape !== false) {
- drawPointShape(points, eachSeries.color, eachSeries.pointShape, context, opts);
+ drawPointShape(
+ points,
+ eachSeries.color,
+ eachSeries.pointShape,
+ context,
+ opts
+ );
}
- drawActivePoint(points, eachSeries.color, eachSeries.pointShape, context, opts, areaOption,seriesIndex);
+ drawActivePoint(
+ points,
+ eachSeries.color,
+ eachSeries.pointShape,
+ context,
+ opts,
+ areaOption,
+ seriesIndex
+ );
});
if (opts.dataLabel !== false && process === 1) {
- series.forEach(function(eachSeries, seriesIndex) {
+ series.forEach(function (eachSeries, seriesIndex) {
let ranges, minRange, maxRange;
ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
minRange = ranges.pop();
maxRange = ranges.shift();
var data = eachSeries.data;
- var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+ var points = getDataPoints(
+ data,
+ minRange,
+ maxRange,
+ xAxisPoints,
+ eachSpacing,
+ opts,
+ config,
+ process
+ );
drawPointText(points, eachSeries, config, context, opts);
});
}
@@ -3891,15 +5329,20 @@ function drawAreaDataPoints(series, opts, config, context) {
return {
xAxisPoints: xAxisPoints,
calPoints: calPoints,
- eachSpacing: eachSpacing
+ eachSpacing: eachSpacing,
};
}
function drawScatterDataPoints(series, opts, config, context) {
- var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
- var scatterOption = assign({}, {
- type: 'circle'
- }, opts.extra.scatter);
+ var process =
+ arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+ var scatterOption = assign(
+ {},
+ {
+ type: "circle",
+ },
+ opts.extra.scatter
+ );
let xAxisData = opts.chartData.xAxisData,
xAxisPoints = xAxisData.xAxisPoints,
eachSpacing = xAxisData.eachSpacing;
@@ -3907,25 +5350,38 @@ function drawScatterDataPoints(series, opts, config, context) {
context.save();
let leftSpace = 0;
let rightSpace = opts.width + eachSpacing;
- if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
+ if (
+ opts._scrollDistance_ &&
+ opts._scrollDistance_ !== 0 &&
+ opts.enableScroll === true
+ ) {
context.translate(opts._scrollDistance_, 0);
leftSpace = -opts._scrollDistance_ - eachSpacing * 2 + opts.area[3];
rightSpace = leftSpace + (opts.xAxis.itemCount + 4) * eachSpacing;
}
- series.forEach(function(eachSeries, seriesIndex) {
+ series.forEach(function (eachSeries, seriesIndex) {
let ranges, minRange, maxRange;
ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
minRange = ranges.pop();
maxRange = ranges.shift();
var data = eachSeries.data;
- var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+ var points = getDataPoints(
+ data,
+ minRange,
+ maxRange,
+ xAxisPoints,
+ eachSpacing,
+ opts,
+ config,
+ process
+ );
context.beginPath();
context.setStrokeStyle(eachSeries.color);
context.setFillStyle(eachSeries.color);
context.setLineWidth(1 * opts.pix);
var shape = eachSeries.pointShape;
- if (shape === 'diamond') {
- points.forEach(function(item, index) {
+ if (shape === "diamond") {
+ points.forEach(function (item, index) {
if (item !== null) {
context.moveTo(item.x, item.y - 4.5);
context.lineTo(item.x - 4.5, item.y);
@@ -3934,22 +5390,22 @@ function drawScatterDataPoints(series, opts, config, context) {
context.lineTo(item.x, item.y - 4.5);
}
});
- } else if (shape === 'circle') {
- points.forEach(function(item, index) {
+ } else if (shape === "circle") {
+ points.forEach(function (item, index) {
if (item !== null) {
context.moveTo(item.x + 2.5 * opts.pix, item.y);
context.arc(item.x, item.y, 3 * opts.pix, 0, 2 * Math.PI, false);
}
});
- } else if (shape === 'square') {
- points.forEach(function(item, index) {
+ } else if (shape === "square") {
+ points.forEach(function (item, index) {
if (item !== null) {
context.moveTo(item.x - 3.5, item.y - 3.5);
context.rect(item.x - 3.5, item.y - 3.5, 7, 7);
}
});
- } else if (shape === 'triangle') {
- points.forEach(function(item, index) {
+ } else if (shape === "triangle") {
+ points.forEach(function (item, index) {
if (item !== null) {
context.moveTo(item.x, item.y - 4.5);
context.lineTo(item.x - 4.5, item.y + 4.5);
@@ -3957,7 +5413,7 @@ function drawScatterDataPoints(series, opts, config, context) {
context.lineTo(item.x, item.y - 4.5);
}
});
- } else if (shape === 'triangle') {
+ } else if (shape === "triangle") {
return;
}
context.closePath();
@@ -3965,13 +5421,22 @@ function drawScatterDataPoints(series, opts, config, context) {
context.stroke();
});
if (opts.dataLabel !== false && process === 1) {
- series.forEach(function(eachSeries, seriesIndex) {
+ series.forEach(function (eachSeries, seriesIndex) {
let ranges, minRange, maxRange;
ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
minRange = ranges.pop();
maxRange = ranges.shift();
var data = eachSeries.data;
- var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+ var points = getDataPoints(
+ data,
+ minRange,
+ maxRange,
+ xAxisPoints,
+ eachSpacing,
+ opts,
+ config,
+ process
+ );
drawPointText(points, eachSeries, config, context, opts);
});
}
@@ -3979,16 +5444,21 @@ function drawScatterDataPoints(series, opts, config, context) {
return {
xAxisPoints: xAxisPoints,
calPoints: calPoints,
- eachSpacing: eachSpacing
+ eachSpacing: eachSpacing,
};
}
function drawBubbleDataPoints(series, opts, config, context) {
- var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
- var bubbleOption = assign({}, {
- opacity: 1,
- border:2
- }, opts.extra.bubble);
+ var process =
+ arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+ var bubbleOption = assign(
+ {},
+ {
+ opacity: 1,
+ border: 2,
+ },
+ opts.extra.bubble
+ );
let xAxisData = opts.chartData.xAxisData,
xAxisPoints = xAxisData.xAxisPoints,
eachSpacing = xAxisData.eachSpacing;
@@ -3996,41 +5466,54 @@ function drawBubbleDataPoints(series, opts, config, context) {
context.save();
let leftSpace = 0;
let rightSpace = opts.width + eachSpacing;
- if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
+ if (
+ opts._scrollDistance_ &&
+ opts._scrollDistance_ !== 0 &&
+ opts.enableScroll === true
+ ) {
context.translate(opts._scrollDistance_, 0);
leftSpace = -opts._scrollDistance_ - eachSpacing * 2 + opts.area[3];
rightSpace = leftSpace + (opts.xAxis.itemCount + 4) * eachSpacing;
}
- series.forEach(function(eachSeries, seriesIndex) {
+ series.forEach(function (eachSeries, seriesIndex) {
let ranges, minRange, maxRange;
ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
minRange = ranges.pop();
maxRange = ranges.shift();
var data = eachSeries.data;
- var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+ var points = getDataPoints(
+ data,
+ minRange,
+ maxRange,
+ xAxisPoints,
+ eachSpacing,
+ opts,
+ config,
+ process
+ );
context.beginPath();
context.setStrokeStyle(eachSeries.color);
context.setLineWidth(bubbleOption.border * opts.pix);
context.setFillStyle(hexToRgb(eachSeries.color, bubbleOption.opacity));
- points.forEach(function(item, index) {
+ points.forEach(function (item, index) {
context.moveTo(item.x + item.r, item.y);
context.arc(item.x, item.y, item.r * opts.pix, 0, 2 * Math.PI, false);
});
context.closePath();
context.fill();
context.stroke();
-
+
if (opts.dataLabel !== false && process === 1) {
- points.forEach(function(item, index) {
+ points.forEach(function (item, index) {
context.beginPath();
var fontSize = eachSeries.textSize * opts.pix || config.fontSize;
context.setFontSize(fontSize);
context.setFillStyle(eachSeries.textColor || "#FFFFFF");
- context.setTextAlign('center');
- context.fillText(String(item.t), item.x, item.y + fontSize/2);
+ context.setTextAlign("center");
+ context.fillText(String(item.t), item.x, item.y + fontSize / 2);
context.closePath();
context.stroke();
- context.setTextAlign('left');
+ context.setTextAlign("left");
});
}
});
@@ -4038,20 +5521,25 @@ function drawBubbleDataPoints(series, opts, config, context) {
return {
xAxisPoints: xAxisPoints,
calPoints: calPoints,
- eachSpacing: eachSpacing
+ eachSpacing: eachSpacing,
};
}
function drawLineDataPoints(series, opts, config, context) {
- var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
- var lineOption = assign({}, {
- type: 'straight',
- width: 2,
- activeType: 'none',
- linearType: 'none',
- onShadow: false,
- animation: 'vertical',
- }, opts.extra.line);
+ var process =
+ arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+ var lineOption = assign(
+ {},
+ {
+ type: "straight",
+ width: 2,
+ activeType: "none",
+ linearType: "none",
+ onShadow: false,
+ animation: "vertical",
+ },
+ opts.extra.line
+ );
lineOption.width *= opts.pix;
let xAxisData = opts.chartData.xAxisData,
xAxisPoints = xAxisData.xAxisPoints,
@@ -4060,12 +5548,16 @@ function drawLineDataPoints(series, opts, config, context) {
context.save();
let leftSpace = 0;
let rightSpace = opts.width + eachSpacing;
- if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
+ if (
+ opts._scrollDistance_ &&
+ opts._scrollDistance_ !== 0 &&
+ opts.enableScroll === true
+ ) {
context.translate(opts._scrollDistance_, 0);
leftSpace = -opts._scrollDistance_ - eachSpacing * 2 + opts.area[3];
rightSpace = leftSpace + (opts.xAxis.itemCount + 4) * eachSpacing;
}
- series.forEach(function(eachSeries, seriesIndex) {
+ series.forEach(function (eachSeries, seriesIndex) {
// 这段很神奇的代码用于解决ios16的setStrokeStyle失效的bug
context.beginPath();
context.setStrokeStyle(eachSeries.color);
@@ -4077,38 +5569,69 @@ function drawLineDataPoints(series, opts, config, context) {
minRange = ranges.pop();
maxRange = ranges.shift();
var data = eachSeries.data;
- var points = getLineDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, lineOption, process);
+ var points = getLineDataPoints(
+ data,
+ minRange,
+ maxRange,
+ xAxisPoints,
+ eachSpacing,
+ opts,
+ config,
+ lineOption,
+ process
+ );
calPoints.push(points);
- var splitPointList = splitPoints(points,eachSeries);
- if (eachSeries.lineType == 'dash') {
+ var splitPointList = splitPoints(points, eachSeries);
+ if (eachSeries.lineType == "dash") {
let dashLength = eachSeries.dashLength ? eachSeries.dashLength : 8;
dashLength *= opts.pix;
context.setLineDash([dashLength, dashLength]);
}
context.beginPath();
var strokeColor = eachSeries.color;
- if (lineOption.linearType !== 'none' && eachSeries.linearColor && eachSeries.linearColor.length > 0) {
- var grd = context.createLinearGradient(opts.chartData.xAxisData.startX, opts.height/2, opts.chartData.xAxisData.endX, opts.height/2);
+ if (
+ lineOption.linearType !== "none" &&
+ eachSeries.linearColor &&
+ eachSeries.linearColor.length > 0
+ ) {
+ var grd = context.createLinearGradient(
+ opts.chartData.xAxisData.startX,
+ opts.height / 2,
+ opts.chartData.xAxisData.endX,
+ opts.height / 2
+ );
for (var i = 0; i < eachSeries.linearColor.length; i++) {
- grd.addColorStop(eachSeries.linearColor[i][0], hexToRgb(eachSeries.linearColor[i][1], 1));
+ grd.addColorStop(
+ eachSeries.linearColor[i][0],
+ hexToRgb(eachSeries.linearColor[i][1], 1)
+ );
}
- strokeColor = grd
+ strokeColor = grd;
}
context.setStrokeStyle(strokeColor);
- if (lineOption.onShadow == true && eachSeries.setShadow && eachSeries.setShadow.length > 0) {
- context.setShadow(eachSeries.setShadow[0], eachSeries.setShadow[1], eachSeries.setShadow[2], eachSeries.setShadow[3]);
- }else{
- context.setShadow(0, 0, 0, 'rgba(0,0,0,0)');
+ if (
+ lineOption.onShadow == true &&
+ eachSeries.setShadow &&
+ eachSeries.setShadow.length > 0
+ ) {
+ context.setShadow(
+ eachSeries.setShadow[0],
+ eachSeries.setShadow[1],
+ eachSeries.setShadow[2],
+ eachSeries.setShadow[3]
+ );
+ } else {
+ context.setShadow(0, 0, 0, "rgba(0,0,0,0)");
}
context.setLineWidth(lineOption.width);
- splitPointList.forEach(function(points, index) {
+ splitPointList.forEach(function (points, index) {
if (points.length === 1) {
context.moveTo(points[0].x, points[0].y);
// context.arc(points[0].x, points[0].y, 1, 0, 2 * Math.PI);
} else {
context.moveTo(points[0].x, points[0].y);
let startPoint = 0;
- if (lineOption.type === 'curve') {
+ if (lineOption.type === "curve") {
for (let j = 0; j < points.length; j++) {
let item = points[j];
if (startPoint == 0 && item.x > leftSpace) {
@@ -4117,11 +5640,18 @@ function drawLineDataPoints(series, opts, config, context) {
}
if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
var ctrlPoint = createCurveControlPoints(points, j - 1);
- context.bezierCurveTo(ctrlPoint.ctrA.x, ctrlPoint.ctrA.y, ctrlPoint.ctrB.x, ctrlPoint.ctrB.y, item.x, item.y);
+ context.bezierCurveTo(
+ ctrlPoint.ctrA.x,
+ ctrlPoint.ctrA.y,
+ ctrlPoint.ctrB.x,
+ ctrlPoint.ctrB.y,
+ item.x,
+ item.y
+ );
}
- };
+ }
}
- if (lineOption.type === 'straight') {
+ if (lineOption.type === "straight") {
for (let j = 0; j < points.length; j++) {
let item = points[j];
if (startPoint == 0 && item.x > leftSpace) {
@@ -4131,9 +5661,9 @@ function drawLineDataPoints(series, opts, config, context) {
if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
context.lineTo(item.x, item.y);
}
- };
+ }
}
- if (lineOption.type === 'step') {
+ if (lineOption.type === "step") {
for (let j = 0; j < points.length; j++) {
let item = points[j];
if (startPoint == 0 && item.x > leftSpace) {
@@ -4144,7 +5674,7 @@ function drawLineDataPoints(series, opts, config, context) {
context.lineTo(item.x, points[j - 1].y);
context.lineTo(item.x, item.y);
}
- };
+ }
}
context.moveTo(points[0].x, points[0].y);
}
@@ -4152,18 +5682,40 @@ function drawLineDataPoints(series, opts, config, context) {
context.stroke();
context.setLineDash([]);
if (opts.dataPointShape !== false) {
- drawPointShape(points, eachSeries.color, eachSeries.pointShape, context, opts);
+ drawPointShape(
+ points,
+ eachSeries.color,
+ eachSeries.pointShape,
+ context,
+ opts
+ );
}
- drawActivePoint(points, eachSeries.color, eachSeries.pointShape, context, opts, lineOption);
+ drawActivePoint(
+ points,
+ eachSeries.color,
+ eachSeries.pointShape,
+ context,
+ opts,
+ lineOption
+ );
});
if (opts.dataLabel !== false && process === 1) {
- series.forEach(function(eachSeries, seriesIndex) {
+ series.forEach(function (eachSeries, seriesIndex) {
let ranges, minRange, maxRange;
ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
minRange = ranges.pop();
maxRange = ranges.shift();
var data = eachSeries.data;
- var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+ var points = getDataPoints(
+ data,
+ minRange,
+ maxRange,
+ xAxisPoints,
+ eachSpacing,
+ opts,
+ config,
+ process
+ );
drawPointText(points, eachSeries, config, context, opts);
});
}
@@ -4171,38 +5723,51 @@ function drawLineDataPoints(series, opts, config, context) {
return {
xAxisPoints: xAxisPoints,
calPoints: calPoints,
- eachSpacing: eachSpacing
+ eachSpacing: eachSpacing,
};
}
function drawMixDataPoints(series, opts, config, context) {
- let process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+ let process =
+ arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
let xAxisData = opts.chartData.xAxisData,
xAxisPoints = xAxisData.xAxisPoints,
eachSpacing = xAxisData.eachSpacing;
- let columnOption = assign({}, {
- width: eachSpacing / 2,
- barBorderCircle: false,
- barBorderRadius: [],
- seriesGap: 2,
- linearType: 'none',
- linearOpacity: 1,
- customColor: [],
- colorStop: 0,
- }, opts.extra.mix.column);
- let areaOption = assign({}, {
- opacity: 0.2,
- gradient: false
- }, opts.extra.mix.area);
- let lineOption = assign({}, {
- width: 2
- }, opts.extra.mix.line);
+ let columnOption = assign(
+ {},
+ {
+ width: eachSpacing / 2,
+ barBorderCircle: false,
+ barBorderRadius: [],
+ seriesGap: 2,
+ linearType: "none",
+ linearOpacity: 1,
+ customColor: [],
+ colorStop: 0,
+ },
+ opts.extra.mix.column
+ );
+ let areaOption = assign(
+ {},
+ {
+ opacity: 0.2,
+ gradient: false,
+ },
+ opts.extra.mix.area
+ );
+ let lineOption = assign(
+ {},
+ {
+ width: 2,
+ },
+ opts.extra.mix.line
+ );
let endY = opts.height - opts.area[2];
let calPoints = [];
var columnIndex = 0;
var columnLength = 0;
- series.forEach(function(eachSeries, seriesIndex) {
- if (eachSeries.type == 'column') {
+ series.forEach(function (eachSeries, seriesIndex) {
+ if (eachSeries.type == "column") {
columnLength += 1;
}
});
@@ -4211,48 +5776,97 @@ function drawMixDataPoints(series, opts, config, context) {
let rightNum = xAxisPoints.length + 2;
let leftSpace = 0;
let rightSpace = opts.width + eachSpacing;
- if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
+ if (
+ opts._scrollDistance_ &&
+ opts._scrollDistance_ !== 0 &&
+ opts.enableScroll === true
+ ) {
context.translate(opts._scrollDistance_, 0);
leftNum = Math.floor(-opts._scrollDistance_ / eachSpacing) - 2;
rightNum = leftNum + opts.xAxis.itemCount + 4;
leftSpace = -opts._scrollDistance_ - eachSpacing * 2 + opts.area[3];
rightSpace = leftSpace + (opts.xAxis.itemCount + 4) * eachSpacing;
}
- columnOption.customColor = fillCustomColor(columnOption.linearType, columnOption.customColor, series, config);
- series.forEach(function(eachSeries, seriesIndex) {
+ columnOption.customColor = fillCustomColor(
+ columnOption.linearType,
+ columnOption.customColor,
+ series,
+ config
+ );
+ series.forEach(function (eachSeries, seriesIndex) {
let ranges, minRange, maxRange;
ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
minRange = ranges.pop();
maxRange = ranges.shift();
var data = eachSeries.data;
- var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+ var points = getDataPoints(
+ data,
+ minRange,
+ maxRange,
+ xAxisPoints,
+ eachSpacing,
+ opts,
+ config,
+ process
+ );
calPoints.push(points);
// 绘制柱状数据图
- if (eachSeries.type == 'column') {
- points = fixColumeData(points, eachSpacing, columnLength, columnIndex, config, opts);
+ if (eachSeries.type == "column") {
+ points = fixColumeData(
+ points,
+ eachSpacing,
+ columnLength,
+ columnIndex,
+ config,
+ opts
+ );
for (let i = 0; i < points.length; i++) {
let item = points[i];
if (item !== null && i > leftNum && i < rightNum) {
var startX = item.x - item.width / 2;
var height = opts.height - item.y - opts.area[2];
context.beginPath();
- var fillColor = item.color || eachSeries.color
- var strokeColor = item.color || eachSeries.color
- if (columnOption.linearType !== 'none') {
- var grd = context.createLinearGradient(startX, item.y, startX, opts.height - opts.area[2]);
+ var fillColor = item.color || eachSeries.color;
+ var strokeColor = item.color || eachSeries.color;
+ if (columnOption.linearType !== "none") {
+ var grd = context.createLinearGradient(
+ startX,
+ item.y,
+ startX,
+ opts.height - opts.area[2]
+ );
//透明渐变
- if (columnOption.linearType == 'opacity') {
- grd.addColorStop(0, hexToRgb(fillColor, columnOption.linearOpacity));
+ if (columnOption.linearType == "opacity") {
+ grd.addColorStop(
+ 0,
+ hexToRgb(fillColor, columnOption.linearOpacity)
+ );
grd.addColorStop(1, hexToRgb(fillColor, 1));
} else {
- grd.addColorStop(0, hexToRgb(columnOption.customColor[eachSeries.linearIndex], columnOption.linearOpacity));
- grd.addColorStop(columnOption.colorStop, hexToRgb(columnOption.customColor[eachSeries.linearIndex], columnOption.linearOpacity));
+ grd.addColorStop(
+ 0,
+ hexToRgb(
+ columnOption.customColor[eachSeries.linearIndex],
+ columnOption.linearOpacity
+ )
+ );
+ grd.addColorStop(
+ columnOption.colorStop,
+ hexToRgb(
+ columnOption.customColor[eachSeries.linearIndex],
+ columnOption.linearOpacity
+ )
+ );
grd.addColorStop(1, hexToRgb(fillColor, 1));
}
- fillColor = grd
+ fillColor = grd;
}
// 圆角边框
- if ((columnOption.barBorderRadius && columnOption.barBorderRadius.length === 4) || columnOption.barBorderCircle) {
+ if (
+ (columnOption.barBorderRadius &&
+ columnOption.barBorderRadius.length === 4) ||
+ columnOption.barBorderCircle
+ ) {
const left = startX;
const top = item.y;
const width = item.width;
@@ -4261,7 +5875,7 @@ function drawMixDataPoints(series, opts, config, context) {
columnOption.barBorderRadius = [width / 2, width / 2, 0, 0];
}
let [r0, r1, r2, r3] = columnOption.barBorderRadius;
- let minRadius = Math.min(width/2,height/2);
+ let minRadius = Math.min(width / 2, height / 2);
r0 = r0 > minRadius ? minRadius : r0;
r1 = r1 > minRadius ? minRadius : r1;
r2 = r2 > minRadius ? minRadius : r2;
@@ -4272,7 +5886,13 @@ function drawMixDataPoints(series, opts, config, context) {
r3 = r3 < 0 ? 0 : r3;
context.arc(left + r0, top + r0, r0, -Math.PI, -Math.PI / 2);
context.arc(left + width - r1, top + r1, r1, -Math.PI / 2, 0);
- context.arc(left + width - r2, top + height - r2, r2, 0, Math.PI / 2);
+ context.arc(
+ left + width - r2,
+ top + height - r2,
+ r2,
+ 0,
+ Math.PI / 2
+ );
context.arc(left + r3, top + height - r3, r3, Math.PI / 2, Math.PI);
} else {
context.moveTo(startX, item.y);
@@ -4280,7 +5900,7 @@ function drawMixDataPoints(series, opts, config, context) {
context.lineTo(startX + item.width, opts.height - opts.area[2]);
context.lineTo(startX, opts.height - opts.area[2]);
context.lineTo(startX, item.y);
- context.setLineWidth(1)
+ context.setLineWidth(1);
context.setStrokeStyle(strokeColor);
}
context.setFillStyle(fillColor);
@@ -4291,8 +5911,8 @@ function drawMixDataPoints(series, opts, config, context) {
columnIndex += 1;
}
//绘制区域图数据
- if (eachSeries.type == 'area') {
- let splitPointList = splitPoints(points,eachSeries);
+ if (eachSeries.type == "area") {
+ let splitPointList = splitPoints(points, eachSeries);
for (let i = 0; i < splitPointList.length; i++) {
let points = splitPointList[i];
// 绘制区域数据
@@ -4300,9 +5920,17 @@ function drawMixDataPoints(series, opts, config, context) {
context.setStrokeStyle(eachSeries.color);
context.setStrokeStyle(hexToRgb(eachSeries.color, areaOption.opacity));
if (areaOption.gradient) {
- let gradient = context.createLinearGradient(0, opts.area[0], 0, opts.height - opts.area[2]);
- gradient.addColorStop('0', hexToRgb(eachSeries.color, areaOption.opacity));
- gradient.addColorStop('1.0', hexToRgb("#FFFFFF", 0.1));
+ let gradient = context.createLinearGradient(
+ 0,
+ opts.area[0],
+ 0,
+ opts.height - opts.area[2]
+ );
+ gradient.addColorStop(
+ "0",
+ hexToRgb(eachSeries.color, areaOption.opacity)
+ );
+ gradient.addColorStop("1.0", hexToRgb("#FFFFFF", 0.1));
context.setFillStyle(gradient);
} else {
context.setFillStyle(hexToRgb(eachSeries.color, areaOption.opacity));
@@ -4313,7 +5941,7 @@ function drawMixDataPoints(series, opts, config, context) {
let lastPoint = points[points.length - 1];
context.moveTo(firstPoint.x, firstPoint.y);
let startPoint = 0;
- if (eachSeries.style === 'curve') {
+ if (eachSeries.style === "curve") {
for (let j = 0; j < points.length; j++) {
let item = points[j];
if (startPoint == 0 && item.x > leftSpace) {
@@ -4322,9 +5950,16 @@ function drawMixDataPoints(series, opts, config, context) {
}
if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
var ctrlPoint = createCurveControlPoints(points, j - 1);
- context.bezierCurveTo(ctrlPoint.ctrA.x, ctrlPoint.ctrA.y, ctrlPoint.ctrB.x, ctrlPoint.ctrB.y, item.x, item.y);
+ context.bezierCurveTo(
+ ctrlPoint.ctrA.x,
+ ctrlPoint.ctrA.y,
+ ctrlPoint.ctrB.x,
+ ctrlPoint.ctrB.y,
+ item.x,
+ item.y
+ );
}
- };
+ }
} else {
for (let j = 0; j < points.length; j++) {
let item = points[j];
@@ -4335,7 +5970,7 @@ function drawMixDataPoints(series, opts, config, context) {
if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
context.lineTo(item.x, item.y);
}
- };
+ }
}
context.lineTo(lastPoint.x, endY);
context.lineTo(firstPoint.x, endY);
@@ -4353,10 +5988,10 @@ function drawMixDataPoints(series, opts, config, context) {
}
}
// 绘制折线数据图
- if (eachSeries.type == 'line') {
- var splitPointList = splitPoints(points,eachSeries);
- splitPointList.forEach(function(points, index) {
- if (eachSeries.lineType == 'dash') {
+ if (eachSeries.type == "line") {
+ var splitPointList = splitPoints(points, eachSeries);
+ splitPointList.forEach(function (points, index) {
+ if (eachSeries.lineType == "dash") {
let dashLength = eachSeries.dashLength ? eachSeries.dashLength : 8;
dashLength *= opts.pix;
context.setLineDash([dashLength, dashLength]);
@@ -4370,7 +6005,7 @@ function drawMixDataPoints(series, opts, config, context) {
} else {
context.moveTo(points[0].x, points[0].y);
let startPoint = 0;
- if (eachSeries.style == 'curve') {
+ if (eachSeries.style == "curve") {
for (let j = 0; j < points.length; j++) {
let item = points[j];
if (startPoint == 0 && item.x > leftSpace) {
@@ -4379,8 +6014,14 @@ function drawMixDataPoints(series, opts, config, context) {
}
if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
var ctrlPoint = createCurveControlPoints(points, j - 1);
- context.bezierCurveTo(ctrlPoint.ctrA.x, ctrlPoint.ctrA.y, ctrlPoint.ctrB.x, ctrlPoint.ctrB.y,
- item.x, item.y);
+ context.bezierCurveTo(
+ ctrlPoint.ctrA.x,
+ ctrlPoint.ctrA.y,
+ ctrlPoint.ctrB.x,
+ ctrlPoint.ctrB.y,
+ item.x,
+ item.y
+ );
}
}
} else {
@@ -4402,26 +6043,48 @@ function drawMixDataPoints(series, opts, config, context) {
});
}
// 绘制点数据图
- if (eachSeries.type == 'point') {
+ if (eachSeries.type == "point") {
eachSeries.addPoint = true;
}
- if (eachSeries.addPoint == true && eachSeries.type !== 'column') {
- drawPointShape(points, eachSeries.color, eachSeries.pointShape, context, opts);
+ if (eachSeries.addPoint == true && eachSeries.type !== "column") {
+ drawPointShape(
+ points,
+ eachSeries.color,
+ eachSeries.pointShape,
+ context,
+ opts
+ );
}
});
if (opts.dataLabel !== false && process === 1) {
var columnIndex = 0;
- series.forEach(function(eachSeries, seriesIndex) {
+ series.forEach(function (eachSeries, seriesIndex) {
let ranges, minRange, maxRange;
ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
minRange = ranges.pop();
maxRange = ranges.shift();
var data = eachSeries.data;
- var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
- if (eachSeries.type !== 'column') {
+ var points = getDataPoints(
+ data,
+ minRange,
+ maxRange,
+ xAxisPoints,
+ eachSpacing,
+ opts,
+ config,
+ process
+ );
+ if (eachSeries.type !== "column") {
drawPointText(points, eachSeries, config, context, opts);
} else {
- points = fixColumeData(points, eachSpacing, columnLength, columnIndex, config, opts);
+ points = fixColumeData(
+ points,
+ eachSpacing,
+ columnLength,
+ columnIndex,
+ config,
+ opts
+ );
drawPointText(points, eachSeries, config, context, opts);
columnIndex += 1;
}
@@ -4432,35 +6095,72 @@ function drawMixDataPoints(series, opts, config, context) {
xAxisPoints: xAxisPoints,
calPoints: calPoints,
eachSpacing: eachSpacing,
- }
+ };
}
-
-function drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints) {
+function drawToolTipBridge(
+ opts,
+ config,
+ context,
+ process,
+ eachSpacing,
+ xAxisPoints
+) {
var toolTipOption = opts.extra.tooltip || {};
- if (toolTipOption.horizentalLine && opts.tooltip && process === 1 && (opts.type == 'line' || opts.type == 'area' || opts.type == 'column' || opts.type == 'mount' || opts.type == 'candle' || opts.type == 'mix')) {
- drawToolTipHorizentalLine(opts, config, context, eachSpacing, xAxisPoints)
+ if (
+ toolTipOption.horizentalLine &&
+ opts.tooltip &&
+ process === 1 &&
+ (opts.type == "line" ||
+ opts.type == "area" ||
+ opts.type == "column" ||
+ opts.type == "mount" ||
+ opts.type == "candle" ||
+ opts.type == "mix")
+ ) {
+ drawToolTipHorizentalLine(opts, config, context, eachSpacing, xAxisPoints);
}
context.save();
- if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
+ if (
+ opts._scrollDistance_ &&
+ opts._scrollDistance_ !== 0 &&
+ opts.enableScroll === true
+ ) {
context.translate(opts._scrollDistance_, 0);
}
- if (opts.tooltip && opts.tooltip.textList && opts.tooltip.textList.length && process === 1) {
- drawToolTip(opts.tooltip.textList, opts.tooltip.offset, opts, config, context, eachSpacing, xAxisPoints);
+ if (
+ opts.tooltip &&
+ opts.tooltip.textList &&
+ opts.tooltip.textList.length &&
+ process === 1
+ ) {
+ drawToolTip(
+ opts.tooltip.textList,
+ opts.tooltip.offset,
+ opts,
+ config,
+ context,
+ eachSpacing,
+ xAxisPoints
+ );
}
context.restore();
-
}
function drawXAxis(categories, opts, config, context) {
-
let xAxisData = opts.chartData.xAxisData,
xAxisPoints = xAxisData.xAxisPoints,
startX = xAxisData.startX,
endX = xAxisData.endX,
eachSpacing = xAxisData.eachSpacing;
- var boundaryGap = 'center';
- if (opts.type == 'bar' || opts.type == 'line' || opts.type == 'area'|| opts.type == 'scatter' || opts.type == 'bubble') {
+ var boundaryGap = "center";
+ if (
+ opts.type == "bar" ||
+ opts.type == "line" ||
+ opts.type == "area" ||
+ opts.type == "scatter" ||
+ opts.type == "bubble"
+ ) {
boundaryGap = opts.xAxis.boundaryGap;
}
var startY = opts.height - opts.area[2];
@@ -4471,17 +6171,25 @@ function drawXAxis(categories, opts, config, context) {
var scrollY = opts.height - opts.area[2] + config.xAxisHeight;
var scrollScreenWidth = endX - startX;
var scrollTotalWidth = eachSpacing * (xAxisPoints.length - 1);
- if(opts.type == 'mount' && opts.extra && opts.extra.mount && opts.extra.mount.widthRatio && opts.extra.mount.widthRatio > 1){
- if(opts.extra.mount.widthRatio>2) opts.extra.mount.widthRatio = 2
- scrollTotalWidth += (opts.extra.mount.widthRatio - 1)*eachSpacing;
+ if (
+ opts.type == "mount" &&
+ opts.extra &&
+ opts.extra.mount &&
+ opts.extra.mount.widthRatio &&
+ opts.extra.mount.widthRatio > 1
+ ) {
+ if (opts.extra.mount.widthRatio > 2) opts.extra.mount.widthRatio = 2;
+ scrollTotalWidth += (opts.extra.mount.widthRatio - 1) * eachSpacing;
}
- var scrollWidth = scrollScreenWidth * scrollScreenWidth / scrollTotalWidth;
+ var scrollWidth =
+ (scrollScreenWidth * scrollScreenWidth) / scrollTotalWidth;
var scrollLeft = 0;
if (opts._scrollDistance_) {
- scrollLeft = -opts._scrollDistance_ * (scrollScreenWidth) / scrollTotalWidth;
+ scrollLeft =
+ (-opts._scrollDistance_ * scrollScreenWidth) / scrollTotalWidth;
}
context.beginPath();
- context.setLineCap('round');
+ context.setLineCap("round");
context.setLineWidth(6 * opts.pix);
context.setStrokeStyle(opts.xAxis.scrollBackgroundColor || "#EFEBEF");
context.moveTo(startX, scrollY);
@@ -4489,14 +6197,14 @@ function drawXAxis(categories, opts, config, context) {
context.stroke();
context.closePath();
context.beginPath();
- context.setLineCap('round');
+ context.setLineCap("round");
context.setLineWidth(6 * opts.pix);
context.setStrokeStyle(opts.xAxis.scrollColor || "#A6A6A6");
context.moveTo(startX + scrollLeft, scrollY);
context.lineTo(startX + scrollLeft + scrollWidth, scrollY);
context.stroke();
context.closePath();
- context.setLineCap('butt');
+ context.setLineCap("butt");
}
context.save();
if (opts._scrollDistance_ && opts._scrollDistance_ !== 0) {
@@ -4505,9 +6213,9 @@ function drawXAxis(categories, opts, config, context) {
//绘制X轴刻度线
if (opts.xAxis.calibration === true) {
context.setStrokeStyle(opts.xAxis.gridColor || "#cccccc");
- context.setLineCap('butt');
+ context.setLineCap("butt");
context.setLineWidth(1 * opts.pix);
- xAxisPoints.forEach(function(item, index) {
+ xAxisPoints.forEach(function (item, index) {
if (index > 0) {
context.beginPath();
context.moveTo(item - eachSpacing / 2, startY);
@@ -4520,13 +6228,16 @@ function drawXAxis(categories, opts, config, context) {
//绘制X轴网格
if (opts.xAxis.disableGrid !== true) {
context.setStrokeStyle(opts.xAxis.gridColor || "#cccccc");
- context.setLineCap('butt');
+ context.setLineCap("butt");
context.setLineWidth(1 * opts.pix);
- if (opts.xAxis.gridType == 'dash') {
- context.setLineDash([opts.xAxis.dashLength * opts.pix, opts.xAxis.dashLength * opts.pix]);
+ if (opts.xAxis.gridType == "dash") {
+ context.setLineDash([
+ opts.xAxis.dashLength * opts.pix,
+ opts.xAxis.dashLength * opts.pix,
+ ]);
}
opts.xAxis.gridEval = opts.xAxis.gridEval || 1;
- xAxisPoints.forEach(function(item, index) {
+ xAxisPoints.forEach(function (item, index) {
if (index % opts.xAxis.gridEval == 0) {
context.beginPath();
context.moveTo(item, startY);
@@ -4545,7 +6256,9 @@ function drawXAxis(categories, opts, config, context) {
if (opts.xAxis.labelCount) {
//如果设置X轴密度
if (opts.xAxis.itemCount) {
- maxXAxisListLength = Math.ceil(categories.length / opts.xAxis.itemCount * opts.xAxis.labelCount);
+ maxXAxisListLength = Math.ceil(
+ (categories.length / opts.xAxis.itemCount) * opts.xAxis.labelCount
+ );
} else {
maxXAxisListLength = opts.xAxis.labelCount;
}
@@ -4566,10 +6279,12 @@ function drawXAxis(categories, opts, config, context) {
newCategories[cgLength - 1] = categories[cgLength - 1];
var xAxisFontSize = opts.xAxis.fontSize * opts.pix || config.fontSize;
if (config._xAxisTextAngle_ === 0) {
- newCategories.forEach(function(item, index) {
- var xitem = opts.xAxis.formatter ? opts.xAxis.formatter(item,index,opts) : item;
+ newCategories.forEach(function (item, index) {
+ var xitem = opts.xAxis.formatter
+ ? opts.xAxis.formatter(item, index, opts)
+ : item;
var offset = -measureText(String(xitem), xAxisFontSize, context) / 2;
- if (boundaryGap == 'center') {
+ if (boundaryGap == "center") {
offset += eachSpacing / 2;
}
var scrollHeight = 0;
@@ -4578,47 +6293,98 @@ function drawXAxis(categories, opts, config, context) {
}
// 如果在主视图区域内
var _scrollDistance_ = opts._scrollDistance_ || 0;
- var truePoints = boundaryGap == 'center' ? xAxisPoints[index] + eachSpacing / 2 : xAxisPoints[index];
- if((truePoints - Math.abs(_scrollDistance_)) >= (opts.area[3] - 1) && (truePoints - Math.abs(_scrollDistance_)) <= (opts.width - opts.area[1] + 1)){
+ var truePoints =
+ boundaryGap == "center"
+ ? xAxisPoints[index] + eachSpacing / 2
+ : xAxisPoints[index];
+ if (
+ truePoints - Math.abs(_scrollDistance_) >= opts.area[3] - 1 &&
+ truePoints - Math.abs(_scrollDistance_) <=
+ opts.width - opts.area[1] + 1
+ ) {
context.beginPath();
context.setFontSize(xAxisFontSize);
- context.setFillStyle(opts.xAxis.fontColor || opts.fontColor);
- context.fillText(String(xitem), xAxisPoints[index] + offset, startY + opts.xAxis.marginTop * opts.pix + (opts.xAxis.lineHeight - opts.xAxis.fontSize) * opts.pix / 2 + opts.xAxis.fontSize * opts.pix);
+
+ // 添加颜色格式化逻辑
+ var labelColor = opts.xAxis.fontColor || opts.fontColor;
+ if (
+ opts.xAxis.labelColorFormatter &&
+ typeof opts.xAxis.labelColorFormatter === "function"
+ ) {
+ var customColor = opts.xAxis.labelColorFormatter(item, index, opts);
+ if (customColor) {
+ labelColor = customColor;
+ }
+ }
+
+ context.setFillStyle(labelColor);
+ context.fillText(
+ String(xitem),
+ xAxisPoints[index] + offset,
+ startY +
+ opts.xAxis.marginTop * opts.pix +
+ ((opts.xAxis.lineHeight - opts.xAxis.fontSize) * opts.pix) / 2 +
+ opts.xAxis.fontSize * opts.pix
+ );
context.closePath();
context.stroke();
}
});
} else {
- newCategories.forEach(function(item, index) {
+ newCategories.forEach(function (item, index) {
var xitem = opts.xAxis.formatter ? opts.xAxis.formatter(item) : item;
// 如果在主视图区域内
var _scrollDistance_ = opts._scrollDistance_ || 0;
- var truePoints = boundaryGap == 'center' ? xAxisPoints[index] + eachSpacing / 2 : xAxisPoints[index];
- if((truePoints - Math.abs(_scrollDistance_)) >= (opts.area[3] - 1) && (truePoints - Math.abs(_scrollDistance_)) <= (opts.width - opts.area[1] + 1)){
+ var truePoints =
+ boundaryGap == "center"
+ ? xAxisPoints[index] + eachSpacing / 2
+ : xAxisPoints[index];
+ if (
+ truePoints - Math.abs(_scrollDistance_) >= opts.area[3] - 1 &&
+ truePoints - Math.abs(_scrollDistance_) <=
+ opts.width - opts.area[1] + 1
+ ) {
context.save();
context.beginPath();
context.setFontSize(xAxisFontSize);
- context.setFillStyle(opts.xAxis.fontColor || opts.fontColor);
+
+ // 添加颜色格式化逻辑
+ var labelColor = opts.xAxis.fontColor || opts.fontColor;
+ if (
+ opts.xAxis.labelColorFormatter &&
+ typeof opts.xAxis.labelColorFormatter === "function"
+ ) {
+ var customColor = opts.xAxis.labelColorFormatter(item, index, opts);
+ if (customColor) {
+ labelColor = customColor;
+ }
+ }
+
+ context.setFillStyle(labelColor);
var textWidth = measureText(String(xitem), xAxisFontSize, context);
var offsetX = xAxisPoints[index];
- if (boundaryGap == 'center') {
+ if (boundaryGap == "center") {
offsetX = xAxisPoints[index] + eachSpacing / 2;
}
var scrollHeight = 0;
if (opts.xAxis.scrollShow) {
scrollHeight = 6 * opts.pix;
}
- var offsetY = startY + opts.xAxis.marginTop * opts.pix + xAxisFontSize - xAxisFontSize * Math.abs(Math.sin(config._xAxisTextAngle_));
- if(opts.xAxis.rotateAngle < 0){
+ var offsetY =
+ startY +
+ opts.xAxis.marginTop * opts.pix +
+ xAxisFontSize -
+ xAxisFontSize * Math.abs(Math.sin(config._xAxisTextAngle_));
+ if (opts.xAxis.rotateAngle < 0) {
offsetX -= xAxisFontSize / 2;
textWidth = 0;
- }else{
+ } else {
offsetX += xAxisFontSize / 2;
textWidth = -textWidth;
}
context.translate(offsetX, offsetY);
context.rotate(-1 * config._xAxisTextAngle_);
- context.fillText(String(xitem), textWidth , 0 );
+ context.fillText(String(xitem), textWidth, 0);
context.closePath();
context.stroke();
context.restore();
@@ -4627,17 +6393,25 @@ function drawXAxis(categories, opts, config, context) {
}
}
context.restore();
-
+
//画X轴标题
if (opts.xAxis.title) {
context.beginPath();
context.setFontSize(opts.xAxis.titleFontSize * opts.pix);
context.setFillStyle(opts.xAxis.titleFontColor);
- context.fillText(String(opts.xAxis.title), opts.width - opts.area[1] + opts.xAxis.titleOffsetX * opts.pix,opts.height - opts.area[2] + opts.xAxis.marginTop * opts.pix + (opts.xAxis.lineHeight - opts.xAxis.titleFontSize) * opts.pix / 2 + (opts.xAxis.titleFontSize + opts.xAxis.titleOffsetY) * opts.pix);
+ context.fillText(
+ String(opts.xAxis.title),
+ opts.width - opts.area[1] + opts.xAxis.titleOffsetX * opts.pix,
+ opts.height -
+ opts.area[2] +
+ opts.xAxis.marginTop * opts.pix +
+ ((opts.xAxis.lineHeight - opts.xAxis.titleFontSize) * opts.pix) / 2 +
+ (opts.xAxis.titleFontSize + opts.xAxis.titleOffsetY) * opts.pix
+ );
context.closePath();
context.stroke();
}
-
+
//绘制X轴轴线
if (opts.xAxis.axisLine) {
context.beginPath();
@@ -4659,15 +6433,21 @@ function drawYAxisGrid(categories, opts, config, context) {
let xAxisPoints = opts.chartData.xAxisData.xAxisPoints,
xAxiseachSpacing = opts.chartData.xAxisData.eachSpacing;
let TotalWidth = xAxiseachSpacing * (xAxisPoints.length - 1);
- if(opts.type == 'mount' && opts.extra && opts.extra.mount && opts.extra.mount.widthRatio && opts.extra.mount.widthRatio > 1 ){
- if(opts.extra.mount.widthRatio>2) opts.extra.mount.widthRatio = 2
+ if (
+ opts.type == "mount" &&
+ opts.extra &&
+ opts.extra.mount &&
+ opts.extra.mount.widthRatio &&
+ opts.extra.mount.widthRatio > 1
+ ) {
+ if (opts.extra.mount.widthRatio > 2) opts.extra.mount.widthRatio = 2;
TotalWidth += (opts.extra.mount.widthRatio - 1) * xAxiseachSpacing;
}
let endX = startX + TotalWidth;
let points = [];
- let startY = 1
+ let startY = 1;
if (opts.xAxis.axisLine === false) {
- startY = 0
+ startY = 0;
}
for (let i = startY; i < opts.yAxis.splitNumber + 1; i++) {
points.push(opts.height - opts.area[2] - eachSpacing * i);
@@ -4676,12 +6456,15 @@ function drawYAxisGrid(categories, opts, config, context) {
if (opts._scrollDistance_ && opts._scrollDistance_ !== 0) {
context.translate(opts._scrollDistance_, 0);
}
- if (opts.yAxis.gridType == 'dash') {
- context.setLineDash([opts.yAxis.dashLength * opts.pix, opts.yAxis.dashLength * opts.pix]);
+ if (opts.yAxis.gridType == "dash") {
+ context.setLineDash([
+ opts.yAxis.dashLength * opts.pix,
+ opts.yAxis.dashLength * opts.pix,
+ ]);
}
context.setStrokeStyle(opts.yAxis.gridColor);
context.setLineWidth(1 * opts.pix);
- points.forEach(function(item, index) {
+ points.forEach(function (item, index) {
context.beginPath();
context.moveTo(startX, item);
context.lineTo(endX, item);
@@ -4703,48 +6486,63 @@ function drawYAxis(series, opts, config, context) {
// set YAxis background
context.beginPath();
context.setFillStyle(opts.background);
- if (opts.enableScroll == true && opts.xAxis.scrollPosition && opts.xAxis.scrollPosition !== 'left') {
+ if (
+ opts.enableScroll == true &&
+ opts.xAxis.scrollPosition &&
+ opts.xAxis.scrollPosition !== "left"
+ ) {
context.fillRect(0, 0, startX, endY + 2 * opts.pix);
}
- if (opts.enableScroll == true && opts.xAxis.scrollPosition && opts.xAxis.scrollPosition !== 'right') {
+ if (
+ opts.enableScroll == true &&
+ opts.xAxis.scrollPosition &&
+ opts.xAxis.scrollPosition !== "right"
+ ) {
context.fillRect(endX, 0, opts.width, endY + 2 * opts.pix);
}
context.closePath();
context.stroke();
-
+
let tStartLeft = opts.area[3];
let tStartRight = opts.width - opts.area[1];
- let tStartCenter = opts.area[3] + (opts.width - opts.area[1] - opts.area[3]) / 2;
+ let tStartCenter =
+ opts.area[3] + (opts.width - opts.area[1] - opts.area[3]) / 2;
if (opts.yAxis.data) {
for (let i = 0; i < opts.yAxis.data.length; i++) {
let yData = opts.yAxis.data[i];
var points = [];
- if(yData.type === 'categories'){
+ if (yData.type === "categories") {
for (let i = 0; i <= yData.categories.length; i++) {
- points.push(opts.area[0] + spacingValid / yData.categories.length / 2 + spacingValid / yData.categories.length * i);
+ points.push(
+ opts.area[0] +
+ spacingValid / yData.categories.length / 2 +
+ (spacingValid / yData.categories.length) * i
+ );
}
- }else{
+ } else {
for (let i = 0; i <= opts.yAxis.splitNumber; i++) {
points.push(opts.area[0] + eachSpacing * i);
}
}
if (yData.disabled !== true) {
let rangesFormat = opts.chartData.yAxisData.rangesFormat[i];
- let yAxisFontSize = yData.fontSize ? yData.fontSize * opts.pix : config.fontSize;
+ let yAxisFontSize = yData.fontSize
+ ? yData.fontSize * opts.pix
+ : config.fontSize;
let yAxisWidth = opts.chartData.yAxisData.yAxisWidth[i];
let textAlign = yData.textAlign || "right";
//画Y轴刻度及文案
- rangesFormat.forEach(function(item, index) {
+ rangesFormat.forEach(function (item, index) {
var label = opts.yAxis.format(item);
var pos = points[index];
context.beginPath();
context.setFontSize(yAxisFontSize);
context.setLineWidth(1 * opts.pix);
- context.setStrokeStyle(yData.axisLineColor || '#cccccc');
+ context.setStrokeStyle(yData.axisLineColor || "#cccccc");
context.setFillStyle(yData.fontColor || opts.fontColor);
let tmpstrat = 0;
let gapwidth = 4 * opts.pix;
- if (yAxisWidth.position == 'left') {
+ if (yAxisWidth.position == "left") {
//画刻度线
if (yData.calibration == true) {
context.moveTo(tStartLeft, pos);
@@ -4754,20 +6552,23 @@ function drawYAxis(series, opts, config, context) {
//画文字
switch (textAlign) {
case "left":
- context.setTextAlign('left');
- tmpstrat = tStartLeft - yAxisWidth.width
+ context.setTextAlign("left");
+ tmpstrat = tStartLeft - yAxisWidth.width;
break;
case "right":
- context.setTextAlign('right');
- tmpstrat = tStartLeft - gapwidth
+ context.setTextAlign("right");
+ tmpstrat = tStartLeft - gapwidth;
break;
default:
- context.setTextAlign('center');
- tmpstrat = tStartLeft - yAxisWidth.width / 2
+ context.setTextAlign("center");
+ tmpstrat = tStartLeft - yAxisWidth.width / 2;
}
- context.fillText(String(label), tmpstrat, pos + yAxisFontSize / 2 - 3 * opts.pix);
-
- } else if (yAxisWidth.position == 'right') {
+ context.fillText(
+ String(label),
+ tmpstrat,
+ pos + yAxisFontSize / 2 - 3 * opts.pix
+ );
+ } else if (yAxisWidth.position == "right") {
//画刻度线
if (yData.calibration == true) {
context.moveTo(tStartRight, pos);
@@ -4776,19 +6577,23 @@ function drawYAxis(series, opts, config, context) {
}
switch (textAlign) {
case "left":
- context.setTextAlign('left');
- tmpstrat = tStartRight + gapwidth
+ context.setTextAlign("left");
+ tmpstrat = tStartRight + gapwidth;
break;
case "right":
- context.setTextAlign('right');
- tmpstrat = tStartRight + yAxisWidth.width
+ context.setTextAlign("right");
+ tmpstrat = tStartRight + yAxisWidth.width;
break;
default:
- context.setTextAlign('center');
- tmpstrat = tStartRight + yAxisWidth.width / 2
+ context.setTextAlign("center");
+ tmpstrat = tStartRight + yAxisWidth.width / 2;
}
- context.fillText(String(label), tmpstrat, pos + yAxisFontSize / 2 - 3 * opts.pix);
- } else if (yAxisWidth.position == 'center') {
+ context.fillText(
+ String(label),
+ tmpstrat,
+ pos + yAxisFontSize / 2 - 3 * opts.pix
+ );
+ } else if (yAxisWidth.position == "center") {
//画刻度线
if (yData.calibration == true) {
context.moveTo(tStartCenter, pos);
@@ -4798,35 +6603,39 @@ function drawYAxis(series, opts, config, context) {
//画文字
switch (textAlign) {
case "left":
- context.setTextAlign('left');
- tmpstrat = tStartCenter - yAxisWidth.width
+ context.setTextAlign("left");
+ tmpstrat = tStartCenter - yAxisWidth.width;
break;
case "right":
- context.setTextAlign('right');
- tmpstrat = tStartCenter - gapwidth
+ context.setTextAlign("right");
+ tmpstrat = tStartCenter - gapwidth;
break;
default:
- context.setTextAlign('center');
- tmpstrat = tStartCenter - yAxisWidth.width / 2
+ context.setTextAlign("center");
+ tmpstrat = tStartCenter - yAxisWidth.width / 2;
}
- context.fillText(String(label), tmpstrat, pos + yAxisFontSize / 2 - 3 * opts.pix);
+ context.fillText(
+ String(label),
+ tmpstrat,
+ pos + yAxisFontSize / 2 - 3 * opts.pix
+ );
}
context.closePath();
context.stroke();
- context.setTextAlign('left');
+ context.setTextAlign("left");
});
//画Y轴轴线
if (yData.axisLine !== false) {
context.beginPath();
- context.setStrokeStyle(yData.axisLineColor || '#cccccc');
+ context.setStrokeStyle(yData.axisLineColor || "#cccccc");
context.setLineWidth(1 * opts.pix);
- if (yAxisWidth.position == 'left') {
+ if (yAxisWidth.position == "left") {
context.moveTo(tStartLeft, opts.height - opts.area[2]);
context.lineTo(tStartLeft, opts.area[0]);
- } else if (yAxisWidth.position == 'right') {
+ } else if (yAxisWidth.position == "right") {
context.moveTo(tStartRight, opts.height - opts.area[2]);
context.lineTo(tStartRight, opts.area[0]);
- } else if (yAxisWidth.position == 'center') {
+ } else if (yAxisWidth.position == "center") {
context.moveTo(tStartCenter, opts.height - opts.area[2]);
context.lineTo(tStartCenter, opts.area[0]);
}
@@ -4839,25 +6648,42 @@ function drawYAxis(series, opts, config, context) {
context.beginPath();
context.setFontSize(titleFontSize);
context.setFillStyle(yData.titleFontColor || opts.fontColor);
- if (yAxisWidth.position == 'left') {
- context.fillText(title, tStartLeft - measureText(title, titleFontSize, context) / 2 + (yData.titleOffsetX || 0), opts.area[0] - (10 - (yData.titleOffsetY || 0)) * opts.pix);
- } else if (yAxisWidth.position == 'right') {
- context.fillText(title, tStartRight - measureText(title, titleFontSize, context) / 2 + (yData.titleOffsetX || 0), opts.area[0] - (10 - (yData.titleOffsetY || 0)) * opts.pix);
- } else if (yAxisWidth.position == 'center') {
- context.fillText(title, tStartCenter - measureText(title, titleFontSize, context) / 2 + (yData.titleOffsetX || 0), opts.area[0] - (10 - (yData.titleOffsetY || 0)) * opts.pix);
+ if (yAxisWidth.position == "left") {
+ context.fillText(
+ title,
+ tStartLeft -
+ measureText(title, titleFontSize, context) / 2 +
+ (yData.titleOffsetX || 0),
+ opts.area[0] - (10 - (yData.titleOffsetY || 0)) * opts.pix
+ );
+ } else if (yAxisWidth.position == "right") {
+ context.fillText(
+ title,
+ tStartRight -
+ measureText(title, titleFontSize, context) / 2 +
+ (yData.titleOffsetX || 0),
+ opts.area[0] - (10 - (yData.titleOffsetY || 0)) * opts.pix
+ );
+ } else if (yAxisWidth.position == "center") {
+ context.fillText(
+ title,
+ tStartCenter -
+ measureText(title, titleFontSize, context) / 2 +
+ (yData.titleOffsetX || 0),
+ opts.area[0] - (10 - (yData.titleOffsetY || 0)) * opts.pix
+ );
}
context.closePath();
context.stroke();
}
- if (yAxisWidth.position == 'left') {
- tStartLeft -= (yAxisWidth.width + opts.yAxis.padding * opts.pix);
+ if (yAxisWidth.position == "left") {
+ tStartLeft -= yAxisWidth.width + opts.yAxis.padding * opts.pix;
} else {
tStartRight += yAxisWidth.width + opts.yAxis.padding * opts.pix;
}
}
}
}
-
}
function drawLegend(series, opts, config, context, chartData) {
@@ -4879,27 +6705,32 @@ function drawLegend(series, opts, config, context, chartData) {
context.setStrokeStyle(opts.legend.borderColor);
context.setFillStyle(opts.legend.backgroundColor);
context.moveTo(legendArea.start.x, legendArea.start.y);
- context.rect(legendArea.start.x, legendArea.start.y, legendArea.width, legendArea.height);
+ context.rect(
+ legendArea.start.x,
+ legendArea.start.y,
+ legendArea.width,
+ legendArea.height
+ );
context.closePath();
context.fill();
context.stroke();
- legendList.forEach(function(itemList, listIndex) {
+ legendList.forEach(function (itemList, listIndex) {
let width = 0;
let height = 0;
width = legendData.widthArr[listIndex];
height = legendData.heightArr[listIndex];
let startX = 0;
let startY = 0;
- if (opts.legend.position == 'top' || opts.legend.position == 'bottom') {
+ if (opts.legend.position == "top" || opts.legend.position == "bottom") {
switch (opts.legend.float) {
- case 'left':
+ case "left":
startX = legendArea.start.x + padding;
- break;
- case 'right':
+ break;
+ case "right":
startX = legendArea.start.x + legendArea.width - width;
- break;
+ break;
default:
- startX = legendArea.start.x + (legendArea.width - width) / 2;
+ startX = legendArea.start.x + (legendArea.width - width) / 2;
}
startY = legendArea.start.y + padding + listIndex * lineHeight;
} else {
@@ -4923,40 +6754,90 @@ function drawLegend(series, opts, config, context, chartData) {
context.setStrokeStyle(item.show ? item.color : opts.legend.hiddenColor);
context.setFillStyle(item.show ? item.color : opts.legend.hiddenColor);
switch (item.legendShape) {
- case 'line':
+ case "line":
context.moveTo(startX, startY + 0.5 * lineHeight - 2 * opts.pix);
- context.fillRect(startX, startY + 0.5 * lineHeight - 2 * opts.pix, 15 * opts.pix, 4 * opts.pix);
+ context.fillRect(
+ startX,
+ startY + 0.5 * lineHeight - 2 * opts.pix,
+ 15 * opts.pix,
+ 4 * opts.pix
+ );
break;
- case 'triangle':
- context.moveTo(startX + 7.5 * opts.pix, startY + 0.5 * lineHeight - 5 * opts.pix);
- context.lineTo(startX + 2.5 * opts.pix, startY + 0.5 * lineHeight + 5 * opts.pix);
- context.lineTo(startX + 12.5 * opts.pix, startY + 0.5 * lineHeight + 5 * opts.pix);
- context.lineTo(startX + 7.5 * opts.pix, startY + 0.5 * lineHeight - 5 * opts.pix);
+ case "triangle":
+ context.moveTo(
+ startX + 7.5 * opts.pix,
+ startY + 0.5 * lineHeight - 5 * opts.pix
+ );
+ context.lineTo(
+ startX + 2.5 * opts.pix,
+ startY + 0.5 * lineHeight + 5 * opts.pix
+ );
+ context.lineTo(
+ startX + 12.5 * opts.pix,
+ startY + 0.5 * lineHeight + 5 * opts.pix
+ );
+ context.lineTo(
+ startX + 7.5 * opts.pix,
+ startY + 0.5 * lineHeight - 5 * opts.pix
+ );
break;
- case 'diamond':
- context.moveTo(startX + 7.5 * opts.pix, startY + 0.5 * lineHeight - 5 * opts.pix);
+ case "diamond":
+ context.moveTo(
+ startX + 7.5 * opts.pix,
+ startY + 0.5 * lineHeight - 5 * opts.pix
+ );
context.lineTo(startX + 2.5 * opts.pix, startY + 0.5 * lineHeight);
- context.lineTo(startX + 7.5 * opts.pix, startY + 0.5 * lineHeight + 5 * opts.pix);
+ context.lineTo(
+ startX + 7.5 * opts.pix,
+ startY + 0.5 * lineHeight + 5 * opts.pix
+ );
context.lineTo(startX + 12.5 * opts.pix, startY + 0.5 * lineHeight);
- context.lineTo(startX + 7.5 * opts.pix, startY + 0.5 * lineHeight - 5 * opts.pix);
+ context.lineTo(
+ startX + 7.5 * opts.pix,
+ startY + 0.5 * lineHeight - 5 * opts.pix
+ );
break;
- case 'circle':
+ case "circle":
context.moveTo(startX + 7.5 * opts.pix, startY + 0.5 * lineHeight);
- context.arc(startX + 7.5 * opts.pix, startY + 0.5 * lineHeight, 5 * opts.pix, 0, 2 * Math.PI);
+ context.arc(
+ startX + 7.5 * opts.pix,
+ startY + 0.5 * lineHeight,
+ 5 * opts.pix,
+ 0,
+ 2 * Math.PI
+ );
break;
- case 'rect':
+ case "rect":
context.moveTo(startX, startY + 0.5 * lineHeight - 5 * opts.pix);
- context.fillRect(startX, startY + 0.5 * lineHeight - 5 * opts.pix, 15 * opts.pix, 10 * opts.pix);
+ context.fillRect(
+ startX,
+ startY + 0.5 * lineHeight - 5 * opts.pix,
+ 15 * opts.pix,
+ 10 * opts.pix
+ );
break;
- case 'square':
- context.moveTo(startX + 5 * opts.pix, startY + 0.5 * lineHeight - 5 * opts.pix);
- context.fillRect(startX + 5 * opts.pix, startY + 0.5 * lineHeight - 5 * opts.pix, 10 * opts.pix, 10 * opts.pix);
+ case "square":
+ context.moveTo(
+ startX + 5 * opts.pix,
+ startY + 0.5 * lineHeight - 5 * opts.pix
+ );
+ context.fillRect(
+ startX + 5 * opts.pix,
+ startY + 0.5 * lineHeight - 5 * opts.pix,
+ 10 * opts.pix,
+ 10 * opts.pix
+ );
break;
- case 'none':
+ case "none":
break;
default:
context.moveTo(startX, startY + 0.5 * lineHeight - 5 * opts.pix);
- context.fillRect(startX, startY + 0.5 * lineHeight - 5 * opts.pix, 15 * opts.pix, 10 * opts.pix);
+ context.fillRect(
+ startX,
+ startY + 0.5 * lineHeight - 5 * opts.pix,
+ 15 * opts.pix,
+ 10 * opts.pix
+ );
}
context.closePath();
context.fill();
@@ -4966,15 +6847,18 @@ function drawLegend(series, opts, config, context, chartData) {
const legendText = item.legendText ? item.legendText : item.name;
context.beginPath();
context.setFontSize(fontSize);
- context.setFillStyle(item.show ? opts.legend.fontColor : opts.legend.hiddenColor);
+ context.setFillStyle(
+ item.show ? opts.legend.fontColor : opts.legend.hiddenColor
+ );
context.fillText(legendText, startX, startY + fontTrans);
context.closePath();
context.stroke();
- if (opts.legend.position == 'top' || opts.legend.position == 'bottom') {
+ if (opts.legend.position == "top" || opts.legend.position == "bottom") {
startX += measureText(legendText, fontSize, context) + itemGap;
item.area[2] = startX;
} else {
- item.area[2] = startX + measureText(legendText, fontSize, context) + itemGap;;
+ item.area[2] =
+ startX + measureText(legendText, fontSize, context) + itemGap;
startX -= shapeWidth + shapeRight;
startY += lineHeight;
}
@@ -4983,48 +6867,74 @@ function drawLegend(series, opts, config, context, chartData) {
}
function drawPieDataPoints(series, opts, config, context) {
- var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
- var pieOption = assign({}, {
- activeOpacity: 0.5,
- activeRadius: 10,
- offsetAngle: 0,
- labelWidth: 15,
- ringWidth: 30,
- customRadius: 0,
- border: false,
- borderWidth: 2,
- borderColor: '#FFFFFF',
- centerColor: '#FFFFFF',
- linearType: 'none',
- customColor: [],
- }, opts.type == "pie" ? opts.extra.pie : opts.extra.ring);
+ var process =
+ arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+ var pieOption = assign(
+ {},
+ {
+ activeOpacity: 0.5,
+ activeRadius: 10,
+ offsetAngle: 0,
+ labelWidth: 15,
+ ringWidth: 30,
+ customRadius: 0,
+ border: false,
+ borderWidth: 2,
+ borderColor: "#FFFFFF",
+ centerColor: "#FFFFFF",
+ linearType: "none",
+ customColor: [],
+ },
+ opts.type == "pie" ? opts.extra.pie : opts.extra.ring
+ );
var centerPosition = {
x: opts.area[3] + (opts.width - opts.area[1] - opts.area[3]) / 2,
- y: opts.area[0] + (opts.height - opts.area[0] - opts.area[2]) / 2
+ y: opts.area[0] + (opts.height - opts.area[0] - opts.area[2]) / 2,
};
if (config.pieChartLinePadding == 0) {
config.pieChartLinePadding = pieOption.activeRadius * opts.pix;
}
- var radius = Math.min((opts.width - opts.area[1] - opts.area[3]) / 2 - config.pieChartLinePadding - config.pieChartTextPadding - config._pieTextMaxLength_, (opts.height - opts.area[0] - opts.area[2]) / 2 - config.pieChartLinePadding - config.pieChartTextPadding);
+ var radius = Math.min(
+ (opts.width - opts.area[1] - opts.area[3]) / 2 -
+ config.pieChartLinePadding -
+ config.pieChartTextPadding -
+ config._pieTextMaxLength_,
+ (opts.height - opts.area[0] - opts.area[2]) / 2 -
+ config.pieChartLinePadding -
+ config.pieChartTextPadding
+ );
radius = radius < 10 ? 10 : radius;
if (pieOption.customRadius > 0) {
radius = pieOption.customRadius * opts.pix;
}
series = getPieDataPoints(series, radius, process);
var activeRadius = pieOption.activeRadius * opts.pix;
- pieOption.customColor = fillCustomColor(pieOption.linearType, pieOption.customColor, series, config);
- series = series.map(function(eachSeries) {
- eachSeries._start_ += (pieOption.offsetAngle) * Math.PI / 180;
+ pieOption.customColor = fillCustomColor(
+ pieOption.linearType,
+ pieOption.customColor,
+ series,
+ config
+ );
+ series = series.map(function (eachSeries) {
+ eachSeries._start_ += (pieOption.offsetAngle * Math.PI) / 180;
return eachSeries;
});
- series.forEach(function(eachSeries, seriesIndex) {
+ series.forEach(function (eachSeries, seriesIndex) {
if (opts.tooltip) {
if (opts.tooltip.index == seriesIndex) {
context.beginPath();
- context.setFillStyle(hexToRgb(eachSeries.color, pieOption.activeOpacity || 0.5));
+ context.setFillStyle(
+ hexToRgb(eachSeries.color, pieOption.activeOpacity || 0.5)
+ );
context.moveTo(centerPosition.x, centerPosition.y);
- context.arc(centerPosition.x, centerPosition.y, eachSeries._radius_ + activeRadius, eachSeries._start_, eachSeries._start_ + 2 * eachSeries._proportion_ * Math.PI);
+ context.arc(
+ centerPosition.x,
+ centerPosition.y,
+ eachSeries._radius_ + activeRadius,
+ eachSeries._start_,
+ eachSeries._start_ + 2 * eachSeries._proportion_ * Math.PI
+ );
context.closePath();
context.fill();
}
@@ -5034,92 +6944,150 @@ function drawPieDataPoints(series, opts, config, context) {
context.lineJoin = "round";
context.setStrokeStyle(pieOption.borderColor);
var fillcolor = eachSeries.color;
- if (pieOption.linearType == 'custom') {
+ if (pieOption.linearType == "custom") {
var grd;
- if(context.createCircularGradient){
- grd = context.createCircularGradient(centerPosition.x, centerPosition.y, eachSeries._radius_)
- }else{
- grd = context.createRadialGradient(centerPosition.x, centerPosition.y, 0,centerPosition.x, centerPosition.y, eachSeries._radius_)
+ if (context.createCircularGradient) {
+ grd = context.createCircularGradient(
+ centerPosition.x,
+ centerPosition.y,
+ eachSeries._radius_
+ );
+ } else {
+ grd = context.createRadialGradient(
+ centerPosition.x,
+ centerPosition.y,
+ 0,
+ centerPosition.x,
+ centerPosition.y,
+ eachSeries._radius_
+ );
}
- grd.addColorStop(0, hexToRgb(pieOption.customColor[eachSeries.linearIndex], 1))
- grd.addColorStop(1, hexToRgb(eachSeries.color, 1))
- fillcolor = grd
+ grd.addColorStop(
+ 0,
+ hexToRgb(pieOption.customColor[eachSeries.linearIndex], 1)
+ );
+ grd.addColorStop(1, hexToRgb(eachSeries.color, 1));
+ fillcolor = grd;
}
context.setFillStyle(fillcolor);
context.moveTo(centerPosition.x, centerPosition.y);
- context.arc(centerPosition.x, centerPosition.y, eachSeries._radius_, eachSeries._start_, eachSeries._start_ + 2 * eachSeries._proportion_ * Math.PI);
+ context.arc(
+ centerPosition.x,
+ centerPosition.y,
+ eachSeries._radius_,
+ eachSeries._start_,
+ eachSeries._start_ + 2 * eachSeries._proportion_ * Math.PI
+ );
context.closePath();
context.fill();
if (pieOption.border == true) {
context.stroke();
}
});
- if (opts.type === 'ring') {
+ if (opts.type === "ring") {
var innerPieWidth = radius * 0.6;
- if (typeof pieOption.ringWidth === 'number' && pieOption.ringWidth > 0) {
+ if (typeof pieOption.ringWidth === "number" && pieOption.ringWidth > 0) {
innerPieWidth = Math.max(0, radius - pieOption.ringWidth * opts.pix);
}
context.beginPath();
context.setFillStyle(pieOption.centerColor);
context.moveTo(centerPosition.x, centerPosition.y);
- context.arc(centerPosition.x, centerPosition.y, innerPieWidth, 0, 2 * Math.PI);
+ context.arc(
+ centerPosition.x,
+ centerPosition.y,
+ innerPieWidth,
+ 0,
+ 2 * Math.PI
+ );
context.closePath();
context.fill();
}
if (opts.dataLabel !== false && process === 1) {
drawPieText(series, opts, config, context, radius, centerPosition);
}
- if (process === 1 && opts.type === 'ring') {
+ if (process === 1 && opts.type === "ring") {
drawRingTitle(opts, config, context, centerPosition);
}
return {
center: centerPosition,
radius: radius,
- series: series
+ series: series,
};
}
function drawRoseDataPoints(series, opts, config, context) {
- var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
- var roseOption = assign({}, {
- type: 'area',
- activeOpacity: 0.5,
- activeRadius: 10,
- offsetAngle: 0,
- labelWidth: 15,
- border: false,
- borderWidth: 2,
- borderColor: '#FFFFFF',
- linearType: 'none',
- customColor: [],
- }, opts.extra.rose);
+ var process =
+ arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+ var roseOption = assign(
+ {},
+ {
+ type: "area",
+ activeOpacity: 0.5,
+ activeRadius: 10,
+ offsetAngle: 0,
+ labelWidth: 15,
+ border: false,
+ borderWidth: 2,
+ borderColor: "#FFFFFF",
+ linearType: "none",
+ customColor: [],
+ },
+ opts.extra.rose
+ );
if (config.pieChartLinePadding == 0) {
config.pieChartLinePadding = roseOption.activeRadius * opts.pix;
}
var centerPosition = {
x: opts.area[3] + (opts.width - opts.area[1] - opts.area[3]) / 2,
- y: opts.area[0] + (opts.height - opts.area[0] - opts.area[2]) / 2
+ y: opts.area[0] + (opts.height - opts.area[0] - opts.area[2]) / 2,
};
- var radius = Math.min((opts.width - opts.area[1] - opts.area[3]) / 2 - config.pieChartLinePadding - config.pieChartTextPadding - config._pieTextMaxLength_, (opts.height - opts.area[0] - opts.area[2]) / 2 - config.pieChartLinePadding - config.pieChartTextPadding);
+ var radius = Math.min(
+ (opts.width - opts.area[1] - opts.area[3]) / 2 -
+ config.pieChartLinePadding -
+ config.pieChartTextPadding -
+ config._pieTextMaxLength_,
+ (opts.height - opts.area[0] - opts.area[2]) / 2 -
+ config.pieChartLinePadding -
+ config.pieChartTextPadding
+ );
radius = radius < 10 ? 10 : radius;
var minRadius = roseOption.minRadius || radius * 0.5;
- if(radius < minRadius){
+ if (radius < minRadius) {
radius = minRadius + 10;
}
- series = getRoseDataPoints(series, roseOption.type, minRadius, radius, process);
+ series = getRoseDataPoints(
+ series,
+ roseOption.type,
+ minRadius,
+ radius,
+ process
+ );
var activeRadius = roseOption.activeRadius * opts.pix;
- roseOption.customColor = fillCustomColor(roseOption.linearType, roseOption.customColor, series, config);
- series = series.map(function(eachSeries) {
- eachSeries._start_ += (roseOption.offsetAngle || 0) * Math.PI / 180;
+ roseOption.customColor = fillCustomColor(
+ roseOption.linearType,
+ roseOption.customColor,
+ series,
+ config
+ );
+ series = series.map(function (eachSeries) {
+ eachSeries._start_ += ((roseOption.offsetAngle || 0) * Math.PI) / 180;
return eachSeries;
});
- series.forEach(function(eachSeries, seriesIndex) {
+ series.forEach(function (eachSeries, seriesIndex) {
if (opts.tooltip) {
if (opts.tooltip.index == seriesIndex) {
context.beginPath();
- context.setFillStyle(hexToRgb(eachSeries.color, roseOption.activeOpacity || 0.5));
+ context.setFillStyle(
+ hexToRgb(eachSeries.color, roseOption.activeOpacity || 0.5)
+ );
context.moveTo(centerPosition.x, centerPosition.y);
- context.arc(centerPosition.x, centerPosition.y, activeRadius + eachSeries._radius_, eachSeries._start_, eachSeries._start_ + 2 * eachSeries._rose_proportion_ * Math.PI);
+ context.arc(
+ centerPosition.x,
+ centerPosition.y,
+ activeRadius + eachSeries._radius_,
+ eachSeries._start_,
+ eachSeries._start_ + 2 * eachSeries._rose_proportion_ * Math.PI
+ );
context.closePath();
context.fill();
}
@@ -5129,20 +7097,40 @@ function drawRoseDataPoints(series, opts, config, context) {
context.lineJoin = "round";
context.setStrokeStyle(roseOption.borderColor);
var fillcolor = eachSeries.color;
- if (roseOption.linearType == 'custom') {
+ if (roseOption.linearType == "custom") {
var grd;
- if(context.createCircularGradient){
- grd = context.createCircularGradient(centerPosition.x, centerPosition.y, eachSeries._radius_)
- }else{
- grd = context.createRadialGradient(centerPosition.x, centerPosition.y, 0,centerPosition.x, centerPosition.y, eachSeries._radius_)
+ if (context.createCircularGradient) {
+ grd = context.createCircularGradient(
+ centerPosition.x,
+ centerPosition.y,
+ eachSeries._radius_
+ );
+ } else {
+ grd = context.createRadialGradient(
+ centerPosition.x,
+ centerPosition.y,
+ 0,
+ centerPosition.x,
+ centerPosition.y,
+ eachSeries._radius_
+ );
}
- grd.addColorStop(0, hexToRgb(roseOption.customColor[eachSeries.linearIndex], 1))
- grd.addColorStop(1, hexToRgb(eachSeries.color, 1))
- fillcolor = grd
+ grd.addColorStop(
+ 0,
+ hexToRgb(roseOption.customColor[eachSeries.linearIndex], 1)
+ );
+ grd.addColorStop(1, hexToRgb(eachSeries.color, 1));
+ fillcolor = grd;
}
context.setFillStyle(fillcolor);
context.moveTo(centerPosition.x, centerPosition.y);
- context.arc(centerPosition.x, centerPosition.y, eachSeries._radius_, eachSeries._start_, eachSeries._start_ + 2 * eachSeries._rose_proportion_ * Math.PI);
+ context.arc(
+ centerPosition.x,
+ centerPosition.y,
+ eachSeries._radius_,
+ eachSeries._start_,
+ eachSeries._start_ + 2 * eachSeries._rose_proportion_ * Math.PI
+ );
context.closePath();
context.fill();
if (roseOption.border == true) {
@@ -5156,34 +7144,39 @@ function drawRoseDataPoints(series, opts, config, context) {
return {
center: centerPosition,
radius: radius,
- series: series
+ series: series,
};
}
function drawArcbarDataPoints(series, opts, config, context) {
- var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
- var arcbarOption = assign({}, {
- startAngle: 0.75,
- endAngle: 0.25,
- type: 'default',
- direction: 'cw',
- lineCap: 'round',
- width: 12 ,
- gap: 2 ,
- linearType: 'none',
- customColor: [],
- }, opts.extra.arcbar);
+ var process =
+ arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+ var arcbarOption = assign(
+ {},
+ {
+ startAngle: 0.75,
+ endAngle: 0.25,
+ type: "default",
+ direction: "cw",
+ lineCap: "round",
+ width: 12,
+ gap: 2,
+ linearType: "none",
+ customColor: [],
+ },
+ opts.extra.arcbar
+ );
series = getArcbarDataPoints(series, arcbarOption, process);
var centerPosition;
if (arcbarOption.centerX || arcbarOption.centerY) {
centerPosition = {
x: arcbarOption.centerX ? arcbarOption.centerX : opts.width / 2,
- y: arcbarOption.centerY ? arcbarOption.centerY : opts.height / 2
+ y: arcbarOption.centerY ? arcbarOption.centerY : opts.height / 2,
};
} else {
centerPosition = {
x: opts.width / 2,
- y: opts.height / 2
+ y: opts.height / 2,
};
}
var radius;
@@ -5195,75 +7188,121 @@ function drawArcbarDataPoints(series, opts, config, context) {
radius -= arcbarOption.width / 2;
}
radius = radius < 10 ? 10 : radius;
- arcbarOption.customColor = fillCustomColor(arcbarOption.linearType, arcbarOption.customColor, series, config);
-
+ arcbarOption.customColor = fillCustomColor(
+ arcbarOption.linearType,
+ arcbarOption.customColor,
+ series,
+ config
+ );
+
for (let i = 0; i < series.length; i++) {
let eachSeries = series[i];
//背景颜色
context.setLineWidth(arcbarOption.width * opts.pix);
- context.setStrokeStyle(arcbarOption.backgroundColor || '#E9E9E9');
+ context.setStrokeStyle(arcbarOption.backgroundColor || "#E9E9E9");
context.setLineCap(arcbarOption.lineCap);
context.beginPath();
- if (arcbarOption.type == 'default') {
- context.arc(centerPosition.x, centerPosition.y, radius - (arcbarOption.width * opts.pix + arcbarOption.gap * opts.pix) * i, arcbarOption.startAngle * Math.PI, arcbarOption.endAngle * Math.PI, arcbarOption.direction == 'ccw');
+ if (arcbarOption.type == "default") {
+ context.arc(
+ centerPosition.x,
+ centerPosition.y,
+ radius -
+ (arcbarOption.width * opts.pix + arcbarOption.gap * opts.pix) * i,
+ arcbarOption.startAngle * Math.PI,
+ arcbarOption.endAngle * Math.PI,
+ arcbarOption.direction == "ccw"
+ );
} else {
- context.arc(centerPosition.x, centerPosition.y, radius - (arcbarOption.width * opts.pix + arcbarOption.gap * opts.pix) * i, 0, 2 * Math.PI, arcbarOption.direction == 'ccw');
+ context.arc(
+ centerPosition.x,
+ centerPosition.y,
+ radius -
+ (arcbarOption.width * opts.pix + arcbarOption.gap * opts.pix) * i,
+ 0,
+ 2 * Math.PI,
+ arcbarOption.direction == "ccw"
+ );
}
context.stroke();
//进度条
- var fillColor = eachSeries.color
- if(arcbarOption.linearType == 'custom'){
- var grd = context.createLinearGradient(centerPosition.x - radius, centerPosition.y, centerPosition.x + radius, centerPosition.y);
- grd.addColorStop(1, hexToRgb(arcbarOption.customColor[eachSeries.linearIndex], 1))
- grd.addColorStop(0, hexToRgb(eachSeries.color, 1))
+ var fillColor = eachSeries.color;
+ if (arcbarOption.linearType == "custom") {
+ var grd = context.createLinearGradient(
+ centerPosition.x - radius,
+ centerPosition.y,
+ centerPosition.x + radius,
+ centerPosition.y
+ );
+ grd.addColorStop(
+ 1,
+ hexToRgb(arcbarOption.customColor[eachSeries.linearIndex], 1)
+ );
+ grd.addColorStop(0, hexToRgb(eachSeries.color, 1));
fillColor = grd;
}
context.setLineWidth(arcbarOption.width * opts.pix);
context.setStrokeStyle(fillColor);
context.setLineCap(arcbarOption.lineCap);
context.beginPath();
- context.arc(centerPosition.x, centerPosition.y, radius - (arcbarOption.width * opts.pix + arcbarOption.gap * opts.pix) * i, arcbarOption.startAngle * Math.PI, eachSeries._proportion_ * Math.PI, arcbarOption.direction == 'ccw');
+ context.arc(
+ centerPosition.x,
+ centerPosition.y,
+ radius -
+ (arcbarOption.width * opts.pix + arcbarOption.gap * opts.pix) * i,
+ arcbarOption.startAngle * Math.PI,
+ eachSeries._proportion_ * Math.PI,
+ arcbarOption.direction == "ccw"
+ );
context.stroke();
}
drawRingTitle(opts, config, context, centerPosition);
return {
center: centerPosition,
radius: radius,
- series: series
+ series: series,
};
}
function drawGaugeDataPoints(categories, series, opts, config, context) {
- var process = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 1;
- var gaugeOption = assign({}, {
- type: 'default',
- startAngle: 0.75,
- endAngle: 0.25,
- width: 15,
- labelOffset:13,
- splitLine: {
- fixRadius: 0,
- splitNumber: 10,
+ var process =
+ arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 1;
+ var gaugeOption = assign(
+ {},
+ {
+ type: "default",
+ startAngle: 0.75,
+ endAngle: 0.25,
width: 15,
- color: '#FFFFFF',
- childNumber: 5,
- childWidth: 5
+ labelOffset: 13,
+ splitLine: {
+ fixRadius: 0,
+ splitNumber: 10,
+ width: 15,
+ color: "#FFFFFF",
+ childNumber: 5,
+ childWidth: 5,
+ },
+ pointer: {
+ width: 15,
+ color: "auto",
+ },
},
- pointer: {
- width: 15,
- color: 'auto'
- }
- }, opts.extra.gauge);
+ opts.extra.gauge
+ );
if (gaugeOption.oldAngle == undefined) {
gaugeOption.oldAngle = gaugeOption.startAngle;
}
if (gaugeOption.oldData == undefined) {
gaugeOption.oldData = 0;
}
- categories = getGaugeAxisPoints(categories, gaugeOption.startAngle, gaugeOption.endAngle);
+ categories = getGaugeAxisPoints(
+ categories,
+ gaugeOption.startAngle,
+ gaugeOption.endAngle
+ );
var centerPosition = {
x: opts.width / 2,
- y: opts.height / 2
+ y: opts.height / 2,
};
var radius = Math.min(centerPosition.x, centerPosition.y);
radius -= 5 * opts.pix;
@@ -5272,24 +7311,43 @@ function drawGaugeDataPoints(categories, series, opts, config, context) {
var innerRadius = radius - gaugeOption.width;
var totalAngle = 0;
//判断仪表盘的样式：default百度样式，progress新样式
- if (gaugeOption.type == 'progress') {
+ if (gaugeOption.type == "progress") {
//## 第一步画中心圆形背景和进度条背景
//中心圆形背景
var pieRadius = radius - gaugeOption.width * 3;
context.beginPath();
- let gradient = context.createLinearGradient(centerPosition.x, centerPosition.y - pieRadius, centerPosition.x, centerPosition.y + pieRadius);
+ let gradient = context.createLinearGradient(
+ centerPosition.x,
+ centerPosition.y - pieRadius,
+ centerPosition.x,
+ centerPosition.y + pieRadius
+ );
//配置渐变填充（起点：中心点向上减半径；结束点中心点向下加半径）
- gradient.addColorStop('0', hexToRgb(series[0].color, 0.3));
- gradient.addColorStop('1.0', hexToRgb("#FFFFFF", 0.1));
+ gradient.addColorStop("0", hexToRgb(series[0].color, 0.3));
+ gradient.addColorStop("1.0", hexToRgb("#FFFFFF", 0.1));
context.setFillStyle(gradient);
- context.arc(centerPosition.x, centerPosition.y, pieRadius, 0, 2 * Math.PI, false);
+ context.arc(
+ centerPosition.x,
+ centerPosition.y,
+ pieRadius,
+ 0,
+ 2 * Math.PI,
+ false
+ );
context.fill();
//画进度条背景
context.setLineWidth(gaugeOption.width);
context.setStrokeStyle(hexToRgb(series[0].color, 0.3));
- context.setLineCap('round');
+ context.setLineCap("round");
context.beginPath();
- context.arc(centerPosition.x, centerPosition.y, innerRadius, gaugeOption.startAngle * Math.PI, gaugeOption.endAngle * Math.PI, false);
+ context.arc(
+ centerPosition.x,
+ centerPosition.y,
+ innerRadius,
+ gaugeOption.startAngle * Math.PI,
+ gaugeOption.endAngle * Math.PI,
+ false
+ );
context.stroke();
//## 第二步画刻度线
if (gaugeOption.endAngle < gaugeOption.startAngle) {
@@ -5298,18 +7356,27 @@ function drawGaugeDataPoints(categories, series, opts, config, context) {
totalAngle = gaugeOption.startAngle - gaugeOption.endAngle;
}
let splitAngle = totalAngle / gaugeOption.splitLine.splitNumber;
- let childAngle = totalAngle / gaugeOption.splitLine.splitNumber / gaugeOption.splitLine.childNumber;
- let startX = -radius - gaugeOption.width * 0.5 - gaugeOption.splitLine.fixRadius;
- let endX = -radius - gaugeOption.width - gaugeOption.splitLine.fixRadius + gaugeOption.splitLine.width;
+ let childAngle =
+ totalAngle /
+ gaugeOption.splitLine.splitNumber /
+ gaugeOption.splitLine.childNumber;
+ let startX =
+ -radius - gaugeOption.width * 0.5 - gaugeOption.splitLine.fixRadius;
+ let endX =
+ -radius -
+ gaugeOption.width -
+ gaugeOption.splitLine.fixRadius +
+ gaugeOption.splitLine.width;
context.save();
context.translate(centerPosition.x, centerPosition.y);
context.rotate((gaugeOption.startAngle - 1) * Math.PI);
- let len = gaugeOption.splitLine.splitNumber * gaugeOption.splitLine.childNumber + 1;
+ let len =
+ gaugeOption.splitLine.splitNumber * gaugeOption.splitLine.childNumber + 1;
let proc = series[0].data * process;
for (let i = 0; i < len; i++) {
context.beginPath();
//刻度线随进度变色
- if (proc > (i / len)) {
+ if (proc > i / len) {
context.setStrokeStyle(hexToRgb(series[0].color, 1));
} else {
context.setStrokeStyle(hexToRgb(series[0].color, 0.3));
@@ -5325,9 +7392,16 @@ function drawGaugeDataPoints(categories, series, opts, config, context) {
series = getGaugeArcbarDataPoints(series, gaugeOption, process);
context.setLineWidth(gaugeOption.width);
context.setStrokeStyle(series[0].color);
- context.setLineCap('round');
+ context.setLineCap("round");
context.beginPath();
- context.arc(centerPosition.x, centerPosition.y, innerRadius, gaugeOption.startAngle * Math.PI, series[0]._proportion_ * Math.PI, false);
+ context.arc(
+ centerPosition.x,
+ centerPosition.y,
+ innerRadius,
+ gaugeOption.startAngle * Math.PI,
+ series[0]._proportion_ * Math.PI,
+ false
+ );
context.stroke();
//## 第四步画指针
let pointerRadius = radius - gaugeOption.width * 2.5;
@@ -5336,10 +7410,15 @@ function drawGaugeDataPoints(categories, series, opts, config, context) {
context.rotate((series[0]._proportion_ - 1) * Math.PI);
context.beginPath();
context.setLineWidth(gaugeOption.width / 3);
- let gradient3 = context.createLinearGradient(0, -pointerRadius * 0.6, 0, pointerRadius * 0.6);
- gradient3.addColorStop('0', hexToRgb('#FFFFFF', 0));
- gradient3.addColorStop('0.5', hexToRgb(series[0].color, 1));
- gradient3.addColorStop('1.0', hexToRgb('#FFFFFF', 0));
+ let gradient3 = context.createLinearGradient(
+ 0,
+ -pointerRadius * 0.6,
+ 0,
+ pointerRadius * 0.6
+ );
+ gradient3.addColorStop("0", hexToRgb("#FFFFFF", 0));
+ gradient3.addColorStop("0.5", hexToRgb(series[0].color, 1));
+ gradient3.addColorStop("1.0", hexToRgb("#FFFFFF", 0));
context.setStrokeStyle(gradient3);
context.arc(0, 0, pointerRadius, 0.85 * Math.PI, 1.15 * Math.PI, false);
context.stroke();
@@ -5358,12 +7437,19 @@ function drawGaugeDataPoints(categories, series, opts, config, context) {
} else {
//画背景
context.setLineWidth(gaugeOption.width);
- context.setLineCap('butt');
+ context.setLineCap("butt");
for (let i = 0; i < categories.length; i++) {
let eachCategories = categories[i];
context.beginPath();
context.setStrokeStyle(eachCategories.color);
- context.arc(centerPosition.x, centerPosition.y, radius, eachCategories._startAngle_ * Math.PI, eachCategories._endAngle_ * Math.PI, false);
+ context.arc(
+ centerPosition.x,
+ centerPosition.y,
+ radius,
+ eachCategories._startAngle_ * Math.PI,
+ eachCategories._endAngle_ * Math.PI,
+ false
+ );
context.stroke();
}
context.save();
@@ -5374,10 +7460,22 @@ function drawGaugeDataPoints(categories, series, opts, config, context) {
totalAngle = gaugeOption.startAngle - gaugeOption.endAngle;
}
let splitAngle = totalAngle / gaugeOption.splitLine.splitNumber;
- let childAngle = totalAngle / gaugeOption.splitLine.splitNumber / gaugeOption.splitLine.childNumber;
- let startX = -radius - gaugeOption.width * 0.5 - gaugeOption.splitLine.fixRadius;
- let endX = -radius - gaugeOption.width * 0.5 - gaugeOption.splitLine.fixRadius + gaugeOption.splitLine.width;
- let childendX = -radius - gaugeOption.width * 0.5 - gaugeOption.splitLine.fixRadius + gaugeOption.splitLine.childWidth;
+ let childAngle =
+ totalAngle /
+ gaugeOption.splitLine.splitNumber /
+ gaugeOption.splitLine.childNumber;
+ let startX =
+ -radius - gaugeOption.width * 0.5 - gaugeOption.splitLine.fixRadius;
+ let endX =
+ -radius -
+ gaugeOption.width * 0.5 -
+ gaugeOption.splitLine.fixRadius +
+ gaugeOption.splitLine.width;
+ let childendX =
+ -radius -
+ gaugeOption.width * 0.5 -
+ gaugeOption.splitLine.fixRadius +
+ gaugeOption.splitLine.childWidth;
context.translate(centerPosition.x, centerPosition.y);
context.rotate((gaugeOption.startAngle - 1) * Math.PI);
for (let i = 0; i < gaugeOption.splitLine.splitNumber + 1; i++) {
@@ -5393,7 +7491,12 @@ function drawGaugeDataPoints(categories, series, opts, config, context) {
context.save();
context.translate(centerPosition.x, centerPosition.y);
context.rotate((gaugeOption.startAngle - 1) * Math.PI);
- for (let i = 0; i < gaugeOption.splitLine.splitNumber * gaugeOption.splitLine.childNumber + 1; i++) {
+ for (
+ let i = 0;
+ i <
+ gaugeOption.splitLine.splitNumber * gaugeOption.splitLine.childNumber + 1;
+ i++
+ ) {
context.beginPath();
context.setStrokeStyle(gaugeOption.splitLine.color);
context.setLineWidth(1 * opts.pix);
@@ -5420,18 +7523,25 @@ function drawGaugeDataPoints(categories, series, opts, config, context) {
context.closePath();
context.fill();
context.beginPath();
- context.setFillStyle('#FFFFFF');
+ context.setFillStyle("#FFFFFF");
context.arc(0, 0, gaugeOption.pointer.width / 6, 0, 2 * Math.PI, false);
context.fill();
context.restore();
}
if (opts.dataLabel !== false) {
- drawGaugeLabel(gaugeOption, radius, centerPosition, opts, config, context);
+ drawGaugeLabel(
+ gaugeOption,
+ radius,
+ centerPosition,
+ opts,
+ config,
+ context
+ );
}
}
//画仪表盘标题，副标题
drawRingTitle(opts, config, context, centerPosition);
- if (process === 1 && opts.type === 'gauge') {
+ if (process === 1 && opts.type === "gauge") {
opts.extra.gauge.oldAngle = series[0]._proportion_;
opts.extra.gauge.oldData = series[0].data;
}
@@ -5440,38 +7550,48 @@ function drawGaugeDataPoints(categories, series, opts, config, context) {
radius: radius,
innerRadius: innerRadius,
categories: categories,
- totalAngle: totalAngle
+ totalAngle: totalAngle,
};
}
function drawRadarDataPoints(series, opts, config, context) {
- var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
- var radarOption = assign({}, {
- gridColor: '#cccccc',
- gridType: 'radar',
- gridEval:1,
- axisLabel:false,
- axisLabelTofix:0,
- labelShow:true,
- labelColor:'#666666',
- labelPointShow:false,
- labelPointRadius:3,
- labelPointColor:'#cccccc',
- opacity: 0.2,
- gridCount: 3,
- border:false,
- borderWidth:2,
- linearType: 'none',
- customColor: [],
- }, opts.extra.radar);
+ var process =
+ arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+ var radarOption = assign(
+ {},
+ {
+ gridColor: "#cccccc",
+ gridType: "radar",
+ gridEval: 1,
+ axisLabel: false,
+ axisLabelTofix: 0,
+ labelShow: true,
+ labelColor: "#666666",
+ labelPointShow: false,
+ labelPointRadius: 3,
+ labelPointColor: "#cccccc",
+ opacity: 0.2,
+ gridCount: 3,
+ border: false,
+ borderWidth: 2,
+ linearType: "none",
+ customColor: [],
+ },
+ opts.extra.radar
+ );
var coordinateAngle = getRadarCoordinateSeries(opts.categories.length);
var centerPosition = {
x: opts.area[3] + (opts.width - opts.area[1] - opts.area[3]) / 2,
- y: opts.area[0] + (opts.height - opts.area[0] - opts.area[2]) / 2
+ y: opts.area[0] + (opts.height - opts.area[0] - opts.area[2]) / 2,
};
- var xr = (opts.width - opts.area[1] - opts.area[3]) / 2
- var yr = (opts.height - opts.area[0] - opts.area[2]) / 2
- var radius = Math.min(xr - (getMaxTextListLength(opts.categories, config.fontSize, context) + config.radarLabelTextMargin), yr - config.radarLabelTextMargin);
+ var xr = (opts.width - opts.area[1] - opts.area[3]) / 2;
+ var yr = (opts.height - opts.area[0] - opts.area[2]) / 2;
+ var radius = Math.min(
+ xr -
+ (getMaxTextListLength(opts.categories, config.fontSize, context) +
+ config.radarLabelTextMargin),
+ yr - config.radarLabelTextMargin
+ );
radius -= config.radarLabelTextMargin * opts.pix;
radius = radius < 10 ? 10 : radius;
radius = radarOption.radius ? radarOption.radius : radius;
@@ -5479,8 +7599,12 @@ function drawRadarDataPoints(series, opts, config, context) {
context.beginPath();
context.setLineWidth(1 * opts.pix);
context.setStrokeStyle(radarOption.gridColor);
- coordinateAngle.forEach(function(angle,index) {
- var pos = convertCoordinateOrigin(radius * Math.cos(angle), radius * Math.sin(angle), centerPosition);
+ coordinateAngle.forEach(function (angle, index) {
+ var pos = convertCoordinateOrigin(
+ radius * Math.cos(angle),
+ radius * Math.sin(angle),
+ centerPosition
+ );
context.moveTo(centerPosition.x, centerPosition.y);
if (index % radarOption.gridEval == 0) {
context.lineTo(pos.x, pos.y);
@@ -5488,17 +7612,20 @@ function drawRadarDataPoints(series, opts, config, context) {
});
context.stroke();
context.closePath();
-
+
// 画背景网格
var _loop = function _loop(i) {
var startPos = {};
context.beginPath();
context.setLineWidth(1 * opts.pix);
context.setStrokeStyle(radarOption.gridColor);
- if (radarOption.gridType == 'radar') {
- coordinateAngle.forEach(function(angle, index) {
- var pos = convertCoordinateOrigin(radius / radarOption.gridCount * i * Math.cos(angle), radius /
- radarOption.gridCount * i * Math.sin(angle), centerPosition);
+ if (radarOption.gridType == "radar") {
+ coordinateAngle.forEach(function (angle, index) {
+ var pos = convertCoordinateOrigin(
+ (radius / radarOption.gridCount) * i * Math.cos(angle),
+ (radius / radarOption.gridCount) * i * Math.sin(angle),
+ centerPosition
+ );
if (index === 0) {
startPos = pos;
context.moveTo(pos.x, pos.y);
@@ -5508,8 +7635,19 @@ function drawRadarDataPoints(series, opts, config, context) {
});
context.lineTo(startPos.x, startPos.y);
} else {
- var pos = convertCoordinateOrigin(radius / radarOption.gridCount * i * Math.cos(1.5), radius / radarOption.gridCount * i * Math.sin(1.5), centerPosition);
- context.arc(centerPosition.x, centerPosition.y, centerPosition.y - pos.y, 0, 2 * Math.PI, false);
+ var pos = convertCoordinateOrigin(
+ (radius / radarOption.gridCount) * i * Math.cos(1.5),
+ (radius / radarOption.gridCount) * i * Math.sin(1.5),
+ centerPosition
+ );
+ context.arc(
+ centerPosition.x,
+ centerPosition.y,
+ centerPosition.y - pos.y,
+ 0,
+ 2 * Math.PI,
+ false
+ );
}
context.stroke();
context.closePath();
@@ -5517,29 +7655,58 @@ function drawRadarDataPoints(series, opts, config, context) {
for (var i = 1; i <= radarOption.gridCount; i++) {
_loop(i);
}
- radarOption.customColor = fillCustomColor(radarOption.linearType, radarOption.customColor, series, config);
- var radarDataPoints = getRadarDataPoints(coordinateAngle, centerPosition, radius, series, opts, process);
- radarDataPoints.forEach(function(eachSeries, seriesIndex) {
+ radarOption.customColor = fillCustomColor(
+ radarOption.linearType,
+ radarOption.customColor,
+ series,
+ config
+ );
+ var radarDataPoints = getRadarDataPoints(
+ coordinateAngle,
+ centerPosition,
+ radius,
+ series,
+ opts,
+ process
+ );
+ radarDataPoints.forEach(function (eachSeries, seriesIndex) {
// 绘制区域数据
context.beginPath();
context.setLineWidth(radarOption.borderWidth * opts.pix);
context.setStrokeStyle(eachSeries.color);
-
+
var fillcolor = hexToRgb(eachSeries.color, radarOption.opacity);
- if (radarOption.linearType == 'custom') {
+ if (radarOption.linearType == "custom") {
var grd;
- if(context.createCircularGradient){
- grd = context.createCircularGradient(centerPosition.x, centerPosition.y, radius)
- }else{
- grd = context.createRadialGradient(centerPosition.x, centerPosition.y, 0,centerPosition.x, centerPosition.y, radius)
+ if (context.createCircularGradient) {
+ grd = context.createCircularGradient(
+ centerPosition.x,
+ centerPosition.y,
+ radius
+ );
+ } else {
+ grd = context.createRadialGradient(
+ centerPosition.x,
+ centerPosition.y,
+ 0,
+ centerPosition.x,
+ centerPosition.y,
+ radius
+ );
}
- grd.addColorStop(0, hexToRgb(radarOption.customColor[series[seriesIndex].linearIndex], radarOption.opacity))
- grd.addColorStop(1, hexToRgb(eachSeries.color, radarOption.opacity))
- fillcolor = grd
+ grd.addColorStop(
+ 0,
+ hexToRgb(
+ radarOption.customColor[series[seriesIndex].linearIndex],
+ radarOption.opacity
+ )
+ );
+ grd.addColorStop(1, hexToRgb(eachSeries.color, radarOption.opacity));
+ fillcolor = grd;
}
-
+
context.setFillStyle(fillcolor);
- eachSeries.data.forEach(function(item, index) {
+ eachSeries.data.forEach(function (item, index) {
if (index === 0) {
context.moveTo(item.position.x, item.position.y);
} else {
@@ -5548,83 +7715,116 @@ function drawRadarDataPoints(series, opts, config, context) {
});
context.closePath();
context.fill();
- if(radarOption.border === true){
+ if (radarOption.border === true) {
context.stroke();
}
context.closePath();
if (opts.dataPointShape !== false) {
- var points = eachSeries.data.map(function(item) {
+ var points = eachSeries.data.map(function (item) {
return item.position;
});
- drawPointShape(points, eachSeries.color, eachSeries.pointShape, context, opts);
+ drawPointShape(
+ points,
+ eachSeries.color,
+ eachSeries.pointShape,
+ context,
+ opts
+ );
}
});
// 画刻度值
- if(radarOption.axisLabel === true){
- const maxData = Math.max(radarOption.max, Math.max.apply(null, dataCombine(series)));
+ if (radarOption.axisLabel === true) {
+ const maxData = Math.max(
+ radarOption.max,
+ Math.max.apply(null, dataCombine(series))
+ );
const stepLength = radius / radarOption.gridCount;
const fontSize = opts.fontSize * opts.pix;
context.setFontSize(fontSize);
context.setFillStyle(opts.fontColor);
- context.setTextAlign('left');
+ context.setTextAlign("left");
for (var i = 0; i < radarOption.gridCount + 1; i++) {
- let label = i * maxData / radarOption.gridCount;
+ let label = (i * maxData) / radarOption.gridCount;
label = label.toFixed(radarOption.axisLabelTofix);
- context.fillText(String(label), centerPosition.x + 3 * opts.pix, centerPosition.y - i * stepLength + fontSize / 2);
+ context.fillText(
+ String(label),
+ centerPosition.x + 3 * opts.pix,
+ centerPosition.y - i * stepLength + fontSize / 2
+ );
}
}
-
+
// draw label text
- drawRadarLabel(coordinateAngle, radius, centerPosition, opts, config, context);
-
+ drawRadarLabel(
+ coordinateAngle,
+ radius,
+ centerPosition,
+ opts,
+ config,
+ context
+ );
+
// draw dataLabel
if (opts.dataLabel !== false && process === 1) {
- radarDataPoints.forEach(function(eachSeries, seriesIndex) {
+ radarDataPoints.forEach(function (eachSeries, seriesIndex) {
context.beginPath();
var fontSize = eachSeries.textSize * opts.pix || config.fontSize;
context.setFontSize(fontSize);
context.setFillStyle(eachSeries.textColor || opts.fontColor);
- eachSeries.data.forEach(function(item, index) {
+ eachSeries.data.forEach(function (item, index) {
//如果是中心点垂直的上下点位
- if(Math.abs(item.position.x - centerPosition.x)<2){
+ if (Math.abs(item.position.x - centerPosition.x) < 2) {
//如果在上面
- if(item.position.y < centerPosition.y){
- context.setTextAlign('center');
+ if (item.position.y < centerPosition.y) {
+ context.setTextAlign("center");
context.fillText(item.value, item.position.x, item.position.y - 4);
- }else{
- context.setTextAlign('center');
- context.fillText(item.value, item.position.x, item.position.y + fontSize + 2);
+ } else {
+ context.setTextAlign("center");
+ context.fillText(
+ item.value,
+ item.position.x,
+ item.position.y + fontSize + 2
+ );
}
- }else{
+ } else {
//如果在左侧
- if(item.position.x < centerPosition.x){
- context.setTextAlign('right');
- context.fillText(item.value, item.position.x - 4, item.position.y + fontSize / 2 - 2);
- }else{
- context.setTextAlign('left');
- context.fillText(item.value, item.position.x + 4, item.position.y + fontSize / 2 - 2);
+ if (item.position.x < centerPosition.x) {
+ context.setTextAlign("right");
+ context.fillText(
+ item.value,
+ item.position.x - 4,
+ item.position.y + fontSize / 2 - 2
+ );
+ } else {
+ context.setTextAlign("left");
+ context.fillText(
+ item.value,
+ item.position.x + 4,
+ item.position.y + fontSize / 2 - 2
+ );
}
}
});
context.closePath();
context.stroke();
});
- context.setTextAlign('left');
+ context.setTextAlign("left");
}
-
+
return {
center: centerPosition,
radius: radius,
- angleList: coordinateAngle
+ angleList: coordinateAngle,
};
}
// 经纬度转墨卡托
function lonlat2mercator(longitude, latitude) {
var mercator = Array(2);
- var x = longitude * 20037508.34 / 180;
- var y = Math.log(Math.tan((90 + latitude) * Math.PI / 360)) / (Math.PI / 180);
- y = y * 20037508.34 / 180;
+ var x = (longitude * 20037508.34) / 180;
+ var y =
+ Math.log(Math.tan(((90 + latitude) * Math.PI) / 360)) / (Math.PI / 180);
+ y = (y * 20037508.34) / 180;
mercator[0] = x;
mercator[1] = y;
return mercator;
@@ -5632,35 +7832,38 @@ function lonlat2mercator(longitude, latitude) {
// 墨卡托转经纬度
function mercator2lonlat(longitude, latitude) {
- var lonlat = Array(2)
- var x = longitude / 20037508.34 * 180;
- var y = latitude / 20037508.34 * 180;
- y = 180 / Math.PI * (2 * Math.atan(Math.exp(y * Math.PI / 180)) - Math.PI / 2);
+ var lonlat = Array(2);
+ var x = (longitude / 20037508.34) * 180;
+ var y = (latitude / 20037508.34) * 180;
+ y =
+ (180 / Math.PI) *
+ (2 * Math.atan(Math.exp((y * Math.PI) / 180)) - Math.PI / 2);
lonlat[0] = x;
lonlat[1] = y;
return lonlat;
}
function getBoundingBox(data) {
- var bounds = {},coords;
+ var bounds = {},
+ coords;
bounds.xMin = 180;
bounds.xMax = 0;
bounds.yMin = 90;
- bounds.yMax = 0
+ bounds.yMax = 0;
for (var i = 0; i < data.length; i++) {
- var coorda = data[i].geometry.coordinates
+ var coorda = data[i].geometry.coordinates;
for (var k = 0; k < coorda.length; k++) {
coords = coorda[k];
if (coords.length == 1) {
- coords = coords[0]
+ coords = coords[0];
}
for (var j = 0; j < coords.length; j++) {
var longitude = coords[j][0];
var latitude = coords[j][1];
var point = {
x: longitude,
- y: latitude
- }
+ y: latitude,
+ };
bounds.xMin = bounds.xMin < point.x ? bounds.xMin : point.x;
bounds.xMax = bounds.xMax > point.x ? bounds.xMax : point.x;
bounds.yMin = bounds.yMin < point.y ? bounds.yMin : point.y;
@@ -5671,17 +7874,24 @@ function getBoundingBox(data) {
return bounds;
}
-function coordinateToPoint(latitude, longitude, bounds, scale, xoffset, yoffset) {
+function coordinateToPoint(
+ latitude,
+ longitude,
+ bounds,
+ scale,
+ xoffset,
+ yoffset
+) {
return {
x: (longitude - bounds.xMin) * scale + xoffset,
- y: (bounds.yMax - latitude) * scale + yoffset
+ y: (bounds.yMax - latitude) * scale + yoffset,
};
}
function pointToCoordinate(pointY, pointX, bounds, scale, xoffset, yoffset) {
return {
x: (pointX - xoffset) / scale + bounds.xMin,
- y: bounds.yMax - (pointY - yoffset) / scale
+ y: bounds.yMax - (pointY - yoffset) / scale,
};
}
@@ -5704,7 +7914,9 @@ function isRayIntersectsSegment(poi, s_poi, e_poi) {
if (s_poi[0] < poi[0] && e_poi[1] < poi[1]) {
return false;
}
- let xseg = e_poi[0] - (e_poi[0] - s_poi[0]) * (e_poi[1] - poi[1]) / (e_poi[1] - s_poi[1]);
+ let xseg =
+ e_poi[0] -
+ ((e_poi[0] - s_poi[0]) * (e_poi[1] - poi[1])) / (e_poi[1] - s_poi[1]);
if (xseg < poi[0]) {
return false;
} else {
@@ -5717,7 +7929,7 @@ function isPoiWithinPoly(poi, poly, mercator) {
for (let i = 0; i < poly.length; i++) {
let epoly = poly[i][0];
if (poly.length == 1) {
- epoly = poly[i][0]
+ epoly = poly[i][0];
}
for (let j = 0; j < epoly.length - 1; j++) {
let s_poi = epoly[j];
@@ -5739,58 +7951,75 @@ function isPoiWithinPoly(poi, poly, mercator) {
}
function drawMapDataPoints(series, opts, config, context) {
- var mapOption = assign({}, {
- border: true,
- mercator: false,
- borderWidth: 1,
- active:true,
- borderColor: '#666666',
- fillOpacity: 0.6,
- activeBorderColor: '#f04864',
- activeFillColor: '#facc14',
- activeFillOpacity: 1
- }, opts.extra.map);
+ var mapOption = assign(
+ {},
+ {
+ border: true,
+ mercator: false,
+ borderWidth: 1,
+ active: true,
+ borderColor: "#666666",
+ fillOpacity: 0.6,
+ activeBorderColor: "#f04864",
+ activeFillColor: "#facc14",
+ activeFillOpacity: 1,
+ },
+ opts.extra.map
+ );
var coords, point;
var data = series;
var bounds = getBoundingBox(data);
if (mapOption.mercator) {
- var max = lonlat2mercator(bounds.xMax, bounds.yMax)
- var min = lonlat2mercator(bounds.xMin, bounds.yMin)
- bounds.xMax = max[0]
- bounds.yMax = max[1]
- bounds.xMin = min[0]
- bounds.yMin = min[1]
+ var max = lonlat2mercator(bounds.xMax, bounds.yMax);
+ var min = lonlat2mercator(bounds.xMin, bounds.yMin);
+ bounds.xMax = max[0];
+ bounds.yMax = max[1];
+ bounds.xMin = min[0];
+ bounds.yMin = min[1];
}
var xScale = opts.width / Math.abs(bounds.xMax - bounds.xMin);
var yScale = opts.height / Math.abs(bounds.yMax - bounds.yMin);
var scale = xScale < yScale ? xScale : yScale;
- var xoffset = opts.width / 2 - Math.abs(bounds.xMax - bounds.xMin) / 2 * scale;
- var yoffset = opts.height / 2 - Math.abs(bounds.yMax - bounds.yMin) / 2 * scale;
+ var xoffset =
+ opts.width / 2 - (Math.abs(bounds.xMax - bounds.xMin) / 2) * scale;
+ var yoffset =
+ opts.height / 2 - (Math.abs(bounds.yMax - bounds.yMin) / 2) * scale;
for (var i = 0; i < data.length; i++) {
context.beginPath();
context.setLineWidth(mapOption.borderWidth * opts.pix);
context.setStrokeStyle(mapOption.borderColor);
- context.setFillStyle(hexToRgb(series[i].color, series[i].fillOpacity||mapOption.fillOpacity));
+ context.setFillStyle(
+ hexToRgb(series[i].color, series[i].fillOpacity || mapOption.fillOpacity)
+ );
if (mapOption.active == true && opts.tooltip) {
if (opts.tooltip.index == i) {
context.setStrokeStyle(mapOption.activeBorderColor);
- context.setFillStyle(hexToRgb(mapOption.activeFillColor, mapOption.activeFillOpacity));
+ context.setFillStyle(
+ hexToRgb(mapOption.activeFillColor, mapOption.activeFillOpacity)
+ );
}
}
- var coorda = data[i].geometry.coordinates
+ var coorda = data[i].geometry.coordinates;
for (var k = 0; k < coorda.length; k++) {
coords = coorda[k];
if (coords.length == 1) {
- coords = coords[0]
+ coords = coords[0];
}
for (var j = 0; j < coords.length; j++) {
var gaosi = Array(2);
if (mapOption.mercator) {
- gaosi = lonlat2mercator(coords[j][0], coords[j][1])
+ gaosi = lonlat2mercator(coords[j][0], coords[j][1]);
} else {
- gaosi = coords[j]
+ gaosi = coords[j];
}
- point = coordinateToPoint(gaosi[1], gaosi[0], bounds, scale, xoffset, yoffset)
+ point = coordinateToPoint(
+ gaosi[1],
+ gaosi[0],
+ bounds,
+ scale,
+ xoffset,
+ yoffset
+ );
if (j === 0) {
context.beginPath();
context.moveTo(point.x, point.y);
@@ -5809,19 +8038,38 @@ function drawMapDataPoints(series, opts, config, context) {
var centerPoint = data[i].properties.centroid;
if (centerPoint) {
if (mapOption.mercator) {
- centerPoint = lonlat2mercator(data[i].properties.centroid[0], data[i].properties.centroid[1])
+ centerPoint = lonlat2mercator(
+ data[i].properties.centroid[0],
+ data[i].properties.centroid[1]
+ );
}
- point = coordinateToPoint(centerPoint[1], centerPoint[0], bounds, scale, xoffset, yoffset);
+ point = coordinateToPoint(
+ centerPoint[1],
+ centerPoint[0],
+ bounds,
+ scale,
+ xoffset,
+ yoffset
+ );
let fontSize = data[i].textSize * opts.pix || config.fontSize;
let fontColor = data[i].textColor || opts.fontColor;
- if(mapOption.active && mapOption.activeTextColor && opts.tooltip && opts.tooltip.index == i){
+ if (
+ mapOption.active &&
+ mapOption.activeTextColor &&
+ opts.tooltip &&
+ opts.tooltip.index == i
+ ) {
fontColor = mapOption.activeTextColor;
}
let text = data[i].properties.name;
context.beginPath();
- context.setFontSize(fontSize)
- context.setFillStyle(fontColor)
- context.fillText(text, point.x - measureText(text, fontSize, context) / 2, point.y + fontSize / 2);
+ context.setFontSize(fontSize);
+ context.setFillStyle(fontColor);
+ context.fillText(
+ text,
+ point.x - measureText(text, fontSize, context) / 2,
+ point.y + fontSize / 2
+ );
context.closePath();
context.stroke();
}
@@ -5832,8 +8080,8 @@ function drawMapDataPoints(series, opts, config, context) {
scale: scale,
xoffset: xoffset,
yoffset: yoffset,
- mercator: mapOption.mercator
- }
+ mercator: mapOption.mercator,
+ };
drawToolTipBridge(opts, config, context, 1);
context.draw();
}
@@ -5843,17 +8091,28 @@ function normalInt(min, max, iter) {
var arr = [];
for (var i = 0; i < iter; i++) {
arr[i] = Math.random();
- };
- return Math.floor(arr.reduce(function(i, j) {
- return i + j
- }) / iter * (max - min)) + min;
-};
+ }
+ return (
+ Math.floor(
+ (arr.reduce(function (i, j) {
+ return i + j;
+ }) /
+ iter) *
+ (max - min)
+ ) + min
+ );
+}
function collisionNew(area, points, width, height) {
var isIn = false;
for (let i = 0; i < points.length; i++) {
if (points[i].area) {
- if (area[3] < points[i].area[1] || area[0] > points[i].area[2] || area[1] > points[i].area[3] || area[2] < points[i].area[0]) {
+ if (
+ area[3] < points[i].area[1] ||
+ area[0] > points[i].area[2] ||
+ area[1] > points[i].area[3] ||
+ area[2] < points[i].area[0]
+ ) {
if (area[0] < 0 || area[1] < 0 || area[2] > width || area[3] > height) {
isIn = true;
break;
@@ -5867,12 +8126,12 @@ function collisionNew(area, points, width, height) {
}
}
return isIn;
-};
+}
function getWordCloudPoint(opts, type, context) {
let points = opts.series;
switch (type) {
- case 'normal':
+ case "normal":
for (let i = 0; i < points.length; i++) {
let text = points[i].name;
let tHeight = points[i].textSize * opts.pix;
@@ -5884,8 +8143,11 @@ function getWordCloudPoint(opts, type, context) {
breaknum++;
x = normalInt(-opts.width / 2, opts.width / 2, 5) - tWidth / 2;
y = normalInt(-opts.height / 2, opts.height / 2, 5) + tHeight / 2;
- area = [x - 5 + opts.width / 2, y - 5 - tHeight + opts.height / 2, x + tWidth + 5 + opts.width / 2, y + 5 +
- opts.height / 2
+ area = [
+ x - 5 + opts.width / 2,
+ y - 5 - tHeight + opts.height / 2,
+ x + tWidth + 5 + opts.width / 2,
+ y + 5 + opts.height / 2,
];
let isCollision = collisionNew(area, points, opts.width, opts.height);
if (!isCollision) break;
@@ -5893,19 +8155,19 @@ function getWordCloudPoint(opts, type, context) {
area = [-100, -100, -100, -100];
break;
}
- };
+ }
points[i].area = area;
}
break;
- case 'vertical':
+ case "vertical":
function Spin() {
//获取均匀随机值，是否旋转，旋转的概率为（1-0.5）
if (Math.random() > 0.7) {
return true;
} else {
- return false
- };
- };
+ return false;
+ }
+ }
for (let i = 0; i < points.length; i++) {
let text = points[i].name;
let tHeight = points[i].textSize * opts.pix;
@@ -5919,13 +8181,41 @@ function getWordCloudPoint(opts, type, context) {
if (isSpin) {
x = normalInt(-opts.width / 2, opts.width / 2, 5) - tWidth / 2;
y = normalInt(-opts.height / 2, opts.height / 2, 5) + tHeight / 2;
- area = [y - 5 - tWidth + opts.width / 2, (-x - 5 + opts.height / 2), y + 5 + opts.width / 2, (-x + tHeight + 5 + opts.height / 2)];
- areav = [opts.width - (opts.width / 2 - opts.height / 2) - (-x + tHeight + 5 + opts.height / 2) - 5, (opts.height / 2 - opts.width / 2) + (y - 5 - tWidth + opts.width / 2) - 5, opts.width - (opts.width / 2 - opts.height / 2) - (-x + tHeight + 5 + opts.height / 2) + tHeight, (opts.height / 2 - opts.width / 2) + (y - 5 - tWidth + opts.width / 2) + tWidth + 5];
+ area = [
+ y - 5 - tWidth + opts.width / 2,
+ -x - 5 + opts.height / 2,
+ y + 5 + opts.width / 2,
+ -x + tHeight + 5 + opts.height / 2,
+ ];
+ areav = [
+ opts.width -
+ (opts.width / 2 - opts.height / 2) -
+ (-x + tHeight + 5 + opts.height / 2) -
+ 5,
+ opts.height / 2 -
+ opts.width / 2 +
+ (y - 5 - tWidth + opts.width / 2) -
+ 5,
+ opts.width -
+ (opts.width / 2 - opts.height / 2) -
+ (-x + tHeight + 5 + opts.height / 2) +
+ tHeight,
+ opts.height / 2 -
+ opts.width / 2 +
+ (y - 5 - tWidth + opts.width / 2) +
+ tWidth +
+ 5,
+ ];
isCollision = collisionNew(areav, points, opts.height, opts.width);
} else {
x = normalInt(-opts.width / 2, opts.width / 2, 5) - tWidth / 2;
y = normalInt(-opts.height / 2, opts.height / 2, 5) + tHeight / 2;
- area = [x - 5 + opts.width / 2, y - 5 - tHeight + opts.height / 2, x + tWidth + 5 + opts.width / 2, y + 5 + opts.height / 2];
+ area = [
+ x - 5 + opts.width / 2,
+ y - 5 - tHeight + opts.height / 2,
+ x + tWidth + 5 + opts.width / 2,
+ y + 5 + opts.height / 2,
+ ];
isCollision = collisionNew(area, points, opts.width, opts.height);
}
if (!isCollision) break;
@@ -5933,7 +8223,7 @@ function getWordCloudPoint(opts, type, context) {
area = [-1000, -1000, -1000, -1000];
break;
}
- };
+ }
if (isSpin) {
points[i].area = areav;
points[i].areav = area;
@@ -5941,20 +8231,29 @@ function getWordCloudPoint(opts, type, context) {
points[i].area = area;
}
points[i].rotate = isSpin;
- };
+ }
break;
}
return points;
}
function drawWordCloudDataPoints(series, opts, config, context) {
- let process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
- let wordOption = assign({}, {
- type: 'normal',
- autoColors: true
- }, opts.extra.word);
+ let process =
+ arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+ let wordOption = assign(
+ {},
+ {
+ type: "normal",
+ autoColors: true,
+ },
+ opts.extra.word
+ );
if (!opts.chartData.wordCloudData) {
- opts.chartData.wordCloudData = getWordCloudPoint(opts, wordOption.type, context);
+ opts.chartData.wordCloudData = getWordCloudPoint(
+ opts,
+ wordOption.type,
+ context
+ );
}
context.beginPath();
context.setFillStyle(opts.background);
@@ -5966,7 +8265,7 @@ function drawWordCloudDataPoints(series, opts, config, context) {
for (let i = 0; i < points.length; i++) {
context.save();
if (points[i].rotate) {
- context.rotate(90 * Math.PI / 180);
+ context.rotate((90 * Math.PI) / 180);
}
let text = points[i].name;
let tHeight = points[i].textSize * opts.pix;
@@ -5979,24 +8278,54 @@ function drawWordCloudDataPoints(series, opts, config, context) {
if (points[i].areav[0] > 0) {
if (opts.tooltip) {
if (opts.tooltip.index == i) {
- context.strokeText(text, (points[i].areav[0] + 5 - opts.width / 2) * process - tWidth * (1 - process) / 2, (points[i].areav[1] + 5 + tHeight - opts.height / 2) * process);
+ context.strokeText(
+ text,
+ (points[i].areav[0] + 5 - opts.width / 2) * process -
+ (tWidth * (1 - process)) / 2,
+ (points[i].areav[1] + 5 + tHeight - opts.height / 2) * process
+ );
} else {
- context.fillText(text, (points[i].areav[0] + 5 - opts.width / 2) * process - tWidth * (1 - process) / 2, (points[i].areav[1] + 5 + tHeight - opts.height / 2) * process);
+ context.fillText(
+ text,
+ (points[i].areav[0] + 5 - opts.width / 2) * process -
+ (tWidth * (1 - process)) / 2,
+ (points[i].areav[1] + 5 + tHeight - opts.height / 2) * process
+ );
}
} else {
- context.fillText(text, (points[i].areav[0] + 5 - opts.width / 2) * process - tWidth * (1 - process) / 2, (points[i].areav[1] + 5 + tHeight - opts.height / 2) * process);
+ context.fillText(
+ text,
+ (points[i].areav[0] + 5 - opts.width / 2) * process -
+ (tWidth * (1 - process)) / 2,
+ (points[i].areav[1] + 5 + tHeight - opts.height / 2) * process
+ );
}
}
} else {
if (points[i].area[0] > 0) {
if (opts.tooltip) {
if (opts.tooltip.index == i) {
- context.strokeText(text, (points[i].area[0] + 5 - opts.width / 2) * process - tWidth * (1 - process) / 2, (points[i].area[1] + 5 + tHeight - opts.height / 2) * process);
+ context.strokeText(
+ text,
+ (points[i].area[0] + 5 - opts.width / 2) * process -
+ (tWidth * (1 - process)) / 2,
+ (points[i].area[1] + 5 + tHeight - opts.height / 2) * process
+ );
} else {
- context.fillText(text, (points[i].area[0] + 5 - opts.width / 2) * process - tWidth * (1 - process) / 2, (points[i].area[1] + 5 + tHeight - opts.height / 2) * process);
+ context.fillText(
+ text,
+ (points[i].area[0] + 5 - opts.width / 2) * process -
+ (tWidth * (1 - process)) / 2,
+ (points[i].area[1] + 5 + tHeight - opts.height / 2) * process
+ );
}
} else {
- context.fillText(text, (points[i].area[0] + 5 - opts.width / 2) * process - tWidth * (1 - process) / 2, (points[i].area[1] + 5 + tHeight - opts.height / 2) * process);
+ context.fillText(
+ text,
+ (points[i].area[0] + 5 - opts.width / 2) * process -
+ (tWidth * (1 - process)) / 2,
+ (points[i].area[1] + 5 + tHeight - opts.height / 2) * process
+ );
}
}
}
@@ -6007,38 +8336,59 @@ function drawWordCloudDataPoints(series, opts, config, context) {
}
function drawFunnelDataPoints(series, opts, config, context) {
- let process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
- let funnelOption = assign({}, {
- type:'funnel',
- activeWidth: 10,
- activeOpacity: 0.3,
- border: false,
- borderWidth: 2,
- borderColor: '#FFFFFF',
- fillOpacity: 1,
- minSize: 0,
- labelAlign: 'right',
- linearType: 'none',
- customColor: [],
- }, opts.extra.funnel);
+ let process =
+ arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+ let funnelOption = assign(
+ {},
+ {
+ type: "funnel",
+ activeWidth: 10,
+ activeOpacity: 0.3,
+ border: false,
+ borderWidth: 2,
+ borderColor: "#FFFFFF",
+ fillOpacity: 1,
+ minSize: 0,
+ labelAlign: "right",
+ linearType: "none",
+ customColor: [],
+ },
+ opts.extra.funnel
+ );
let eachSpacing = (opts.height - opts.area[0] - opts.area[2]) / series.length;
let centerPosition = {
x: opts.area[3] + (opts.width - opts.area[1] - opts.area[3]) / 2,
- y: opts.height - opts.area[2]
+ y: opts.height - opts.area[2],
};
let activeWidth = funnelOption.activeWidth * opts.pix;
- let radius = Math.min((opts.width - opts.area[1] - opts.area[3]) / 2 - activeWidth, (opts.height - opts.area[0] - opts.area[2]) / 2 - activeWidth);
- let seriesNew = getFunnelDataPoints(series, radius, funnelOption, eachSpacing, process);
+ let radius = Math.min(
+ (opts.width - opts.area[1] - opts.area[3]) / 2 - activeWidth,
+ (opts.height - opts.area[0] - opts.area[2]) / 2 - activeWidth
+ );
+ let seriesNew = getFunnelDataPoints(
+ series,
+ radius,
+ funnelOption,
+ eachSpacing,
+ process
+ );
context.save();
context.translate(centerPosition.x, centerPosition.y);
- funnelOption.customColor = fillCustomColor(funnelOption.linearType, funnelOption.customColor, series, config);
- if(funnelOption.type == 'pyramid'){
+ funnelOption.customColor = fillCustomColor(
+ funnelOption.linearType,
+ funnelOption.customColor,
+ series,
+ config
+ );
+ if (funnelOption.type == "pyramid") {
for (let i = 0; i < seriesNew.length; i++) {
- if (i == seriesNew.length -1) {
+ if (i == seriesNew.length - 1) {
if (opts.tooltip) {
if (opts.tooltip.index == i) {
context.beginPath();
- context.setFillStyle(hexToRgb(seriesNew[i].color, funnelOption.activeOpacity));
+ context.setFillStyle(
+ hexToRgb(seriesNew[i].color, funnelOption.activeOpacity)
+ );
context.moveTo(-activeWidth, -eachSpacing);
context.lineTo(-seriesNew[i].radius - activeWidth, 0);
context.lineTo(seriesNew[i].radius + activeWidth, 0);
@@ -6048,17 +8398,39 @@ function drawFunnelDataPoints(series, opts, config, context) {
context.fill();
}
}
- seriesNew[i].funnelArea = [centerPosition.x - seriesNew[i].radius, centerPosition.y - eachSpacing * (i + 1), centerPosition.x + seriesNew[i].radius, centerPosition.y - eachSpacing * i];
+ seriesNew[i].funnelArea = [
+ centerPosition.x - seriesNew[i].radius,
+ centerPosition.y - eachSpacing * (i + 1),
+ centerPosition.x + seriesNew[i].radius,
+ centerPosition.y - eachSpacing * i,
+ ];
context.beginPath();
context.setLineWidth(funnelOption.borderWidth * opts.pix);
context.setStrokeStyle(funnelOption.borderColor);
var fillColor = hexToRgb(seriesNew[i].color, funnelOption.fillOpacity);
- if (funnelOption.linearType == 'custom') {
- var grd = context.createLinearGradient(seriesNew[i].radius, -eachSpacing, -seriesNew[i].radius, -eachSpacing);
- grd.addColorStop(0, hexToRgb(seriesNew[i].color, funnelOption.fillOpacity));
- grd.addColorStop(0.5, hexToRgb(funnelOption.customColor[seriesNew[i].linearIndex], funnelOption.fillOpacity));
- grd.addColorStop(1, hexToRgb(seriesNew[i].color, funnelOption.fillOpacity));
- fillColor = grd
+ if (funnelOption.linearType == "custom") {
+ var grd = context.createLinearGradient(
+ seriesNew[i].radius,
+ -eachSpacing,
+ -seriesNew[i].radius,
+ -eachSpacing
+ );
+ grd.addColorStop(
+ 0,
+ hexToRgb(seriesNew[i].color, funnelOption.fillOpacity)
+ );
+ grd.addColorStop(
+ 0.5,
+ hexToRgb(
+ funnelOption.customColor[seriesNew[i].linearIndex],
+ funnelOption.fillOpacity
+ )
+ );
+ grd.addColorStop(
+ 1,
+ hexToRgb(seriesNew[i].color, funnelOption.fillOpacity)
+ );
+ fillColor = grd;
}
context.setFillStyle(fillColor);
context.moveTo(0, -eachSpacing);
@@ -6074,10 +8446,15 @@ function drawFunnelDataPoints(series, opts, config, context) {
if (opts.tooltip) {
if (opts.tooltip.index == i) {
context.beginPath();
- context.setFillStyle(hexToRgb(seriesNew[i].color, funnelOption.activeOpacity));
+ context.setFillStyle(
+ hexToRgb(seriesNew[i].color, funnelOption.activeOpacity)
+ );
context.moveTo(0, 0);
context.lineTo(-seriesNew[i].radius - activeWidth, 0);
- context.lineTo(-seriesNew[i + 1].radius - activeWidth, -eachSpacing);
+ context.lineTo(
+ -seriesNew[i + 1].radius - activeWidth,
+ -eachSpacing
+ );
context.lineTo(seriesNew[i + 1].radius + activeWidth, -eachSpacing);
context.lineTo(seriesNew[i].radius + activeWidth, 0);
context.lineTo(0, 0);
@@ -6085,17 +8462,39 @@ function drawFunnelDataPoints(series, opts, config, context) {
context.fill();
}
}
- seriesNew[i].funnelArea = [centerPosition.x - seriesNew[i].radius, centerPosition.y - eachSpacing * (i + 1), centerPosition.x + seriesNew[i].radius, centerPosition.y - eachSpacing * i];
+ seriesNew[i].funnelArea = [
+ centerPosition.x - seriesNew[i].radius,
+ centerPosition.y - eachSpacing * (i + 1),
+ centerPosition.x + seriesNew[i].radius,
+ centerPosition.y - eachSpacing * i,
+ ];
context.beginPath();
context.setLineWidth(funnelOption.borderWidth * opts.pix);
context.setStrokeStyle(funnelOption.borderColor);
var fillColor = hexToRgb(seriesNew[i].color, funnelOption.fillOpacity);
- if (funnelOption.linearType == 'custom') {
- var grd = context.createLinearGradient(seriesNew[i].radius, -eachSpacing, -seriesNew[i].radius, -eachSpacing);
- grd.addColorStop(0, hexToRgb(seriesNew[i].color, funnelOption.fillOpacity));
- grd.addColorStop(0.5, hexToRgb(funnelOption.customColor[seriesNew[i].linearIndex], funnelOption.fillOpacity));
- grd.addColorStop(1, hexToRgb(seriesNew[i].color, funnelOption.fillOpacity));
- fillColor = grd
+ if (funnelOption.linearType == "custom") {
+ var grd = context.createLinearGradient(
+ seriesNew[i].radius,
+ -eachSpacing,
+ -seriesNew[i].radius,
+ -eachSpacing
+ );
+ grd.addColorStop(
+ 0,
+ hexToRgb(seriesNew[i].color, funnelOption.fillOpacity)
+ );
+ grd.addColorStop(
+ 0.5,
+ hexToRgb(
+ funnelOption.customColor[seriesNew[i].linearIndex],
+ funnelOption.fillOpacity
+ )
+ );
+ grd.addColorStop(
+ 1,
+ hexToRgb(seriesNew[i].color, funnelOption.fillOpacity)
+ );
+ fillColor = grd;
}
context.setFillStyle(fillColor);
context.moveTo(0, 0);
@@ -6110,43 +8509,67 @@ function drawFunnelDataPoints(series, opts, config, context) {
context.stroke();
}
}
- context.translate(0, -eachSpacing)
+ context.translate(0, -eachSpacing);
}
- }else{
- context.translate(0, - (seriesNew.length - 1) * eachSpacing);
+ } else {
+ context.translate(0, -(seriesNew.length - 1) * eachSpacing);
for (let i = 0; i < seriesNew.length; i++) {
if (i == seriesNew.length - 1) {
if (opts.tooltip) {
if (opts.tooltip.index == i) {
context.beginPath();
- context.setFillStyle(hexToRgb(seriesNew[i].color, funnelOption.activeOpacity));
- context.moveTo(-activeWidth - funnelOption.minSize/2, 0);
+ context.setFillStyle(
+ hexToRgb(seriesNew[i].color, funnelOption.activeOpacity)
+ );
+ context.moveTo(-activeWidth - funnelOption.minSize / 2, 0);
context.lineTo(-seriesNew[i].radius - activeWidth, -eachSpacing);
context.lineTo(seriesNew[i].radius + activeWidth, -eachSpacing);
- context.lineTo(activeWidth + funnelOption.minSize/2, 0);
- context.lineTo(-activeWidth - funnelOption.minSize/2, 0);
+ context.lineTo(activeWidth + funnelOption.minSize / 2, 0);
+ context.lineTo(-activeWidth - funnelOption.minSize / 2, 0);
context.closePath();
context.fill();
}
}
- seriesNew[i].funnelArea = [centerPosition.x - seriesNew[i].radius, centerPosition.y - eachSpacing, centerPosition.x + seriesNew[i].radius, centerPosition.y ];
+ seriesNew[i].funnelArea = [
+ centerPosition.x - seriesNew[i].radius,
+ centerPosition.y - eachSpacing,
+ centerPosition.x + seriesNew[i].radius,
+ centerPosition.y,
+ ];
context.beginPath();
context.setLineWidth(funnelOption.borderWidth * opts.pix);
context.setStrokeStyle(funnelOption.borderColor);
var fillColor = hexToRgb(seriesNew[i].color, funnelOption.fillOpacity);
- if (funnelOption.linearType == 'custom') {
- var grd = context.createLinearGradient(seriesNew[i].radius, -eachSpacing, -seriesNew[i].radius, -eachSpacing);
- grd.addColorStop(0, hexToRgb(seriesNew[i].color, funnelOption.fillOpacity));
- grd.addColorStop(0.5, hexToRgb(funnelOption.customColor[seriesNew[i].linearIndex], funnelOption.fillOpacity));
- grd.addColorStop(1, hexToRgb(seriesNew[i].color, funnelOption.fillOpacity));
- fillColor = grd
+ if (funnelOption.linearType == "custom") {
+ var grd = context.createLinearGradient(
+ seriesNew[i].radius,
+ -eachSpacing,
+ -seriesNew[i].radius,
+ -eachSpacing
+ );
+ grd.addColorStop(
+ 0,
+ hexToRgb(seriesNew[i].color, funnelOption.fillOpacity)
+ );
+ grd.addColorStop(
+ 0.5,
+ hexToRgb(
+ funnelOption.customColor[seriesNew[i].linearIndex],
+ funnelOption.fillOpacity
+ )
+ );
+ grd.addColorStop(
+ 1,
+ hexToRgb(seriesNew[i].color, funnelOption.fillOpacity)
+ );
+ fillColor = grd;
}
context.setFillStyle(fillColor);
context.moveTo(0, 0);
- context.lineTo(-funnelOption.minSize/2, 0);
+ context.lineTo(-funnelOption.minSize / 2, 0);
context.lineTo(-seriesNew[i].radius, -eachSpacing);
context.lineTo(seriesNew[i].radius, -eachSpacing);
- context.lineTo(funnelOption.minSize/2, 0);
+ context.lineTo(funnelOption.minSize / 2, 0);
context.lineTo(0, 0);
context.closePath();
context.fill();
@@ -6157,7 +8580,9 @@ function drawFunnelDataPoints(series, opts, config, context) {
if (opts.tooltip) {
if (opts.tooltip.index == i) {
context.beginPath();
- context.setFillStyle(hexToRgb(seriesNew[i].color, funnelOption.activeOpacity));
+ context.setFillStyle(
+ hexToRgb(seriesNew[i].color, funnelOption.activeOpacity)
+ );
context.moveTo(0, 0);
context.lineTo(-seriesNew[i + 1].radius - activeWidth, 0);
context.lineTo(-seriesNew[i].radius - activeWidth, -eachSpacing);
@@ -6168,17 +8593,39 @@ function drawFunnelDataPoints(series, opts, config, context) {
context.fill();
}
}
- seriesNew[i].funnelArea = [centerPosition.x - seriesNew[i].radius, centerPosition.y - eachSpacing * (seriesNew.length - i), centerPosition.x + seriesNew[i].radius, centerPosition.y - eachSpacing * (seriesNew.length - i - 1)];
+ seriesNew[i].funnelArea = [
+ centerPosition.x - seriesNew[i].radius,
+ centerPosition.y - eachSpacing * (seriesNew.length - i),
+ centerPosition.x + seriesNew[i].radius,
+ centerPosition.y - eachSpacing * (seriesNew.length - i - 1),
+ ];
context.beginPath();
context.setLineWidth(funnelOption.borderWidth * opts.pix);
context.setStrokeStyle(funnelOption.borderColor);
var fillColor = hexToRgb(seriesNew[i].color, funnelOption.fillOpacity);
- if (funnelOption.linearType == 'custom') {
- var grd = context.createLinearGradient(seriesNew[i].radius, -eachSpacing, -seriesNew[i].radius, -eachSpacing);
- grd.addColorStop(0, hexToRgb(seriesNew[i].color, funnelOption.fillOpacity));
- grd.addColorStop(0.5, hexToRgb(funnelOption.customColor[seriesNew[i].linearIndex], funnelOption.fillOpacity));
- grd.addColorStop(1, hexToRgb(seriesNew[i].color, funnelOption.fillOpacity));
- fillColor = grd
+ if (funnelOption.linearType == "custom") {
+ var grd = context.createLinearGradient(
+ seriesNew[i].radius,
+ -eachSpacing,
+ -seriesNew[i].radius,
+ -eachSpacing
+ );
+ grd.addColorStop(
+ 0,
+ hexToRgb(seriesNew[i].color, funnelOption.fillOpacity)
+ );
+ grd.addColorStop(
+ 0.5,
+ hexToRgb(
+ funnelOption.customColor[seriesNew[i].linearIndex],
+ funnelOption.fillOpacity
+ )
+ );
+ grd.addColorStop(
+ 1,
+ hexToRgb(seriesNew[i].color, funnelOption.fillOpacity)
+ );
+ fillColor = grd;
}
context.setFillStyle(fillColor);
context.moveTo(0, 0);
@@ -6193,35 +8640,61 @@ function drawFunnelDataPoints(series, opts, config, context) {
context.stroke();
}
}
- context.translate(0, eachSpacing)
+ context.translate(0, eachSpacing);
}
}
-
+
context.restore();
if (opts.dataLabel !== false && process === 1) {
- drawFunnelText(seriesNew, opts, context, eachSpacing, funnelOption.labelAlign, activeWidth, centerPosition);
+ drawFunnelText(
+ seriesNew,
+ opts,
+ context,
+ eachSpacing,
+ funnelOption.labelAlign,
+ activeWidth,
+ centerPosition
+ );
}
if (process === 1) {
- drawFunnelCenterText(seriesNew, opts, context, eachSpacing, funnelOption.labelAlign, activeWidth, centerPosition);
+ drawFunnelCenterText(
+ seriesNew,
+ opts,
+ context,
+ eachSpacing,
+ funnelOption.labelAlign,
+ activeWidth,
+ centerPosition
+ );
}
return {
center: centerPosition,
radius: radius,
- series: seriesNew
+ series: seriesNew,
};
}
-function drawFunnelText(series, opts, context, eachSpacing, labelAlign, activeWidth, centerPosition) {
+function drawFunnelText(
+ series,
+ opts,
+ context,
+ eachSpacing,
+ labelAlign,
+ activeWidth,
+ centerPosition
+) {
for (let i = 0; i < series.length; i++) {
let item = series[i];
- if(item.labelShow === false){
+ if (item.labelShow === false) {
continue;
}
let startX, endX, startY, fontSize;
- let text = item.formatter ? item.formatter(item,i,series,opts) : util.toFixed(item._proportion_ * 100) + '%';
+ let text = item.formatter
+ ? item.formatter(item, i, series, opts)
+ : util.toFixed(item._proportion_ * 100) + "%";
text = item.labelText ? item.labelText : text;
- if (labelAlign == 'right') {
- if (i == series.length -1) {
+ if (labelAlign == "right") {
+ if (i == series.length - 1) {
startX = (item.funnelArea[2] + centerPosition.x) / 2;
} else {
startX = (item.funnelArea[2] + series[i + 1].funnelArea[2]) / 2;
@@ -6250,8 +8723,8 @@ function drawFunnelText(series, opts, context, eachSpacing, labelAlign, activeWi
context.stroke();
context.closePath();
}
- if (labelAlign == 'left') {
- if (i == series.length -1) {
+ if (labelAlign == "left") {
+ if (i == series.length - 1) {
startX = (item.funnelArea[0] + centerPosition.x) / 2;
} else {
startX = (item.funnelArea[0] + series[i + 1].funnelArea[0]) / 2;
@@ -6275,7 +8748,11 @@ function drawFunnelText(series, opts, context, eachSpacing, labelAlign, activeWi
context.beginPath();
context.setFontSize(fontSize);
context.setFillStyle(item.textColor || opts.fontColor);
- context.fillText(text, endX - 5 - measureText(text, fontSize, context), startY + fontSize / 2 - 2);
+ context.fillText(
+ text,
+ endX - 5 - measureText(text, fontSize, context),
+ startY + fontSize / 2 - 2
+ );
context.closePath();
context.stroke();
context.closePath();
@@ -6283,7 +8760,15 @@ function drawFunnelText(series, opts, context, eachSpacing, labelAlign, activeWi
}
}
-function drawFunnelCenterText(series, opts, context, eachSpacing, labelAlign, activeWidth, centerPosition) {
+function drawFunnelCenterText(
+ series,
+ opts,
+ context,
+ eachSpacing,
+ labelAlign,
+ activeWidth,
+ centerPosition
+) {
for (let i = 0; i < series.length; i++) {
let item = series[i];
let startY, fontSize;
@@ -6293,7 +8778,11 @@ function drawFunnelCenterText(series, opts, context, eachSpacing, labelAlign, ac
context.beginPath();
context.setFontSize(fontSize);
context.setFillStyle(item.centerTextColor || "#FFFFFF");
- context.fillText(item.centerText, centerPosition.x - measureText(item.centerText, fontSize, context) / 2, startY + fontSize / 2 - 2);
+ context.fillText(
+ item.centerText,
+ centerPosition.x - measureText(item.centerText, fontSize, context) / 2,
+ startY + fontSize / 2 - 2
+ );
context.closePath();
context.stroke();
context.closePath();
@@ -6301,7 +8790,6 @@ function drawFunnelCenterText(series, opts, context, eachSpacing, labelAlign, ac
}
}
-
function drawCanvas(opts, context) {
context.save();
context.translate(0, 0.5);
@@ -6325,30 +8813,30 @@ var Timing = {
},
linear: function linear(pos) {
return pos;
- }
+ },
};
function Animation(opts) {
this.isStop = false;
- opts.duration = typeof opts.duration === 'undefined' ? 1000 : opts.duration;
- opts.timing = opts.timing || 'easeInOut';
+ opts.duration = typeof opts.duration === "undefined" ? 1000 : opts.duration;
+ opts.timing = opts.timing || "easeInOut";
var delay = 17;
function createAnimationFrame() {
- if (typeof setTimeout !== 'undefined') {
- return function(step, delay) {
- setTimeout(function() {
+ if (typeof setTimeout !== "undefined") {
+ return function (step, delay) {
+ setTimeout(function () {
var timeStamp = +new Date();
step(timeStamp);
}, delay);
};
- } else if (typeof requestAnimationFrame !== 'undefined') {
+ } else if (typeof requestAnimationFrame !== "undefined") {
return requestAnimationFrame;
} else {
- return function(step) {
+ return function (step) {
step(null);
};
}
- };
+ }
var animationFrame = createAnimationFrame();
var startTimeStamp = null;
var _step = function step(timestamp) {
@@ -6375,7 +8863,7 @@ function Animation(opts) {
animationFrame(_step, delay);
}
-Animation.prototype.stop = function() {
+Animation.prototype.stop = function () {
this.isStop = true;
};
@@ -6383,14 +8871,20 @@ function drawCharts(type, opts, config, context) {
var _this = this;
var series = opts.series;
//兼容ECharts饼图类数据格式
- if (type === 'pie' || type === 'ring' || type === 'mount' || type === 'rose' || type === 'funnel') {
+ if (
+ type === "pie" ||
+ type === "ring" ||
+ type === "mount" ||
+ type === "rose" ||
+ type === "funnel"
+ ) {
series = fixPieSeries(series, opts, config);
}
var categories = opts.categories;
- if (type === 'mount') {
+ if (type === "mount") {
categories = [];
for (let j = 0; j < series.length; j++) {
- if(series[j].show !== false) categories.push(series[j].name)
+ if (series[j].show !== false) categories.push(series[j].name);
}
opts.categories = categories;
}
@@ -6398,10 +8892,15 @@ function drawCharts(type, opts, config, context) {
var duration = opts.animation ? opts.duration : 0;
_this.animationInstance && _this.animationInstance.stop();
var seriesMA = null;
- if (type == 'candle') {
+ if (type == "candle") {
let average = assign({}, opts.extra.candle.average);
if (average.show) {
- seriesMA = calCandleMA(average.day, average.name, average.color, series[0].data);
+ seriesMA = calCandleMA(
+ average.day,
+ average.name,
+ average.color,
+ series[0].data
+ );
seriesMA = fillSeries(seriesMA, opts, config);
opts.seriesMA = seriesMA;
} else if (opts.seriesMA) {
@@ -6421,35 +8920,56 @@ function drawCharts(type, opts, config, context) {
opts.area[j] = opts.padding[j] * opts.pix;
}
//通过计算三大区域：图例、X轴、Y轴的大小，确定绘图区域
- var _calLegendData = calLegendData(seriesMA, opts, config, opts.chartData, context),
+ var _calLegendData = calLegendData(
+ seriesMA,
+ opts,
+ config,
+ opts.chartData,
+ context
+ ),
legendHeight = _calLegendData.area.wholeHeight,
legendWidth = _calLegendData.area.wholeWidth;
switch (opts.legend.position) {
- case 'top':
+ case "top":
opts.area[0] += legendHeight;
break;
- case 'bottom':
+ case "bottom":
opts.area[2] += legendHeight;
break;
- case 'left':
+ case "left":
opts.area[3] += legendWidth;
break;
- case 'right':
+ case "right":
opts.area[1] += legendWidth;
break;
}
let _calYAxisData = {},
yAxisWidth = 0;
- if (opts.type === 'line' || opts.type === 'column'|| opts.type === 'mount' || opts.type === 'area' || opts.type === 'mix' || opts.type === 'candle' || opts.type === 'scatter' || opts.type === 'bubble' || opts.type === 'bar') {
- _calYAxisData = calYAxisData(series, opts, config, context);
- yAxisWidth = _calYAxisData.yAxisWidth;
+ if (
+ opts.type === "line" ||
+ opts.type === "column" ||
+ opts.type === "mount" ||
+ opts.type === "area" ||
+ opts.type === "mix" ||
+ opts.type === "candle" ||
+ opts.type === "scatter" ||
+ opts.type === "bubble" ||
+ opts.type === "bar"
+ ) {
+ _calYAxisData = calYAxisData(series, opts, config, context);
+ yAxisWidth = _calYAxisData.yAxisWidth;
//如果显示Y轴标题
if (opts.yAxis.showTitle) {
let maxTitleHeight = 0;
for (let i = 0; i < opts.yAxis.data.length; i++) {
- maxTitleHeight = Math.max(maxTitleHeight, opts.yAxis.data[i].titleFontSize ? opts.yAxis.data[i].titleFontSize * opts.pix : config.fontSize)
+ maxTitleHeight = Math.max(
+ maxTitleHeight,
+ opts.yAxis.data[i].titleFontSize
+ ? opts.yAxis.data[i].titleFontSize * opts.pix
+ : config.fontSize
+ );
}
opts.area[0] += maxTitleHeight;
}
@@ -6457,14 +8977,14 @@ function drawCharts(type, opts, config, context) {
leftIndex = 0;
//计算主绘图区域左右位置
for (let i = 0; i < yAxisWidth.length; i++) {
- if (yAxisWidth[i].position == 'left') {
+ if (yAxisWidth[i].position == "left") {
if (leftIndex > 0) {
opts.area[3] += yAxisWidth[i].width + opts.yAxis.padding * opts.pix;
} else {
opts.area[3] += yAxisWidth[i].width;
}
leftIndex += 1;
- } else if (yAxisWidth[i].position == 'right') {
+ } else if (yAxisWidth[i].position == "right") {
if (rightIndex > 0) {
opts.area[1] += yAxisWidth[i].width + opts.yAxis.padding * opts.pix;
} else {
@@ -6478,9 +8998,21 @@ function drawCharts(type, opts, config, context) {
}
opts.chartData.yAxisData = _calYAxisData;
- if (opts.categories && opts.categories.length && opts.type !== 'radar' && opts.type !== 'gauge' && opts.type !== 'bar') {
+ if (
+ opts.categories &&
+ opts.categories.length &&
+ opts.type !== "radar" &&
+ opts.type !== "gauge" &&
+ opts.type !== "bar"
+ ) {
opts.chartData.xAxisData = getXAxisPoints(opts.categories, opts, config);
- let _calCategoriesData = calCategoriesData(opts.categories, opts, config, opts.chartData.xAxisData.eachSpacing, context),
+ let _calCategoriesData = calCategoriesData(
+ opts.categories,
+ opts,
+ config,
+ opts.chartData.xAxisData.eachSpacing,
+ context
+ ),
xAxisHeight = _calCategoriesData.xAxisHeight,
angle = _calCategoriesData.angle;
config.xAxisHeight = xAxisHeight;
@@ -6488,10 +9020,22 @@ function drawCharts(type, opts, config, context) {
opts.area[2] += xAxisHeight;
opts.chartData.categoriesData = _calCategoriesData;
} else {
- if (opts.type === 'line' || opts.type === 'area' || opts.type === 'scatter' || opts.type === 'bubble' || opts.type === 'bar') {
+ if (
+ opts.type === "line" ||
+ opts.type === "area" ||
+ opts.type === "scatter" ||
+ opts.type === "bubble" ||
+ opts.type === "bar"
+ ) {
opts.chartData.xAxisData = calXAxisData(series, opts, config, context);
categories = opts.chartData.xAxisData.rangesFormat;
- let _calCategoriesData = calCategoriesData(categories, opts, config, opts.chartData.xAxisData.eachSpacing, context),
+ let _calCategoriesData = calCategoriesData(
+ categories,
+ opts,
+ config,
+ opts.chartData.xAxisData.eachSpacing,
+ context
+ ),
xAxisHeight = _calCategoriesData.xAxisHeight,
angle = _calCategoriesData.angle;
config.xAxisHeight = xAxisHeight;
@@ -6500,13 +9044,17 @@ function drawCharts(type, opts, config, context) {
opts.chartData.categoriesData = _calCategoriesData;
} else {
opts.chartData.xAxisData = {
- xAxisPoints: []
+ xAxisPoints: [],
};
}
}
//计算右对齐偏移距离
- if (opts.enableScroll && opts.xAxis.scrollAlign == 'right' && opts._scrollDistance_ === undefined) {
+ if (
+ opts.enableScroll &&
+ opts.xAxis.scrollAlign == "right" &&
+ opts._scrollDistance_ === undefined
+ ) {
let offsetLeft = 0,
xAxisPoints = opts.chartData.xAxisData.xAxisPoints,
startX = opts.chartData.xAxisData.startX,
@@ -6522,16 +9070,19 @@ function drawCharts(type, opts, config, context) {
opts._scrollDistance_ = offsetLeft;
}
- if (type === 'pie' || type === 'ring' || type === 'rose') {
- config._pieTextMaxLength_ = opts.dataLabel === false ? 0 : getPieTextMaxLength(seriesMA, config, context, opts);
+ if (type === "pie" || type === "ring" || type === "rose") {
+ config._pieTextMaxLength_ =
+ opts.dataLabel === false
+ ? 0
+ : getPieTextMaxLength(seriesMA, config, context, opts);
}
-
+
switch (type) {
- case 'word':
+ case "word":
this.animationInstance = new Animation({
timing: opts.timing,
duration: duration,
- onProcess: function(process) {
+ onProcess: function (process) {
context.clearRect(0, 0, opts.width, opts.height);
if (opts.rotate) {
contextRotate(context, opts);
@@ -6540,37 +9091,43 @@ function drawCharts(type, opts, config, context) {
drawCanvas(opts, context);
},
onAnimationFinish: function onAnimationFinish() {
- _this.uevent.trigger('renderComplete');
- }
+ _this.uevent.trigger("renderComplete");
+ },
});
break;
- case 'map':
+ case "map":
context.clearRect(0, 0, opts.width, opts.height);
drawMapDataPoints(series, opts, config, context);
- setTimeout(()=>{
- this.uevent.trigger('renderComplete');
- },50)
+ setTimeout(() => {
+ this.uevent.trigger("renderComplete");
+ }, 50);
break;
- case 'funnel':
+ case "funnel":
this.animationInstance = new Animation({
timing: opts.timing,
duration: duration,
- onProcess: function(process) {
+ onProcess: function (process) {
context.clearRect(0, 0, opts.width, opts.height);
if (opts.rotate) {
contextRotate(context, opts);
}
- opts.chartData.funnelData = drawFunnelDataPoints(series, opts, config, context, process);
+ opts.chartData.funnelData = drawFunnelDataPoints(
+ series,
+ opts,
+ config,
+ context,
+ process
+ );
drawLegend(opts.series, opts, config, context, opts.chartData);
drawToolTipBridge(opts, config, context, process);
drawCanvas(opts, context);
},
onAnimationFinish: function onAnimationFinish() {
- _this.uevent.trigger('renderComplete');
- }
+ _this.uevent.trigger("renderComplete");
+ },
});
break;
- case 'line':
+ case "line":
this.animationInstance = new Animation({
timing: opts.timing,
duration: duration,
@@ -6581,7 +9138,13 @@ function drawCharts(type, opts, config, context) {
}
drawYAxisGrid(categories, opts, config, context);
drawXAxis(categories, opts, config, context);
- var _drawLineDataPoints = drawLineDataPoints(series, opts, config, context, process),
+ var _drawLineDataPoints = drawLineDataPoints(
+ series,
+ opts,
+ config,
+ context,
+ process
+ ),
xAxisPoints = _drawLineDataPoints.xAxisPoints,
calPoints = _drawLineDataPoints.calPoints,
eachSpacing = _drawLineDataPoints.eachSpacing;
@@ -6593,15 +9156,22 @@ function drawCharts(type, opts, config, context) {
drawMarkLine(opts, config, context);
}
drawLegend(opts.series, opts, config, context, opts.chartData);
- drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
+ drawToolTipBridge(
+ opts,
+ config,
+ context,
+ process,
+ eachSpacing,
+ xAxisPoints
+ );
drawCanvas(opts, context);
},
onAnimationFinish: function onAnimationFinish() {
- _this.uevent.trigger('renderComplete');
- }
+ _this.uevent.trigger("renderComplete");
+ },
});
break;
- case 'scatter':
+ case "scatter":
this.animationInstance = new Animation({
timing: opts.timing,
duration: duration,
@@ -6612,7 +9182,13 @@ function drawCharts(type, opts, config, context) {
}
drawYAxisGrid(categories, opts, config, context);
drawXAxis(categories, opts, config, context);
- var _drawScatterDataPoints = drawScatterDataPoints(series, opts, config, context, process),
+ var _drawScatterDataPoints = drawScatterDataPoints(
+ series,
+ opts,
+ config,
+ context,
+ process
+ ),
xAxisPoints = _drawScatterDataPoints.xAxisPoints,
calPoints = _drawScatterDataPoints.calPoints,
eachSpacing = _drawScatterDataPoints.eachSpacing;
@@ -6624,15 +9200,22 @@ function drawCharts(type, opts, config, context) {
drawMarkLine(opts, config, context);
}
drawLegend(opts.series, opts, config, context, opts.chartData);
- drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
+ drawToolTipBridge(
+ opts,
+ config,
+ context,
+ process,
+ eachSpacing,
+ xAxisPoints
+ );
drawCanvas(opts, context);
},
onAnimationFinish: function onAnimationFinish() {
- _this.uevent.trigger('renderComplete');
- }
+ _this.uevent.trigger("renderComplete");
+ },
});
break;
- case 'bubble':
+ case "bubble":
this.animationInstance = new Animation({
timing: opts.timing,
duration: duration,
@@ -6643,7 +9226,13 @@ function drawCharts(type, opts, config, context) {
}
drawYAxisGrid(categories, opts, config, context);
drawXAxis(categories, opts, config, context);
- var _drawBubbleDataPoints = drawBubbleDataPoints(series, opts, config, context, process),
+ var _drawBubbleDataPoints = drawBubbleDataPoints(
+ series,
+ opts,
+ config,
+ context,
+ process
+ ),
xAxisPoints = _drawBubbleDataPoints.xAxisPoints,
calPoints = _drawBubbleDataPoints.calPoints,
eachSpacing = _drawBubbleDataPoints.eachSpacing;
@@ -6655,15 +9244,22 @@ function drawCharts(type, opts, config, context) {
drawMarkLine(opts, config, context);
}
drawLegend(opts.series, opts, config, context, opts.chartData);
- drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
+ drawToolTipBridge(
+ opts,
+ config,
+ context,
+ process,
+ eachSpacing,
+ xAxisPoints
+ );
drawCanvas(opts, context);
},
onAnimationFinish: function onAnimationFinish() {
- _this.uevent.trigger('renderComplete');
- }
+ _this.uevent.trigger("renderComplete");
+ },
});
break;
- case 'mix':
+ case "mix":
this.animationInstance = new Animation({
timing: opts.timing,
duration: duration,
@@ -6674,7 +9270,13 @@ function drawCharts(type, opts, config, context) {
}
drawYAxisGrid(categories, opts, config, context);
drawXAxis(categories, opts, config, context);
- var _drawMixDataPoints = drawMixDataPoints(series, opts, config, context, process),
+ var _drawMixDataPoints = drawMixDataPoints(
+ series,
+ opts,
+ config,
+ context,
+ process
+ ),
xAxisPoints = _drawMixDataPoints.xAxisPoints,
calPoints = _drawMixDataPoints.calPoints,
eachSpacing = _drawMixDataPoints.eachSpacing;
@@ -6686,15 +9288,22 @@ function drawCharts(type, opts, config, context) {
drawMarkLine(opts, config, context);
}
drawLegend(opts.series, opts, config, context, opts.chartData);
- drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
+ drawToolTipBridge(
+ opts,
+ config,
+ context,
+ process,
+ eachSpacing,
+ xAxisPoints
+ );
drawCanvas(opts, context);
},
onAnimationFinish: function onAnimationFinish() {
- _this.uevent.trigger('renderComplete');
- }
+ _this.uevent.trigger("renderComplete");
+ },
});
break;
- case 'column':
+ case "column":
this.animationInstance = new Animation({
timing: opts.timing,
duration: duration,
@@ -6705,7 +9314,13 @@ function drawCharts(type, opts, config, context) {
}
drawYAxisGrid(categories, opts, config, context);
drawXAxis(categories, opts, config, context);
- var _drawColumnDataPoints = drawColumnDataPoints(series, opts, config, context, process),
+ var _drawColumnDataPoints = drawColumnDataPoints(
+ series,
+ opts,
+ config,
+ context,
+ process
+ ),
xAxisPoints = _drawColumnDataPoints.xAxisPoints,
calPoints = _drawColumnDataPoints.calPoints,
eachSpacing = _drawColumnDataPoints.eachSpacing;
@@ -6717,15 +9332,22 @@ function drawCharts(type, opts, config, context) {
drawMarkLine(opts, config, context);
}
drawLegend(opts.series, opts, config, context, opts.chartData);
- drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
+ drawToolTipBridge(
+ opts,
+ config,
+ context,
+ process,
+ eachSpacing,
+ xAxisPoints
+ );
drawCanvas(opts, context);
},
onAnimationFinish: function onAnimationFinish() {
- _this.uevent.trigger('renderComplete');
- }
+ _this.uevent.trigger("renderComplete");
+ },
});
break;
- case 'mount':
+ case "mount":
this.animationInstance = new Animation({
timing: opts.timing,
duration: duration,
@@ -6736,7 +9358,13 @@ function drawCharts(type, opts, config, context) {
}
drawYAxisGrid(categories, opts, config, context);
drawXAxis(categories, opts, config, context);
- var _drawMountDataPoints = drawMountDataPoints(series, opts, config, context, process),
+ var _drawMountDataPoints = drawMountDataPoints(
+ series,
+ opts,
+ config,
+ context,
+ process
+ ),
xAxisPoints = _drawMountDataPoints.xAxisPoints,
calPoints = _drawMountDataPoints.calPoints,
eachSpacing = _drawMountDataPoints.eachSpacing;
@@ -6748,15 +9376,22 @@ function drawCharts(type, opts, config, context) {
drawMarkLine(opts, config, context);
}
drawLegend(opts.series, opts, config, context, opts.chartData);
- drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
+ drawToolTipBridge(
+ opts,
+ config,
+ context,
+ process,
+ eachSpacing,
+ xAxisPoints
+ );
drawCanvas(opts, context);
},
onAnimationFinish: function onAnimationFinish() {
- _this.uevent.trigger('renderComplete');
- }
+ _this.uevent.trigger("renderComplete");
+ },
});
break;
- case 'bar':
+ case "bar":
this.animationInstance = new Animation({
timing: opts.timing,
duration: duration,
@@ -6766,7 +9401,13 @@ function drawCharts(type, opts, config, context) {
contextRotate(context, opts);
}
drawXAxis(categories, opts, config, context);
- var _drawBarDataPoints = drawBarDataPoints(series, opts, config, context, process),
+ var _drawBarDataPoints = drawBarDataPoints(
+ series,
+ opts,
+ config,
+ context,
+ process
+ ),
yAxisPoints = _drawBarDataPoints.yAxisPoints,
calPoints = _drawBarDataPoints.calPoints,
eachSpacing = _drawBarDataPoints.eachSpacing;
@@ -6779,15 +9420,22 @@ function drawCharts(type, opts, config, context) {
drawMarkLine(opts, config, context);
}
drawLegend(opts.series, opts, config, context, opts.chartData);
- drawToolTipBridge(opts, config, context, process, eachSpacing, yAxisPoints);
+ drawToolTipBridge(
+ opts,
+ config,
+ context,
+ process,
+ eachSpacing,
+ yAxisPoints
+ );
drawCanvas(opts, context);
},
onAnimationFinish: function onAnimationFinish() {
- _this.uevent.trigger('renderComplete');
- }
+ _this.uevent.trigger("renderComplete");
+ },
});
break;
- case 'area':
+ case "area":
this.animationInstance = new Animation({
timing: opts.timing,
duration: duration,
@@ -6798,7 +9446,13 @@ function drawCharts(type, opts, config, context) {
}
drawYAxisGrid(categories, opts, config, context);
drawXAxis(categories, opts, config, context);
- var _drawAreaDataPoints = drawAreaDataPoints(series, opts, config, context, process),
+ var _drawAreaDataPoints = drawAreaDataPoints(
+ series,
+ opts,
+ config,
+ context,
+ process
+ ),
xAxisPoints = _drawAreaDataPoints.xAxisPoints,
calPoints = _drawAreaDataPoints.calPoints,
eachSpacing = _drawAreaDataPoints.eachSpacing;
@@ -6810,15 +9464,22 @@ function drawCharts(type, opts, config, context) {
drawMarkLine(opts, config, context);
}
drawLegend(opts.series, opts, config, context, opts.chartData);
- drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
+ drawToolTipBridge(
+ opts,
+ config,
+ context,
+ process,
+ eachSpacing,
+ xAxisPoints
+ );
drawCanvas(opts, context);
},
onAnimationFinish: function onAnimationFinish() {
- _this.uevent.trigger('renderComplete');
- }
+ _this.uevent.trigger("renderComplete");
+ },
});
break;
- case 'ring':
+ case "ring":
this.animationInstance = new Animation({
timing: opts.timing,
duration: duration,
@@ -6827,17 +9488,23 @@ function drawCharts(type, opts, config, context) {
if (opts.rotate) {
contextRotate(context, opts);
}
- opts.chartData.pieData = drawPieDataPoints(series, opts, config, context, process);
+ opts.chartData.pieData = drawPieDataPoints(
+ series,
+ opts,
+ config,
+ context,
+ process
+ );
drawLegend(opts.series, opts, config, context, opts.chartData);
drawToolTipBridge(opts, config, context, process);
drawCanvas(opts, context);
},
onAnimationFinish: function onAnimationFinish() {
- _this.uevent.trigger('renderComplete');
- }
+ _this.uevent.trigger("renderComplete");
+ },
});
break;
- case 'pie':
+ case "pie":
this.animationInstance = new Animation({
timing: opts.timing,
duration: duration,
@@ -6846,17 +9513,23 @@ function drawCharts(type, opts, config, context) {
if (opts.rotate) {
contextRotate(context, opts);
}
- opts.chartData.pieData = drawPieDataPoints(series, opts, config, context, process);
+ opts.chartData.pieData = drawPieDataPoints(
+ series,
+ opts,
+ config,
+ context,
+ process
+ );
drawLegend(opts.series, opts, config, context, opts.chartData);
drawToolTipBridge(opts, config, context, process);
drawCanvas(opts, context);
},
onAnimationFinish: function onAnimationFinish() {
- _this.uevent.trigger('renderComplete');
- }
+ _this.uevent.trigger("renderComplete");
+ },
});
break;
- case 'rose':
+ case "rose":
this.animationInstance = new Animation({
timing: opts.timing,
duration: duration,
@@ -6865,17 +9538,23 @@ function drawCharts(type, opts, config, context) {
if (opts.rotate) {
contextRotate(context, opts);
}
- opts.chartData.pieData = drawRoseDataPoints(series, opts, config, context, process);
+ opts.chartData.pieData = drawRoseDataPoints(
+ series,
+ opts,
+ config,
+ context,
+ process
+ );
drawLegend(opts.series, opts, config, context, opts.chartData);
drawToolTipBridge(opts, config, context, process);
drawCanvas(opts, context);
},
onAnimationFinish: function onAnimationFinish() {
- _this.uevent.trigger('renderComplete');
- }
+ _this.uevent.trigger("renderComplete");
+ },
});
break;
- case 'radar':
+ case "radar":
this.animationInstance = new Animation({
timing: opts.timing,
duration: duration,
@@ -6884,17 +9563,23 @@ function drawCharts(type, opts, config, context) {
if (opts.rotate) {
contextRotate(context, opts);
}
- opts.chartData.radarData = drawRadarDataPoints(series, opts, config, context, process);
+ opts.chartData.radarData = drawRadarDataPoints(
+ series,
+ opts,
+ config,
+ context,
+ process
+ );
drawLegend(opts.series, opts, config, context, opts.chartData);
drawToolTipBridge(opts, config, context, process);
drawCanvas(opts, context);
},
onAnimationFinish: function onAnimationFinish() {
- _this.uevent.trigger('renderComplete');
- }
+ _this.uevent.trigger("renderComplete");
+ },
});
break;
- case 'arcbar':
+ case "arcbar":
this.animationInstance = new Animation({
timing: opts.timing,
duration: duration,
@@ -6903,15 +9588,21 @@ function drawCharts(type, opts, config, context) {
if (opts.rotate) {
contextRotate(context, opts);
}
- opts.chartData.arcbarData = drawArcbarDataPoints(series, opts, config, context, process);
+ opts.chartData.arcbarData = drawArcbarDataPoints(
+ series,
+ opts,
+ config,
+ context,
+ process
+ );
drawCanvas(opts, context);
},
onAnimationFinish: function onAnimationFinish() {
- _this.uevent.trigger('renderComplete');
- }
+ _this.uevent.trigger("renderComplete");
+ },
});
break;
- case 'gauge':
+ case "gauge":
this.animationInstance = new Animation({
timing: opts.timing,
duration: duration,
@@ -6920,15 +9611,22 @@ function drawCharts(type, opts, config, context) {
if (opts.rotate) {
contextRotate(context, opts);
}
- opts.chartData.gaugeData = drawGaugeDataPoints(categories, series, opts, config, context, process);
+ opts.chartData.gaugeData = drawGaugeDataPoints(
+ categories,
+ series,
+ opts,
+ config,
+ context,
+ process
+ );
drawCanvas(opts, context);
},
onAnimationFinish: function onAnimationFinish() {
- _this.uevent.trigger('renderComplete');
- }
+ _this.uevent.trigger("renderComplete");
+ },
});
break;
- case 'candle':
+ case "candle":
this.animationInstance = new Animation({
timing: opts.timing,
duration: duration,
@@ -6939,7 +9637,14 @@ function drawCharts(type, opts, config, context) {
}
drawYAxisGrid(categories, opts, config, context);
drawXAxis(categories, opts, config, context);
- var _drawCandleDataPoints = drawCandleDataPoints(series, seriesMA, opts, config, context, process),
+ var _drawCandleDataPoints = drawCandleDataPoints(
+ series,
+ seriesMA,
+ opts,
+ config,
+ context,
+ process
+ ),
xAxisPoints = _drawCandleDataPoints.xAxisPoints,
calPoints = _drawCandleDataPoints.calPoints,
eachSpacing = _drawCandleDataPoints.eachSpacing;
@@ -6955,12 +9660,19 @@ function drawCharts(type, opts, config, context) {
} else {
drawLegend(opts.series, opts, config, context, opts.chartData);
}
- drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
+ drawToolTipBridge(
+ opts,
+ config,
+ context,
+ process,
+ eachSpacing,
+ xAxisPoints
+ );
drawCanvas(opts, context);
},
onAnimationFinish: function onAnimationFinish() {
- _this.uevent.trigger('renderComplete');
- }
+ _this.uevent.trigger("renderComplete");
+ },
});
break;
}
@@ -6970,27 +9682,31 @@ function uChartsEvent() {
this.events = {};
}
-uChartsEvent.prototype.addEventListener = function(type, listener) {
+uChartsEvent.prototype.addEventListener = function (type, listener) {
this.events[type] = this.events[type] || [];
this.events[type].push(listener);
};
-uChartsEvent.prototype.delEventListener = function(type) {
+uChartsEvent.prototype.delEventListener = function (type) {
this.events[type] = [];
};
-uChartsEvent.prototype.trigger = function() {
- for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
+uChartsEvent.prototype.trigger = function () {
+ for (
+ var _len = arguments.length, args = Array(_len), _key = 0;
+ _key < _len;
+ _key++
+ ) {
args[_key] = arguments[_key];
}
var type = args[0];
var params = args.slice(1);
if (!!this.events[type]) {
- this.events[type].forEach(function(listener) {
+ this.events[type].forEach(function (listener) {
try {
listener.apply(null, params);
} catch (e) {
- //console.log('[uCharts] '+e);
+ //console.log('[uCharts] '+e);
}
});
}
@@ -7001,88 +9717,116 @@ var uCharts = function uCharts(opts) {
opts.fontSize = opts.fontSize ? opts.fontSize : 13;
opts.fontColor = opts.fontColor ? opts.fontColor : config.fontColor;
if (opts.background == "" || opts.background == "none") {
- opts.background = "#FFFFFF"
+ opts.background = "#FFFFFF";
}
opts.title = assign({}, opts.title);
opts.subtitle = assign({}, opts.subtitle);
opts.duration = opts.duration ? opts.duration : 1000;
- opts.yAxis = assign({}, {
- data: [],
- showTitle: false,
- disabled: false,
- disableGrid: false,
- gridSet: 'number',
- splitNumber: 5,
- gridType: 'solid',
- dashLength: 4 * opts.pix,
- gridColor: '#cccccc',
- padding: 10,
- fontColor: '#666666',
- format: function format(val) {
- return val;
- }
- }, opts.yAxis);
- opts.xAxis = assign({}, {
- rotateLabel: false,
- rotateAngle:45,
- disabled: false,
- disableGrid: false,
- splitNumber: 5,
- calibration:false,
- fontColor: '#666666',
- fontSize: 13,
- lineHeight: 20,
- marginTop: 0,
- gridType: 'solid',
- dashLength: 4,
- scrollAlign: 'left',
- boundaryGap: 'center',
- axisLine: true,
- axisLineColor: '#cccccc',
- titleFontSize: 13,
- titleOffsetY: 0,
- titleOffsetX: 0,
- titleFontColor: '#666666'
- }, opts.xAxis);
+ opts.yAxis = assign(
+ {},
+ {
+ data: [],
+ showTitle: false,
+ disabled: false,
+ disableGrid: false,
+ gridSet: "number",
+ splitNumber: 5,
+ gridType: "solid",
+ dashLength: 4 * opts.pix,
+ gridColor: "#cccccc",
+ padding: 10,
+ fontColor: "#666666",
+ format: function format(val) {
+ return val;
+ },
+ },
+ opts.yAxis
+ );
+ opts.xAxis = assign(
+ {},
+ {
+ rotateLabel: false,
+ rotateAngle: 45,
+ disabled: false,
+ disableGrid: false,
+ splitNumber: 5,
+ calibration: false,
+ fontColor: "#666666",
+ fontSize: 13,
+ lineHeight: 20,
+ marginTop: 0,
+ gridType: "solid",
+ dashLength: 4,
+ scrollAlign: "left",
+ boundaryGap: "center",
+ axisLine: true,
+ axisLineColor: "#cccccc",
+ titleFontSize: 13,
+ titleOffsetY: 0,
+ titleOffsetX: 0,
+ titleFontColor: "#666666",
+ },
+ opts.xAxis
+ );
opts.xAxis.scrollPosition = opts.xAxis.scrollAlign;
- opts.legend = assign({}, {
- show: true,
- position: 'bottom',
- float: 'center',
- backgroundColor: 'rgba(0,0,0,0)',
- borderColor: 'rgba(0,0,0,0)',
- borderWidth: 0,
- padding: 5,
- margin: 5,
- itemGap: 10,
- fontSize: opts.fontSize,
- lineHeight: opts.fontSize,
- fontColor: opts.fontColor,
- formatter: {},
- hiddenColor: '#CECECE'
- }, opts.legend);
- opts.extra = assign({
- tooltip:{
- legendShape: 'auto'
- }
- }, opts.extra);
+ opts.legend = assign(
+ {},
+ {
+ show: true,
+ position: "bottom",
+ float: "center",
+ backgroundColor: "rgba(0,0,0,0)",
+ borderColor: "rgba(0,0,0,0)",
+ borderWidth: 0,
+ padding: 5,
+ margin: 5,
+ itemGap: 10,
+ fontSize: opts.fontSize,
+ lineHeight: opts.fontSize,
+ fontColor: opts.fontColor,
+ formatter: {},
+ hiddenColor: "#CECECE",
+ },
+ opts.legend
+ );
+ opts.extra = assign(
+ {
+ tooltip: {
+ legendShape: "auto",
+ },
+ },
+ opts.extra
+ );
opts.rotate = opts.rotate ? true : false;
opts.animation = opts.animation ? true : false;
opts.rotate = opts.rotate ? true : false;
opts.canvas2d = opts.canvas2d ? true : false;
-
+
let config$$1 = assign({}, config);
config$$1.color = opts.color ? opts.color : config$$1.color;
- if (opts.type == 'pie') {
- config$$1.pieChartLinePadding = opts.dataLabel === false ? 0 : opts.extra.pie.labelWidth * opts.pix || config$$1.pieChartLinePadding * opts.pix;
+ if (opts.type == "pie") {
+ config$$1.pieChartLinePadding =
+ opts.dataLabel === false
+ ? 0
+ : opts.extra.pie.labelWidth * opts.pix ||
+ config$$1.pieChartLinePadding * opts.pix;
}
- if (opts.type == 'ring') {
- config$$1.pieChartLinePadding = opts.dataLabel === false ? 0 : opts.extra.ring.labelWidth * opts.pix || config$$1.pieChartLinePadding * opts.pix;
+ if (opts.type == "ring") {
+ config$$1.pieChartLinePadding =
+ opts.dataLabel === false
+ ? 0
+ : opts.extra.ring.labelWidth * opts.pix ||
+ config$$1.pieChartLinePadding * opts.pix;
}
- if (opts.type == 'rose') {
- config$$1.pieChartLinePadding = opts.dataLabel === false ? 0 : opts.extra.rose.labelWidth * opts.pix || config$$1.pieChartLinePadding * opts.pix;
+ if (opts.type == "rose") {
+ config$$1.pieChartLinePadding =
+ opts.dataLabel === false
+ ? 0
+ : opts.extra.rose.labelWidth * opts.pix ||
+ config$$1.pieChartLinePadding * opts.pix;
}
- config$$1.pieChartTextPadding = opts.dataLabel === false ? 0 : config$$1.pieChartTextPadding * opts.pix;
+ config$$1.pieChartTextPadding =
+ opts.dataLabel === false ? 0 : config$$1.pieChartTextPadding * opts.pix;
//屏幕旋转
config$$1.rotate = opts.rotate;
@@ -7099,43 +9843,45 @@ var uCharts = function uCharts(opts) {
config$$1.fontSize = opts.fontSize * opts.pix;
config$$1.titleFontSize = config.titleFontSize * opts.pix;
config$$1.subtitleFontSize = config.subtitleFontSize * opts.pix;
- if(!opts.context){
- throw new Error('[uCharts] 未获取到context！注意：v2.0版本后，需要自行获取canvas的绘图上下文并传入opts.context！');
+ if (!opts.context) {
+ throw new Error(
+ "[uCharts] 未获取到context！注意：v2.0版本后，需要自行获取canvas的绘图上下文并传入opts.context！"
+ );
}
this.context = opts.context;
if (!this.context.setTextAlign) {
- this.context.setStrokeStyle = function(e) {
- return this.strokeStyle = e;
- }
- this.context.setLineWidth = function(e) {
- return this.lineWidth = e;
- }
- this.context.setLineCap = function(e) {
- return this.lineCap = e;
- }
- this.context.setFontSize = function(e) {
- return this.font = e + "px sans-serif";
- }
- this.context.setFillStyle = function(e) {
- return this.fillStyle = e;
- }
- this.context.setTextAlign = function(e) {
- return this.textAlign = e;
- }
- this.context.setTextBaseline = function(e) {
- return this.textBaseline = e;
- }
- this.context.setShadow = function(offsetX,offsetY,blur,color) {
+ this.context.setStrokeStyle = function (e) {
+ return (this.strokeStyle = e);
+ };
+ this.context.setLineWidth = function (e) {
+ return (this.lineWidth = e);
+ };
+ this.context.setLineCap = function (e) {
+ return (this.lineCap = e);
+ };
+ this.context.setFontSize = function (e) {
+ return (this.font = e + "px sans-serif");
+ };
+ this.context.setFillStyle = function (e) {
+ return (this.fillStyle = e);
+ };
+ this.context.setTextAlign = function (e) {
+ return (this.textAlign = e);
+ };
+ this.context.setTextBaseline = function (e) {
+ return (this.textBaseline = e);
+ };
+ this.context.setShadow = function (offsetX, offsetY, blur, color) {
this.shadowColor = color;
this.shadowOffsetX = offsetX;
this.shadowOffsetY = offsetY;
this.shadowBlur = blur;
- }
- this.context.draw = function() {}
+ };
+ this.context.draw = function () {};
}
//兼容NVUEsetLineDash
- if(!this.context.setLineDash){
- this.context.setLineDash = function(e) {}
+ if (!this.context.setLineDash) {
+ this.context.setLineDash = function (e) {};
}
opts.chartData = {};
this.uevent = new uChartsEvent();
@@ -7143,36 +9889,48 @@ var uCharts = function uCharts(opts) {
currentOffset: 0,
startTouchX: 0,
distance: 0,
- lastMoveTime: 0
+ lastMoveTime: 0,
};
this.opts = opts;
this.config = config$$1;
drawCharts.call(this, opts.type, opts, config$$1, this.context);
};
-uCharts.prototype.updateData = function() {
- let data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+uCharts.prototype.updateData = function () {
+ let data =
+ arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
this.opts = assign({}, this.opts, data);
this.opts.updateData = true;
- let scrollPosition = data.scrollPosition || 'current';
+ let scrollPosition = data.scrollPosition || "current";
switch (scrollPosition) {
- case 'current':
+ case "current":
this.opts._scrollDistance_ = this.scrollOption.currentOffset;
break;
- case 'left':
+ case "left":
this.opts._scrollDistance_ = 0;
this.scrollOption = {
currentOffset: 0,
startTouchX: 0,
distance: 0,
- lastMoveTime: 0
+ lastMoveTime: 0,
};
break;
- case 'right':
- let _calYAxisData = calYAxisData(this.opts.series, this.opts, this.config, this.context), yAxisWidth = _calYAxisData.yAxisWidth;
+ case "right":
+ let _calYAxisData = calYAxisData(
+ this.opts.series,
+ this.opts,
+ this.config,
+ this.context
+ ),
+ yAxisWidth = _calYAxisData.yAxisWidth;
this.config.yAxisWidth = yAxisWidth;
let offsetLeft = 0;
- let _getXAxisPoints0 = getXAxisPoints(this.opts.categories, this.opts, this.config), xAxisPoints = _getXAxisPoints0.xAxisPoints,
+ let _getXAxisPoints0 = getXAxisPoints(
+ this.opts.categories,
+ this.opts,
+ this.config
+ ),
+ xAxisPoints = _getXAxisPoints0.xAxisPoints,
startX = _getXAxisPoints0.startX,
endX = _getXAxisPoints0.endX,
eachSpacing = _getXAxisPoints0.eachSpacing;
@@ -7183,7 +9941,7 @@ uCharts.prototype.updateData = function() {
currentOffset: offsetLeft,
startTouchX: offsetLeft,
distance: 0,
- lastMoveTime: 0
+ lastMoveTime: 0,
};
this.opts._scrollDistance_ = offsetLeft;
break;
@@ -7191,22 +9949,38 @@ uCharts.prototype.updateData = function() {
drawCharts.call(this, this.opts.type, this.opts, this.config, this.context);
};
-uCharts.prototype.zoom = function() {
- var val = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.opts.xAxis.itemCount;
+uCharts.prototype.zoom = function () {
+ var val =
+ arguments.length > 0 && arguments[0] !== undefined
+ ? arguments[0]
+ : this.opts.xAxis.itemCount;
if (this.opts.enableScroll !== true) {
- console.log('[uCharts] 请启用滚动条后使用')
+ console.log("[uCharts] 请启用滚动条后使用");
return;
}
//当前屏幕中间点
- let centerPoint = Math.round(Math.abs(this.scrollOption.currentOffset) / this.opts.chartData.eachSpacing) + Math.round(this.opts.xAxis.itemCount / 2);
+ let centerPoint =
+ Math.round(
+ Math.abs(this.scrollOption.currentOffset) /
+ this.opts.chartData.eachSpacing
+ ) + Math.round(this.opts.xAxis.itemCount / 2);
this.opts.animation = false;
this.opts.xAxis.itemCount = val.itemCount;
//重新计算x轴偏移距离
- let _calYAxisData = calYAxisData(this.opts.series, this.opts, this.config, this.context),
+ let _calYAxisData = calYAxisData(
+ this.opts.series,
+ this.opts,
+ this.config,
+ this.context
+ ),
yAxisWidth = _calYAxisData.yAxisWidth;
this.config.yAxisWidth = yAxisWidth;
let offsetLeft = 0;
- let _getXAxisPoints0 = getXAxisPoints(this.opts.categories, this.opts, this.config),
+ let _getXAxisPoints0 = getXAxisPoints(
+ this.opts.categories,
+ this.opts,
+ this.config
+ ),
xAxisPoints = _getXAxisPoints0.xAxisPoints,
startX = _getXAxisPoints0.startX,
endX = _getXAxisPoints0.endX,
@@ -7225,16 +9999,22 @@ uCharts.prototype.zoom = function() {
currentOffset: offsetLeft,
startTouchX: 0,
distance: 0,
- lastMoveTime: 0
+ lastMoveTime: 0,
};
- calValidDistance(this, offsetLeft, this.opts.chartData, this.config, this.opts);
+ calValidDistance(
+ this,
+ offsetLeft,
+ this.opts.chartData,
+ this.config,
+ this.opts
+ );
this.opts._scrollDistance_ = offsetLeft;
drawCharts.call(this, this.opts.type, this.opts, this.config, this.context);
};
-uCharts.prototype.dobuleZoom = function(e) {
+uCharts.prototype.dobuleZoom = function (e) {
if (this.opts.enableScroll !== true) {
- console.log('[uCharts] 请启用滚动条后使用')
+ console.log("[uCharts] 请启用滚动条后使用");
return;
}
const tcs = e.changedTouches;
@@ -7245,15 +10025,46 @@ uCharts.prototype.dobuleZoom = function(e) {
tcs[i].x = tcs[i].x ? tcs[i].x : tcs[i].clientX;
tcs[i].y = tcs[i].y ? tcs[i].y : tcs[i].clientY;
}
- const ntcs = [getTouches(tcs[0], this.opts, e),getTouches(tcs[1], this.opts, e)];
+ const ntcs = [
+ getTouches(tcs[0], this.opts, e),
+ getTouches(tcs[1], this.opts, e),
+ ];
const xlength = Math.abs(ntcs[0].x - ntcs[1].x);
// 记录初始的两指之间的数据
- if(!this.scrollOption.moveCount){
- let cts0 = {changedTouches:[{x:tcs[0].x,y:this.opts.area[0] / this.opts.pix + 2}]};
- let cts1 = {changedTouches:[{x:tcs[1].x,y:this.opts.area[0] / this.opts.pix + 2}]};
- if(this.opts.rotate){
- cts0 = {changedTouches:[{x:this.opts.height / this.opts.pix - this.opts.area[0] / this.opts.pix - 2,y:tcs[0].y}]};
- cts1 = {changedTouches:[{x:this.opts.height / this.opts.pix - this.opts.area[0] / this.opts.pix - 2,y:tcs[1].y}]};
+ if (!this.scrollOption.moveCount) {
+ let cts0 = {
+ changedTouches: [
+ { x: tcs[0].x, y: this.opts.area[0] / this.opts.pix + 2 },
+ ],
+ };
+ let cts1 = {
+ changedTouches: [
+ { x: tcs[1].x, y: this.opts.area[0] / this.opts.pix + 2 },
+ ],
+ };
+ if (this.opts.rotate) {
+ cts0 = {
+ changedTouches: [
+ {
+ x:
+ this.opts.height / this.opts.pix -
+ this.opts.area[0] / this.opts.pix -
+ 2,
+ y: tcs[0].y,
+ },
+ ],
+ };
+ cts1 = {
+ changedTouches: [
+ {
+ x:
+ this.opts.height / this.opts.pix -
+ this.opts.area[0] / this.opts.pix -
+ 2,
+ y: tcs[1].y,
+ },
+ ],
+ };
}
const moveCurrent1 = this.getCurrentDataIndex(cts0).index;
const moveCurrent2 = this.getCurrentDataIndex(cts1).index;
@@ -7263,16 +10074,25 @@ uCharts.prototype.dobuleZoom = function(e) {
this.scrollOption.moveCurrent2 = Math.max(moveCurrent1, moveCurrent2);
return;
}
-
+
let currentEachSpacing = xlength / this.scrollOption.moveCount;
- let itemCount = (this.opts.width - this.opts.area[1] - this.opts.area[3]) / currentEachSpacing;
+ let itemCount =
+ (this.opts.width - this.opts.area[1] - this.opts.area[3]) /
+ currentEachSpacing;
itemCount = itemCount <= 2 ? 2 : itemCount;
- itemCount = itemCount >= this.opts.categories.length ? this.opts.categories.length : itemCount;
+ itemCount =
+ itemCount >= this.opts.categories.length
+ ? this.opts.categories.length
+ : itemCount;
this.opts.animation = false;
this.opts.xAxis.itemCount = itemCount;
// 重新计算滚动条偏移距离
let offsetLeft = 0;
- let _getXAxisPoints0 = getXAxisPoints(this.opts.categories, this.opts, this.config),
+ let _getXAxisPoints0 = getXAxisPoints(
+ this.opts.categories,
+ this.opts,
+ this.config
+ ),
xAxisPoints = _getXAxisPoints0.xAxisPoints,
startX = _getXAxisPoints0.startX,
endX = _getXAxisPoints0.endX,
@@ -7280,34 +10100,44 @@ uCharts.prototype.dobuleZoom = function(e) {
let currentLeft = eachSpacing * this.scrollOption.moveCurrent1;
let screenWidth = endX - startX;
let MaxLeft = screenWidth - eachSpacing * (xAxisPoints.length - 1);
- offsetLeft = -currentLeft+Math.min(ntcs[0].x,ntcs[1].x)-this.opts.area[3]-eachSpacing;
+ offsetLeft =
+ -currentLeft +
+ Math.min(ntcs[0].x, ntcs[1].x) -
+ this.opts.area[3] -
+ eachSpacing;
if (offsetLeft > 0) {
offsetLeft = 0;
}
if (offsetLeft < MaxLeft) {
offsetLeft = MaxLeft;
}
- this.scrollOption.currentOffset= offsetLeft;
- this.scrollOption.startTouchX= 0;
- this.scrollOption.distance=0;
- calValidDistance(this, offsetLeft, this.opts.chartData, this.config, this.opts);
+ this.scrollOption.currentOffset = offsetLeft;
+ this.scrollOption.startTouchX = 0;
+ this.scrollOption.distance = 0;
+ calValidDistance(
+ this,
+ offsetLeft,
+ this.opts.chartData,
+ this.config,
+ this.opts
+ );
this.opts._scrollDistance_ = offsetLeft;
drawCharts.call(this, this.opts.type, this.opts, this.config, this.context);
-}
+};
-uCharts.prototype.stopAnimation = function() {
+uCharts.prototype.stopAnimation = function () {
this.animationInstance && this.animationInstance.stop();
};
-uCharts.prototype.addEventListener = function(type, listener) {
+uCharts.prototype.addEventListener = function (type, listener) {
this.uevent.addEventListener(type, listener);
};
-uCharts.prototype.delEventListener = function(type) {
+uCharts.prototype.delEventListener = function (type) {
this.uevent.delEventListener(type);
};
-uCharts.prototype.getCurrentDataIndex = function(e) {
+uCharts.prototype.getCurrentDataIndex = function (e) {
var touches = null;
if (e.changedTouches) {
touches = e.changedTouches[0];
@@ -7316,52 +10146,85 @@ uCharts.prototype.getCurrentDataIndex = function(e) {
}
if (touches) {
let _touches$ = getTouches(touches, this.opts, e);
- if (this.opts.type === 'pie' || this.opts.type === 'ring') {
- return findPieChartCurrentIndex({
- x: _touches$.x,
- y: _touches$.y
- }, this.opts.chartData.pieData, this.opts);
- } else if (this.opts.type === 'rose') {
- return findRoseChartCurrentIndex({
- x: _touches$.x,
- y: _touches$.y
- }, this.opts.chartData.pieData, this.opts);
- } else if (this.opts.type === 'radar') {
- return findRadarChartCurrentIndex({
- x: _touches$.x,
- y: _touches$.y
- }, this.opts.chartData.radarData, this.opts.categories.length);
- } else if (this.opts.type === 'funnel') {
- return findFunnelChartCurrentIndex({
- x: _touches$.x,
- y: _touches$.y
- }, this.opts.chartData.funnelData);
- } else if (this.opts.type === 'map') {
- return findMapChartCurrentIndex({
- x: _touches$.x,
- y: _touches$.y
- }, this.opts);
- } else if (this.opts.type === 'word') {
- return findWordChartCurrentIndex({
- x: _touches$.x,
- y: _touches$.y
- }, this.opts.chartData.wordCloudData);
- } else if (this.opts.type === 'bar') {
- return findBarChartCurrentIndex({
- x: _touches$.x,
- y: _touches$.y
- }, this.opts.chartData.calPoints, this.opts, this.config, Math.abs(this.scrollOption.currentOffset));
+ if (this.opts.type === "pie" || this.opts.type === "ring") {
+ return findPieChartCurrentIndex(
+ {
+ x: _touches$.x,
+ y: _touches$.y,
+ },
+ this.opts.chartData.pieData,
+ this.opts
+ );
+ } else if (this.opts.type === "rose") {
+ return findRoseChartCurrentIndex(
+ {
+ x: _touches$.x,
+ y: _touches$.y,
+ },
+ this.opts.chartData.pieData,
+ this.opts
+ );
+ } else if (this.opts.type === "radar") {
+ return findRadarChartCurrentIndex(
+ {
+ x: _touches$.x,
+ y: _touches$.y,
+ },
+ this.opts.chartData.radarData,
+ this.opts.categories.length
+ );
+ } else if (this.opts.type === "funnel") {
+ return findFunnelChartCurrentIndex(
+ {
+ x: _touches$.x,
+ y: _touches$.y,
+ },
+ this.opts.chartData.funnelData
+ );
+ } else if (this.opts.type === "map") {
+ return findMapChartCurrentIndex(
+ {
+ x: _touches$.x,
+ y: _touches$.y,
+ },
+ this.opts
+ );
+ } else if (this.opts.type === "word") {
+ return findWordChartCurrentIndex(
+ {
+ x: _touches$.x,
+ y: _touches$.y,
+ },
+ this.opts.chartData.wordCloudData
+ );
+ } else if (this.opts.type === "bar") {
+ return findBarChartCurrentIndex(
+ {
+ x: _touches$.x,
+ y: _touches$.y,
+ },
+ this.opts.chartData.calPoints,
+ this.opts,
+ this.config,
+ Math.abs(this.scrollOption.currentOffset)
+ );
} else {
- return findCurrentIndex({
- x: _touches$.x,
- y: _touches$.y
- }, this.opts.chartData.calPoints, this.opts, this.config, Math.abs(this.scrollOption.currentOffset));
+ return findCurrentIndex(
+ {
+ x: _touches$.x,
+ y: _touches$.y,
+ },
+ this.opts.chartData.calPoints,
+ this.opts,
+ this.config,
+ Math.abs(this.scrollOption.currentOffset)
+ );
}
}
return -1;
};
-uCharts.prototype.getLegendDataIndex = function(e) {
+uCharts.prototype.getLegendDataIndex = function (e) {
var touches = null;
if (e.changedTouches) {
touches = e.changedTouches[0];
@@ -7370,16 +10233,20 @@ uCharts.prototype.getLegendDataIndex = function(e) {
}
if (touches) {
let _touches$ = getTouches(touches, this.opts, e);
- return findLegendIndex({
- x: _touches$.x,
- y: _touches$.y
- }, this.opts.chartData.legendData);
+ return findLegendIndex(
+ {
+ x: _touches$.x,
+ y: _touches$.y,
+ },
+ this.opts.chartData.legendData
+ );
}
return -1;
};
-uCharts.prototype.touchLegend = function(e) {
- var option = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+uCharts.prototype.touchLegend = function (e) {
+ var option =
+ arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
var touches = null;
if (e.changedTouches) {
touches = e.changedTouches[0];
@@ -7390,21 +10257,27 @@ uCharts.prototype.touchLegend = function(e) {
var _touches$ = getTouches(touches, this.opts, e);
var index = this.getLegendDataIndex(e);
if (index >= 0) {
- if (this.opts.type == 'candle') {
+ if (this.opts.type == "candle") {
this.opts.seriesMA[index].show = !this.opts.seriesMA[index].show;
} else {
this.opts.series[index].show = !this.opts.series[index].show;
}
this.opts.animation = option.animation ? true : false;
this.opts._scrollDistance_ = this.scrollOption.currentOffset;
- drawCharts.call(this, this.opts.type, this.opts, this.config, this.context);
+ drawCharts.call(
+ this,
+ this.opts.type,
+ this.opts,
+ this.config,
+ this.context
+ );
}
}
-
};
-uCharts.prototype.showToolTip = function(e) {
- var option = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+uCharts.prototype.showToolTip = function (e) {
+ var option =
+ arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
var touches = null;
if (e.changedTouches) {
touches = e.changedTouches[0];
@@ -7418,15 +10291,32 @@ uCharts.prototype.showToolTip = function(e) {
var currentOffset = this.scrollOption.currentOffset;
var opts = assign({}, this.opts, {
_scrollDistance_: currentOffset,
- animation: false
+ animation: false,
});
- if (this.opts.type === 'line' || this.opts.type === 'area' || this.opts.type === 'column' || this.opts.type === 'scatter' || this.opts.type === 'bubble') {
+ if (
+ this.opts.type === "line" ||
+ this.opts.type === "area" ||
+ this.opts.type === "column" ||
+ this.opts.type === "scatter" ||
+ this.opts.type === "bubble"
+ ) {
var current = this.getCurrentDataIndex(e);
var index = option.index == undefined ? current.index : option.index;
- if (index > -1 || index.length>0) {
- var seriesData = getSeriesDataItem(this.opts.series, index, current.group);
+ if (index > -1 || index.length > 0) {
+ var seriesData = getSeriesDataItem(
+ this.opts.series,
+ index,
+ current.group
+ );
if (seriesData.length !== 0) {
- var _getToolTipData = getToolTipData(seriesData, this.opts, index, current.group, this.opts.categories, option),
+ var _getToolTipData = getToolTipData(
+ seriesData,
+ this.opts,
+ index,
+ current.group,
+ this.opts.categories,
+ option
+ ),
textList = _getToolTipData.textList,
offset = _getToolTipData.offset;
offset.y = _touches$.y;
@@ -7435,43 +10325,64 @@ uCharts.prototype.showToolTip = function(e) {
offset: option.offset !== undefined ? option.offset : offset,
option: option,
index: index,
- group: current.group
+ group: current.group,
};
}
}
drawCharts.call(this, opts.type, opts, this.config, this.context);
}
- if (this.opts.type === 'mount') {
- var index = option.index == undefined ? this.getCurrentDataIndex(e).index : option.index;
+ if (this.opts.type === "mount") {
+ var index =
+ option.index == undefined
+ ? this.getCurrentDataIndex(e).index
+ : option.index;
if (index > -1) {
- var opts = assign({}, this.opts, {animation: false});
+ var opts = assign({}, this.opts, { animation: false });
var seriesData = assign({}, opts._series_[index]);
- var textList = [{
- text: option.formatter ? option.formatter(seriesData, undefined, index, opts) : seriesData.name + ': ' + seriesData.data,
- color: seriesData.color,
- legendShape: this.opts.extra.tooltip.legendShape == 'auto' ? seriesData.legendShape : this.opts.extra.tooltip.legendShape
- }];
+ var textList = [
+ {
+ text: option.formatter
+ ? option.formatter(seriesData, undefined, index, opts)
+ : seriesData.name + ": " + seriesData.data,
+ color: seriesData.color,
+ legendShape:
+ this.opts.extra.tooltip.legendShape == "auto"
+ ? seriesData.legendShape
+ : this.opts.extra.tooltip.legendShape,
+ },
+ ];
var offset = {
x: opts.chartData.calPoints[index].x,
- y: _touches$.y
+ y: _touches$.y,
};
opts.tooltip = {
textList: option.textList ? option.textList : textList,
offset: option.offset !== undefined ? option.offset : offset,
option: option,
- index: index
+ index: index,
};
}
-
+
drawCharts.call(this, opts.type, opts, this.config, this.context);
}
- if (this.opts.type === 'bar') {
+ if (this.opts.type === "bar") {
var current = this.getCurrentDataIndex(e);
var index = option.index == undefined ? current.index : option.index;
- if (index > -1 || index.length>0) {
- var seriesData = getSeriesDataItem(this.opts.series, index, current.group);
+ if (index > -1 || index.length > 0) {
+ var seriesData = getSeriesDataItem(
+ this.opts.series,
+ index,
+ current.group
+ );
if (seriesData.length !== 0) {
- var _getToolTipData = getToolTipData(seriesData, this.opts, index, current.group, this.opts.categories, option),
+ var _getToolTipData = getToolTipData(
+ seriesData,
+ this.opts,
+ index,
+ current.group,
+ this.opts.categories,
+ option
+ ),
textList = _getToolTipData.textList,
offset = _getToolTipData.offset;
offset.x = _touches$.x;
@@ -7479,24 +10390,30 @@ uCharts.prototype.showToolTip = function(e) {
textList: option.textList !== undefined ? option.textList : textList,
offset: option.offset !== undefined ? option.offset : offset,
option: option,
- index: index
+ index: index,
};
}
}
drawCharts.call(this, opts.type, opts, this.config, this.context);
}
- if (this.opts.type === 'mix') {
+ if (this.opts.type === "mix") {
var current = this.getCurrentDataIndex(e);
var index = option.index == undefined ? current.index : option.index;
if (index > -1) {
var currentOffset = this.scrollOption.currentOffset;
var opts = assign({}, this.opts, {
_scrollDistance_: currentOffset,
- animation: false
+ animation: false,
});
var seriesData = getSeriesDataItem(this.opts.series, index);
if (seriesData.length !== 0) {
- var _getMixToolTipData = getMixToolTipData(seriesData, this.opts, index, this.opts.categories, option),
+ var _getMixToolTipData = getMixToolTipData(
+ seriesData,
+ this.opts,
+ index,
+ this.opts.categories,
+ option
+ ),
textList = _getMixToolTipData.textList,
offset = _getMixToolTipData.offset;
offset.y = _touches$.y;
@@ -7504,24 +10421,32 @@ uCharts.prototype.showToolTip = function(e) {
textList: option.textList ? option.textList : textList,
offset: option.offset !== undefined ? option.offset : offset,
option: option,
- index: index
+ index: index,
};
}
}
drawCharts.call(this, opts.type, opts, this.config, this.context);
}
- if (this.opts.type === 'candle') {
+ if (this.opts.type === "candle") {
var current = this.getCurrentDataIndex(e);
var index = option.index == undefined ? current.index : option.index;
if (index > -1) {
var currentOffset = this.scrollOption.currentOffset;
var opts = assign({}, this.opts, {
_scrollDistance_: currentOffset,
- animation: false
+ animation: false,
});
var seriesData = getSeriesDataItem(this.opts.series, index);
if (seriesData.length !== 0) {
- var _getToolTipData = getCandleToolTipData(this.opts.series[0].data, seriesData, this.opts, index, this.opts.categories, this.opts.extra.candle, option),
+ var _getToolTipData = getCandleToolTipData(
+ this.opts.series[0].data,
+ seriesData,
+ this.opts,
+ index,
+ this.opts.categories,
+ this.opts.extra.candle,
+ option
+ ),
textList = _getToolTipData.textList,
offset = _getToolTipData.offset;
offset.y = _touches$.y;
@@ -7529,106 +10454,146 @@ uCharts.prototype.showToolTip = function(e) {
textList: option.textList ? option.textList : textList,
offset: option.offset !== undefined ? option.offset : offset,
option: option,
- index: index
+ index: index,
};
}
}
drawCharts.call(this, opts.type, opts, this.config, this.context);
}
- if (this.opts.type === 'pie' || this.opts.type === 'ring' || this.opts.type === 'rose' || this.opts.type === 'funnel') {
- var index = option.index == undefined ? this.getCurrentDataIndex(e) : option.index;
+ if (
+ this.opts.type === "pie" ||
+ this.opts.type === "ring" ||
+ this.opts.type === "rose" ||
+ this.opts.type === "funnel"
+ ) {
+ var index =
+ option.index == undefined ? this.getCurrentDataIndex(e) : option.index;
if (index > -1) {
- var opts = assign({}, this.opts, {animation: false});
+ var opts = assign({}, this.opts, { animation: false });
var seriesData = assign({}, opts._series_[index]);
- var textList = [{
- text: option.formatter ? option.formatter(seriesData, undefined, index, opts) : seriesData.name + ': ' + seriesData.data,
- color: seriesData.color,
- legendShape: this.opts.extra.tooltip.legendShape == 'auto' ? seriesData.legendShape : this.opts.extra.tooltip.legendShape
- }];
+ var textList = [
+ {
+ text: option.formatter
+ ? option.formatter(seriesData, undefined, index, opts)
+ : seriesData.name + ": " + seriesData.data,
+ color: seriesData.color,
+ legendShape:
+ this.opts.extra.tooltip.legendShape == "auto"
+ ? seriesData.legendShape
+ : this.opts.extra.tooltip.legendShape,
+ },
+ ];
var offset = {
x: _touches$.x,
- y: _touches$.y
+ y: _touches$.y,
};
opts.tooltip = {
textList: option.textList ? option.textList : textList,
offset: option.offset !== undefined ? option.offset : offset,
option: option,
- index: index
+ index: index,
};
}
drawCharts.call(this, opts.type, opts, this.config, this.context);
}
- if (this.opts.type === 'map') {
- var index = option.index == undefined ? this.getCurrentDataIndex(e) : option.index;
+ if (this.opts.type === "map") {
+ var index =
+ option.index == undefined ? this.getCurrentDataIndex(e) : option.index;
if (index > -1) {
- var opts = assign({}, this.opts, {animation: false});
+ var opts = assign({}, this.opts, { animation: false });
var seriesData = assign({}, this.opts.series[index]);
- seriesData.name = seriesData.properties.name
- var textList = [{
- text: option.formatter ? option.formatter(seriesData, undefined, index, this.opts) : seriesData.name,
- color: seriesData.color,
- legendShape: this.opts.extra.tooltip.legendShape == 'auto' ? seriesData.legendShape : this.opts.extra.tooltip.legendShape
- }];
+ seriesData.name = seriesData.properties.name;
+ var textList = [
+ {
+ text: option.formatter
+ ? option.formatter(seriesData, undefined, index, this.opts)
+ : seriesData.name,
+ color: seriesData.color,
+ legendShape:
+ this.opts.extra.tooltip.legendShape == "auto"
+ ? seriesData.legendShape
+ : this.opts.extra.tooltip.legendShape,
+ },
+ ];
var offset = {
x: _touches$.x,
- y: _touches$.y
+ y: _touches$.y,
};
opts.tooltip = {
textList: option.textList ? option.textList : textList,
offset: option.offset !== undefined ? option.offset : offset,
option: option,
- index: index
+ index: index,
};
}
opts.updateData = false;
drawCharts.call(this, opts.type, opts, this.config, this.context);
}
- if (this.opts.type === 'word') {
- var index = option.index == undefined ? this.getCurrentDataIndex(e) : option.index;
+ if (this.opts.type === "word") {
+ var index =
+ option.index == undefined ? this.getCurrentDataIndex(e) : option.index;
if (index > -1) {
- var opts = assign({}, this.opts, {animation: false});
+ var opts = assign({}, this.opts, { animation: false });
var seriesData = assign({}, this.opts.series[index]);
- var textList = [{
- text: option.formatter ? option.formatter(seriesData, undefined, index, this.opts) : seriesData.name,
- color: seriesData.color,
- legendShape: this.opts.extra.tooltip.legendShape == 'auto' ? seriesData.legendShape : this.opts.extra.tooltip.legendShape
- }];
+ var textList = [
+ {
+ text: option.formatter
+ ? option.formatter(seriesData, undefined, index, this.opts)
+ : seriesData.name,
+ color: seriesData.color,
+ legendShape:
+ this.opts.extra.tooltip.legendShape == "auto"
+ ? seriesData.legendShape
+ : this.opts.extra.tooltip.legendShape,
+ },
+ ];
var offset = {
x: _touches$.x,
- y: _touches$.y
+ y: _touches$.y,
};
opts.tooltip = {
textList: option.textList ? option.textList : textList,
offset: option.offset !== undefined ? option.offset : offset,
option: option,
- index: index
+ index: index,
};
}
opts.updateData = false;
drawCharts.call(this, opts.type, opts, this.config, this.context);
}
- if (this.opts.type === 'radar') {
- var index = option.index == undefined ? this.getCurrentDataIndex(e) : option.index;
+ if (this.opts.type === "radar") {
+ var index =
+ option.index == undefined ? this.getCurrentDataIndex(e) : option.index;
if (index > -1) {
- var opts = assign({}, this.opts, {animation: false});
+ var opts = assign({}, this.opts, { animation: false });
var seriesData = getSeriesDataItem(this.opts.series, index);
if (seriesData.length !== 0) {
var textList = seriesData.map((item) => {
return {
- text: option.formatter ? option.formatter(item, this.opts.categories[index], index, this.opts) : item.name + ': ' + item.data,
+ text: option.formatter
+ ? option.formatter(
+ item,
+ this.opts.categories[index],
+ index,
+ this.opts
+ )
+ : item.name + ": " + item.data,
color: item.color,
- legendShape: this.opts.extra.tooltip.legendShape == 'auto' ? item.legendShape : this.opts.extra.tooltip.legendShape
+ legendShape:
+ this.opts.extra.tooltip.legendShape == "auto"
+ ? item.legendShape
+ : this.opts.extra.tooltip.legendShape,
};
});
var offset = {
x: _touches$.x,
- y: _touches$.y
+ y: _touches$.y,
};
opts.tooltip = {
textList: option.textList ? option.textList : textList,
offset: option.offset !== undefined ? option.offset : offset,
option: option,
- index: index
+ index: index,
};
}
}
@@ -7636,21 +10601,21 @@ uCharts.prototype.showToolTip = function(e) {
}
};
-uCharts.prototype.translate = function(distance) {
+uCharts.prototype.translate = function (distance) {
this.scrollOption = {
currentOffset: distance,
startTouchX: distance,
distance: 0,
- lastMoveTime: 0
+ lastMoveTime: 0,
};
let opts = assign({}, this.opts, {
_scrollDistance_: distance,
- animation: false
+ animation: false,
});
drawCharts.call(this, this.opts.type, opts, this.config, this.context);
};
-uCharts.prototype.scrollStart = function(e) {
+uCharts.prototype.scrollStart = function (e) {
var touches = null;
if (e.changedTouches) {
touches = e.changedTouches[0];
@@ -7663,7 +10628,7 @@ uCharts.prototype.scrollStart = function(e) {
}
};
-uCharts.prototype.scroll = function(e) {
+uCharts.prototype.scroll = function (e) {
if (this.scrollOption.lastMoveTime === 0) {
this.scrollOption.lastMoveTime = Date.now();
}
@@ -7684,19 +10649,25 @@ uCharts.prototype.scroll = function(e) {
var _distance;
_distance = _touches$.x - this.scrollOption.startTouchX;
var currentOffset = this.scrollOption.currentOffset;
- var validDistance = calValidDistance(this, currentOffset + _distance, this.opts.chartData, this.config, this.opts);
+ var validDistance = calValidDistance(
+ this,
+ currentOffset + _distance,
+ this.opts.chartData,
+ this.config,
+ this.opts
+ );
this.scrollOption.distance = _distance = validDistance - currentOffset;
var opts = assign({}, this.opts, {
_scrollDistance_: currentOffset + _distance,
- animation: false
+ animation: false,
});
- this.opts = opts;
+ this.opts = opts;
drawCharts.call(this, opts.type, opts, this.config, this.context);
return currentOffset + _distance;
}
};
-uCharts.prototype.scrollEnd = function(e) {
+uCharts.prototype.scrollEnd = function (e) {
if (this.opts.enableScroll === true) {
var _scrollOption = this.scrollOption,
currentOffset = _scrollOption.currentOffset,
@@ -7707,4 +10678,4 @@ uCharts.prototype.scrollEnd = function(e) {
}
};
-export default uCharts;
\ No newline at end of file
+export default uCharts;
diff --git a/src/pages/view/homeSchool/ChengJiFenXi.vue b/src/pages/view/homeSchool/ChengJiFenXi.vue
index 0ea67f3..4493f0c 100644
--- a/src/pages/view/homeSchool/ChengJiFenXi.vue
+++ b/src/pages/view/homeSchool/ChengJiFenXi.vue
@@ -37,7 +37,11 @@
-
+
diff --git a/src/pages/view/homeSchool/components/CjBjNjPjf.vue b/src/pages/view/homeSchool/components/CjBjNjPjf.vue
index 6bc05cc..fd07f91 100644
--- a/src/pages/view/homeSchool/components/CjBjNjPjf.vue
+++ b/src/pages/view/homeSchool/components/CjBjNjPjf.vue
@@ -35,10 +35,12 @@ interface BjPjInfo {
// --- Props ---
interface Props {
bjPjList?: BjPjInfo[];
+ currentBjId?: string | number;
}
const props = withDefaults(defineProps(), {
bjPjList: () => [],
+ currentBjId: "",
});
// --- Emits ---
@@ -73,13 +75,22 @@ const drawLineChart = () => {
// 使用后端返回的班级平均分数据
const lineData = {
- categories: props.bjPjList.map(
- (bj) => bj.bjmc || bj.njmc + bj.bjmc
- ),
+ categories: props.bjPjList.map((bj) => {
+ const label = bj.bjmc || bj.njmc + bj.bjmc;
+ return label;
+ }),
series: [
{
name: "班级平均分",
data: props.bjPjList.map((bj) => bj.fs),
+ color: ["#ea7ccc"],
+ textColorFormatter: (item: any, index: number, opts: any) => {
+ const bj = props.bjPjList[index];
+ if (bj && bj.bjId === props.currentBjId) {
+ return "#1890ff"; // 当前班级标签使用蓝色
+ }
+ return "#666666"; // 其他班级标签使用灰色
+ },
},
],
};
@@ -118,6 +129,35 @@ const drawLineChart = () => {
newOption.categories = lineData.categories;
newOption.series = lineData.series;
+ // 设置x轴标签颜色格式化函数
+ newOption.xAxis.labelColorFormatter = (
+ item: string,
+ index: number,
+ opts: any
+ ) => {
+ const bj = props.bjPjList[index];
+ if (bj && bj.bjId === props.currentBjId) {
+ return "#1890ff"; // 当前班级标签使用蓝色
+ }
+ return "#666666"; // 其他班级标签使用灰色
+ };
+
+ // 设置数据标签颜色格式化函数，与x轴标签颜色保持一致
+ newOption.dataLabelColorFormatter = (
+ item: any,
+ index: number,
+ opts: any
+ ) => {
+ const bj = props.bjPjList[index];
+ if (bj && bj.bjId === props.currentBjId) {
+ return "#1890ff"; // 当前班级数据标签使用蓝色
+ }
+ return "#666666"; // 其他班级数据标签使用灰色
+ };
+
+ // 设置全局颜色数组
+ newOption.color = ["#000000"]; // 线条颜色为黑色
+
const options = new uCharts(newOption);
try {
diff --git a/src/pages/view/homeSchool/components/cj.data.ts b/src/pages/view/homeSchool/components/cj.data.ts
index e55aa70..9563a31 100644
--- a/src/pages/view/homeSchool/components/cj.data.ts
+++ b/src/pages/view/homeSchool/components/cj.data.ts
@@ -250,14 +250,14 @@ export const lineOption = {
rotateLock: false,
background: "#FFFFFF",
color: [
- "#1890FF",
- "#91CB74",
- "#FAC858",
- "#EE6666",
- "#73C0DE",
- "#3CA272",
- "#FC8452",
- "#9A60B4",
+ // "#1890FF",
+ // "#91CB74",
+ // "#FAC858",
+ // "#EE6666",
+ // "#73C0DE",
+ // "#3CA272",
+ // "#FC8452",
+ // "#9A60B4",
"#ea7ccc",
],
padding: [15, 10, 0, 15],