Skip to content

Commit e450277

Browse files
committed
closes #256
Добавлен состав критерия отбора
1 parent 8c83b02 commit e450277

File tree

10 files changed

+69
-1
lines changed

10 files changed

+69
-1
lines changed

src/main/java/com/github/_1c_syntax/bsl/mdo/FilterCriterion.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,12 @@ public class FilterCriterion implements MDObject, ModuleOwner, CommandOwner, For
9292
* Свое
9393
*/
9494

95+
/**
96+
* Состав критерия
97+
*/
98+
@Singular("addContent")
99+
List<MdoReference> content;
100+
95101
/**
96102
* Пояснение
97103
*/

src/test/resources/ext/designer/mdclasses/src/cf/FilterCriteria/КритерийОтбора1.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@
1717
<Comment/>
1818
<Type/>
1919
<UseStandardCommands>true</UseStandardCommands>
20-
<Content/>
20+
<Content>
21+
<xr:Item xsi:type="xr:MDObjectRef">Document.Документ1.Attribute.Реквизит1</xr:Item>
22+
<xr:Item xsi:type="xr:MDObjectRef">Document.Документ1.Attribute.Реквизит2</xr:Item>
23+
</Content>
2124
<DefaultForm/>
2225
<AuxiliaryForm/>
2326
<ListPresentation/>

src/test/resources/ext/edt/mdclasses/configuration/src/FilterCriteria/КритерийОтбора1/КритерийОтбора1.mdo

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,6 @@
77
<name>КритерийОтбора1</name>
88
<type/>
99
<useStandardCommands>true</useStandardCommands>
10+
<content>Document.Документ1.Attribute.Реквизит1</content>
11+
<content>Document.Документ1.Attribute.Реквизит2</content>
1012
</mdclass:FilterCriterion>

src/test/resources/fixtures/mdclasses/Configuration.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1233,6 +1233,12 @@
12331233
],
12341234
"commands": [],
12351235
"forms": [],
1236+
"content": [
1237+
[
1238+
2
1239+
],
1240+
[]
1241+
],
12361242
"explanation": {
12371243
"@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/XDTOPackages/com.github._1c_syntax.bsl.mdo.XDTOPackage/synonym"
12381244
}

src/test/resources/fixtures/mdclasses/Configuration_edt.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1233,6 +1233,12 @@
12331233
],
12341234
"commands": [],
12351235
"forms": [],
1236+
"content": [
1237+
[
1238+
2
1239+
],
1240+
[]
1241+
],
12361242
"explanation": {
12371243
"@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/XDTOPackages/com.github._1c_syntax.bsl.mdo.XDTOPackage/synonym"
12381244
}

src/test/resources/fixtures/mdclasses/FilterCriteria.КритерийОтбора1.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
{"com.github._1c_syntax.bsl.mdo.FilterCriterion": {
22
"commands": [],
33
"comment": "",
4+
"content": [
5+
[
6+
{
7+
"type": "ATTRIBUTE",
8+
"mdoRef": "Document.Документ1.Attribute.Реквизит1",
9+
"mdoRefRu": "Документ.Документ1.Реквизит.Реквизит1"
10+
},
11+
{
12+
"type": "ATTRIBUTE",
13+
"mdoRef": "Document.Документ1.Attribute.Реквизит2",
14+
"mdoRefRu": "Документ.Документ1.Реквизит.Реквизит2"
15+
}
16+
],
17+
[]
18+
],
419
"explanation": {
520
"content": [
621
[]

src/test/resources/fixtures/mdclasses/FilterCriteria.КритерийОтбора1_edt.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
{"com.github._1c_syntax.bsl.mdo.FilterCriterion": {
22
"commands": [],
33
"comment": "",
4+
"content": [
5+
[
6+
{
7+
"type": "ATTRIBUTE",
8+
"mdoRef": "Document.Документ1.Attribute.Реквизит1",
9+
"mdoRefRu": "Документ.Документ1.Реквизит.Реквизит1"
10+
},
11+
{
12+
"type": "ATTRIBUTE",
13+
"mdoRef": "Document.Документ1.Attribute.Реквизит2",
14+
"mdoRefRu": "Документ.Документ1.Реквизит.Реквизит2"
15+
}
16+
],
17+
[]
18+
],
419
"explanation": {
520
"content": [
621
[]

src/test/resources/fixtures/mdclasses_3_24/Configuration_edt.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1233,6 +1233,7 @@
12331233
],
12341234
"commands": [],
12351235
"forms": [],
1236+
"content": [],
12361237
"explanation": {
12371238
"@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/XDTOPackages/com.github._1c_syntax.bsl.mdo.XDTOPackage/synonym"
12381239
}

src/test/resources/fixtures/ssl_3_1/FilterCriteria.ФайлыВТоме.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
{"com.github._1c_syntax.bsl.mdo.FilterCriterion": {
22
"commands": [],
33
"comment": "",
4+
"content": [
5+
{
6+
"type": "ATTRIBUTE",
7+
"mdoRef": "Catalog.ВерсииФайлов.Attribute.Том",
8+
"mdoRefRu": "Справочник.ВерсииФайлов.Реквизит.Том"
9+
}
10+
],
411
"explanation": {
512
"content": [
613
[]

src/test/resources/fixtures/ssl_3_1/FilterCriteria.ФайлыВТоме_edt.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
{"com.github._1c_syntax.bsl.mdo.FilterCriterion": {
22
"commands": [],
33
"comment": "",
4+
"content": [
5+
{
6+
"type": "ATTRIBUTE",
7+
"mdoRef": "Catalog.ВерсииФайлов.Attribute.Том",
8+
"mdoRefRu": "Справочник.ВерсииФайлов.Реквизит.Том"
9+
}
10+
],
411
"explanation": {
512
"content": [
613
[]

0 commit comments

Comments
 (0)