Merge branch 'refs/heads/feature/SUPPORT-9213_change_to_Idm3' into develop
# Conflicts: # resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на изменение.page
This commit is contained in:
adel.ka
commit
95585c0b0c
2 changed files with 5119 additions and 991 deletions
|
|
@ -900,7 +900,6 @@
|
|||
<componentRootId>317d3481-41e0-4516-94a5-93a49aac2622</componentRootId>
|
||||
<name>Основные данные</name>
|
||||
<container>true</container>
|
||||
<expanded>false</expanded>
|
||||
<childrenReordered>false</childrenReordered>
|
||||
<scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5">
|
||||
<properties>
|
||||
|
|
@ -2172,7 +2171,7 @@
|
|||
<entry>
|
||||
<key>behavior</key>
|
||||
<value>
|
||||
<simple>{"objectId":"7438abfe-6811-4133-b4e9-1d620a87767e","packageName":"component.field","className":"NumberField","type":"TS"}</simple>
|
||||
<simple>{"objectId":"549e0dcb-a8b4-432c-a21c-254f4a21fdc8","packageName":"component.field","className":"NumberField","type":"TS"}</simple>
|
||||
</value>
|
||||
</entry>
|
||||
<entry>
|
||||
|
|
@ -2222,7 +2221,7 @@
|
|||
<entry>
|
||||
<key>behavior</key>
|
||||
<value>
|
||||
<simple>{"objectId":"2810edc4-dae7-4fc7-b457-5a483fee9081","packageName":"component.container","className":"FilterGroup","type":"TS"}</simple>
|
||||
<simple>{"objectId":"ff08b2b2-5a27-4e39-b110-24aea0b9baf3","packageName":"component.container","className":"FilterGroup","type":"TS"}</simple>
|
||||
</value>
|
||||
</entry>
|
||||
<entry>
|
||||
|
|
@ -2826,7 +2825,69 @@
|
|||
<componentRootId>62adbc2d-0be1-45de-bc44-b77d11b129d7</componentRootId>
|
||||
<name>Grid_groups</name>
|
||||
<container>true</container>
|
||||
<expanded>false</expanded>
|
||||
<removed>true</removed>
|
||||
</children>
|
||||
<children id="2810edc4-dae7-4fc7-b457-5a483fee9081">
|
||||
<prototypeId>27912fc5-0be7-4d4c-ae46-a82979253599</prototypeId>
|
||||
<componentRootId>2810edc4-dae7-4fc7-b457-5a483fee9081</componentRootId>
|
||||
<name>Filter group_gr</name>
|
||||
<container>true</container>
|
||||
<removed>true</removed>
|
||||
</children>
|
||||
</children>
|
||||
<children id="f6583342-45fe-48cd-adde-ed933ada3ecc">
|
||||
<prototypeId>84b784bf-7bec-42f5-bbb7-8a465de45019</prototypeId>
|
||||
<componentRootId>f6583342-45fe-48cd-adde-ed933ada3ecc</componentRootId>
|
||||
<name>Роли</name>
|
||||
<container>true</container>
|
||||
<childrenReordered>false</childrenReordered>
|
||||
<scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5">
|
||||
<properties>
|
||||
<entry>
|
||||
<key>heading</key>
|
||||
<value>
|
||||
<simple>"Роли"</simple>
|
||||
</value>
|
||||
</entry>
|
||||
</properties>
|
||||
</scripts>
|
||||
<scripts id="e149fe87-788e-4d2f-8d3b-02abfaf052da"/>
|
||||
<scripts id="98b064c8-1d68-432b-a99b-f8868d987e43"/>
|
||||
<scripts id="0f6c4754-b38d-4ecf-b9b6-556168286ae6"/>
|
||||
<scripts id="540780ae-3c57-4c6b-86d3-22e52cefd63f"/>
|
||||
<children id="53f5c552-9049-4a62-ae7c-981f4c33d240">
|
||||
<prototypeId>133ca212-09a6-413a-ac66-e2f6ce188f1f</prototypeId>
|
||||
<componentRootId>53f5c552-9049-4a62-ae7c-981f4c33d240</componentRootId>
|
||||
<name>Логин</name>
|
||||
<container>false</container>
|
||||
<removed>true</removed>
|
||||
</children>
|
||||
<children id="09e97823-698c-4ab7-a7d5-4960e65a33de">
|
||||
<prototypeId>133ca212-09a6-413a-ac66-e2f6ce188f1f</prototypeId>
|
||||
<componentRootId>09e97823-698c-4ab7-a7d5-4960e65a33de</componentRootId>
|
||||
<name>Должность</name>
|
||||
<container>false</container>
|
||||
<removed>true</removed>
|
||||
</children>
|
||||
<children id="c458f177-1677-46dc-aa5b-f01b04a6244e">
|
||||
<prototypeId>f9a38417-9ad0-412a-9b5f-bbeb450dddd6</prototypeId>
|
||||
<componentRootId>c458f177-1677-46dc-aa5b-f01b04a6244e</componentRootId>
|
||||
<name>Организация</name>
|
||||
<container>false</container>
|
||||
<removed>true</removed>
|
||||
</children>
|
||||
<children id="efe4b6a9-0c0e-4728-b083-e1f742155fdc">
|
||||
<prototypeId>133ca212-09a6-413a-ac66-e2f6ce188f1f</prototypeId>
|
||||
<componentRootId>efe4b6a9-0c0e-4728-b083-e1f742155fdc</componentRootId>
|
||||
<name>Пароль</name>
|
||||
<container>false</container>
|
||||
<removed>true</removed>
|
||||
</children>
|
||||
<children id="cc576959-b76c-411d-853e-371ce6c2dfdb">
|
||||
<prototypeId>16071adb-3bdf-4c33-b29b-886876016415</prototypeId>
|
||||
<componentRootId>cc576959-b76c-411d-853e-371ce6c2dfdb</componentRootId>
|
||||
<name>Grid_groups</name>
|
||||
<container>true</container>
|
||||
<childrenReordered>false</childrenReordered>
|
||||
<scripts id="07201df9-ff33-4c71-9aae-a2cfdd028234">
|
||||
<properties>
|
||||
|
|
@ -2904,7 +2965,7 @@
|
|||
<entry>
|
||||
<key>column</key>
|
||||
<value>
|
||||
<simple>{"objectId":"c8b2b349-588a-473a-bc1e-fb8cf5a03c0a","packageName":"component.grid","className":"GridV2Column","type":"TS"}</simple>
|
||||
<simple>{"objectId":"0dca8df0-8918-41f9-8a20-2bc243102f28","packageName":"component.grid","className":"GridV2Column","type":"TS"}</simple>
|
||||
</value>
|
||||
</entry>
|
||||
<entry>
|
||||
|
|
@ -2915,9 +2976,9 @@
|
|||
</entry>
|
||||
</properties>
|
||||
</scripts>
|
||||
<children id="8a4be27e-9e06-466a-9d96-822df62a1570">
|
||||
<children id="1a27a598-2ead-4697-8d25-6c3dde472f96">
|
||||
<prototypeId>364c8faa-5e56-46cd-9203-d2ec6ef2dc74</prototypeId>
|
||||
<componentRootId>8a4be27e-9e06-466a-9d96-822df62a1570</componentRootId>
|
||||
<componentRootId>1a27a598-2ead-4697-8d25-6c3dde472f96</componentRootId>
|
||||
<name>Column</name>
|
||||
<container>false</container>
|
||||
<childrenReordered>false</childrenReordered>
|
||||
|
|
@ -2945,9 +3006,9 @@
|
|||
</properties>
|
||||
</scripts>
|
||||
</children>
|
||||
<children id="c8b2b349-588a-473a-bc1e-fb8cf5a03c0a">
|
||||
<children id="0dca8df0-8918-41f9-8a20-2bc243102f28">
|
||||
<prototypeId>364c8faa-5e56-46cd-9203-d2ec6ef2dc74</prototypeId>
|
||||
<componentRootId>c8b2b349-588a-473a-bc1e-fb8cf5a03c0a</componentRootId>
|
||||
<componentRootId>0dca8df0-8918-41f9-8a20-2bc243102f28</componentRootId>
|
||||
<name>Column role id</name>
|
||||
<container>false</container>
|
||||
<expanded>false</expanded>
|
||||
|
|
@ -2995,12 +3056,11 @@
|
|||
</scripts>
|
||||
</children>
|
||||
</children>
|
||||
<children id="2810edc4-dae7-4fc7-b457-5a483fee9081">
|
||||
<children id="ff08b2b2-5a27-4e39-b110-24aea0b9baf3">
|
||||
<prototypeId>27912fc5-0be7-4d4c-ae46-a82979253599</prototypeId>
|
||||
<componentRootId>2810edc4-dae7-4fc7-b457-5a483fee9081</componentRootId>
|
||||
<componentRootId>ff08b2b2-5a27-4e39-b110-24aea0b9baf3</componentRootId>
|
||||
<name>Filter group_gr</name>
|
||||
<container>true</container>
|
||||
<expanded>false</expanded>
|
||||
<childrenReordered>false</childrenReordered>
|
||||
<scripts id="3f5f352c-1a86-4702-a914-6c163c903157">
|
||||
<properties>
|
||||
|
|
@ -3035,7 +3095,7 @@
|
|||
<entry>
|
||||
<key>filterable</key>
|
||||
<value>
|
||||
<simple>{"objectId":"62adbc2d-0be1-45de-bc44-b77d11b129d7","packageName":"rpc","className":"GridRpcService","type":"JAVA"}</simple>
|
||||
<simple>{"objectId":"cc576959-b76c-411d-853e-371ce6c2dfdb","packageName":"rpc","className":"GridRpcService","type":"JAVA"}</simple>
|
||||
</value>
|
||||
</entry>
|
||||
</properties>
|
||||
|
|
@ -3044,9 +3104,9 @@
|
|||
<scripts id="7176bfcf-d736-48a3-b620-6a77412d4026"/>
|
||||
<scripts id="21c9994a-3743-4adb-ae52-130f48aeab83"/>
|
||||
<scripts id="fc0d4368-d207-4b1f-b9e9-4bb06ae7291f"/>
|
||||
<children id="7438abfe-6811-4133-b4e9-1d620a87767e">
|
||||
<children id="549e0dcb-a8b4-432c-a21c-254f4a21fdc8">
|
||||
<prototypeId>c4b63ae3-f093-4b74-891b-d16e2a35644e</prototypeId>
|
||||
<componentRootId>7438abfe-6811-4133-b4e9-1d620a87767e</componentRootId>
|
||||
<componentRootId>549e0dcb-a8b4-432c-a21c-254f4a21fdc8</componentRootId>
|
||||
<name>user_application_list_id_gr</name>
|
||||
<container>false</container>
|
||||
<childrenReordered>false</childrenReordered>
|
||||
|
|
@ -3084,50 +3144,43 @@
|
|||
<scripts id="9304bfac-45fd-43bc-96f6-a2414a59a2d7"/>
|
||||
<scripts id="9bb9b2a8-7cd9-4926-a4ac-64ff03a32d45"/>
|
||||
</children>
|
||||
<children id="ae48cdef-aa12-401f-8063-67ea2c28e5fd">
|
||||
<children id="284ead30-9eb4-4d09-8b8d-ef3438ef0679">
|
||||
<prototypeId>312c9663-86b4-4672-97bd-67d313585c00</prototypeId>
|
||||
<componentRootId>ae48cdef-aa12-401f-8063-67ea2c28e5fd</componentRootId>
|
||||
<componentRootId>284ead30-9eb4-4d09-8b8d-ef3438ef0679</componentRootId>
|
||||
<name>user_application_list_id_column</name>
|
||||
<container>false</container>
|
||||
<removed>true</removed>
|
||||
</children>
|
||||
<children id="6eef50e5-6f6b-47f8-ada0-c9a67322adf0">
|
||||
<children id="b6ec527b-3ea1-45e4-87b9-d63c2076cccc">
|
||||
<prototypeId>98594cec-0a9b-4cef-af09-e1b71cb2ad9e</prototypeId>
|
||||
<componentRootId>6eef50e5-6f6b-47f8-ada0-c9a67322adf0</componentRootId>
|
||||
<componentRootId>b6ec527b-3ea1-45e4-87b9-d63c2076cccc</componentRootId>
|
||||
<name>AC_copy</name>
|
||||
<container>false</container>
|
||||
<removed>true</removed>
|
||||
</children>
|
||||
<children id="405b8a64-7843-4f9c-a96e-a65ec5afde54">
|
||||
<children id="41d83d99-1f46-4b75-9208-4f2155263bcb">
|
||||
<prototypeId>69af9ec9-d640-499a-bf05-cda6ce64a81f</prototypeId>
|
||||
<componentRootId>405b8a64-7843-4f9c-a96e-a65ec5afde54</componentRootId>
|
||||
<componentRootId>41d83d99-1f46-4b75-9208-4f2155263bcb</componentRootId>
|
||||
<name>Примечание по изменениям</name>
|
||||
<container>false</container>
|
||||
<removed>true</removed>
|
||||
</children>
|
||||
<children id="6444b668-e6f2-4c79-af80-cb87289bcf5e">
|
||||
<children id="1e1e5b97-eda7-468f-bb10-99f0faf4f739">
|
||||
<prototypeId>cec9ebf4-4f6a-4e51-a0a3-759e39dd610e</prototypeId>
|
||||
<componentRootId>6444b668-e6f2-4c79-af80-cb87289bcf5e</componentRootId>
|
||||
<componentRootId>1e1e5b97-eda7-468f-bb10-99f0faf4f739</componentRootId>
|
||||
<name>Filter button</name>
|
||||
<container>false</container>
|
||||
<removed>true</removed>
|
||||
</children>
|
||||
<children id="d6866159-35f2-4ec5-babb-604d70544053">
|
||||
<children id="fe9e9b2b-f514-4ebc-b77d-a84590459d2a">
|
||||
<prototypeId>887d2044-9e34-46a5-852c-e9ce07b42f30</prototypeId>
|
||||
<componentRootId>d6866159-35f2-4ec5-babb-604d70544053</componentRootId>
|
||||
<componentRootId>fe9e9b2b-f514-4ebc-b77d-a84590459d2a</componentRootId>
|
||||
<name>Статус</name>
|
||||
<container>false</container>
|
||||
<removed>true</removed>
|
||||
</children>
|
||||
</children>
|
||||
</children>
|
||||
<children id="57f4208e-96f4-44dd-8b03-7ee84077b128">
|
||||
<prototypeId>84b784bf-7bec-42f5-bbb7-8a465de45019</prototypeId>
|
||||
<componentRootId>57f4208e-96f4-44dd-8b03-7ee84077b128</componentRootId>
|
||||
<name>Роли</name>
|
||||
<container>true</container>
|
||||
<removed>true</removed>
|
||||
</children>
|
||||
</children>
|
||||
<children id="81bc8720-c32a-481c-bc05-35bbb81b0a14">
|
||||
<prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
|
||||
|
|
@ -3190,7 +3243,6 @@
|
|||
<componentRootId>2ee6f91b-c4a2-461d-8428-c3a6a13c9244</componentRootId>
|
||||
<name>hidden</name>
|
||||
<container>true</container>
|
||||
<expanded>false</expanded>
|
||||
<childrenReordered>false</childrenReordered>
|
||||
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
|
||||
<properties>
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
Loading…
Add table
Add a link
Reference in a new issue