diff --git a/.changeset/curvy-pets-repair.md b/.changeset/curvy-pets-repair.md new file mode 100644 index 000000000..a3c65b8d9 --- /dev/null +++ b/.changeset/curvy-pets-repair.md @@ -0,0 +1,5 @@ +--- +"@alauda/ui": patch +--- + +fix: tree select reset filter text diff --git a/src/theme/_mixin.scss b/src/theme/_mixin.scss index f8f0b2394..5e047df12 100644 --- a/src/theme/_mixin.scss +++ b/src/theme/_mixin.scss @@ -223,8 +223,6 @@ align-items: center; width: use-var(icon-size-m); height: use-var(icon-size-m); - font-size: use-var(icon-size-m); - line-height: use-var(icon-size-m); color: use-rgb(primary); background-color: use-rgb(p-6); border-radius: 50%; @@ -233,9 +231,12 @@ transition: transform 0.1s ease-in-out; aui-icon { - display: block; - width: use-var(icon-size-m); - height: use-var(icon-size-m); + display: flex; + justify-content: center; + align-items: center; + width: use-var(icon-size-s); + height: use-var(icon-size-s); + font-size: use-var(icon-size-s); } &:hover { diff --git a/src/tree-select/tree-select.component.html b/src/tree-select/tree-select.component.html index e1dfb95ea..977fbc71d 100644 --- a/src/tree-select/tree-select.component.html +++ b/src/tree-select/tree-select.component.html @@ -23,7 +23,7 @@ [placeholder]="getPlaceholder()" [readonly]="inputReadonly" (input)="onInput($event)" - (blur)="closeNodes()" + (blur)="closeOption()" (keydown)="onKeyDown($event)" /> { }); it('should ngModel work', fakeAsync(() => { - ins.selectRef.openNodes(); + ins.selectRef.openOption(); fixture.detectChanges(); expect( @@ -71,7 +71,7 @@ describe('TreeSelectComponent', () => { fixture.detectChanges(); tick(); expect(inputEl.value).toBe('b-2'); - ins.selectRef.openNodes(); + ins.selectRef.openOption(); fixture.detectChanges(); expect( ocEl.querySelector('.aui-tree-node[data-value=b-2]').className, @@ -97,7 +97,7 @@ describe('TreeSelectComponent', () => { }); it('should tree node could be disabled', () => { - ins.selectRef.openNodes(); + ins.selectRef.openOption(); fixture.detectChanges(); ocEl .querySelector('.aui-tree-node[data-value=a-3] .aui-tree-node__title') diff --git a/src/tree-select/tree-select.component.ts b/src/tree-select/tree-select.component.ts index dd7f38e56..371201969 100644 --- a/src/tree-select/tree-select.component.ts +++ b/src/tree-select/tree-select.component.ts @@ -173,14 +173,6 @@ export class TreeSelectComponent extends CommonFormControl { } } - openNodes() { - this.tooltipRef.createTooltip(); - } - - closeNodes() { - this.tooltipRef.disposeTooltip(); - } - updatePosition() { this.tooltipRef.updatePosition(); } @@ -219,7 +211,7 @@ export class TreeSelectComponent extends CommonFormControl { if (!node.selected) { this.emitValue(node.nodeData.value); if (this.onChange) { - this.closeNodes(); + this.closeOption(); } } } @@ -232,7 +224,12 @@ export class TreeSelectComponent extends CommonFormControl { } } + openOption() { + this.tooltipRef.createTooltip(); + } + closeOption() { + this.inputRef.elementRef.nativeElement.value = this.displayText; this.tooltipRef.disposeTooltip(); } @@ -253,7 +250,7 @@ export class TreeSelectComponent extends CommonFormControl { protected override valueIn(v: T): T { this.updateSelectDisplay(v); - this.closeNodes(); + this.closeOption(); return v; }