micord/ervu-account-applications
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'feature/SUPPORT-9304' into develop

Browse source
This commit is contained in:
adel.ka 2025-08-04 09:27:20 +03:00
commit 6d570da8a7
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
frontend/src/ts/account_applications/component/field/DropdownTreeViewComponent.ts
View file

@ -61,6 +61,8 @@ export class DropdownTreeViewComponent extends InputControl {
public valueChangeEvent: Event<TreeItemDto> = new Event<TreeItemDto>(); public valueChangeEvent: Event<TreeItemDto> = new Event<TreeItemDto>();
@AdvancedProperty() @AdvancedProperty()
public skipInitialSelection: boolean; public skipInitialSelection: boolean;
@AdvancedProperty()
public allowClear: boolean = true;
@NotNull() @NotNull()
public preferBusinessId: boolean = false; public preferBusinessId: boolean = false;
private rpcService: TreeItemRpcService; private rpcService: TreeItemRpcService;
@ -272,7 +274,7 @@ export class DropdownTreeViewComponent extends InputControl {
onKeyDown(event: KeyboardEvent): void { onKeyDown(event: KeyboardEvent): void {
const isInput = (event.target as HTMLElement).tagName === 'INPUT'; 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(); this.clearValue();
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();

10
resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на изменение.page
View file

@ -799,7 +799,6 @@
<componentRootId>a397e301-e715-4c6a-b289-5a27af3900d3</componentRootId> <componentRootId>a397e301-e715-4c6a-b289-5a27af3900d3</componentRootId>
<name>Основные данные</name> <name>Основные данные</name>
<container>true</container> <container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered> <childrenReordered>false</childrenReordered>
<scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5"> <scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5">
<properties> <properties>
@ -5940,6 +5939,12 @@
<childrenReordered>false</childrenReordered> <childrenReordered>false</childrenReordered>
<scripts id="d524f4d7-efdc-45ac-a9a5-a160e241b871"> <scripts id="d524f4d7-efdc-45ac-a9a5-a160e241b871">
<properties> <properties>
<entry>
<key>allowClear</key>
<value>
<simple>false</simple>
</value>
</entry>
<entry> <entry>
<key>collectible</key> <key>collectible</key>
<value> <value>
@ -5967,7 +5972,7 @@
<entry> <entry>
<key>skipInitialSelection</key> <key>skipInitialSelection</key>
<value> <value>
<simple>true</simple> <simple>false</simple>
</value> </value>
</entry> </entry>
</properties> </properties>
@ -12404,6 +12409,7 @@
<componentRootId>6668fe64-2735-462c-92ba-09a929aaa7dc</componentRootId> <componentRootId>6668fe64-2735-462c-92ba-09a929aaa7dc</componentRootId>
<name>Роли</name> <name>Роли</name>
<container>true</container> <container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered> <childrenReordered>false</childrenReordered>
<scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5"> <scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5">
<properties> <properties>