SUPPORT-9100 sync
This commit is contained in:
parent
2ee500cab2
commit
558b79e03f
6 changed files with 153 additions and 2 deletions
|
|
@ -11,6 +11,7 @@
|
||||||
- SUPPORT-9080: Ошибка дубликатов в УЗ
|
- SUPPORT-9080: Ошибка дубликатов в УЗ
|
||||||
- SUPPORT-9060: Исправление отображения ошибок
|
- SUPPORT-9060: Исправление отображения ошибок
|
||||||
- SUPPORT-9089: Исправление всплывающего окна
|
- SUPPORT-9089: Исправление всплывающего окна
|
||||||
|
- SUPPORT-9100: Добавить возможность сброса фильтра
|
||||||
|
|
||||||
### Сборка и запуск
|
### Сборка и запуск
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7867,6 +7867,12 @@
|
||||||
<value>
|
<value>
|
||||||
<simple>"Организация"</simple>
|
<simple>"Организация"</simple>
|
||||||
</value>
|
</value>
|
||||||
|
</entry>
|
||||||
|
<entry>
|
||||||
|
<key>skipInitialSelection</key>
|
||||||
|
<value>
|
||||||
|
<simple>true</simple>
|
||||||
|
</value>
|
||||||
</entry>
|
</entry>
|
||||||
</properties>
|
</properties>
|
||||||
</scripts>
|
</scripts>
|
||||||
|
|
@ -8889,6 +8895,29 @@
|
||||||
<removed>true</removed>
|
<removed>true</removed>
|
||||||
</children>
|
</children>
|
||||||
</children>
|
</children>
|
||||||
|
<children id="0da6e404-74cb-4fea-9b37-a01f1c12b97d">
|
||||||
|
<prototypeId>3fd6fceb-c698-499f-9101-610040334af3</prototypeId>
|
||||||
|
<componentRootId>0da6e404-74cb-4fea-9b37-a01f1c12b97d</componentRootId>
|
||||||
|
<name>Кнопка очистки фильтра</name>
|
||||||
|
<container>false</container>
|
||||||
|
<childrenReordered>false</childrenReordered>
|
||||||
|
<scripts id="17c7b52a-9116-4374-87b0-4b122917a0c7">
|
||||||
|
<properties>
|
||||||
|
<entry>
|
||||||
|
<key>caption</key>
|
||||||
|
<value>
|
||||||
|
<simple>"Очистить фильтр"</simple>
|
||||||
|
</value>
|
||||||
|
</entry>
|
||||||
|
<entry>
|
||||||
|
<key>filterGroup</key>
|
||||||
|
<value>
|
||||||
|
<simple>{"objectId":"e32ab073-1f82-4f65-9963-a64c92d0c726","packageName":"component.container","className":"FilterGroup","type":"TS"}</simple>
|
||||||
|
</value>
|
||||||
|
</entry>
|
||||||
|
</properties>
|
||||||
|
</scripts>
|
||||||
|
</children>
|
||||||
<children id="d01de423-91e3-47e0-b3d2-937c22bf6c1e">
|
<children id="d01de423-91e3-47e0-b3d2-937c22bf6c1e">
|
||||||
<prototypeId>c4b63ae3-f093-4b74-891b-d16e2a35644e</prototypeId>
|
<prototypeId>c4b63ae3-f093-4b74-891b-d16e2a35644e</prototypeId>
|
||||||
<componentRootId>d01de423-91e3-47e0-b3d2-937c22bf6c1e</componentRootId>
|
<componentRootId>d01de423-91e3-47e0-b3d2-937c22bf6c1e</componentRootId>
|
||||||
|
|
|
||||||
|
|
@ -7868,6 +7868,12 @@
|
||||||
<value>
|
<value>
|
||||||
<simple>"Организация"</simple>
|
<simple>"Организация"</simple>
|
||||||
</value>
|
</value>
|
||||||
|
</entry>
|
||||||
|
<entry>
|
||||||
|
<key>skipInitialSelection</key>
|
||||||
|
<value>
|
||||||
|
<simple>true</simple>
|
||||||
|
</value>
|
||||||
</entry>
|
</entry>
|
||||||
</properties>
|
</properties>
|
||||||
</scripts>
|
</scripts>
|
||||||
|
|
@ -8890,6 +8896,29 @@
|
||||||
<removed>true</removed>
|
<removed>true</removed>
|
||||||
</children>
|
</children>
|
||||||
</children>
|
</children>
|
||||||
|
<children id="36e612d8-b485-49cb-bc97-a53f73881f24">
|
||||||
|
<prototypeId>3fd6fceb-c698-499f-9101-610040334af3</prototypeId>
|
||||||
|
<componentRootId>36e612d8-b485-49cb-bc97-a53f73881f24</componentRootId>
|
||||||
|
<name>Кнопка очистки фильтра</name>
|
||||||
|
<container>false</container>
|
||||||
|
<childrenReordered>false</childrenReordered>
|
||||||
|
<scripts id="17c7b52a-9116-4374-87b0-4b122917a0c7">
|
||||||
|
<properties>
|
||||||
|
<entry>
|
||||||
|
<key>caption</key>
|
||||||
|
<value>
|
||||||
|
<simple>"Очистить фильтр"</simple>
|
||||||
|
</value>
|
||||||
|
</entry>
|
||||||
|
<entry>
|
||||||
|
<key>filterGroup</key>
|
||||||
|
<value>
|
||||||
|
<simple>{"objectId":"e32ab073-1f82-4f65-9963-a64c92d0c726","packageName":"component.container","className":"FilterGroup","type":"TS"}</simple>
|
||||||
|
</value>
|
||||||
|
</entry>
|
||||||
|
</properties>
|
||||||
|
</scripts>
|
||||||
|
</children>
|
||||||
<children id="d01de423-91e3-47e0-b3d2-937c22bf6c1e">
|
<children id="d01de423-91e3-47e0-b3d2-937c22bf6c1e">
|
||||||
<prototypeId>c4b63ae3-f093-4b74-891b-d16e2a35644e</prototypeId>
|
<prototypeId>c4b63ae3-f093-4b74-891b-d16e2a35644e</prototypeId>
|
||||||
<componentRootId>d01de423-91e3-47e0-b3d2-937c22bf6c1e</componentRootId>
|
<componentRootId>d01de423-91e3-47e0-b3d2-937c22bf6c1e</componentRootId>
|
||||||
|
|
|
||||||
|
|
@ -16881,7 +16881,6 @@
|
||||||
<componentRootId>cddc4349-300b-4b76-bea1-a2c7c5c2b171</componentRootId>
|
<componentRootId>cddc4349-300b-4b76-bea1-a2c7c5c2b171</componentRootId>
|
||||||
<name>Dialog</name>
|
<name>Dialog</name>
|
||||||
<container>true</container>
|
<container>true</container>
|
||||||
<expanded>false</expanded>
|
|
||||||
<childrenReordered>false</childrenReordered>
|
<childrenReordered>false</childrenReordered>
|
||||||
<scripts id="cf4526a1-96ab-4820-8aa9-62fb54c2b64c">
|
<scripts id="cf4526a1-96ab-4820-8aa9-62fb54c2b64c">
|
||||||
<properties>
|
<properties>
|
||||||
|
|
@ -17059,6 +17058,12 @@
|
||||||
<value>
|
<value>
|
||||||
<simple>"Организация"</simple>
|
<simple>"Организация"</simple>
|
||||||
</value>
|
</value>
|
||||||
|
</entry>
|
||||||
|
<entry>
|
||||||
|
<key>skipInitialSelection</key>
|
||||||
|
<value>
|
||||||
|
<simple>true</simple>
|
||||||
|
</value>
|
||||||
</entry>
|
</entry>
|
||||||
</properties>
|
</properties>
|
||||||
</scripts>
|
</scripts>
|
||||||
|
|
@ -17985,6 +17990,29 @@
|
||||||
<removed>true</removed>
|
<removed>true</removed>
|
||||||
</children>
|
</children>
|
||||||
</children>
|
</children>
|
||||||
|
<children id="d4e42e10-1b55-491e-a2bf-27f1cb4e85f3">
|
||||||
|
<prototypeId>3fd6fceb-c698-499f-9101-610040334af3</prototypeId>
|
||||||
|
<componentRootId>d4e42e10-1b55-491e-a2bf-27f1cb4e85f3</componentRootId>
|
||||||
|
<name>Кнопка очистки фильтра</name>
|
||||||
|
<container>false</container>
|
||||||
|
<childrenReordered>false</childrenReordered>
|
||||||
|
<scripts id="17c7b52a-9116-4374-87b0-4b122917a0c7">
|
||||||
|
<properties>
|
||||||
|
<entry>
|
||||||
|
<key>caption</key>
|
||||||
|
<value>
|
||||||
|
<simple>"Очистить фильтр"</simple>
|
||||||
|
</value>
|
||||||
|
</entry>
|
||||||
|
<entry>
|
||||||
|
<key>filterGroup</key>
|
||||||
|
<value>
|
||||||
|
<simple>{"objectId":"9aad96b1-3dfe-4c51-9cf1-76a108adae3f","packageName":"component.container","className":"FilterGroup","type":"TS"}</simple>
|
||||||
|
</value>
|
||||||
|
</entry>
|
||||||
|
</properties>
|
||||||
|
</scripts>
|
||||||
|
</children>
|
||||||
<children id="e3fa0b69-cb35-45a7-b080-e4b2a47f8084">
|
<children id="e3fa0b69-cb35-45a7-b080-e4b2a47f8084">
|
||||||
<prototypeId>c4b63ae3-f093-4b74-891b-d16e2a35644e</prototypeId>
|
<prototypeId>c4b63ae3-f093-4b74-891b-d16e2a35644e</prototypeId>
|
||||||
<componentRootId>e3fa0b69-cb35-45a7-b080-e4b2a47f8084</componentRootId>
|
<componentRootId>e3fa0b69-cb35-45a7-b080-e4b2a47f8084</componentRootId>
|
||||||
|
|
|
||||||
|
|
@ -7706,7 +7706,6 @@
|
||||||
<componentRootId>ec35c0af-f0ca-486b-953a-ed607a05ac70</componentRootId>
|
<componentRootId>ec35c0af-f0ca-486b-953a-ed607a05ac70</componentRootId>
|
||||||
<name>Dialog</name>
|
<name>Dialog</name>
|
||||||
<container>true</container>
|
<container>true</container>
|
||||||
<expanded>false</expanded>
|
|
||||||
<childrenReordered>false</childrenReordered>
|
<childrenReordered>false</childrenReordered>
|
||||||
<scripts id="cf4526a1-96ab-4820-8aa9-62fb54c2b64c">
|
<scripts id="cf4526a1-96ab-4820-8aa9-62fb54c2b64c">
|
||||||
<properties>
|
<properties>
|
||||||
|
|
@ -7884,6 +7883,12 @@
|
||||||
<value>
|
<value>
|
||||||
<simple>"Организация"</simple>
|
<simple>"Организация"</simple>
|
||||||
</value>
|
</value>
|
||||||
|
</entry>
|
||||||
|
<entry>
|
||||||
|
<key>skipInitialSelection</key>
|
||||||
|
<value>
|
||||||
|
<simple>true</simple>
|
||||||
|
</value>
|
||||||
</entry>
|
</entry>
|
||||||
</properties>
|
</properties>
|
||||||
</scripts>
|
</scripts>
|
||||||
|
|
@ -8810,6 +8815,30 @@
|
||||||
<removed>true</removed>
|
<removed>true</removed>
|
||||||
</children>
|
</children>
|
||||||
</children>
|
</children>
|
||||||
|
<children id="ae42fc0b-6caf-4ab9-b852-c86dc11ba4b6">
|
||||||
|
<prototypeId>3fd6fceb-c698-499f-9101-610040334af3</prototypeId>
|
||||||
|
<componentRootId>ae42fc0b-6caf-4ab9-b852-c86dc11ba4b6</componentRootId>
|
||||||
|
<name>Кнопка очистки фильтра</name>
|
||||||
|
<container>false</container>
|
||||||
|
<expanded>false</expanded>
|
||||||
|
<childrenReordered>false</childrenReordered>
|
||||||
|
<scripts id="17c7b52a-9116-4374-87b0-4b122917a0c7">
|
||||||
|
<properties>
|
||||||
|
<entry>
|
||||||
|
<key>caption</key>
|
||||||
|
<value>
|
||||||
|
<simple>"Очистить фильтр"</simple>
|
||||||
|
</value>
|
||||||
|
</entry>
|
||||||
|
<entry>
|
||||||
|
<key>filterGroup</key>
|
||||||
|
<value>
|
||||||
|
<simple>{"objectId":"e32ab073-1f82-4f65-9963-a64c92d0c726","packageName":"component.container","className":"FilterGroup","type":"TS"}</simple>
|
||||||
|
</value>
|
||||||
|
</entry>
|
||||||
|
</properties>
|
||||||
|
</scripts>
|
||||||
|
</children>
|
||||||
<children id="d01de423-91e3-47e0-b3d2-937c22bf6c1e">
|
<children id="d01de423-91e3-47e0-b3d2-937c22bf6c1e">
|
||||||
<prototypeId>c4b63ae3-f093-4b74-891b-d16e2a35644e</prototypeId>
|
<prototypeId>c4b63ae3-f093-4b74-891b-d16e2a35644e</prototypeId>
|
||||||
<componentRootId>d01de423-91e3-47e0-b3d2-937c22bf6c1e</componentRootId>
|
<componentRootId>d01de423-91e3-47e0-b3d2-937c22bf6c1e</componentRootId>
|
||||||
|
|
|
||||||
|
|
@ -1023,6 +1023,18 @@
|
||||||
<value>
|
<value>
|
||||||
<simple>"Организация"</simple>
|
<simple>"Организация"</simple>
|
||||||
</value>
|
</value>
|
||||||
|
</entry>
|
||||||
|
<entry>
|
||||||
|
<key>preferBusinessId</key>
|
||||||
|
<value>
|
||||||
|
<simple>true</simple>
|
||||||
|
</value>
|
||||||
|
</entry>
|
||||||
|
<entry>
|
||||||
|
<key>skipInitialSelection</key>
|
||||||
|
<value>
|
||||||
|
<simple>true</simple>
|
||||||
|
</value>
|
||||||
</entry>
|
</entry>
|
||||||
</properties>
|
</properties>
|
||||||
</scripts>
|
</scripts>
|
||||||
|
|
@ -2664,6 +2676,29 @@
|
||||||
</children>
|
</children>
|
||||||
</children>
|
</children>
|
||||||
</children>
|
</children>
|
||||||
|
<children id="039ee58a-58fa-435c-9049-f53e790115a7">
|
||||||
|
<prototypeId>3fd6fceb-c698-499f-9101-610040334af3</prototypeId>
|
||||||
|
<componentRootId>039ee58a-58fa-435c-9049-f53e790115a7</componentRootId>
|
||||||
|
<name>Кнопка очистки фильтра</name>
|
||||||
|
<container>false</container>
|
||||||
|
<childrenReordered>false</childrenReordered>
|
||||||
|
<scripts id="17c7b52a-9116-4374-87b0-4b122917a0c7">
|
||||||
|
<properties>
|
||||||
|
<entry>
|
||||||
|
<key>caption</key>
|
||||||
|
<value>
|
||||||
|
<simple>"Очистить фильтр"</simple>
|
||||||
|
</value>
|
||||||
|
</entry>
|
||||||
|
<entry>
|
||||||
|
<key>filterGroup</key>
|
||||||
|
<value>
|
||||||
|
<simple>{"objectId":"ca69506d-fd9f-43b7-8d18-d03c3b5fa756","packageName":"component.container","className":"FilterGroup","type":"TS"}</simple>
|
||||||
|
</value>
|
||||||
|
</entry>
|
||||||
|
</properties>
|
||||||
|
</scripts>
|
||||||
|
</children>
|
||||||
<children id="8db09491-18d7-499b-b98f-190f44e04ab9">
|
<children id="8db09491-18d7-499b-b98f-190f44e04ab9">
|
||||||
<prototypeId>c4b63ae3-f093-4b74-891b-d16e2a35644e</prototypeId>
|
<prototypeId>c4b63ae3-f093-4b74-891b-d16e2a35644e</prototypeId>
|
||||||
<componentRootId>8db09491-18d7-499b-b98f-190f44e04ab9</componentRootId>
|
<componentRootId>8db09491-18d7-499b-b98f-190f44e04ab9</componentRootId>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue