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

Merge branch 'test/SUPPORT-8728_dropdowntreeview_component' into ervu/tmp_makets

Browse source 
* test/SUPPORT-8728_dropdowntreeview_component:
  SUPPORT-8728: fix case parent id = self id; + add sort order
  правки, ошибка
  SUPPORT-8728: fix накидывание скрипта фильтра
  SUPPORT-8728: перенос и удаление неиспользуемых методов
This commit is contained in:
Фоат Саляхов 2024-12-09 14:45:08 +03:00
commit f2765d6b7d
28 changed files with 322 additions and 1208 deletions
Download patch file Download diff file Expand all files Collapse all files

37
resources/src/main/resources/FilterDropdownTreeView.component
View file

@ -1,37 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<xmlComponent>
<id>236ea5f5-8f3b-4266-9395-e7062180423d</id>
<name>FilterDropdownTreeView</name>
<category>filters</category>
<internal>false</internal>
<versions>
<studioVersion>3.177.3</studioVersion>
<packageVersions>
<entry>
<key>ru.cg.webbpm.packages.base.resources</key>
<value>3.177.3</value>
</entry>
</packageVersions>
</versions>
<rootObject id="97aef2b8-52a1-47f4-a930-9b0bce6994f9">
<name>FilterDropdownTreeView</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="977e4959-7aa0-4530-b424-74bb5d24c6f7">
<classRef type="TS">
<className>DropdownTreeViewComponent</className>
<packageName>component.field</packageName>
</classRef>
<enabled>true</enabled>
<expanded>true</expanded>
</scripts>
<scripts id="7f107b73-51a9-4dd0-a277-9315aa09cea9">
<classRef type="TS">
<className>FilterComponent</className>
<packageName>component.filter</packageName>
</classRef>
<enabled>true</enabled>
<expanded>true</expanded>
</scripts>
</rootObject>
</xmlComponent>

159
resources/src/main/resources/business-model/ervu-business-metrics/register_subpoenas.page
View file

@ -3002,12 +3002,165 @@
</children>
</children>
</children>
<children id="9f9c5c62-0ba7-447e-8d37-3eafef87fca1">
<prototypeId>d7d54cfb-26b5-4dba-b56f-b6247183c24d</prototypeId>
<componentRootId>9f9c5c62-0ba7-447e-8d37-3eafef87fca1</componentRootId>
<name>Горизонтальный контейнер новый</name>
<container>true</container>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
<scripts id="b6068710-0f31-48ec-8e03-c0c1480a40c0">
<properties>
<entry>
<key>service</key>
<value>
<implRef/>
</value>
</entry>
</properties>
</scripts>
<scripts id="fe04d7fb-6c5b-46c4-b723-667732d81f4f"/>
<scripts id="5c566210-2a60-4048-a2d1-84c7dd023248"/>
<scripts id="3171b2e1-b4af-4335-95fa-1b2592604b84"/>
<children id="4865ca95-3ec1-4b4a-8179-b70261e79e69">
<prototypeId>b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94</prototypeId>
<componentRootId>4865ca95-3ec1-4b4a-8179-b70261e79e69</componentRootId>
<name>Выпадающий список Причины</name>
<container>false</container>
<removed>true</removed>
</children>
<children id="682038cd-2f2f-447c-b219-faec471b2077">
<prototypeId>97aef2b8-52a1-47f4-a930-9b0bce6994f9</prototypeId>
<componentRootId>682038cd-2f2f-447c-b219-faec471b2077</componentRootId>
<name>FilterDropdownTreeView</name>
<container>false</container>
<removed>true</removed>
</children>
<children id="f4c97cf8-64a1-497e-9ffb-75a39c6f9b0e">
<prototypeId>630accd8-3776-4fc1-a87c-3a0f05274678</prototypeId>
<componentRootId>f4c97cf8-64a1-497e-9ffb-75a39c6f9b0e</componentRootId>
<name>DropdownTreeView</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="e1d0d895-79ee-4230-a47c-e4086b8dbfdb">
<properties>
<entry>
<key>collapseLevel</key>
<value>
<simple>2.0</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="bba43bd6-32d0-4039-bd0c-2d70871a2649">
<properties>
<entry>
<key>treeItemService</key>
<value>
<complex>
<entry>
<key>businessIdColumn</key>
<value>
<simple>{"schema":"summonses_list","table":"summonses_reason","entity":"summonses_reason","name":"code"}</simple>
</value>
</entry>
<entry>
<key>idColumn</key>
<value>
<simple>{"schema":"summonses_list","table":"summonses_reason","entity":"summonses_reason","name":"summonses_reason_id"}</simple>
</value>
</entry>
<entry>
<key>labelColumn</key>
<value>
<simple>{"schema":"summonses_list","table":"summonses_reason","entity":"summonses_reason","name":"name"}</simple>
</value>
</entry>
<entry>
<key>loadDao</key>
<value>
<complex>
<entry>
<key>graph</key>
<value>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"summonses_reason","schemaName":"summonses_list","x":390.0,"y":241.0,"alias":"summonses_reason","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"summonses_reason","schemaName":"summonses_list","x":390.0,"y":241.0,"alias":"summonses_reason","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"summonses_reason":{"tableName":"summonses_reason","schemaName":"summonses_list","x":390.0,"y":241.0,"alias":"summonses_reason","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>parentIdColumn</key>
<value>
<simple>{"schema":"summonses_list","table":"summonses_reason","entity":"summonses_reason","name":"parent_summonses_reason_id"}</simple>
</value>
</entry>
<entry>
<key>sortColumn</key>
<value>
<simple>{"schema":"summonses_list","table":"summonses_reason","entity":"summonses_reason","name":"summonses_reason_id"}</simple>
</value>
</entry>
<entry>
<key>sortOrder</key>
<value>
<simple>"ASC"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</properties>
</scripts>
<scripts id="3c7faf24-c429-4b32-941a-8fcb931b36ac">
<classRef type="TS">
<className>FilterComponent</className>
<packageName>component.filter</packageName>
</classRef>
</scripts>
<scripts id="8e3e86de-54c2-48c5-b105-28ecb59d845e">
<classRef type="TS">
<className>DropdownTreeViewFilterComponent</className>
<packageName>ervu_business_metrics.component.filter</packageName>
</classRef>
<enabled>true</enabled>
<expanded>true</expanded>
<properties>
<entry>
<key>isBusinessId</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>operation</key>
<value>
<simple>"EQUAL"</simple>
</value>
</entry>
</properties>
</scripts>
</children>
<children id="ad7fdcc3-0e9e-47d1-bbed-536c1db97b4a">
<prototypeId>97aef2b8-52a1-47f4-a930-9b0bce6994f9</prototypeId>
<componentRootId>ad7fdcc3-0e9e-47d1-bbed-536c1db97b4a</componentRootId>
<name>FilterDropdownTreeView</name>
<container>false</container>
<removed>true</removed>
</children>
</children>
<children id="4865ca95-3ec1-4b4a-8179-b70261e79e69">
<prototypeId>b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94</prototypeId>
<componentRootId>4865ca95-3ec1-4b4a-8179-b70261e79e69</componentRootId>
<name>Выпадающий список РФ</name>
<container>false</container>
<removed>true</removed>
</children>
<children id="18ecb7c6-2148-4eb0-a18c-97af5e73cac7">
<prototypeId>d7d54cfb-26b5-4dba-b56f-b6247183c24d</prototypeId>
<componentRootId>18ecb7c6-2148-4eb0-a18c-97af5e73cac7</componentRootId>
<name>ГК Второй ряд</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -3032,7 +3185,6 @@
<componentRootId>e1256afb-de60-497e-9f3f-2e242baffa07</componentRootId>
<name>Vbox_50%</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -3121,6 +3273,7 @@
</complex>
</value>
</item>
<item id="e7c93b8d-4615-42f0-9ea3-d6bfe5821855" removed="true"/>
</value>
</entry>
<entry>
@ -3157,6 +3310,7 @@
</complex>
</value>
</item>
<item id="44abcd97-d239-4ea7-b4f4-2e68d45f1b1f" removed="true"/>
</value>
</entry>
</properties>
@ -9073,7 +9227,6 @@
<componentRootId>8ccf3815-9f26-4892-9c46-f78f72f8b019</componentRootId>
<name>ГК Четвертый ряд</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>