mirror of
https://github.com/akveo/ngx-admin.git
synced 2026-03-14 01:16:14 +01:00
feat: angular 7+ update (#1910)
Closes #1890 BREAKING CHANGES: Angular 7+ now required. The following libraries were updated: - @agm/core - @ng-bootstrap/ng-bootstrap - @swimlane/ngx-charts - ng2-ckeditor - ngx-echarts
This commit is contained in:
parent
3f422db62e
commit
aa7579ccd6
13 changed files with 4568 additions and 1504 deletions
|
|
@ -2,8 +2,8 @@ import { Component, OnDestroy } from '@angular/core';
|
|||
import { HttpClient } from '@angular/common/http';
|
||||
import { combineLatest } from 'rxjs';
|
||||
import { takeWhile } from 'rxjs/operators';
|
||||
import { NgxEchartsService } from 'ngx-echarts';
|
||||
import { NbThemeService } from '@nebular/theme';
|
||||
import { registerMap } from 'echarts';
|
||||
|
||||
@Component({
|
||||
selector: 'ngx-bubble-map',
|
||||
|
|
@ -31,8 +31,7 @@ export class BubbleMapComponent implements OnDestroy {
|
|||
private alive = true;
|
||||
|
||||
constructor(private theme: NbThemeService,
|
||||
private http: HttpClient,
|
||||
private es: NgxEchartsService) {
|
||||
private http: HttpClient) {
|
||||
|
||||
combineLatest([
|
||||
this.http.get('assets/map/world.json'),
|
||||
|
|
@ -41,7 +40,7 @@ export class BubbleMapComponent implements OnDestroy {
|
|||
.pipe(takeWhile(() => this.alive))
|
||||
.subscribe(([map, config]: [any, any]) => {
|
||||
|
||||
this.es.registerMap('world', map);
|
||||
registerMap('world', map);
|
||||
|
||||
const colors = config.variables;
|
||||
this.bubbleTheme = config.variables.bubbleMap;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import { Component, ElementRef, EventEmitter, NgZone, OnInit, Output, ViewChild } from '@angular/core';
|
||||
import { MapsAPILoader } from '@agm/core';
|
||||
import { Location } from '../entity/Location';
|
||||
import {} from 'googlemaps';
|
||||
|
||||
|
||||
@Component({
|
||||
selector: 'ngx-search',
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue