Andreas/ngx-admin
1
0
Fork 0
mirror of https://github.com/akveo/ngx-admin.git synced 2026-01-05 17:18:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(charts): update echarts library

Browse source
This commit is contained in:
KostyaDanovsky 2017-07-13 14:49:22 +03:00
parent edb098705f
commit e12b77174d
5 changed files with 47 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/app/pages/charts/charts.module.ts
View file

@ -12,7 +12,7 @@ import { D3PieComponent } from './d3/pie/pie.component';
import { EchartsLineComponent } from './echarts/line/line.component';
import { EchartsPieComponent } from './echarts/pie/pie.component';
import { EchartsBarComponent } from './echarts/bar/bar.component';
import { AngularEchartsModule } from 'angular2-echarts';
import { AngularEchartsModule } from 'ngx-echarts';
import { NgxChartsModule } from '@swimlane/ngx-charts';
import { ChartsModule as Ng2Charts } from 'ng2-charts/ng2-charts';

4
src/app/pages/charts/echarts/bar/bar.component.ts
View file

@ -3,12 +3,12 @@ import { Component } from '@angular/core';
@Component({
selector: 'ngx-echarts-bar',
template: `
<div echarts [options]="barChartOptions" class="echart"></div>
<div echarts [options]="options" class="echart"></div>
`,
})
export class EchartsBarComponent {
barChartOptions = {
options = {
color: ['#3398DB'],

8
src/app/pages/charts/echarts/echarts.component.scss
View file

@ -1,9 +1,13 @@
@import '../../../@theme/styles/variables';
@include nga-install-component() {
display: block;
ngx-echarts-pie, ngx-echarts-bar, ngx-echarts-line {
display: block;
height: 100%;
}
/deep/ .echart {
height: calc(#{nga-theme(card-height-xmedium)} - 50px);
height: 100%;
}
}