diff --git a/maxkey-web-frontend/maxkey-web-app/src/app/routes/dashboard/home/home.component.ts b/maxkey-web-frontend/maxkey-web-app/src/app/routes/dashboard/home/home.component.ts index c2744f48f..57c3c67e3 100644 --- a/maxkey-web-frontend/maxkey-web-app/src/app/routes/dashboard/home/home.component.ts +++ b/maxkey-web-frontend/maxkey-web-app/src/app/routes/dashboard/home/home.component.ts @@ -18,21 +18,21 @@ import { Platform } from '@angular/cdk/platform'; import { DOCUMENT } from '@angular/common'; import { ChangeDetectionStrategy, ViewContainerRef, ChangeDetectorRef, Component, Inject, OnInit, Renderer2 } from '@angular/core'; import type { Chart } from '@antv/g2'; +import { I18NService } from '@core'; import { OnboardingService } from '@delon/abc/onboarding'; import { ACLService } from '@delon/acl'; +import { ALAIN_I18N_TOKEN } from '@delon/theme'; import { environment } from '@env/environment'; import { format } from 'date-fns'; import { NzSafeAny } from 'ng-zorro-antd/core/types'; import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal'; -import { CONSTS } from 'src/app/shared/consts'; +import { AppCategoryService } from '../../../service/app-category.service'; import { AppListService } from '../../../service/appList.service'; import { AuthnService } from '../../../service/authn.service'; import { AccoutsComponent } from '../../config/accouts/accouts.component'; import { Console } from 'console'; -import {ALAIN_I18N_TOKEN} from "@delon/theme"; -import {I18NService} from "@core"; @Component({ selector: 'app-home', @@ -60,6 +60,7 @@ export class HomeComponent implements OnInit { private modal: NzModalService, private viewContainerRef: ViewContainerRef, private appListService: AppListService, + private appCategoryService: AppCategoryService, private cdr: ChangeDetectorRef, private obSrv: OnboardingService, private platform: Platform, @@ -103,6 +104,7 @@ export class HomeComponent implements OnInit { } ngOnInit(): void { + this.appCategoryList = this.appCategoryService.list(); if (environment.api.baseUrl.endsWith('/')) { this.baseUrl = environment.api.baseUrl.substring(0, environment.api.baseUrl.length - 1); } else { @@ -114,129 +116,14 @@ export class HomeComponent implements OnInit { this.staticAppList = this.appList; this.cdr.detectChanges(); }); - this.appCategoryList = [{ - id:'none', - name:this.i18n.fanyi('mxk.apps.category.none') - },{ - id:'1011', - name:this.i18n.fanyi('mxk.apps.category.1011') - }, - { - id:'1012', - name:this.i18n.fanyi('mxk.apps.category.1012') - }, - { - id:'1013', - name:this.i18n.fanyi('mxk.apps.category.1013') - }, - { - id:'1014', - name:this.i18n.fanyi('mxk.apps.category.1014') - }, - { - id:'1015', - name:this.i18n.fanyi('mxk.apps.category.1015') - }, - { - id:'1016', - name:this.i18n.fanyi('mxk.apps.category.1016') - }, - { - id:'1017', - name:this.i18n.fanyi('mxk.apps.category.1017') - }, - { - id:'1111', - name:this.i18n.fanyi('mxk.apps.category.1111') - }, - { - id:'1112', - name:this.i18n.fanyi('mxk.apps.category.1112') - }, - { - id:'1113', - name:this.i18n.fanyi('mxk.apps.category.1113') - }, - { - id:'1114', - name:this.i18n.fanyi('mxk.apps.category.1114') - }, - { - id:'1211', - name:this.i18n.fanyi('mxk.apps.category.1211') - }, - { - id:'1212', - name:this.i18n.fanyi('mxk.apps.category.1212') - }, - { - id:'1213', - name:this.i18n.fanyi('mxk.apps.category.1213') - }, - { - id:'1214', - name:this.i18n.fanyi('mxk.apps.category.1214') - }, - { - id:'1215', - name:this.i18n.fanyi('mxk.apps.category.1215') - }, - { - id:'1215', - name:this.i18n.fanyi('mxk.apps.category.1215') - }, - { - id:'1311', - name:this.i18n.fanyi('mxk.apps.category.1311') - }, - { - id:'1411', - name:this.i18n.fanyi('mxk.apps.category.1411') - }, - { - id:'1511', - name:this.i18n.fanyi('mxk.apps.category.1511') - }, - { - id:'1512', - name:this.i18n.fanyi('mxk.apps.category.1512') - }, - { - id:'1611', - name:this.i18n.fanyi('mxk.apps.category.1611') - }, - { - id:'1711', - name:this.i18n.fanyi('mxk.apps.category.1711') - }, - { - id:'1712', - name:this.i18n.fanyi('mxk.apps.category.1712') - }, - { - id:'1811', - name:this.i18n.fanyi('mxk.apps.category.1811') - }, - { - id:'1812', - name:this.i18n.fanyi('mxk.apps.category.1812') - },{ - id:'1911', - name:this.i18n.fanyi('mxk.apps.category.1911') - }, - { - id:'1912', - name:this.i18n.fanyi('mxk.apps.category.1912') - } - ] } - changeCategory (): void { - this.appList = []; - if (this.appsCategory === null || this.appsCategory === '') { + + changeCategory(): void { + if (this.appCategoryService.list() === null || this.appCategoryService.list() === '') { this.appList = this.staticAppList; } else { - for(let i = 0;i { + constructor(private _httpClient: HttpClient, @Inject(ALAIN_I18N_TOKEN) private i18n: I18NService) { + super(_httpClient, '/app/appcategory'); + } + + list(): any { + return [ + { + id: 'none', + name: this.i18n.fanyi('mxk.apps.category.none') + }, + { + id: '1011', + name: this.i18n.fanyi('mxk.apps.category.1011') + }, + { + id: '1012', + name: this.i18n.fanyi('mxk.apps.category.1012') + }, + { + id: '1013', + name: this.i18n.fanyi('mxk.apps.category.1013') + }, + { + id: '1014', + name: this.i18n.fanyi('mxk.apps.category.1014') + }, + { + id: '1015', + name: this.i18n.fanyi('mxk.apps.category.1015') + }, + { + id: '1016', + name: this.i18n.fanyi('mxk.apps.category.1016') + }, + { + id: '1017', + name: this.i18n.fanyi('mxk.apps.category.1017') + }, + { + id: '1111', + name: this.i18n.fanyi('mxk.apps.category.1111') + }, + { + id: '1112', + name: this.i18n.fanyi('mxk.apps.category.1112') + }, + { + id: '1113', + name: this.i18n.fanyi('mxk.apps.category.1113') + }, + { + id: '1114', + name: this.i18n.fanyi('mxk.apps.category.1114') + }, + { + id: '1211', + name: this.i18n.fanyi('mxk.apps.category.1211') + }, + { + id: '1212', + name: this.i18n.fanyi('mxk.apps.category.1212') + }, + { + id: '1213', + name: this.i18n.fanyi('mxk.apps.category.1213') + }, + { + id: '1214', + name: this.i18n.fanyi('mxk.apps.category.1214') + }, + { + id: '1215', + name: this.i18n.fanyi('mxk.apps.category.1215') + }, + { + id: '1215', + name: this.i18n.fanyi('mxk.apps.category.1215') + }, + { + id: '1311', + name: this.i18n.fanyi('mxk.apps.category.1311') + }, + { + id: '1411', + name: this.i18n.fanyi('mxk.apps.category.1411') + }, + { + id: '1511', + name: this.i18n.fanyi('mxk.apps.category.1511') + }, + { + id: '1512', + name: this.i18n.fanyi('mxk.apps.category.1512') + }, + { + id: '1611', + name: this.i18n.fanyi('mxk.apps.category.1611') + }, + { + id: '1711', + name: this.i18n.fanyi('mxk.apps.category.1711') + }, + { + id: '1712', + name: this.i18n.fanyi('mxk.apps.category.1712') + }, + { + id: '1811', + name: this.i18n.fanyi('mxk.apps.category.1811') + }, + { + id: '1812', + name: this.i18n.fanyi('mxk.apps.category.1812') + }, + { + id: '1911', + name: this.i18n.fanyi('mxk.apps.category.1911') + }, + { + id: '1912', + name: this.i18n.fanyi('mxk.apps.category.1912') + } + ]; + } +}