fix(input-number): fix input number display value error with suffix w…

…hen delete #PJM-16714
atinc · Dec 27, 2023 · 8e2b362 · 8e2b362
1 parent de7d4f1
commit 8e2b362
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 19 deletions.
diff --git a/src/input-number/input-number.component.ts b/src/input-number/input-number.component.ts
@@ -226,17 +226,17 @@ export class ThyInputNumberComponent
     }
 
     onModelChange(value: string): void {
+        const parseValue = this.parser(value);
         if (this.isInputNumber(value)) {
             this.activeValue = value;
         } else {
-            this.displayValue = this.activeValue;
-            this.inputElement.nativeElement.value = this.displayValue;
+            this.displayValue = parseValue;
+            this.inputElement.nativeElement.value = parseValue;
         }
-        const parseValue = this.parser(value);
         const validValue = this.getCurrentValidValue(parseValue);
-        if (this.validValue !== validValue) {
+        if (`${this.validValue}` !== `${validValue}`) {
             this.updateValidValue(validValue);
-            this.onChangeFn(this.validValue);
+            this.onChangeFn(validValue);
         }
     }
 

diff --git a/src/input-number/test/input-number.spec.ts b/src/input-number/test/input-number.spec.ts
@@ -572,19 +572,19 @@ describe('input-number component', () => {
     it('should Only floating point numbers can be entered work', fakeAsync(() => {
         const testValueToken = [
             { from: '-', to: '' },
-            { from: '-3', to: '-3' },
-            { from: '-3abc', to: '-3' },
-            { from: '-3.1', to: '-3.1' }
+            { from: '-3', to: '0' },
+            { from: '-3abc', to: '0' },
+            { from: '-3.1', to: '0' }
         ];
         fixture.detectChanges();
         testValueToken.forEach(item => {
-            inputElement.value = item.from;
             const inputNumberComponent = inputNumberComponentInstance.inputNumberComponent;
             inputNumberComponent.onModelChange(item.from);
+            dispatchKeyboardEvent(inputElement, 'keydown', keycodes.ENTER);
             tick();
             fixture.detectChanges();
             flush();
-            expect(inputElement.value).toBe(item.to);
+            expect(inputNumberComponent.displayValue).toBe(item.to);
         });
     }));
 
@@ -603,19 +603,10 @@ describe('input-number component', () => {
     it('should set activeValue to value if it is a number', () => {
         fixture.detectChanges();
         const component = inputNumberComponentInstance.inputNumberComponent;
-        console.log(inputNumberComponentInstance, component);
         component.onModelChange('123');
         expect(component.activeValue).toBe('123');
     });
 
-    it('should set displayValue to activeValue if value is not a number', () => {
-        fixture.detectChanges();
-        const component = inputNumberComponentInstance.inputNumberComponent;
-        component.activeValue = '123';
-        component.onModelChange('abc');
-        expect(component.displayValue).toBe('123');
-    });
-
     it('should call parser with value', () => {
         fixture.detectChanges();
         const component = inputNumberComponentInstance.inputNumberComponent;