Merge branch 'feature/SUPPORT-9304' into develop
This commit is contained in:
commit
6d570da8a7
2 changed files with 11 additions and 3 deletions
|
|
@ -61,6 +61,8 @@ export class DropdownTreeViewComponent extends InputControl {
|
|||
public valueChangeEvent: Event<TreeItemDto> = new Event<TreeItemDto>();
|
||||
@AdvancedProperty()
|
||||
public skipInitialSelection: boolean;
|
||||
@AdvancedProperty()
|
||||
public allowClear: boolean = true;
|
||||
@NotNull()
|
||||
public preferBusinessId: boolean = false;
|
||||
private rpcService: TreeItemRpcService;
|
||||
|
|
@ -272,7 +274,7 @@ export class DropdownTreeViewComponent extends InputControl {
|
|||
|
||||
onKeyDown(event: KeyboardEvent): void {
|
||||
const isInput = (event.target as HTMLElement).tagName === 'INPUT';
|
||||
if (EventUtils.isKeyBackspace(event) && !isInput && this.value) {
|
||||
if (EventUtils.isKeyBackspace(event) && !isInput && this.value && this.allowClear) {
|
||||
this.clearValue();
|
||||
event.stopPropagation();
|
||||
event.preventDefault();
|
||||
|
|
|
|||
|
|
@ -799,7 +799,6 @@
|
|||
<componentRootId>a397e301-e715-4c6a-b289-5a27af3900d3</componentRootId>
|
||||
<name>Основные данные</name>
|
||||
<container>true</container>
|
||||
<expanded>false</expanded>
|
||||
<childrenReordered>false</childrenReordered>
|
||||
<scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5">
|
||||
<properties>
|
||||
|
|
@ -5940,6 +5939,12 @@
|
|||
<childrenReordered>false</childrenReordered>
|
||||
<scripts id="d524f4d7-efdc-45ac-a9a5-a160e241b871">
|
||||
<properties>
|
||||
<entry>
|
||||
<key>allowClear</key>
|
||||
<value>
|
||||
<simple>false</simple>
|
||||
</value>
|
||||
</entry>
|
||||
<entry>
|
||||
<key>collectible</key>
|
||||
<value>
|
||||
|
|
@ -5967,7 +5972,7 @@
|
|||
<entry>
|
||||
<key>skipInitialSelection</key>
|
||||
<value>
|
||||
<simple>true</simple>
|
||||
<simple>false</simple>
|
||||
</value>
|
||||
</entry>
|
||||
</properties>
|
||||
|
|
@ -12404,6 +12409,7 @@
|
|||
<componentRootId>6668fe64-2735-462c-92ba-09a929aaa7dc</componentRootId>
|
||||
<name>Роли</name>
|
||||
<container>true</container>
|
||||
<expanded>false</expanded>
|
||||
<childrenReordered>false</childrenReordered>
|
||||
<scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5">
|
||||
<properties>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue