mirror of https://github.com/abpframework/abp.git
Browse Source
# Conflicts: # npm/ng-packs/packages/core/src/lib/core.module.tsfeature/ssr-migration-schematic
53 changed files with 233 additions and 367 deletions
@ -1,11 +1,10 @@ |
|||||
import { CommonModule } from '@angular/common'; |
|
||||
import { NgModule } from '@angular/core'; |
import { NgModule } from '@angular/core'; |
||||
import { ChartComponent } from './chart.component'; |
import { ChartComponent } from './chart.component'; |
||||
|
|
||||
@NgModule({ |
@NgModule({ |
||||
imports: [CommonModule], |
imports: [ChartComponent], |
||||
exports: [ChartComponent], |
exports: [ChartComponent], |
||||
declarations: [ChartComponent], |
declarations: [], |
||||
providers: [], |
providers: [], |
||||
}) |
}) |
||||
export class ChartModule {} |
export class ChartModule {} |
||||
|
|||||
@ -1,19 +1,11 @@ |
|||||
import { CoreModule } from '@abp/ng.core'; |
|
||||
import { NgModule } from '@angular/core'; |
import { NgModule } from '@angular/core'; |
||||
import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; |
|
||||
import { NzNoAnimationModule } from 'ng-zorro-antd/core/no-animation'; |
|
||||
import { NzTreeModule } from 'ng-zorro-antd/tree'; |
|
||||
import { TreeComponent } from './components/tree.component'; |
import { TreeComponent } from './components/tree.component'; |
||||
import { ExpandedIconTemplateDirective } from './templates/expanded-icon-template.directive'; |
import { ExpandedIconTemplateDirective } from './templates/expanded-icon-template.directive'; |
||||
import { TreeNodeTemplateDirective } from './templates/tree-node-template.directive'; |
import { TreeNodeTemplateDirective } from './templates/tree-node-template.directive'; |
||||
|
|
||||
const templates = [TreeNodeTemplateDirective, ExpandedIconTemplateDirective]; |
|
||||
|
|
||||
const exported = [...templates, TreeComponent]; |
|
||||
|
|
||||
@NgModule({ |
@NgModule({ |
||||
imports: [CoreModule, NzTreeModule, NgbDropdownModule, NzNoAnimationModule], |
imports: [TreeComponent, TreeNodeTemplateDirective, ExpandedIconTemplateDirective], |
||||
exports: [...exported], |
exports: [TreeComponent, TreeNodeTemplateDirective, ExpandedIconTemplateDirective], |
||||
declarations: [...exported], |
declarations: [], |
||||
}) |
}) |
||||
export class TreeModule {} |
export class TreeModule {} |
||||
|
|||||
@ -1,4 +1,4 @@ |
|||||
export * from './lib/setting-management.module'; |
export * from './lib/setting-management.module'; |
||||
export * from './lib/components/setting-management.component'; |
export * from './lib/components/setting-management.component'; |
||||
export * from './lib/enums'; |
export * from './lib/enums'; |
||||
export * from './lib/setting-management.config'; |
export * from './lib/setting-management.routes'; |
||||
|
|||||
@ -1,12 +1,14 @@ |
|||||
import { Component } from '@angular/core'; |
import { Component } from '@angular/core'; |
||||
|
import {InternetConnectionStatusComponent, LoaderBarComponent} from "@abp/ng.theme.shared"; |
||||
|
import {DynamicLayoutComponent} from "@abp/ng.core"; |
||||
|
|
||||
@Component({ |
@Component({ |
||||
standalone: false, |
|
||||
selector: 'app-root', |
selector: 'app-root', |
||||
template: ` |
template: ` |
||||
<abp-loader-bar /> |
<abp-loader-bar /> |
||||
<abp-dynamic-layout /> |
<abp-dynamic-layout /> |
||||
<abp-internet-status /> |
<abp-internet-status /> |
||||
`,
|
`,
|
||||
|
imports: [LoaderBarComponent, DynamicLayoutComponent, InternetConnectionStatusComponent] |
||||
}) |
}) |
||||
export class AppComponent {} |
export class AppComponent {} |
||||
|
|||||
@ -1,11 +0,0 @@ |
|||||
import { NgModule } from '@angular/core'; |
|
||||
import { Routes, RouterModule } from '@angular/router'; |
|
||||
import { HomeComponent } from './home.component'; |
|
||||
|
|
||||
const routes: Routes = [{ path: '', component: HomeComponent }]; |
|
||||
|
|
||||
@NgModule({ |
|
||||
imports: [RouterModule.forChild(routes)], |
|
||||
exports: [RouterModule], |
|
||||
}) |
|
||||
export class HomeRoutingModule {} |
|
||||
@ -1,10 +0,0 @@ |
|||||
import { NgModule } from '@angular/core'; |
|
||||
import { SharedModule } from '../shared/shared.module'; |
|
||||
import { HomeRoutingModule } from './home-routing.module'; |
|
||||
import { HomeComponent } from './home.component'; |
|
||||
|
|
||||
@NgModule({ |
|
||||
declarations: [HomeComponent], |
|
||||
imports: [SharedModule, HomeRoutingModule], |
|
||||
}) |
|
||||
export class HomeModule {} |
|
||||
@ -0,0 +1,9 @@ |
|||||
|
import { Routes } from '@angular/router'; |
||||
|
|
||||
|
export const homeRoutes: Routes = [ |
||||
|
{ |
||||
|
path: '', |
||||
|
pathMatch: 'full', |
||||
|
loadComponent: () => import('./home.component').then(m => m.HomeComponent), |
||||
|
}, |
||||
|
]; |
||||
@ -1,13 +1,5 @@ |
|||||
import { enableProdMode } from '@angular/core'; |
import { bootstrapApplication } from '@angular/platform-browser'; |
||||
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; |
import { appConfig } from './app/app.config'; |
||||
|
import { AppComponent } from './app/app.component'; |
||||
|
|
||||
import { AppModule } from './app/app.module'; |
bootstrapApplication(AppComponent, appConfig).catch(err => console.error(err)); |
||||
import { environment } from './environments/environment'; |
|
||||
|
|
||||
if (environment.production) { |
|
||||
enableProdMode(); |
|
||||
} |
|
||||
|
|
||||
platformBrowserDynamic() |
|
||||
.bootstrapModule(AppModule) |
|
||||
.catch(err => console.error(err)); |
|
||||
|
|||||
@ -1,12 +1,14 @@ |
|||||
import { Component } from '@angular/core'; |
import { Component } from '@angular/core'; |
||||
|
import { InternetConnectionStatusComponent, LoaderBarComponent } from '@abp/ng.theme.shared'; |
||||
|
import { DynamicLayoutComponent } from '@abp/ng.core'; |
||||
|
|
||||
@Component({ |
@Component({ |
||||
standalone: false, |
|
||||
selector: 'app-root', |
selector: 'app-root', |
||||
template: ` |
template: ` |
||||
<abp-loader-bar /> |
<abp-loader-bar /> |
||||
<abp-dynamic-layout /> |
<abp-dynamic-layout /> |
||||
<abp-internet-status /> |
<abp-internet-status /> |
||||
`,
|
`,
|
||||
|
imports: [LoaderBarComponent, DynamicLayoutComponent, InternetConnectionStatusComponent], |
||||
}) |
}) |
||||
export class AppComponent {} |
export class AppComponent {} |
||||
|
|||||
@ -0,0 +1,46 @@ |
|||||
|
import {ApplicationConfig, importProvidersFrom} from '@angular/core'; |
||||
|
import { provideRouter } from '@angular/router'; |
||||
|
import {provideAnimations} from "@angular/platform-browser/animations"; |
||||
|
|
||||
|
import { appRoutes } from './app.routes'; |
||||
|
import { APP_ROUTE_PROVIDER } from './route.provider'; |
||||
|
import { provideAbpCore, withOptions } from '@abp/ng.core'; |
||||
|
import { environment } from '../environments/environment'; |
||||
|
import { registerLocale } from '@abp/ng.core/locale'; |
||||
|
import { provideAbpOAuth } from '@abp/ng.oauth'; |
||||
|
import { provideAbpThemeShared } from '@abp/ng.theme.shared'; |
||||
|
import { provideSettingManagementConfig } from '@abp/ng.setting-management/config'; |
||||
|
import { provideAccountConfig } from '@abp/ng.account/config'; |
||||
|
import { provideIdentityConfig } from '@abp/ng.identity/config'; |
||||
|
import { provideTenantManagementConfig } from '@abp/ng.tenant-management/config'; |
||||
|
import { provideFeatureManagementConfig } from '@abp/ng.feature-management'; |
||||
|
import {ThemeLeptonXModule} from "@abp/ng.theme.lepton-x"; |
||||
|
import {SideMenuLayoutModule} from "@abp/ng.theme.lepton-x/layouts"; |
||||
|
import {AccountLayoutModule} from "@abp/ng.theme.lepton-x/account"; |
||||
|
|
||||
|
export const appConfig: ApplicationConfig = { |
||||
|
providers: [ |
||||
|
provideRouter(appRoutes), |
||||
|
APP_ROUTE_PROVIDER, |
||||
|
provideAbpCore( |
||||
|
withOptions({ |
||||
|
environment, |
||||
|
registerLocaleFn: registerLocale(), |
||||
|
}) |
||||
|
), |
||||
|
provideAbpOAuth(), |
||||
|
provideAbpThemeShared(), |
||||
|
provideSettingManagementConfig(), |
||||
|
provideAccountConfig(), |
||||
|
provideIdentityConfig(), |
||||
|
provideTenantManagementConfig(), |
||||
|
provideFeatureManagementConfig(), |
||||
|
provideAnimations(), |
||||
|
provideAbpCore(), |
||||
|
importProvidersFrom([ |
||||
|
ThemeLeptonXModule.forRoot(), |
||||
|
SideMenuLayoutModule.forRoot(), |
||||
|
AccountLayoutModule.forRoot(), |
||||
|
]) |
||||
|
], |
||||
|
}; |
||||
@ -1,56 +0,0 @@ |
|||||
import { CoreModule, provideAbpCore, withOptions } from '@abp/ng.core'; |
|
||||
import { registerLocale } from '@abp/ng.core/locale'; |
|
||||
import { |
|
||||
InternetConnectionStatusComponent, |
|
||||
ThemeSharedModule, |
|
||||
provideAbpThemeShared, |
|
||||
} from '@abp/ng.theme.shared'; |
|
||||
import { provideFeatureManagementConfig } from '@abp/ng.feature-management'; |
|
||||
import { provideAbpOAuth } from '@abp/ng.oauth'; |
|
||||
import { provideIdentityConfig } from '@abp/ng.identity/config'; |
|
||||
import { provideSettingManagementConfig } from '@abp/ng.setting-management/config'; |
|
||||
import { provideTenantManagementConfig } from '@abp/ng.tenant-management/config'; |
|
||||
import { provideAccountConfig } from '@abp/ng.account/config'; |
|
||||
import { ThemeLeptonXModule } from '@abp/ng.theme.lepton-x'; |
|
||||
import { SideMenuLayoutModule } from '@abp/ng.theme.lepton-x/layouts'; |
|
||||
import { AccountLayoutModule } from '@abp/ng.theme.lepton-x/account'; |
|
||||
import { NgModule } from '@angular/core'; |
|
||||
import { BrowserModule } from '@angular/platform-browser'; |
|
||||
import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; |
|
||||
import { environment } from '../environments/environment'; |
|
||||
import { AppRoutingModule } from './app-routing.module'; |
|
||||
import { AppComponent } from './app.component'; |
|
||||
import { APP_ROUTE_PROVIDER } from './route.provider'; |
|
||||
|
|
||||
@NgModule({ |
|
||||
imports: [ |
|
||||
BrowserModule, |
|
||||
BrowserAnimationsModule, |
|
||||
AppRoutingModule, |
|
||||
CoreModule, |
|
||||
ThemeSharedModule, |
|
||||
ThemeLeptonXModule.forRoot(), |
|
||||
SideMenuLayoutModule.forRoot(), |
|
||||
AccountLayoutModule.forRoot(), |
|
||||
InternetConnectionStatusComponent, |
|
||||
], |
|
||||
declarations: [AppComponent], |
|
||||
providers: [ |
|
||||
APP_ROUTE_PROVIDER, |
|
||||
provideAbpCore( |
|
||||
withOptions({ |
|
||||
environment, |
|
||||
registerLocaleFn: registerLocale(), |
|
||||
}) |
|
||||
), |
|
||||
provideAbpOAuth(), |
|
||||
provideAbpThemeShared(), |
|
||||
provideSettingManagementConfig(), |
|
||||
provideAccountConfig(), |
|
||||
provideIdentityConfig(), |
|
||||
provideTenantManagementConfig(), |
|
||||
provideFeatureManagementConfig(), |
|
||||
], |
|
||||
bootstrap: [AppComponent], |
|
||||
}) |
|
||||
export class AppModule {} |
|
||||
@ -1,11 +0,0 @@ |
|||||
import { NgModule } from '@angular/core'; |
|
||||
import { Routes, RouterModule } from '@angular/router'; |
|
||||
import { HomeComponent } from './home.component'; |
|
||||
|
|
||||
const routes: Routes = [{ path: '', component: HomeComponent }]; |
|
||||
|
|
||||
@NgModule({ |
|
||||
imports: [RouterModule.forChild(routes)], |
|
||||
exports: [RouterModule], |
|
||||
}) |
|
||||
export class HomeRoutingModule {} |
|
||||
@ -1,10 +0,0 @@ |
|||||
import { NgModule } from '@angular/core'; |
|
||||
import { SharedModule } from '../shared/shared.module'; |
|
||||
import { HomeRoutingModule } from './home-routing.module'; |
|
||||
import { HomeComponent } from './home.component'; |
|
||||
|
|
||||
@NgModule({ |
|
||||
declarations: [HomeComponent], |
|
||||
imports: [SharedModule, HomeRoutingModule], |
|
||||
}) |
|
||||
export class HomeModule {} |
|
||||
@ -0,0 +1,9 @@ |
|||||
|
import { Routes } from '@angular/router'; |
||||
|
|
||||
|
export const homeRoutes: Routes = [ |
||||
|
{ |
||||
|
path: '', |
||||
|
pathMatch: 'full', |
||||
|
loadComponent: () => import('./home.component').then(m => m.HomeComponent), |
||||
|
}, |
||||
|
]; |
||||
@ -1,13 +1,5 @@ |
|||||
import { enableProdMode } from '@angular/core'; |
import { bootstrapApplication } from '@angular/platform-browser'; |
||||
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; |
import { appConfig } from './app/app.config'; |
||||
|
import { AppComponent } from './app/app.component'; |
||||
|
|
||||
import { AppModule } from './app/app.module'; |
bootstrapApplication(AppComponent, appConfig).catch(err => console.error(err)); |
||||
import { environment } from './environments/environment'; |
|
||||
|
|
||||
if (environment.production) { |
|
||||
enableProdMode(); |
|
||||
} |
|
||||
|
|
||||
platformBrowserDynamic() |
|
||||
.bootstrapModule(AppModule) |
|
||||
.catch(err => console.error(err)); |
|
||||
|
|||||
@ -1,11 +1,13 @@ |
|||||
import { Component } from '@angular/core'; |
import { Component } from '@angular/core'; |
||||
|
import {LoaderBarComponent} from "@abp/ng.theme.shared"; |
||||
|
import {DynamicLayoutComponent} from "@abp/ng.core"; |
||||
|
|
||||
@Component({ |
@Component({ |
||||
standalone: false, |
|
||||
selector: 'app-root', |
selector: 'app-root', |
||||
template: ` |
template: ` |
||||
<abp-loader-bar /> |
<abp-loader-bar /> |
||||
<abp-dynamic-layout /> |
<abp-dynamic-layout />, |
||||
`,
|
`,
|
||||
|
imports: [LoaderBarComponent, DynamicLayoutComponent] |
||||
}) |
}) |
||||
export class AppComponent {} |
export class AppComponent {} |
||||
|
|||||
@ -1,16 +0,0 @@ |
|||||
import { NgModule } from '@angular/core'; |
|
||||
import { Routes, RouterModule } from '@angular/router'; |
|
||||
import { HomeComponent } from './home.component'; |
|
||||
|
|
||||
const routes: Routes = [ |
|
||||
{ |
|
||||
path: '', |
|
||||
children: [{ path: '', component: HomeComponent }], |
|
||||
}, |
|
||||
]; |
|
||||
|
|
||||
@NgModule({ |
|
||||
imports: [RouterModule.forChild(routes)], |
|
||||
exports: [RouterModule], |
|
||||
}) |
|
||||
export class HomeRoutingModule {} |
|
||||
@ -1,10 +0,0 @@ |
|||||
import { NgModule } from '@angular/core'; |
|
||||
import { SharedModule } from '../shared/shared.module'; |
|
||||
import { HomeRoutingModule } from './home-routing.module'; |
|
||||
import { HomeComponent } from './home.component'; |
|
||||
|
|
||||
@NgModule({ |
|
||||
declarations: [HomeComponent], |
|
||||
imports: [SharedModule, HomeRoutingModule], |
|
||||
}) |
|
||||
export class HomeModule {} |
|
||||
@ -0,0 +1,9 @@ |
|||||
|
import { Routes } from '@angular/router'; |
||||
|
|
||||
|
export const homeRoutes: Routes = [ |
||||
|
{ |
||||
|
path: '', |
||||
|
pathMatch: 'full', |
||||
|
loadComponent: () => import('./home.component').then(m => m.HomeComponent), |
||||
|
}, |
||||
|
]; |
||||
@ -1,12 +1,5 @@ |
|||||
import { enableProdMode } from '@angular/core'; |
import { bootstrapApplication } from '@angular/platform-browser'; |
||||
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; |
import { appConfig } from './app/app.config'; |
||||
|
import { AppComponent } from './app/app.component'; |
||||
|
|
||||
import { AppModule } from './app/app.module'; |
bootstrapApplication(AppComponent, appConfig).catch(err => console.error(err)); |
||||
import { environment } from './environments/environment'; |
|
||||
|
|
||||
if (environment.production) { |
|
||||
enableProdMode(); |
|
||||
} |
|
||||
|
|
||||
platformBrowserDynamic().bootstrapModule(AppModule) |
|
||||
.catch(err => console.error(err)); |
|
||||
|
|||||
@ -1,12 +1,6 @@ |
|||||
import { ModuleWithProviders, NgModule } from '@angular/core'; |
import {makeEnvironmentProviders} from '@angular/core'; |
||||
import { MY_PROJECT_NAME_ROUTE_PROVIDERS } from './providers/route.provider'; |
import { MY_PROJECT_NAME_ROUTE_PROVIDERS } from './providers/route.provider'; |
||||
|
|
||||
@NgModule() |
export function provideMyProjectNameConfig() { |
||||
export class MyProjectNameConfigModule { |
return makeEnvironmentProviders([MY_PROJECT_NAME_ROUTE_PROVIDERS]) |
||||
static forRoot(): ModuleWithProviders<MyProjectNameConfigModule> { |
|
||||
return { |
|
||||
ngModule: MyProjectNameConfigModule, |
|
||||
providers: [MY_PROJECT_NAME_ROUTE_PROVIDERS], |
|
||||
}; |
|
||||
} |
|
||||
} |
} |
||||
|
|||||
@ -1,23 +0,0 @@ |
|||||
import { NgModule, NgModuleFactory, ModuleWithProviders } from '@angular/core'; |
|
||||
import { CoreModule, LazyModuleFactory } from '@abp/ng.core'; |
|
||||
import { ThemeSharedModule } from '@abp/ng.theme.shared'; |
|
||||
import { MyProjectNameComponent } from './components/my-project-name.component'; |
|
||||
import { MyProjectNameRoutingModule } from './my-project-name-routing.module'; |
|
||||
|
|
||||
@NgModule({ |
|
||||
declarations: [MyProjectNameComponent], |
|
||||
imports: [CoreModule, ThemeSharedModule, MyProjectNameRoutingModule], |
|
||||
exports: [MyProjectNameComponent], |
|
||||
}) |
|
||||
export class MyProjectNameModule { |
|
||||
static forChild(): ModuleWithProviders<MyProjectNameModule> { |
|
||||
return { |
|
||||
ngModule: MyProjectNameModule, |
|
||||
providers: [], |
|
||||
}; |
|
||||
} |
|
||||
|
|
||||
static forLazy(): NgModuleFactory<MyProjectNameModule> { |
|
||||
return new LazyModuleFactory(MyProjectNameModule.forChild()); |
|
||||
} |
|
||||
} |
|
||||
Loading…
Reference in new issue