diff --git a/package-lock.json b/package-lock.json index 77a84817..9809fc1f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "ngx-admin", - "version": "8.0.0", + "version": "9.0.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/src/app/pages/dashboard/rooms/rooms.component.ts b/src/app/pages/dashboard/rooms/rooms.component.ts index 8235f4d5..8121e690 100644 --- a/src/app/pages/dashboard/rooms/rooms.component.ts +++ b/src/app/pages/dashboard/rooms/rooms.component.ts @@ -12,7 +12,7 @@ import { map } from 'rxjs/operators'; class="collapse" [hidden]="isCollapsed()"> - + `, diff --git a/src/app/pages/e-commerce/country-orders/chart/country-orders-chart.component.ts b/src/app/pages/e-commerce/country-orders/chart/country-orders-chart.component.ts index 826a7fe0..ec6a71dc 100644 --- a/src/app/pages/e-commerce/country-orders/chart/country-orders-chart.component.ts +++ b/src/app/pages/e-commerce/country-orders/chart/country-orders-chart.component.ts @@ -1,4 +1,4 @@ -import { AfterViewInit, Component, Input, OnChanges, OnDestroy, SimpleChanges } from '@angular/core'; +import { Component, Input, OnChanges, OnDestroy, SimpleChanges } from '@angular/core'; import { NbThemeService } from '@nebular/theme'; import { takeWhile } from 'rxjs/operators'; import { LayoutService } from '../../../../@core/utils/layout.service'; @@ -19,7 +19,7 @@ import { LayoutService } from '../../../../@core/utils/layout.service'; `, }) -export class CountryOrdersChartComponent implements AfterViewInit, OnDestroy, OnChanges { +export class CountryOrdersChartComponent implements OnDestroy, OnChanges { @Input() countryName: string; @Input() data: number[]; @@ -58,7 +58,7 @@ export class CountryOrdersChartComponent implements AfterViewInit, OnDestroy, On } } - ngAfterViewInit() { + initChartOptions() { this.theme.getJsTheme() .pipe(takeWhile(() => this.alive)) .subscribe(config => { @@ -166,6 +166,8 @@ export class CountryOrdersChartComponent implements AfterViewInit, OnDestroy, On onChartInit(ec) { this.echartsInstance = ec; + + this.initChartOptions(); } resizeChart() { diff --git a/src/app/pages/e-commerce/country-orders/country-orders.component.ts b/src/app/pages/e-commerce/country-orders/country-orders.component.ts index 17dd3865..db09f60d 100644 --- a/src/app/pages/e-commerce/country-orders/country-orders.component.ts +++ b/src/app/pages/e-commerce/country-orders/country-orders.component.ts @@ -10,7 +10,7 @@ import { CountryOrderData } from '../../../@core/data/country-order'; Country Orders Statistics -