diff --git a/components/empty/demo/basic.ts b/components/empty/demo/basic.ts index b9c9cff71b7..3bc427e387a 100644 --- a/components/empty/demo/basic.ts +++ b/components/empty/demo/basic.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { NzEmptyModule } from 'ng-zorro-antd/empty'; + @Component({ selector: 'nz-demo-empty-basic', - template: ` ` + standalone: true, + imports: [NzEmptyModule], + template: `` }) export class NzDemoEmptyBasicComponent {} diff --git a/components/empty/demo/config.ts b/components/empty/demo/config.ts index 125a207f619..c21367cf0fc 100644 --- a/components/empty/demo/config.ts +++ b/components/empty/demo/config.ts @@ -1,9 +1,34 @@ import { Component, TemplateRef, ViewChild } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { NzCascaderModule } from 'ng-zorro-antd/cascader'; import { NzConfigService } from 'ng-zorro-antd/core/config'; +import { NzDividerModule } from 'ng-zorro-antd/divider'; +import { NzEmptyModule } from 'ng-zorro-antd/empty'; +import { NzIconModule } from 'ng-zorro-antd/icon'; +import { NzListModule } from 'ng-zorro-antd/list'; +import { NzSelectModule } from 'ng-zorro-antd/select'; +import { NzSwitchModule } from 'ng-zorro-antd/switch'; +import { NzTableModule } from 'ng-zorro-antd/table'; +import { NzTransferModule } from 'ng-zorro-antd/transfer'; +import { NzTreeSelectModule } from 'ng-zorro-antd/tree-select'; @Component({ selector: 'nz-demo-empty-config', + standalone: true, + imports: [ + FormsModule, + NzCascaderModule, + NzDividerModule, + NzEmptyModule, + NzIconModule, + NzListModule, + NzSelectModule, + NzSwitchModule, + NzTableModule, + NzTransferModule, + NzTreeSelectModule + ], template: ` ` + standalone: true, + imports: [NzEmptyModule], + template: `` }) export class NzDemoEmptyDescriptionComponent {} diff --git a/components/empty/demo/module b/components/empty/demo/module deleted file mode 100644 index 3c4909acfda..00000000000 --- a/components/empty/demo/module +++ /dev/null @@ -1,25 +0,0 @@ -import { NzEmptyModule } from 'ng-zorro-antd/empty'; -import { NzSwitchModule } from 'ng-zorro-antd/switch'; -import { NzCascaderModule } from 'ng-zorro-antd/cascader'; -import { NzDividerModule } from 'ng-zorro-antd/divider'; -import { NzTreeSelectModule } from 'ng-zorro-antd/tree-select'; -import { NzSelectModule } from 'ng-zorro-antd/select'; -import { NzTableModule } from 'ng-zorro-antd/table'; -import { NzListModule } from 'ng-zorro-antd/list'; -import { NzTransferModule } from 'ng-zorro-antd/transfer'; -import { NzButtonModule } from 'ng-zorro-antd/button'; -import { NzIconModule } from 'ng-zorro-antd/icon'; - -export const moduleList = [ - NzEmptyModule, - NzIconModule, - NzSwitchModule, - NzCascaderModule, - NzDividerModule, - NzTreeSelectModule, - NzSelectModule, - NzTableModule, - NzTransferModule, - NzListModule, - NzButtonModule -]; diff --git a/components/empty/demo/simple.ts b/components/empty/demo/simple.ts index 18da13e7504..8589782b6a2 100644 --- a/components/empty/demo/simple.ts +++ b/components/empty/demo/simple.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { NzEmptyModule } from 'ng-zorro-antd/empty'; + @Component({ selector: 'nz-demo-empty-simple', - template: ` ` + standalone: true, + imports: [NzEmptyModule], + template: `` }) export class NzDemoEmptySimpleComponent {} diff --git a/components/empty/empty.spec.ts b/components/empty/empty.spec.ts index 360e4fda759..36dcd87b789 100644 --- a/components/empty/empty.spec.ts +++ b/components/empty/empty.spec.ts @@ -1,14 +1,12 @@ -import { CommonModule } from '@angular/common'; -import { Component, DebugElement, NgModule, TemplateRef, ViewChild, inject } from '@angular/core'; +import { Component, DebugElement, TemplateRef, ViewChild, inject } from '@angular/core'; import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { NZ_CONFIG, NzConfigService } from 'ng-zorro-antd/core/config'; +import { NzI18nService } from 'ng-zorro-antd/i18n'; +import en_US from 'ng-zorro-antd/i18n/languages/en_US'; +import { NzListModule } from 'ng-zorro-antd/list'; -import { ComponentBed, createComponentBed } from '../core/testing/component-bed'; -import { NzI18nService } from '../i18n'; -import en_US from '../i18n/languages/en_US'; -import { NzListModule } from '../list'; import { NZ_EMPTY_COMPONENT_NAME } from './config'; import { NzEmbedEmptyComponent } from './embed-empty.component'; import { NzEmptyComponent } from './empty.component'; @@ -16,18 +14,13 @@ import { NzEmptyModule } from './empty.module'; describe('nz-empty', () => { describe('basic', () => { - let testBed: ComponentBed; let fixture: ComponentFixture; let testComponent: NzEmptyTestBasicComponent; let emptyComponent: DebugElement; beforeEach(() => { - testBed = createComponentBed(NzEmptyTestBasicComponent, { - imports: [NzEmptyModule] - }); - - fixture = testBed.fixture; - testComponent = testBed.component; + fixture = TestBed.createComponent(NzEmptyTestBasicComponent); + testComponent = fixture.debugElement.componentInstance; emptyComponent = fixture.debugElement.query(By.directive(NzEmptyComponent)); fixture.detectChanges(); @@ -112,7 +105,7 @@ describe('nz-empty', () => { const contentEl = emptyComponent.nativeElement.lastElementChild; expect(contentEl.innerText.trim()).toBe('暂无数据'); - testBed.bed.inject(NzI18nService).setLocale(en_US); + TestBed.inject(NzI18nService).setLocale(en_US); fixture.detectChanges(); expect(contentEl.innerText.trim()).toBe('No Data'); }); @@ -129,10 +122,7 @@ describe('nz-empty', () => { describe('service method', () => { beforeEach(() => { - TestBed.configureTestingModule({ - imports: [NzEmptyTestServiceModule] - }).compileComponents(); - + TestBed.configureTestingModule({}).compileComponents(); fixture = TestBed.createComponent(NzEmptyTestServiceComponent); testComponent = fixture.debugElement.componentInstance; }); @@ -167,7 +157,7 @@ describe('nz-empty', () => { expect(embedComponent.nativeElement.innerText).toBe('list'); // Null. - testComponent.noResult = null; + testComponent.noResult = null!; refresh(); expect(embedComponent).toBeTruthy(); expect(emptyComponent).toBeFalsy(); @@ -232,9 +222,17 @@ describe('nz-empty', () => { describe('service injection', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NzEmptyTestInjectionModule] + providers: [ + { + provide: NZ_CONFIG, + useValue: { + empty: { + nzDefaultEmptyContent: NzEmptyTestCustomComponent + } + } + } + ] }).compileComponents(); - fixture = TestBed.createComponent(NzEmptyTestServiceComponent); testComponent = fixture.debugElement.componentInstance; }); @@ -264,6 +262,8 @@ describe('nz-empty', () => { }); @Component({ + standalone: true, + imports: [NzEmptyModule], template: ` Image @@ -277,12 +277,14 @@ export class NzEmptyTestBasicComponent { @ViewChild('contentTpl', { static: false }) contentTpl!: TemplateRef; @ViewChild('footerTpl', { static: false }) footerTpl!: TemplateRef; - image?: TemplateRef | string; + image!: TemplateRef | string; content?: TemplateRef | string; footer?: TemplateRef | string; } @Component({ + standalone: true, + imports: [NzListModule], template: ` @@ -293,7 +295,7 @@ export class NzEmptyTestBasicComponent { export class NzEmptyTestServiceComponent { @ViewChild('tpl', { static: false }) template!: TemplateRef; - noResult?: string | null; + noResult!: string; constructor(public configService: NzConfigService) {} @@ -307,34 +309,10 @@ export class NzEmptyTestServiceComponent { } @Component({ - // eslint-disable-next-line + standalone: true, selector: 'nz-empty-test-custom', - template: `
I'm in component {{ name }}
` + template: `
I'm in component {{ name }}
` }) export class NzEmptyTestCustomComponent { name = inject(NZ_EMPTY_COMPONENT_NAME); } - -@NgModule({ - imports: [CommonModule, NzEmptyModule, NzListModule], - declarations: [NzEmptyTestServiceComponent, NzEmptyTestCustomComponent], - exports: [NzEmptyTestServiceComponent, NzEmptyTestCustomComponent] -}) -export class NzEmptyTestServiceModule {} - -@NgModule({ - imports: [CommonModule, NzEmptyModule, NzListModule], - declarations: [NzEmptyTestServiceComponent, NzEmptyTestCustomComponent], - exports: [NzEmptyTestServiceComponent, NzEmptyTestCustomComponent], - providers: [ - { - provide: NZ_CONFIG, - useValue: { - empty: { - nzDefaultEmptyContent: NzEmptyTestCustomComponent - } - } - } - ] -}) -export class NzEmptyTestInjectionModule {}