Merge branch 'develop' into feature/SUPPORT-9276_blocked_filter

This commit is contained in:
gulnaz 2025-07-21 09:53:24 +03:00
commit 63a9218578
132 changed files with 340 additions and 304 deletions

View file

@ -4691,7 +4691,19 @@
<name>Дата и время</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="9c5c7a86-dc40-4b30-a5a7-5e7b4c7ea1e1"/>
<scripts id="9c5c7a86-dc40-4b30-a5a7-5e7b4c7ea1e1">
<properties>
<entry>
<key>valueFormatter</key>
<value>
<implRef type="TS">
<className>UserZoneDateTimeFormatter</className>
<packageName>component.grid.formatters</packageName>
</implRef>
</value>
</entry>
</properties>
</scripts>
<scripts id="fd653fca-12f9-4e35-baa4-b6b5dd3f6d59">
<properties>
<entry>
@ -4715,10 +4727,7 @@
<entry>
<key>formatter</key>
<value>
<implRef type="JAVA">
<className>DateTimeFormatter</className>
<packageName>custom.grid.formatter</packageName>
</implRef>
<implRef/>
</value>
</entry>
</properties>

View file

@ -7534,7 +7534,19 @@
<name>Дата и время</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="9c5c7a86-dc40-4b30-a5a7-5e7b4c7ea1e1"/>
<scripts id="9c5c7a86-dc40-4b30-a5a7-5e7b4c7ea1e1">
<properties>
<entry>
<key>valueFormatter</key>
<value>
<implRef type="TS">
<className>UserZoneDateTimeFormatter</className>
<packageName>component.grid.formatters</packageName>
</implRef>
</value>
</entry>
</properties>
</scripts>
<scripts id="fd653fca-12f9-4e35-baa4-b6b5dd3f6d59">
<properties>
<entry>
@ -7558,10 +7570,7 @@
<entry>
<key>formatter</key>
<value>
<implRef type="JAVA">
<className>DateTimeFormatter</className>
<packageName>custom.grid.formatter</packageName>
</implRef>
<implRef/>
</value>
</entry>
</properties>

View file

@ -13620,6 +13620,12 @@
<childrenReordered>false</childrenReordered>
<scripts id="e6553d24-6c92-461b-b0ab-f7a400836302">
<properties>
<entry>
<key>autoStretchColumns</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>label</key>
<value>
@ -13706,7 +13712,7 @@
<entry>
<key>width</key>
<value>
<simple>500</simple>
<simple>null</simple>
</value>
</entry>
</complex>

View file

@ -1279,7 +1279,7 @@
<entry>
<key>fieldName</key>
<value>
<simple>"person.middlename"</simple>
<simple>"person.middleName"</simple>
</value>
</entry>
</properties>

View file

@ -5145,7 +5145,19 @@
<name>Дата создания</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="9c5c7a86-dc40-4b30-a5a7-5e7b4c7ea1e1"/>
<scripts id="9c5c7a86-dc40-4b30-a5a7-5e7b4c7ea1e1">
<properties>
<entry>
<key>valueFormatter</key>
<value>
<implRef type="TS">
<className>UserZoneDateTimeFormatter</className>
<packageName>component.grid.formatters</packageName>
</implRef>
</value>
</entry>
</properties>
</scripts>
<scripts id="fd653fca-12f9-4e35-baa4-b6b5dd3f6d59">
<properties>
<entry>
@ -5169,10 +5181,7 @@
<entry>
<key>formatter</key>
<value>
<implRef type="JAVA">
<className>DateTimeFormatter</className>
<packageName>custom.grid.formatter</packageName>
</implRef>
<implRef/>
</value>
</entry>
</properties>