Merge branch 'feature/SUPPORT-8904_for_develop' into feature/SUPPORT-8904_for_merge_to_develop
# Conflicts: # frontend/src/ts/ervu-dashboard/component/chart/ErvuChartV2.ts # frontend/src/ts/ervu-dashboard/component/chart/plugin/DarkBackgroundColorChartPlugin.ts
This commit is contained in:
commit
33de2cdbc3
1 changed files with 0 additions and 41 deletions
|
|
@ -290,11 +290,6 @@ export class ErvuChartV2 extends Control implements Filterable {
|
|||
chartOptions.scales = chartOptions.scales ? chartOptions.scales : {};
|
||||
chartOptions.scales.x = this.bars.x;
|
||||
chartOptions.scales.y = this.bars.y;
|
||||
|
||||
// shadow bar treatment
|
||||
if (this.bars.shadowBar && datasetsLength > 0) {
|
||||
this.initShadowBar(datasets);
|
||||
}
|
||||
}
|
||||
|
||||
if (this.options) {
|
||||
|
|
@ -320,42 +315,6 @@ export class ErvuChartV2 extends Control implements Filterable {
|
|||
this.chartConfig = chartConfig;
|
||||
}
|
||||
|
||||
private initShadowBar(datasets) {
|
||||
const shadowBarStack: string = this.bars.shadowBar;
|
||||
const shadowBarIndex = datasets.findIndex(element => element.stack === shadowBarStack);
|
||||
|
||||
if (shadowBarIndex > -1) {
|
||||
const shadowBar = datasets[shadowBarIndex];
|
||||
|
||||
const stacks: string[] = [];
|
||||
datasets.forEach((element, index) => {
|
||||
let stack: string = element.stack;
|
||||
if (stack) {
|
||||
if (stack !== shadowBarStack && !stacks.includes(stack)) {
|
||||
stacks.push(stack);
|
||||
}
|
||||
}
|
||||
else {
|
||||
stack = shadowBarStack + index;
|
||||
element.stack = stack;
|
||||
stacks.push(stack);
|
||||
}
|
||||
});
|
||||
|
||||
datasets.splice(shadowBarIndex, 1);
|
||||
|
||||
stacks.forEach(value => {
|
||||
const cloneShadowBar = {...shadowBar};
|
||||
cloneShadowBar.data = [];
|
||||
shadowBar.data.forEach((item) => {
|
||||
cloneShadowBar.data.push({...item});
|
||||
});
|
||||
cloneShadowBar.stack = value;
|
||||
datasets.push(cloneShadowBar);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
private repaint(chartData) {
|
||||
if (this.chart) {
|
||||
this.chart.destroy();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue