Merge branch 'develop' of 10.10.31.70:/ervu-lkrp-ul into develop

This commit is contained in:
m.epshtein 2024-09-13 14:31:37 +03:00
commit 9ac8984490

View file

@ -28,6 +28,19 @@
</item>
</value>
</entry>
<entry>
<key>style</key>
<value>
<complex>
<entry>
<key>stretch</key>
<value>
<simple>true</simple>
</value>
</entry>
</complex>
</value>
</entry>
</properties>
</scripts>
<scripts id="72befe90-1915-483f-b88c-d1ec5d4bdc8e"/>
@ -300,6 +313,18 @@
<simple>true</simple>
</value>
</entry>
<entry>
<key>rowHeight</key>
<value>
<simple>60.0</simple>
</value>
</entry>
<entry>
<key>rowModelType</key>
<value>
<simple>"CLIENT_SIDE"</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="1996166f-7922-4f28-a571-9646d956ef37">
@ -336,6 +361,12 @@
<scripts id="9c5c7a86-dc40-4b30-a5a7-5e7b4c7ea1e1"/>
<scripts id="fd653fca-12f9-4e35-baa4-b6b5dd3f6d59">
<properties>
<entry>
<key>autoHeight</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>displayName</key>
<value>
@ -381,6 +412,18 @@
<simple>true</simple>
</value>
</entry>
<entry>
<key>width</key>
<value>
<simple>null</simple>
</value>
</entry>
<entry>
<key>widthFixed</key>
<value>
<simple>null</simple>
</value>
</entry>
</properties>
</scripts>
</children>
@ -393,6 +436,12 @@
<scripts id="9c5c7a86-dc40-4b30-a5a7-5e7b4c7ea1e1"/>
<scripts id="fd653fca-12f9-4e35-baa4-b6b5dd3f6d59">
<properties>
<entry>
<key>autoHeight</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>displayName</key>
<value>
@ -429,6 +478,18 @@
<simple>true</simple>
</value>
</entry>
<entry>
<key>width</key>
<value>
<simple>null</simple>
</value>
</entry>
<entry>
<key>widthFixed</key>
<value>
<simple>null</simple>
</value>
</entry>
</properties>
</scripts>
</children>
@ -441,6 +502,12 @@
<scripts id="9c5c7a86-dc40-4b30-a5a7-5e7b4c7ea1e1"/>
<scripts id="fd653fca-12f9-4e35-baa4-b6b5dd3f6d59">
<properties>
<entry>
<key>autoHeight</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>displayName</key>
<value>
@ -477,6 +544,18 @@
<simple>true</simple>
</value>
</entry>
<entry>
<key>width</key>
<value>
<simple>null</simple>
</value>
</entry>
<entry>
<key>widthFixed</key>
<value>
<simple>null</simple>
</value>
</entry>
</properties>
</scripts>
</children>
@ -489,6 +568,12 @@
<scripts id="9c5c7a86-dc40-4b30-a5a7-5e7b4c7ea1e1"/>
<scripts id="fd653fca-12f9-4e35-baa4-b6b5dd3f6d59">
<properties>
<entry>
<key>autoHeight</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>displayName</key>
<value>
@ -525,6 +610,18 @@
<simple>true</simple>
</value>
</entry>
<entry>
<key>width</key>
<value>
<simple>null</simple>
</value>
</entry>
<entry>
<key>widthFixed</key>
<value>
<simple>null</simple>
</value>
</entry>
</properties>
</scripts>
</children>
@ -537,6 +634,12 @@
<scripts id="9c5c7a86-dc40-4b30-a5a7-5e7b4c7ea1e1"/>
<scripts id="fd653fca-12f9-4e35-baa4-b6b5dd3f6d59">
<properties>
<entry>
<key>autoHeight</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>displayName</key>
<value>
@ -573,6 +676,18 @@
<simple>true</simple>
</value>
</entry>
<entry>
<key>width</key>
<value>
<simple>null</simple>
</value>
</entry>
<entry>
<key>widthFixed</key>
<value>
<simple>null</simple>
</value>
</entry>
</properties>
</scripts>
</children>
@ -585,6 +700,12 @@
<scripts id="9c5c7a86-dc40-4b30-a5a7-5e7b4c7ea1e1"/>
<scripts id="fd653fca-12f9-4e35-baa4-b6b5dd3f6d59">
<properties>
<entry>
<key>autoHeight</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>displayName</key>
<value>
@ -621,6 +742,18 @@
<simple>true</simple>
</value>
</entry>
<entry>
<key>width</key>
<value>
<simple>null</simple>
</value>
</entry>
<entry>
<key>widthFixed</key>
<value>
<simple>null</simple>
</value>
</entry>
</properties>
</scripts>
</children>
@ -633,6 +766,12 @@
<scripts id="9c5c7a86-dc40-4b30-a5a7-5e7b4c7ea1e1"/>
<scripts id="fd653fca-12f9-4e35-baa4-b6b5dd3f6d59">
<properties>
<entry>
<key>autoHeight</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>displayName</key>
<value>
@ -669,6 +808,18 @@
<simple>true</simple>
</value>
</entry>
<entry>
<key>width</key>
<value>
<simple>null</simple>
</value>
</entry>
<entry>
<key>widthFixed</key>
<value>
<simple>null</simple>
</value>
</entry>
</properties>
</scripts>
</children>