diff --git a/components/input-number-legacy/demo/addon.ts b/components/input-number-legacy/demo/addon.ts index 52f9f3e6369..9232a8d841a 100644 --- a/components/input-number-legacy/demo/addon.ts +++ b/components/input-number-legacy/demo/addon.ts @@ -13,10 +13,10 @@ import { NzSpaceModule } from 'ng-zorro-antd/space'; template: ` - + - + @@ -33,10 +33,10 @@ import { NzSpaceModule } from 'ng-zorro-antd/space'; - + - + diff --git a/components/input-number-legacy/demo/basic.ts b/components/input-number-legacy/demo/basic.ts index 402c0f5938b..c3697452773 100644 --- a/components/input-number-legacy/demo/basic.ts +++ b/components/input-number-legacy/demo/basic.ts @@ -7,12 +7,7 @@ import { NzInputNumberLegacyModule } from 'ng-zorro-antd/input-number-legacy'; selector: 'nz-demo-input-number-legacy-basic', standalone: true, imports: [FormsModule, NzInputNumberLegacyModule], - template: `` + template: `` }) export class NzDemoInputNumberLegacyBasicComponent { value = 3; diff --git a/components/input-number-legacy/demo/borderless.ts b/components/input-number-legacy/demo/borderless.ts index df0d262b45a..4f40a81864e 100644 --- a/components/input-number-legacy/demo/borderless.ts +++ b/components/input-number-legacy/demo/borderless.ts @@ -7,7 +7,7 @@ import { NzInputNumberLegacyModule } from 'ng-zorro-antd/input-number-legacy'; selector: 'nz-demo-input-number-legacy-borderless', standalone: true, imports: [FormsModule, NzInputNumberLegacyModule], - template: `` + template: `` }) export class NzDemoInputNumberLegacyBorderlessComponent { value = 3; diff --git a/components/input-number-legacy/demo/digit.ts b/components/input-number-legacy/demo/digit.ts index 6c2b26e779d..388b8b823dc 100644 --- a/components/input-number-legacy/demo/digit.ts +++ b/components/input-number-legacy/demo/digit.ts @@ -8,13 +8,13 @@ import { NzInputNumberLegacyModule } from 'ng-zorro-antd/input-number-legacy'; standalone: true, imports: [FormsModule, NzInputNumberLegacyModule], template: ` - + > ` }) export class NzDemoInputNumberLegacyDigitComponent { diff --git a/components/input-number-legacy/demo/disabled.ts b/components/input-number-legacy/demo/disabled.ts index c29c3779912..403da1a0014 100644 --- a/components/input-number-legacy/demo/disabled.ts +++ b/components/input-number-legacy/demo/disabled.ts @@ -9,13 +9,13 @@ import { NzInputNumberLegacyModule } from 'ng-zorro-antd/input-number-legacy'; standalone: true, imports: [FormsModule, NzButtonModule, NzInputNumberLegacyModule], template: ` - + >

- + @@ -59,14 +51,14 @@ import { NzSpaceModule } from 'ng-zorro-antd/space'; - + - + - +
diff --git a/components/input-number-legacy/demo/precision.ts b/components/input-number-legacy/demo/precision.ts index 985eade88f0..79f848d09e9 100644 --- a/components/input-number-legacy/demo/precision.ts +++ b/components/input-number-legacy/demo/precision.ts @@ -8,27 +8,23 @@ import { NzInputNumberLegacyModule } from 'ng-zorro-antd/input-number-legacy'; standalone: true, imports: [FormsModule, NzInputNumberLegacyModule], template: ` - - + - + + > `, styles: [ ` - nz-input-number-legacy { + nz-input-number { margin-right: 8px; } ` diff --git a/components/input-number-legacy/demo/prefix.ts b/components/input-number-legacy/demo/prefix.ts index d6530b7b86f..ebfb71ab28f 100644 --- a/components/input-number-legacy/demo/prefix.ts +++ b/components/input-number-legacy/demo/prefix.ts @@ -11,13 +11,13 @@ import { NzSpaceModule } from 'ng-zorro-antd/space'; template: ` - + - + - + ` diff --git a/components/input-number-legacy/demo/size.ts b/components/input-number-legacy/demo/size.ts index 00e3581522a..fd8f56a5150 100644 --- a/components/input-number-legacy/demo/size.ts +++ b/components/input-number-legacy/demo/size.ts @@ -8,25 +8,13 @@ import { NzInputNumberLegacyModule } from 'ng-zorro-antd/input-number-legacy'; standalone: true, imports: [FormsModule, NzInputNumberLegacyModule], template: ` - - - + + + `, styles: [ ` - nz-input-number-legacy { + nz-input-number { margin-right: 8px; } ` diff --git a/components/input-number-legacy/demo/status.ts b/components/input-number-legacy/demo/status.ts index 873d126a6af..b391137f654 100644 --- a/components/input-number-legacy/demo/status.ts +++ b/components/input-number-legacy/demo/status.ts @@ -10,13 +10,13 @@ import { NzSpaceModule } from 'ng-zorro-antd/space'; imports: [FormsModule, NzInputNumberLegacyModule, NzSpaceModule], template: ` - - + + - + - + ` diff --git a/components/input-number-legacy/doc/index.en-US.md b/components/input-number-legacy/doc/index.en-US.md index 8fa8e3b286f..4d2dc7939a6 100755 --- a/components/input-number-legacy/doc/index.en-US.md +++ b/components/input-number-legacy/doc/index.en-US.md @@ -20,7 +20,7 @@ import { NzInputNumberLegacyModule } from 'ng-zorro-antd/input-number-legacy'; ## API -### nz-input-number-legacy +### nz-input-number | property | description | type | default | | ------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------- | ------------------------------------------------------------------------------- | diff --git a/components/input-number-legacy/doc/index.zh-CN.md b/components/input-number-legacy/doc/index.zh-CN.md index 81e507f033e..44d13a03f3a 100755 --- a/components/input-number-legacy/doc/index.zh-CN.md +++ b/components/input-number-legacy/doc/index.zh-CN.md @@ -21,7 +21,7 @@ import { NzInputNumberLegacyModule } from 'ng-zorro-antd/input-number-legacy'; ## API -### nz-input-number-legacy +### nz-input-number | 成员 | 说明 | 类型 | 默认值 | | ------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------ | --------------------------------------------------------------------------------- | ------------------------------------------------------------------------------- | diff --git a/components/input-number-legacy/input-number-group.spec.ts b/components/input-number-legacy/input-number-group.spec.ts index 54f3b272a4e..bdfae9d35d9 100644 --- a/components/input-number-legacy/input-number-group.spec.ts +++ b/components/input-number-legacy/input-number-group.spec.ts @@ -199,9 +199,7 @@ describe('input-number-group', () => { inputNumberGroupElement = fixture.debugElement.query(By.directive(NzInputNumberGroupComponent)).nativeElement; }); it('should size work', () => { - expect(inputNumberGroupElement.querySelector('nz-input-number-legacy')!.classList).toContain( - 'ant-input-number-lg' - ); + expect(inputNumberGroupElement.querySelector('nz-input-number')!.classList).toContain('ant-input-number-lg'); }); }); describe('mix', () => { @@ -342,7 +340,7 @@ describe('input-number-group', () => { imports: [NzInputNumberLegacyModule], template: ` - + beforeTemplate afterTemplate @@ -361,7 +359,7 @@ export class NzTestInputNumberGroupAddonComponent { imports: [NzInputNumberLegacyModule], template: ` - + beforeTemplate afterTemplate @@ -381,8 +379,8 @@ export class NzTestInputNumberGroupAffixComponent { imports: [NzInputNumberLegacyModule], template: ` - - + + ` }) @@ -397,10 +395,10 @@ export class NzTestInputNumberGroupMultipleComponent { template: `
- +
- +
` @@ -412,7 +410,7 @@ export class NzTestInputNumberGroupColComponent {} imports: [NzInputNumberLegacyModule], template: ` - + ` }) @@ -424,14 +422,14 @@ export class NzTestInputNumberGroupMixComponent {} template: ` @if (!isAddon) { - + } @else { - + } ` @@ -447,7 +445,7 @@ export class NzTestInputNumberGroupWithStatusComponent { template: `
- +
` @@ -464,7 +462,7 @@ export class NzTestInputNumberGroupWithDirComponent { - + diff --git a/components/input-number-legacy/input-number.component.ts b/components/input-number-legacy/input-number.component.ts index 722bb3a577c..64daaf83b3a 100644 --- a/components/input-number-legacy/input-number.component.ts +++ b/components/input-number-legacy/input-number.component.ts @@ -52,8 +52,8 @@ import { NZ_SPACE_COMPACT_ITEM_TYPE, NZ_SPACE_COMPACT_SIZE, NzSpaceCompactItemDi * @deprecated Deprecated in v19.0.0. It is recommended to use the new version ``. */ @Component({ - selector: 'nz-input-number-legacy', - exportAs: 'nzInputNumberLegacy', + selector: 'nz-input-number', + exportAs: 'nzInputNumber', template: `
{ standalone: true, imports: [FormsModule, NzInputNumberLegacyModule], template: ` - { [nzPrecision]="precision" [nzPrecisionMode]="precisionMode" [nzBorderless]="!bordered" - > + > ` }) export class NzTestInputNumberBasicComponent { @@ -653,7 +653,7 @@ export class NzTestInputNumberBasicComponent { @Component({ standalone: true, imports: [NzInputNumberLegacyModule], - template: `` + template: `` }) export class NzTestReadOnlyInputNumberBasicComponent { @ViewChild(NzInputNumberLegacyComponent, { static: false }) nzInputNumberComponent!: NzInputNumberLegacyComponent; @@ -665,12 +665,7 @@ export class NzTestReadOnlyInputNumberBasicComponent { imports: [ReactiveFormsModule, NzInputNumberLegacyModule], template: `
- +
` }) @@ -690,7 +685,7 @@ export class NzTestInputNumberFormComponent { @Component({ standalone: true, imports: [NzInputNumberLegacyModule], - template: `` + template: `` }) export class NzTestInputNumberStatusComponent { status: NzStatus = 'error'; @@ -703,7 +698,7 @@ export class NzTestInputNumberStatusComponent {
- +
diff --git a/components/input-number/style/patch.less b/components/input-number/style/patch.less index 13b7a5751ea..650e3a648a7 100644 --- a/components/input-number/style/patch.less +++ b/components/input-number/style/patch.less @@ -1,6 +1,7 @@ +// The following patch applies only to input-number-legacy. .@{ant-prefix}-input-number { &-affix-wrapper { - > nz-input-number-legacy.@{ant-prefix}-input-number { + > nz-input-number.@{ant-prefix}-input-number { width: 100%; border: none; outline: none; diff --git a/components/space/space-compact.component.spec.ts b/components/space/space-compact.component.spec.ts index e69ba9f176e..6c384cb763d 100644 --- a/components/space/space-compact.component.spec.ts +++ b/components/space/space-compact.component.spec.ts @@ -8,7 +8,6 @@ import { NzSizeLDSType } from 'ng-zorro-antd/core/types'; import { NzDatePickerModule } from 'ng-zorro-antd/date-picker'; import { NzInputModule } from 'ng-zorro-antd/input'; import { NzInputNumberModule } from 'ng-zorro-antd/input-number'; -import { NzInputNumberLegacyModule } from 'ng-zorro-antd/input-number-legacy'; import { NzSelectModule } from 'ng-zorro-antd/select'; import { NzTimePickerModule } from 'ng-zorro-antd/time-picker'; import { NzTreeSelectModule } from 'ng-zorro-antd/tree-select'; @@ -34,7 +33,6 @@ describe('Space compact', () => { const nzInput = spaceCompactElement.querySelector('input[nz-input]'); const nzInputGroup = spaceCompactElement.querySelector('nz-input-group'); const nzInputNumber = spaceCompactElement.querySelector('nz-input-number'); - const nzInputNumberLegacy = spaceCompactElement.querySelector('nz-input-number-legacy'); const nzDatePicker = spaceCompactElement.querySelector('nz-date-picker'); const nzRangePicker = spaceCompactElement.querySelector('nz-range-picker'); const nzTimePicker = spaceCompactElement.querySelector('nz-time-picker'); @@ -45,7 +43,6 @@ describe('Space compact', () => { expect(nzInput).toBeTruthy(); expect(nzInputNumber).toBeTruthy(); - expect(nzInputNumberLegacy).toBeTruthy(); expect(nzInputGroup).toBeTruthy(); expect(nzDatePicker).toBeTruthy(); expect(nzRangePicker).toBeTruthy(); @@ -59,7 +56,6 @@ describe('Space compact', () => { expect(nzInputGroup!.classList).toContain('ant-input-compact-item'); expect(nzInputNumber!.classList).toContain('ant-input-number-compact-item'); - expect(nzInputNumberLegacy!.classList).toContain('ant-input-number-compact-item'); expect(nzDatePicker!.classList).toContain('ant-picker-compact-item'); expect(nzRangePicker!.classList).toContain('ant-picker-compact-item'); @@ -100,7 +96,6 @@ describe('Space compact', () => { const spaceCompactElement: HTMLElement = fixture.nativeElement; const nzInput = spaceCompactElement.querySelector('input[nz-input]'); const nzInputNumber = spaceCompactElement.querySelector('nz-input-number'); - const nzInputNumberLegacy = spaceCompactElement.querySelector('nz-input-number-legacy'); const nzDatePicker = spaceCompactElement.querySelector('nz-date-picker'); const nzRangePicker = spaceCompactElement.querySelector('nz-range-picker'); const nzTimePicker = spaceCompactElement.querySelector('nz-time-picker'); @@ -114,7 +109,6 @@ describe('Space compact', () => { expect(nzInput!.classList).toContain('ant-input-sm'); expect(nzInputNumber!.classList).toContain('ant-input-number-sm'); - expect(nzInputNumberLegacy!.classList).toContain('ant-input-number-sm'); expect(nzDatePicker!.classList).toContain('ant-picker-small'); expect(nzRangePicker!.classList).toContain('ant-picker-small'); expect(nzTimePicker!.classList).toContain('ant-picker-small'); @@ -128,7 +122,6 @@ describe('Space compact', () => { expect(nzInput!.classList).toContain('ant-input-lg'); expect(nzInputNumber!.classList).toContain('ant-input-number-lg'); - expect(nzInputNumberLegacy!.classList).toContain('ant-input-number-lg'); expect(nzDatePicker!.classList).toContain('ant-picker-large'); expect(nzRangePicker!.classList).toContain('ant-picker-large'); expect(nzTimePicker!.classList).toContain('ant-picker-large'); @@ -211,7 +204,6 @@ describe('Space compact direction', () => { NzButtonModule, NzInputModule, NzInputNumberModule, - NzInputNumberLegacyModule, NzSelectModule, NzCascaderModule, NzTreeSelectModule, @@ -225,7 +217,6 @@ describe('Space compact direction', () => { } -