creator/cc-1c-skills
1
0
Fork 0
mirror of https://github.com/Nikolay-Shirokov/cc-1c-skills.git synced 2026-09-30 14:05:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(skd-compile,skd-edit): порядок элементов и булевы значения по XSD схемы компоновки (#101)

Browse Source 
Схема, которую пишут навыки, не читалась платформой через XDTO: «Нарушен
порядок следования значений свойств». Порядок сверен с XSD платформы и с
настоящими выгрузками.

skd-compile: presentationExpression сразу после role, appearance до
availableValue; valueType у вычисляемого поля последним; флаги
useRestriction в порядке field/condition/group/order; составной тип —
сначала все Type, потом квалификаторы; в настройках dataParameters сразу
после filter, additionalProperties до itemsViewMode; у группировки filter
до order/selection; у таблицы и диаграммы viewMode до columns/pointsViewMode;
JSON-булево пишется true/false, а не True/False.

skd-edit: вставка узлов настроек, структуры и роли поля — по месту в XSD,
а не по спискам якорей (set-structure ставил item перед selection);
modify-field раскладывает сохранённые части поля по местам.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_018dc2yLQfw6wppbopM1Y4Ps
This commit is contained in:
Nick Shirokov
2026-09-29 13:41:38 +03:00
co-authored by Claude Opus 5.5
parent c47879098e
commit 1ef99d1b03
37 changed files with 2124 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.claude/skills/skd-compile/scripts/skd-compile.ps1
+142 -102
View File
@@ -1,4 +1,4 @@
# skd-compile v1.123 — Compile 1C DCS from JSON
# skd-compile v1.124 — Compile 1C DCS from JSON
# Source: https://github.com/Nikolay-Shirokov/cc-1c-skills
[CmdletBinding(PositionalBinding=$false)]
param(
@@ -474,9 +474,44 @@ function Emit-ValueType {
if (-not $typeStr) { return }
# Multi-type: iterate and emit each type with its qualifiers
# Составной тип: по XSD TypeDescription сначала все Type, затем TypeSet, затем квалификаторы
# (Number, String, Date, BinaryData) — а не «тип со своими квалификаторами» подряд. Каждый тип
# пишем во временный буфер и раскладываем строки по разделам; квалификатор вида — один.
if ($typeStr -is [array] -or $typeStr -is [System.Collections.IList]) {
foreach ($t in $typeStr) { Emit-SingleValueType -typeStr "$t" -indent $indent }
$saved = $script:xml
$types = New-Object System.Collections.ArrayList
$typeSets = New-Object System.Collections.ArrayList
$quals = [ordered]@{ 'NumberQualifiers' = $null; 'StringQualifiers' = $null; 'DateQualifiers' = $null; 'BinaryDataQualifiers' = $null }
try {
foreach ($t in $typeStr) {
$script:xml = New-Object System.Text.StringBuilder
Emit-SingleValueType -typeStr "$t" -indent $indent
$lines = $script:xml.ToString() -split "`r?`n" | Where-Object { $_ -ne '' }
$cur = $null
foreach ($ln in $lines) {
if ($cur) {
[void]$cur.Add($ln)
if ($ln -eq "$indent</v8:$curKind>") { $cur = $null }
continue
}
if ($ln.StartsWith("$indent<v8:TypeSet")) { [void]$typeSets.Add($ln); continue }
$qm = [regex]::Match($ln, '^\s*<v8:(\w+Qualifiers)>$')
if ($qm.Success -and $quals.Contains($qm.Groups[1].Value)) {
$curKind = $qm.Groups[1].Value
$cur = New-Object System.Collections.ArrayList
[void]$cur.Add($ln)
if ($null -eq $quals[$curKind]) { $quals[$curKind] = $cur }
continue
}
[void]$types.Add($ln)
}
}
} finally {
$script:xml = $saved
}
foreach ($ln in $types) { X $ln }
foreach ($ln in $typeSets) { X $ln }
foreach ($k in $quals.Keys) { if ($quals[$k]) { foreach ($ln in $quals[$k]) { X $ln } } }
return
}
@@ -1105,6 +1140,18 @@ function Emit-InputParameters {
X "$indent</inputParameters>"
}
# Флаги ограничения использования — в порядке XSD FieldUseRestriction (field condition group order),
# а не в порядке ввода: чтение по схеме (XDTO) отвергает нарушенный порядок. Имена — XML-имена
# флагов; дубли (noFilter и noCondition дают один condition) схлопываются.
function Emit-RestrictionFlags {
param([object[]]$names, [string]$indent)
$flagOrder = @('field', 'condition', 'group', 'order')
$given = @($names | ForEach-Object { "$_" } | Where-Object { $_ })
foreach ($n in $flagOrder) {
if ($given -contains $n) { X "$indent<$n>true</$n>" }
}
}
function Emit-Field {
param($fieldDef, [string]$indent)
@@ -1193,24 +1240,14 @@ function Emit-Field {
}
if ($f.restrict.Count -gt 0) {
X "$indent`t<useRestriction>"
foreach ($r in $f.restrict) {
$xmlName = $restrictMap["$r"]
if ($xmlName) {
X "$indent`t`t<$xmlName>true</$xmlName>"
}
}
Emit-RestrictionFlags -names @($f.restrict | ForEach-Object { $restrictMap["$_"] }) -indent "$indent`t`t"
X "$indent`t</useRestriction>"
}
# AttributeUseRestriction
if ($f["attrRestrict"] -and $f["attrRestrict"].Count -gt 0) {
X "$indent`t<attributeUseRestriction>"
foreach ($r in $f["attrRestrict"]) {
$xmlName = $restrictMap["$r"]
if ($xmlName) {
X "$indent`t`t<$xmlName>true</$xmlName>"
}
}
Emit-RestrictionFlags -names @($f["attrRestrict"] | ForEach-Object { $restrictMap["$_"] }) -indent "$indent`t`t"
X "$indent`t</attributeUseRestriction>"
}
@@ -1237,7 +1274,12 @@ function Emit-Field {
X "$indent`t</role>"
}
# OrderExpression — после role, до valueType. Допустим массив (multi-sort).
# PresentationExpression — сразу после role, до orderExpression (порядок XSD DataSetFieldField)
if ($f["presentationExpression"]) {
X "$indent`t<presentationExpression>$(Esc-XmlText $f["presentationExpression"])</presentationExpression>"
}
# OrderExpression — после presentationExpression, до valueType. Допустим массив (multi-sort).
if ($f["orderExpression"]) {
$oeRaw = $f["orderExpression"]
if ($oeRaw -is [System.Collections.IDictionary]) {
@@ -1266,27 +1308,6 @@ function Emit-Field {
X "$indent`t</valueType>"
}
# AvailableValues — list of allowed values with optional multilang presentation
if ($f["availableValues"]) {
foreach ($av in $f["availableValues"]) {
X "$indent`t<availableValue>"
$avVal = $av.value
$avType = if ($av.valueType) { "$($av.valueType)" } else { '' }
if (-not $avType) {
if ($avVal -is [bool]) { $avType = 'xs:boolean' }
elseif ($avVal -is [int] -or $avVal -is [long] -or $avVal -is [double]) { $avType = 'xs:decimal' }
elseif ("$avVal" -match '^\d{4}-\d{2}-\d{2}T') { $avType = 'xs:dateTime' }
else { $avType = 'xs:string' }
}
$avStr = if ($avVal -is [bool]) { "$avVal".ToLower() } else { Esc-XmlText "$avVal" }
X "$indent`t`t<value xsi:type=`"$avType`">$avStr</value>"
if ($av.presentation) {
Emit-MLText -tag "presentation" -text $av.presentation -indent "$indent`t`t"
}
X "$indent`t</availableValue>"
}
}
# Appearance
if ($f.appearance -and $f.appearance.Count -gt 0) {
X "$indent`t<appearance>"
@@ -1305,9 +1326,25 @@ function Emit-Field {
X "$indent`t</appearance>"
}
# PresentationExpression
if ($f["presentationExpression"]) {
X "$indent`t<presentationExpression>$(Esc-XmlText $f["presentationExpression"])</presentationExpression>"
# AvailableValues — после appearance (порядок XSD); список значений с необязательным представлением
if ($f["availableValues"]) {
foreach ($av in $f["availableValues"]) {
X "$indent`t<availableValue>"
$avVal = $av.value
$avType = if ($av.valueType) { "$($av.valueType)" } else { '' }
if (-not $avType) {
if ($avVal -is [bool]) { $avType = 'xs:boolean' }
elseif ($avVal -is [int] -or $avVal -is [long] -or $avVal -is [double]) { $avType = 'xs:decimal' }
elseif ("$avVal" -match '^\d{4}-\d{2}-\d{2}T') { $avType = 'xs:dateTime' }
else { $avType = 'xs:string' }
}
$avStr = if ($avVal -is [bool]) { "$avVal".ToLower() } else { Esc-XmlText "$avVal" }
X "$indent`t`t<value xsi:type=`"$avType`">$avStr</value>"
if ($av.presentation) {
Emit-MLText -tag "presentation" -text $av.presentation -indent "$indent`t`t"
}
X "$indent`t</availableValue>"
}
}
# InputParameters — в конце field
@@ -1458,25 +1495,14 @@ function Emit-CalcFields {
if ($title) {
Emit-MLText -tag "title" -text $title -indent "`t`t"
}
if ($typeStr) {
X "`t`t<valueType>"
Emit-ValueType -typeStr $typeStr -indent "`t`t`t"
X "`t`t</valueType>"
}
if ($restrictObj -or $restrictTokens.Count -gt 0) {
X "`t`t<useRestriction>"
if ($restrictObj) {
foreach ($prop in $restrictObj.PSObject.Properties) {
if ($prop.Value -eq $true) {
X "`t`t`t<$($prop.Name)>true</$($prop.Name)>"
}
}
$flagNames = @($restrictObj.PSObject.Properties | Where-Object { $_.Value -eq $true } | ForEach-Object { $_.Name })
} else {
foreach ($r in $restrictTokens) {
$xmlName = $restrictMap["$r"]
if ($xmlName) { X "`t`t`t<$xmlName>true</$xmlName>" }
}
$flagNames = @($restrictTokens | ForEach-Object { $restrictMap["$_"] })
}
Emit-RestrictionFlags -names $flagNames -indent "`t`t`t"
X "`t`t</useRestriction>"
}
if ($appearance) {
@@ -1494,6 +1520,12 @@ function Emit-CalcFields {
}
X "`t`t</appearance>"
}
# valueType — последним: после useRestriction и appearance (порядок XSD CalculatedField)
if ($typeStr) {
X "`t`t<valueType>"
Emit-ValueType -typeStr $typeStr -indent "`t`t`t"
X "`t`t</valueType>"
}
X "`t</calculatedField>"
}
@@ -1792,7 +1824,8 @@ function Emit-ParamValue {
if ($val.Contains('endDate')) { $edStr = "$($val['endDate'])" }
}
}
$valStr = if ($variantStr) { $variantStr } else { "$val" }
# JSON-булево: "$val" даёт True/False, а xs:boolean — только true/false/1/0
$valStr = if ($variantStr) { $variantStr } elseif ($val -is [bool]) { "$val".ToLower() } else { "$val" }
if ($type -eq "StandardPeriod") {
# Platform-pattern: startDate/endDate эмитятся ТОЛЬКО для variant=Custom.
@@ -1809,7 +1842,7 @@ function Emit-ParamValue {
} elseif ($type -match '^date') {
X "$indent<value xsi:type=`"xs:dateTime`">$(Esc-XmlText $valStr)</value>"
} elseif ($type -eq "boolean") {
X "$indent<value xsi:type=`"xs:boolean`">$(Esc-XmlText $valStr)</value>"
X "$indent<value xsi:type=`"xs:boolean`">$(Esc-XmlText $valStr.ToLower())</value>"
} elseif ($type -match '^decimal') {
X "$indent<value xsi:type=`"xs:decimal`">$(Esc-XmlText $valStr)</value>"
} elseif ($type -match '^string') {
@@ -1821,7 +1854,7 @@ function Emit-ParamValue {
if ($valStr -match '^\d{4}-\d{2}-\d{2}T') {
X "$indent<value xsi:type=`"xs:dateTime`">$(Esc-XmlText $valStr)</value>"
} elseif ($valStr -eq "true" -or $valStr -eq "false") {
X "$indent<value xsi:type=`"xs:boolean`">$(Esc-XmlText $valStr)</value>"
X "$indent<value xsi:type=`"xs:boolean`">$(Esc-XmlText $valStr.ToLower())</value>"
} elseif ($valStr -match '^(ПланСчетов|Справочник|Перечисление|Документ|ПланВидовХарактеристик|ПланВидовРасчета|БизнесПроцесс|Задача|РегистрСведений|ПланОбмена)\.' -or $valStr -match '^(ChartOfAccounts|Catalog|Enum|Document|ChartOfCharacteristicTypes|ChartOfCalculationTypes|BusinessProcess|Task|InformationRegister|ExchangePlan)\.') {
X "$indent<value xsi:type=`"dcscor:DesignTimeValue`">$(Esc-XmlText $valStr)</value>"
} else {
@@ -2684,6 +2717,7 @@ function Emit-AppearanceValue {
} else {
if ($innerVal.Contains($attrName)) { $av = $innerVal[$attrName] }
}
if ($av -is [bool]) { $av = "$av".ToLower() }
if ($null -ne $av) { $attrParts += "$attrName=`"$(Esc-Xml "$av")`"" }
}
X "$indent`t<dcscor:value xsi:type=`"v8ui:Font`" $($attrParts -join ' ')/>"
@@ -2691,7 +2725,8 @@ function Emit-AppearanceValue {
# Multilang dict ({"ru": "...", "en": "..."}) → LocalStringType независимо от ключа.
Emit-MLText -tag "dcscor:value" -text $innerVal -indent "$indent`t"
} else {
$actualVal = "$innerVal"
# JSON-булево: "$innerVal" даёт True/False, а xs:boolean — только true/false
$actualVal = if ($innerVal -is [bool]) { "$innerVal".ToLower() } else { "$innerVal" }
# Параметр-специфичный тип для известных appearance keys
$keyTypeMap = @{
'Размещение' = 'dcscor:DataCompositionTextPlacementType'
@@ -2709,7 +2744,7 @@ function Emit-AppearanceValue {
# локальный xmlns не нужен — эмитим short form.
X "$indent`t<dcscor:value xsi:type=`"v8ui:Color`">$(Esc-XmlText $actualVal)</dcscor:value>"
} elseif ($actualVal -eq "true" -or $actualVal -eq "false") {
X "$indent`t<dcscor:value xsi:type=`"xs:boolean`">$actualVal</dcscor:value>"
X "$indent`t<dcscor:value xsi:type=`"xs:boolean`">$($actualVal.ToLower())</dcscor:value>"
} elseif ($key -eq "Текст" -or $key -eq "Заголовок" -or $key -eq "Формат") {
# Строковые ключи, традиционно эмитятся как LocalStringType (даже если только ru).
Emit-MLText -tag "dcscor:value" -text $actualVal -indent "$indent`t"
@@ -2879,10 +2914,11 @@ function Emit-OutputParametersSubItem {
X "$indent`t`t<dcscor:item xsi:type=`"dcsset:SettingsParameterValue`">"
if ($subUseFalse) { X "$indent`t`t`t<dcscor:use>false</dcscor:use>" }
X "$indent`t`t`t<dcscor:parameter>$(Esc-XmlText $subName)</dcscor:parameter>"
$subStr = if ($subVal -is [bool]) { "$subVal".ToLower() } else { "$subVal" }
if ($subUri) {
X "$indent`t`t`t<dcscor:value xmlns:dN=`"$subUri`" xsi:type=`"dN:$subLocalName`">$(Esc-XmlText "$subVal")</dcscor:value>"
X "$indent`t`t`t<dcscor:value xmlns:dN=`"$subUri`" xsi:type=`"dN:$subLocalName`">$(Esc-XmlText $subStr)</dcscor:value>"
} else {
X "$indent`t`t`t<dcscor:value xsi:type=`"$subVT`">$(Esc-XmlText "$subVal")</dcscor:value>"
X "$indent`t`t`t<dcscor:value xsi:type=`"$subVT`">$(Esc-XmlText $subStr)</dcscor:value>"
}
X "$indent`t`t</dcscor:item>"
}
@@ -2956,13 +2992,16 @@ function Emit-OutputParameters {
} else {
if ($rawVal.Contains($attrName)) { $av = $rawVal[$attrName] }
}
if ($av -is [bool]) { $av = "$av".ToLower() }
if ($null -ne $av) { $attrParts += "$attrName=`"$(Esc-Xml "$av")`"" }
}
X "$indent`t`t<dcscor:value xsi:type=`"v8ui:Font`" $($attrParts -join ' ')/>"
} elseif ($ptype -eq "mltext") {
Emit-MLText -tag "dcscor:value" -text $rawVal -indent "$indent`t`t"
} else {
X "$indent`t`t<dcscor:value xsi:type=`"$ptype`">$(Esc-XmlText "$rawVal")</dcscor:value>"
# JSON-булево: "$rawVal" даёт True/False, а xs:boolean — только true/false
$rawStr = if ($rawVal -is [bool]) { "$rawVal".ToLower() } else { "$rawVal" }
X "$indent`t`t<dcscor:value xsi:type=`"$ptype`">$(Esc-XmlText $rawStr)</dcscor:value>"
}
# Nested sub-параметры (ТипДиаграммы.ВидПодписей и т.п.) — эмитим между value и extras.
# valueType: строка → xsi:type=string, объект {uri, name} → локальный xmlns:dN + xsi:type=dN:name.
@@ -3360,6 +3399,9 @@ function Emit-StructureItem {
# Платформа на группировке (плоской и вложенной в ось, short/explicit) всегда пишет
# order+selection; при отсутствии ключа кладёт Auto. Ключ присутствует (в т.ч. пустой [])
# — уважаем как задано (blockViewMode/userSettingID имеют смысл только при явном order).
# filter — до order/selection (порядок XSD StructureItemGroup: groupItems filter order selection)
Emit-Filter -items $item.filter -indent "$indent`t"
$hasGrpOrderKey = $item.PSObject.Properties.Match('order').Count -gt 0
$grpOrderItems = if ($hasGrpOrderKey) { $item.order } else { @('Auto') }
Emit-Order -items $grpOrderItems -indent "$indent`t" -blockViewMode $item.orderViewMode -blockUserSettingID $item.orderUserSettingID
@@ -3367,8 +3409,6 @@ function Emit-StructureItem {
$grpSelItems = if ($hasGrpSelKey) { $item.selection } else { @('Auto') }
Emit-Selection -items $grpSelItems -indent "$indent`t"
Emit-Filter -items $item.filter -indent "$indent`t"
if ($item.conditionalAppearance) {
Emit-ConditionalAppearance -items $item.conditionalAppearance -indent "$indent`t"
}
@@ -3447,13 +3487,6 @@ function Emit-StructureItem {
if ($item.outputParameters) {
Emit-OutputParameters -params $item.outputParameters -indent "$indent`t"
}
# columnsViewMode / rowsViewMode — axis-level режим доступности (после rows/columns)
if ($item.columnsViewMode) {
X "$indent`t<dcsset:columnsViewMode>$(Esc-XmlText "$($item.columnsViewMode)")</dcsset:columnsViewMode>"
}
if ($item.rowsViewMode) {
X "$indent`t<dcsset:rowsViewMode>$(Esc-XmlText "$($item.rowsViewMode)")</dcsset:rowsViewMode>"
}
# viewMode / userSettingID / userSettingPresentation / itemsViewMode на самой таблице
if ($item.viewMode) {
X "$indent`t<dcsset:viewMode>$(Esc-XmlText "$($item.viewMode)")</dcsset:viewMode>"
@@ -3465,6 +3498,13 @@ function Emit-StructureItem {
if ($item.userSettingPresentation) {
Emit-MLText -tag "dcsset:userSettingPresentation" -text $item.userSettingPresentation -indent "$indent`t"
}
# columnsViewMode / rowsViewMode — axis-level режим доступности: после viewMode/userSettingID (порядок XSD и платформы)
if ($item.columnsViewMode) {
X "$indent`t<dcsset:columnsViewMode>$(Esc-XmlText "$($item.columnsViewMode)")</dcsset:columnsViewMode>"
}
if ($item.rowsViewMode) {
X "$indent`t<dcsset:rowsViewMode>$(Esc-XmlText "$($item.rowsViewMode)")</dcsset:rowsViewMode>"
}
if ($item.itemsViewMode) {
X "$indent`t<dcsset:itemsViewMode>$(Esc-XmlText "$($item.itemsViewMode)")</dcsset:itemsViewMode>"
}
@@ -3529,13 +3569,6 @@ function Emit-StructureItem {
Emit-OutputParameters -params $item.outputParameters -indent "$indent`t"
}
# pointsViewMode / seriesViewMode — axis-level режим доступности (после points/series)
if ($item.pointsViewMode) {
X "$indent`t<dcsset:pointsViewMode>$(Esc-XmlText "$($item.pointsViewMode)")</dcsset:pointsViewMode>"
}
if ($item.seriesViewMode) {
X "$indent`t<dcsset:seriesViewMode>$(Esc-XmlText "$($item.seriesViewMode)")</dcsset:seriesViewMode>"
}
# viewMode / userSettingID / userSettingPresentation / itemsViewMode на самой диаграмме
if ($item.viewMode) {
X "$indent`t<dcsset:viewMode>$(Esc-XmlText "$($item.viewMode)")</dcsset:viewMode>"
@@ -3547,6 +3580,13 @@ function Emit-StructureItem {
if ($item.userSettingPresentation) {
Emit-MLText -tag "dcsset:userSettingPresentation" -text $item.userSettingPresentation -indent "$indent`t"
}
# pointsViewMode / seriesViewMode — axis-level режим доступности: после viewMode/userSettingID (порядок XSD и платформы)
if ($item.pointsViewMode) {
X "$indent`t<dcsset:pointsViewMode>$(Esc-XmlText "$($item.pointsViewMode)")</dcsset:pointsViewMode>"
}
if ($item.seriesViewMode) {
X "$indent`t<dcsset:seriesViewMode>$(Esc-XmlText "$($item.seriesViewMode)")</dcsset:seriesViewMode>"
}
if ($item.itemsViewMode) {
X "$indent`t<dcsset:itemsViewMode>$(Esc-XmlText "$($item.itemsViewMode)")</dcsset:itemsViewMode>"
}
@@ -3645,24 +3685,7 @@ function Emit-SettingsVariants {
Emit-Filter -items $s.filter -indent "`t`t`t" -blockViewMode $fvm -blockUserSettingID $fusid
}
# Order
$ovm = Get-BlockVM 'order'; $ousid = Get-BlockUSID 'order'
if ($s.order -or $null -ne $ovm -or $null -ne $ousid) {
Emit-Order -items $s.order -indent "`t`t`t" -blockViewMode $ovm -blockUserSettingID $ousid
}
# ConditionalAppearance
$cavm = Get-BlockVM 'conditionalAppearance'; $causid = Get-BlockUSID 'conditionalAppearance'
if ($s.conditionalAppearance -or $null -ne $cavm -or $null -ne $causid) {
Emit-ConditionalAppearance -items $s.conditionalAppearance -indent "`t`t`t" -blockViewMode $cavm -blockUserSettingID $causid
}
# OutputParameters (platform does NOT emit <viewMode> on this block)
if ($s.outputParameters) {
Emit-OutputParameters -params $s.outputParameters -indent "`t`t`t"
}
# DataParameters
# DataParameters — сразу после filter, до order (порядок XSD Settings; иначе XDTO: «нарушен порядок»)
if ($s.dataParameters -eq 'auto') {
# Auto-generate dataParameters for all non-hidden params.
# Pattern follows 1C Designer / ERP persistence:
@@ -3711,6 +3734,23 @@ function Emit-SettingsVariants {
Emit-DataParameters -items $s.dataParameters -indent "`t`t`t"
}
# Order
$ovm = Get-BlockVM 'order'; $ousid = Get-BlockUSID 'order'
if ($s.order -or $null -ne $ovm -or $null -ne $ousid) {
Emit-Order -items $s.order -indent "`t`t`t" -blockViewMode $ovm -blockUserSettingID $ousid
}
# ConditionalAppearance
$cavm = Get-BlockVM 'conditionalAppearance'; $causid = Get-BlockUSID 'conditionalAppearance'
if ($s.conditionalAppearance -or $null -ne $cavm -or $null -ne $causid) {
Emit-ConditionalAppearance -items $s.conditionalAppearance -indent "`t`t`t" -blockViewMode $cavm -blockUserSettingID $causid
}
# OutputParameters (platform does NOT emit <viewMode> on this block)
if ($s.outputParameters) {
Emit-OutputParameters -params $s.outputParameters -indent "`t`t`t"
}
# Structure (supports string shorthand: "Организация > details")
if ($s.structure) {
$structItems = $s.structure
@@ -3722,12 +3762,7 @@ function Emit-SettingsVariants {
}
}
# <dcsset:itemsViewMode> on <dcsset:settings> — emit only if explicitly set
if ($s.itemsViewMode) {
X "`t`t`t<dcsset:itemsViewMode>$(Esc-XmlText "$($s.itemsViewMode)")</dcsset:itemsViewMode>"
}
# <dcsset:additionalProperties> — key/value свойства варианта
# <dcsset:additionalProperties> — key/value свойства варианта; до itemsViewMode (порядок XSD)
if ($s.additionalProperties) {
X "`t`t`t<dcsset:additionalProperties>"
foreach ($prop in $s.additionalProperties.PSObject.Properties) {
@@ -3738,6 +3773,11 @@ function Emit-SettingsVariants {
X "`t`t`t</dcsset:additionalProperties>"
}
# <dcsset:itemsViewMode> on <dcsset:settings> — emit only if explicitly set
if ($s.itemsViewMode) {
X "`t`t`t<dcsset:itemsViewMode>$(Esc-XmlText "$($s.itemsViewMode)")</dcsset:itemsViewMode>"
}
X "`t`t</dcsset:settings>"
X "`t</settingsVariant>"
}
.claude/skills/skd-compile/scripts/skd-compile.py
+124 -84
View File
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
# skd-compile v1.123 — Compile 1C DCS from JSON
# skd-compile v1.124 — Compile 1C DCS from JSON
# Source: https://github.com/Nikolay-Shirokov/cc-1c-skills
import argparse
import json
@@ -457,10 +457,39 @@ def emit_value_type(lines, type_spec, indent):
if not type_spec:
return
# Multi-type: iterate and emit each type with its qualifiers
# Составной тип: по XSD TypeDescription сначала все Type, затем TypeSet, затем квалификаторы
# (Number, String, Date, BinaryData) — а не «тип со своими квалификаторами» подряд. Каждый тип
# пишем во временный список и раскладываем строки по разделам; квалификатор вида — один.
if isinstance(type_spec, list):
types, type_sets = [], []
quals = {'NumberQualifiers': None, 'StringQualifiers': None, 'DateQualifiers': None, 'BinaryDataQualifiers': None}
for t in type_spec:
emit_single_value_type(lines, str(t), indent)
buf = []
emit_single_value_type(buf, str(t), indent)
cur = None
cur_kind = None
for ln in buf:
if cur is not None:
cur.append(ln)
if ln == f'{indent}</v8:{cur_kind}>':
cur = None
continue
if ln.startswith(f'{indent}<v8:TypeSet'):
type_sets.append(ln)
continue
qm = re.match(r'^\s*<v8:(\w+Qualifiers)>$', ln)
if qm and qm.group(1) in quals:
cur_kind = qm.group(1)
cur = [ln]
if quals[cur_kind] is None:
quals[cur_kind] = cur
continue
types.append(ln)
lines.extend(types)
lines.extend(type_sets)
for k in quals:
if quals[k]:
lines.extend(quals[k])
return
emit_single_value_type(lines, str(type_spec), indent)
@@ -999,6 +1028,16 @@ def emit_input_parameters(lines, ip, indent):
lines.append(f'{indent}</inputParameters>')
# Флаги ограничения использования — в порядке XSD FieldUseRestriction (field condition group order),
# а не в порядке ввода: чтение по схеме (XDTO) отвергает нарушенный порядок. Имена — XML-имена
# флагов; дубли (noFilter и noCondition дают один condition) схлопываются.
def emit_restriction_flags(lines, names, indent):
given = [str(n).lower() for n in names if n]
for n in ('field', 'condition', 'group', 'order'):
if n in given:
lines.append(f'{indent}<{n}>true</{n}>')
def emit_field(lines, field_def, indent):
if isinstance(field_def, str):
f = parse_field_shorthand(field_def)
@@ -1071,19 +1110,13 @@ def emit_field(lines, field_def, indent):
}
if f.get('restrict') and len(f['restrict']) > 0:
lines.append(f'{indent}\t<useRestriction>')
for r in f['restrict']:
xml_name = restrict_map.get(str(r))
if xml_name:
lines.append(f'{indent}\t\t<{xml_name}>true</{xml_name}>')
emit_restriction_flags(lines, [restrict_map.get(str(r)) for r in f['restrict']], f'{indent}\t\t')
lines.append(f'{indent}\t</useRestriction>')
# AttributeUseRestriction
if f.get('attrRestrict') and len(f['attrRestrict']) > 0:
lines.append(f'{indent}\t<attributeUseRestriction>')
for r in f['attrRestrict']:
xml_name = restrict_map.get(str(r))
if xml_name:
lines.append(f'{indent}\t\t<{xml_name}>true</{xml_name}>')
emit_restriction_flags(lines, [restrict_map.get(str(r)) for r in f['attrRestrict']], f'{indent}\t\t')
lines.append(f'{indent}\t</attributeUseRestriction>')
# Role
@@ -1104,7 +1137,11 @@ def emit_field(lines, field_def, indent):
lines.append(f'{indent}\t\t<dcscom:{k}>{esc_xml_text(str(v))}</dcscom:{k}>')
lines.append(f'{indent}\t</role>')
# OrderExpression — после role, до valueType
# PresentationExpression — сразу после role, до orderExpression (порядок XSD DataSetFieldField)
if f.get('presentationExpression'):
lines.append(f'{indent}\t<presentationExpression>{esc_xml_text(f["presentationExpression"])}</presentationExpression>')
# OrderExpression — после presentationExpression, до valueType. Допустим массив (multi-sort).
if f.get('orderExpression'):
oe_raw = f['orderExpression']
oe_list = oe_raw if isinstance(oe_raw, list) else [oe_raw]
@@ -1125,7 +1162,21 @@ def emit_field(lines, field_def, indent):
emit_value_type(lines, f['type'], f'{indent}\t\t')
lines.append(f'{indent}\t</valueType>')
# AvailableValues — list of allowed values with optional multilang presentation
# Appearance
if f.get('appearance') and len(f['appearance']) > 0:
lines.append(f'{indent}\t<appearance>')
for key, val in f['appearance'].items():
# \u0413\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u043e\u0435\u041f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u0442\u0440\u0435\u0431\u0443\u0435\u0442 \u0441\u043f\u0435\u0446\u0438\u0430\u043b\u044c\u043d\u043e\u0433\u043e xsi:type, \u043d\u0435 \u0441\u0442\u0440\u043e\u043a\u0430
if key == '\u0413\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u043e\u0435\u041f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435' and not isinstance(val, dict):
lines.append(f'{indent}\t\t<dcscor:item xsi:type="dcsset:SettingsParameterValue">')
lines.append(f'{indent}\t\t\t<dcscor:parameter>{esc_xml_text(key)}</dcscor:parameter>')
lines.append(f'{indent}\t\t\t<dcscor:value xsi:type="v8ui:HorizontalAlign">{esc_xml_text(str(val))}</dcscor:value>')
lines.append(f'{indent}\t\t</dcscor:item>')
else:
emit_appearance_value(lines, key, val, f'{indent}\t\t')
lines.append(f'{indent}\t</appearance>')
# AvailableValues — после appearance (порядок XSD); список значений с необязательным представлением
if f.get('availableValues'):
for av in f['availableValues']:
lines.append(f'{indent}\t<availableValue>')
@@ -1146,24 +1197,6 @@ def emit_field(lines, field_def, indent):
emit_mltext(lines, f'{indent}\t\t', 'presentation', av['presentation'])
lines.append(f'{indent}\t</availableValue>')
# Appearance
if f.get('appearance') and len(f['appearance']) > 0:
lines.append(f'{indent}\t<appearance>')
for key, val in f['appearance'].items():
# \u0413\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u043e\u0435\u041f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u0442\u0440\u0435\u0431\u0443\u0435\u0442 \u0441\u043f\u0435\u0446\u0438\u0430\u043b\u044c\u043d\u043e\u0433\u043e xsi:type, \u043d\u0435 \u0441\u0442\u0440\u043e\u043a\u0430
if key == '\u0413\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u043e\u0435\u041f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435' and not isinstance(val, dict):
lines.append(f'{indent}\t\t<dcscor:item xsi:type="dcsset:SettingsParameterValue">')
lines.append(f'{indent}\t\t\t<dcscor:parameter>{esc_xml_text(key)}</dcscor:parameter>')
lines.append(f'{indent}\t\t\t<dcscor:value xsi:type="v8ui:HorizontalAlign">{esc_xml_text(str(val))}</dcscor:value>')
lines.append(f'{indent}\t\t</dcscor:item>')
else:
emit_appearance_value(lines, key, val, f'{indent}\t\t')
lines.append(f'{indent}\t</appearance>')
# PresentationExpression
if f.get('presentationExpression'):
lines.append(f'{indent}\t<presentationExpression>{esc_xml_text(f["presentationExpression"])}</presentationExpression>')
# InputParameters — в конце field
if f.get('inputParameters'):
emit_input_parameters(lines, f['inputParameters'], f'{indent}\t')
@@ -1298,21 +1331,13 @@ def emit_calc_fields(lines, defn):
if title:
emit_mltext(lines, '\t\t', 'title', title)
if type_str:
lines.append('\t\t<valueType>')
emit_value_type(lines, type_str, '\t\t\t')
lines.append('\t\t</valueType>')
if restrict_obj or restrict_tokens:
lines.append('\t\t<useRestriction>')
if restrict_obj:
for xml_name, flag in restrict_obj.items():
if flag:
lines.append(f'\t\t\t<{esc_xml_text(str(xml_name))}>true</{esc_xml_text(str(xml_name))}>')
flag_names = [xml_name for xml_name, flag in restrict_obj.items() if flag is True]
else:
for r in restrict_tokens:
xml_name = restrict_map.get(str(r))
if xml_name:
lines.append(f'\t\t\t<{xml_name}>true</{xml_name}>')
flag_names = [restrict_map.get(str(r)) for r in restrict_tokens]
emit_restriction_flags(lines, flag_names, '\t\t\t')
lines.append('\t\t</useRestriction>')
if appearance:
lines.append('\t\t<appearance>')
@@ -1325,6 +1350,11 @@ def emit_calc_fields(lines, defn):
else:
emit_appearance_value(lines, k, v, '\t\t\t')
lines.append('\t\t</appearance>')
# valueType — последним: после useRestriction и appearance (порядок XSD CalculatedField)
if type_str:
lines.append('\t\t<valueType>')
emit_value_type(lines, type_str, '\t\t\t')
lines.append('\t\t</valueType>')
lines.append('\t</calculatedField>')
@@ -1414,7 +1444,8 @@ def emit_param_value(lines, type_str, val, indent, value_list_allowed=False):
variant_str = str(val.get('variant')) if val.get('variant') is not None else None
sd_str = str(val['startDate']) if 'startDate' in val else None
ed_str = str(val['endDate']) if 'endDate' in val else None
val_str = variant_str if variant_str else str(val)
# JSON-булево: str(False) даёт "False", а xs:boolean — только true/false/1/0
val_str = variant_str if variant_str else (str(val).lower() if isinstance(val, bool) else str(val))
if type_str == 'StandardPeriod':
# Platform-pattern: startDate/endDate ТОЛЬКО для variant=Custom.
@@ -1429,7 +1460,7 @@ def emit_param_value(lines, type_str, val, indent, value_list_allowed=False):
elif type_str and re.match(r'^date', type_str):
lines.append(f'{indent}<value xsi:type="xs:dateTime">{esc_xml_text(val_str)}</value>')
elif type_str == 'boolean':
lines.append(f'{indent}<value xsi:type="xs:boolean">{esc_xml_text(val_str)}</value>')
lines.append(f'{indent}<value xsi:type="xs:boolean">{esc_xml_text(val_str.lower())}</value>')
elif type_str and re.match(r'^decimal', type_str):
lines.append(f'{indent}<value xsi:type="xs:decimal">{esc_xml_text(val_str)}</value>')
elif type_str and re.match(r'^string', type_str):
@@ -1440,8 +1471,8 @@ def emit_param_value(lines, type_str, val, indent, value_list_allowed=False):
# Guess from value
if re.match(r'^\d{4}-\d{2}-\d{2}T', val_str):
lines.append(f'{indent}<value xsi:type="xs:dateTime">{esc_xml_text(val_str)}</value>')
elif val_str == 'true' or val_str == 'false':
lines.append(f'{indent}<value xsi:type="xs:boolean">{esc_xml_text(val_str)}</value>')
elif val_str.lower() in ('true', 'false'):
lines.append(f'{indent}<value xsi:type="xs:boolean">{esc_xml_text(val_str.lower())}</value>')
elif re.match(r'^(ПланСчетов|Справочник|Перечисление|Документ|ПланВидовХарактеристик|ПланВидовРасчета|БизнесПроцесс|Задача|РегистрСведений|ПланОбмена|ChartOfAccounts|Catalog|Enum|Document|ChartOfCharacteristicTypes|ChartOfCalculationTypes|BusinessProcess|Task|InformationRegister|ExchangePlan)\.', val_str):
lines.append(f'{indent}<value xsi:type="dcscor:DesignTimeValue">{esc_xml_text(val_str)}</value>')
else:
@@ -2340,12 +2371,15 @@ def emit_appearance_value(lines, key, val, indent):
attr_parts = []
for attr_name in ('ref', 'faceName', 'height', 'bold', 'italic', 'underline', 'strikeout', 'kind', 'scale'):
if attr_name in inner_val:
attr_parts.append(f'{attr_name}="{esc_xml(str(inner_val[attr_name]))}"')
av = inner_val[attr_name]
av = str(av).lower() if isinstance(av, bool) else str(av)
attr_parts.append(f'{attr_name}="{esc_xml(av)}"')
lines.append(f'{indent}\t<dcscor:value xsi:type="v8ui:Font" {" ".join(attr_parts)}/>')
elif isinstance(inner_val, dict):
emit_mltext(lines, f'{indent}\t', 'dcscor:value', inner_val)
else:
actual_val = str(inner_val) if inner_val is not None else ''
# JSON-булево: str(True) даёт "True", а xs:boolean — только true/false
actual_val = (str(inner_val).lower() if isinstance(inner_val, bool) else str(inner_val)) if inner_val is not None else ''
# \u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440-\u0441\u043f\u0435\u0446\u0438\u0444\u0438\u0447\u043d\u044b\u0439 \u0442\u0438\u043f \u0434\u043b\u044f \u0438\u0437\u0432\u0435\u0441\u0442\u043d\u044b\u0445 appearance keys
key_type_map = {
'\u0420\u0430\u0437\u043c\u0435\u0449\u0435\u043d\u0438\u0435': 'dcscor:DataCompositionTextPlacementType',
@@ -2362,8 +2396,8 @@ def emit_appearance_value(lines, key, val, indent):
# Внутри <dcsset:settings> префиксы style:/web:/win:/sys: уже объявлены на корне,
# локальный xmlns не нужен — эмитим short form.
lines.append(f'{indent}\t<dcscor:value xsi:type="v8ui:Color">{esc_xml_text(actual_val)}</dcscor:value>')
elif actual_val == 'true' or actual_val == 'false':
lines.append(f'{indent}\t<dcscor:value xsi:type="xs:boolean">{actual_val}</dcscor:value>')
elif actual_val.lower() in ('true', 'false'):
lines.append(f'{indent}\t<dcscor:value xsi:type="xs:boolean">{actual_val.lower()}</dcscor:value>')
elif key in ('\u0422\u0435\u043a\u0441\u0442', '\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a', '\u0424\u043e\u0440\u043c\u0430\u0442'):
emit_mltext(lines, f'{indent}\t', 'dcscor:value', actual_val)
elif re.match(r'^-?\d+(\.\d+)?$', actual_val):
@@ -2494,12 +2528,16 @@ def emit_output_parameters(lines, params, indent):
attr_parts = []
for attr_name in ('ref', 'faceName', 'height', 'bold', 'italic', 'underline', 'strikeout', 'kind', 'scale'):
if attr_name in val:
attr_parts.append(f'{attr_name}="{esc_xml(str(val[attr_name]))}"')
av = val[attr_name]
av = str(av).lower() if isinstance(av, bool) else str(av)
attr_parts.append(f'{attr_name}="{esc_xml(av)}"')
lines.append(f'{indent}\t\t<dcscor:value xsi:type="v8ui:Font" {" ".join(attr_parts)}/>')
elif ptype == 'mltext':
emit_mltext(lines, f'{indent}\t\t', 'dcscor:value', val)
else:
lines.append(f'{indent}\t\t<dcscor:value xsi:type="{ptype}">{esc_xml_text(str(val))}</dcscor:value>')
# JSON-булево: str(True) даёт "True", а xs:boolean — только true/false
raw_str = str(val).lower() if isinstance(val, bool) else str(val)
lines.append(f'{indent}\t\t<dcscor:value xsi:type="{ptype}">{esc_xml_text(raw_str)}</dcscor:value>')
# Nested sub-параметры (ТипДиаграммы.ВидПодписей и т.п.).
# valueType: строка → xsi:type=string, объект {uri, name} → локальный xmlns:dN.
if wrap_items and isinstance(wrap_items, dict):
@@ -2525,10 +2563,11 @@ def emit_output_parameters(lines, params, indent):
if sub_use_false:
lines.append(f'{indent}\t\t\t<dcscor:use>false</dcscor:use>')
lines.append(f'{indent}\t\t\t<dcscor:parameter>{esc_xml_text(sub_name)}</dcscor:parameter>')
sub_str = str(sub_val).lower() if isinstance(sub_val, bool) else str(sub_val)
if sub_uri:
lines.append(f'{indent}\t\t\t<dcscor:value xmlns:dN="{sub_uri}" xsi:type="dN:{sub_local_name}">{esc_xml_text(str(sub_val))}</dcscor:value>')
lines.append(f'{indent}\t\t\t<dcscor:value xmlns:dN="{sub_uri}" xsi:type="dN:{sub_local_name}">{esc_xml_text(sub_str)}</dcscor:value>')
else:
lines.append(f'{indent}\t\t\t<dcscor:value xsi:type="{sub_vt}">{esc_xml_text(str(sub_val))}</dcscor:value>')
lines.append(f'{indent}\t\t\t<dcscor:value xsi:type="{sub_vt}">{esc_xml_text(sub_str)}</dcscor:value>')
lines.append(f'{indent}\t\t</dcscor:item>')
if wrap_vm:
lines.append(f'{indent}\t\t<dcsset:viewMode>{esc_xml_text(str(wrap_vm))}</dcsset:viewMode>')
@@ -2820,13 +2859,14 @@ def emit_structure_item(lines, item, indent, short_group=False):
# Платформа на группировке (плоской и вложенной в ось, short/explicit) всегда пишет
# order+selection; при отсутствии ключа кладёт Auto. Ключ присутствует (в т.ч. пустой [])
# — уважаем как задано (blockViewMode/userSettingID имеют смысл только при явном order).
# filter — до order/selection (порядок XSD StructureItemGroup: groupItems filter order selection)
emit_filter(lines, item.get('filter'), f'{indent}\t')
grp_order_items = item['order'] if 'order' in item else ['Auto']
emit_order(lines, grp_order_items, f'{indent}\t', block_view_mode=item.get('orderViewMode'), block_user_setting_id=item.get('orderUserSettingID'))
grp_sel_items = item['selection'] if 'selection' in item else ['Auto']
emit_selection(lines, grp_sel_items, f'{indent}\t')
emit_filter(lines, item.get('filter'), f'{indent}\t')
if item.get('conditionalAppearance'):
emit_conditional_appearance(lines, item['conditionalAppearance'], f'{indent}\t')
@@ -2882,11 +2922,6 @@ def emit_structure_item(lines, item, indent, short_group=False):
emit_conditional_appearance(lines, item['conditionalAppearance'], f'{indent}\t')
if item.get('outputParameters'):
emit_output_parameters(lines, item['outputParameters'], f'{indent}\t')
# columnsViewMode / rowsViewMode — axis-level режим доступности
if item.get('columnsViewMode'):
lines.append(f'{indent}\t<dcsset:columnsViewMode>{esc_xml_text(str(item["columnsViewMode"]))}</dcsset:columnsViewMode>')
if item.get('rowsViewMode'):
lines.append(f'{indent}\t<dcsset:rowsViewMode>{esc_xml_text(str(item["rowsViewMode"]))}</dcsset:rowsViewMode>')
# viewMode / userSettingID / userSettingPresentation / itemsViewMode на самой таблице
if item.get('viewMode'):
lines.append(f'{indent}\t<dcsset:viewMode>{esc_xml_text(str(item["viewMode"]))}</dcsset:viewMode>')
@@ -2895,6 +2930,11 @@ def emit_structure_item(lines, item, indent, short_group=False):
lines.append(f'{indent}\t<dcsset:userSettingID>{esc_xml_text(gid)}</dcsset:userSettingID>')
if item.get('userSettingPresentation'):
emit_mltext(lines, f'{indent}\t', 'dcsset:userSettingPresentation', item['userSettingPresentation'])
# columnsViewMode / rowsViewMode — axis-level режим доступности: после viewMode/userSettingID (порядок XSD и платформы)
if item.get('columnsViewMode'):
lines.append(f'{indent}\t<dcsset:columnsViewMode>{esc_xml_text(str(item["columnsViewMode"]))}</dcsset:columnsViewMode>')
if item.get('rowsViewMode'):
lines.append(f'{indent}\t<dcsset:rowsViewMode>{esc_xml_text(str(item["rowsViewMode"]))}</dcsset:rowsViewMode>')
if item.get('itemsViewMode'):
lines.append(f'{indent}\t<dcsset:itemsViewMode>{esc_xml_text(str(item["itemsViewMode"]))}</dcsset:itemsViewMode>')
@@ -2936,11 +2976,6 @@ def emit_structure_item(lines, item, indent, short_group=False):
if item.get('outputParameters'):
emit_output_parameters(lines, item['outputParameters'], f'{indent}\t')
# pointsViewMode / seriesViewMode — axis-level режим доступности
if item.get('pointsViewMode'):
lines.append(f'{indent}\t<dcsset:pointsViewMode>{esc_xml_text(str(item["pointsViewMode"]))}</dcsset:pointsViewMode>')
if item.get('seriesViewMode'):
lines.append(f'{indent}\t<dcsset:seriesViewMode>{esc_xml_text(str(item["seriesViewMode"]))}</dcsset:seriesViewMode>')
# viewMode / userSettingID / userSettingPresentation / itemsViewMode на самой диаграмме
if item.get('viewMode'):
lines.append(f'{indent}\t<dcsset:viewMode>{esc_xml_text(str(item["viewMode"]))}</dcsset:viewMode>')
@@ -2949,6 +2984,11 @@ def emit_structure_item(lines, item, indent, short_group=False):
lines.append(f'{indent}\t<dcsset:userSettingID>{esc_xml_text(gid)}</dcsset:userSettingID>')
if item.get('userSettingPresentation'):
emit_mltext(lines, f'{indent}\t', 'dcsset:userSettingPresentation', item['userSettingPresentation'])
# pointsViewMode / seriesViewMode — axis-level режим доступности: после viewMode/userSettingID (порядок XSD и платформы)
if item.get('pointsViewMode'):
lines.append(f'{indent}\t<dcsset:pointsViewMode>{esc_xml_text(str(item["pointsViewMode"]))}</dcsset:pointsViewMode>')
if item.get('seriesViewMode'):
lines.append(f'{indent}\t<dcsset:seriesViewMode>{esc_xml_text(str(item["seriesViewMode"]))}</dcsset:seriesViewMode>')
if item.get('itemsViewMode'):
lines.append(f'{indent}\t<dcsset:itemsViewMode>{esc_xml_text(str(item["itemsViewMode"]))}</dcsset:itemsViewMode>')
@@ -3023,19 +3063,7 @@ def emit_settings_variants(lines, defn):
if s.get('filter') or fvm is not None or fusid is not None:
emit_filter(lines, s.get('filter'), '\t\t\t', block_view_mode=fvm, block_user_setting_id=fusid)
ovm, ousid = _block_vm('order'), _block_usid('order')
if s.get('order') or ovm is not None or ousid is not None:
emit_order(lines, s.get('order'), '\t\t\t', block_view_mode=ovm, block_user_setting_id=ousid)
cavm, causid = _block_vm('conditionalAppearance'), _block_usid('conditionalAppearance')
if s.get('conditionalAppearance') or cavm is not None or causid is not None:
emit_conditional_appearance(lines, s.get('conditionalAppearance'), '\t\t\t', block_view_mode=cavm, block_user_setting_id=causid)
# OutputParameters (platform does NOT emit <viewMode> on this block)
if s.get('outputParameters'):
emit_output_parameters(lines, s['outputParameters'], '\t\t\t')
# DataParameters
# DataParameters — сразу после filter, до order (порядок XSD Settings; иначе XDTO: «нарушен порядок»)
if s.get('dataParameters') == 'auto':
# Auto-generate dataParameters for all non-hidden params.
# Pattern follows 1C Designer / ERP persistence:
@@ -3078,6 +3106,18 @@ def emit_settings_variants(lines, defn):
elif s.get('dataParameters'):
emit_data_parameters(lines, s['dataParameters'], '\t\t\t')
ovm, ousid = _block_vm('order'), _block_usid('order')
if s.get('order') or ovm is not None or ousid is not None:
emit_order(lines, s.get('order'), '\t\t\t', block_view_mode=ovm, block_user_setting_id=ousid)
cavm, causid = _block_vm('conditionalAppearance'), _block_usid('conditionalAppearance')
if s.get('conditionalAppearance') or cavm is not None or causid is not None:
emit_conditional_appearance(lines, s.get('conditionalAppearance'), '\t\t\t', block_view_mode=cavm, block_user_setting_id=causid)
# OutputParameters (platform does NOT emit <viewMode> on this block)
if s.get('outputParameters'):
emit_output_parameters(lines, s['outputParameters'], '\t\t\t')
# Structure (supports string shorthand)
if s.get('structure'):
struct_items = s['structure']
@@ -3088,11 +3128,7 @@ def emit_settings_variants(lines, defn):
for item in struct_items:
emit_structure_item(lines, item, '\t\t\t')
# <dcsset:itemsViewMode> on settings — emit only if explicitly set
if s.get('itemsViewMode'):
lines.append(f'\t\t\t<dcsset:itemsViewMode>{esc_xml_text(str(s["itemsViewMode"]))}</dcsset:itemsViewMode>')
# <dcsset:additionalProperties> — key/value свойства варианта
# <dcsset:additionalProperties> — key/value свойства варианта; до itemsViewMode (порядок XSD)
if s.get('additionalProperties'):
lines.append('\t\t\t<dcsset:additionalProperties>')
for k, v in s['additionalProperties'].items():
@@ -3101,6 +3137,10 @@ def emit_settings_variants(lines, defn):
lines.append('\t\t\t\t</v8:Property>')
lines.append('\t\t\t</dcsset:additionalProperties>')
# <dcsset:itemsViewMode> on settings — emit only if explicitly set
if s.get('itemsViewMode'):
lines.append(f'\t\t\t<dcsset:itemsViewMode>{esc_xml_text(str(s["itemsViewMode"]))}</dcsset:itemsViewMode>')
lines.append('\t\t</dcsset:settings>')
lines.append('\t</settingsVariant>')
.claude/skills/skd-edit/scripts/skd-edit.ps1
+78 -40
View File
@@ -1,4 +1,4 @@
# skd-edit v1.41 — Atomic 1C DCS editor
# skd-edit v1.42 — Atomic 1C DCS editor
# Source: https://github.com/Nikolay-Shirokov/cc-1c-skills
# NB: парный .py собирает выражения автодат вне f-string ради совместимости с python 3.9 (PEP 701).
[CmdletBinding(PositionalBinding=$false)]
@@ -1175,11 +1175,12 @@ function Build-RestrictionXml {
"noGroup" = "group"; "noOrder" = "order"
}
# Флаги — в порядке XSD FieldUseRestriction (field condition group order), не в порядке ввода
$given = @($restrict | ForEach-Object { $restrictMap["$_"] } | Where-Object { $_ })
$lines = @()
$lines += "$indent<useRestriction>"
foreach ($r in $restrict) {
$xmlName = $restrictMap["$r"]
if ($xmlName) {
foreach ($xmlName in @('field', 'condition', 'group', 'order')) {
if ($given -contains $xmlName) {
$lines += "$indent`t<$xmlName>true</$xmlName>"
}
}
@@ -1209,30 +1210,42 @@ function Build-FieldFragment {
$lines += (Build-MLTextXml -tag "title" -text $parsed.title -indent "$i`t")
}
# Остальные части собираем как (место по XSD, xml) и выводим по месту: сохранённые как есть
# узлы (attributeUseRestriction, presentationExpression, orderExpression, appearance, …)
# встают на своё место, а не в хвост после valueType. Незнакомые — в конец, как раньше.
$fieldOrder = [string[]]$script:XsdChildOrder['DataSetFieldField']
$parts = New-Object System.Collections.ArrayList
if ($parsed.restrict -and $parsed.restrict.Count -gt 0) {
$lines += (Build-RestrictionXml -restrict $parsed.restrict -indent "$i`t")
[void]$parts.Add(@([array]::IndexOf($fieldOrder, 'useRestriction'), (Build-RestrictionXml -restrict $parsed.restrict -indent "$i`t")))
}
$roleXml = Build-RoleXml -roles $parsed.roles -indent "$i`t"
if ($roleXml) { $lines += $roleXml }
if ($roleXml) { [void]$parts.Add(@([array]::IndexOf($fieldOrder, 'role'), $roleXml)) }
$vtRank = [array]::IndexOf($fieldOrder, 'valueType')
if ($parsed.rawValueType) {
# Preserve original <valueType> verbatim — keeps qualifiers (StringQualifiers,
# NumberQualifiers, DateQualifiers, …) that aren't expressible via shorthand.
$lines += "$i`t" + $parsed.rawValueType
[void]$parts.Add(@($vtRank, ("$i`t" + $parsed.rawValueType)))
} elseif ($parsed.type) {
$lines += "$i`t<valueType>"
$lines += (Build-ValueTypeXml -typeStr $parsed.type -indent "$i`t`t")
$lines += "$i`t</valueType>"
$vt = @("$i`t<valueType>") + @(Build-ValueTypeXml -typeStr $parsed.type -indent "$i`t`t") + @("$i`t</valueType>")
[void]$parts.Add(@($vtRank, ($vt -join "`n")))
}
# Defense in depth: re-emit OuterXml of unknown children (e.g. <editFormat>,
# <appearance>, custom extensions) that Read-FieldProperties captured.
if ($parsed._unknownChildren) {
foreach ($raw in $parsed._unknownChildren) {
$lines += "$i`t" + $raw
$m = [regex]::Match($raw, '^<(?:[\w.-]+:)?([\w.-]+)')
$r = if ($m.Success) { [array]::IndexOf($fieldOrder, $m.Groups[1].Value) } else { -1 }
if ($r -lt 0) { $r = $fieldOrder.Count }
[void]$parts.Add(@($r, ("$i`t" + $raw)))
}
}
# Устойчивая сортировка по месту: при равенстве — порядок добавления
$idx = 0
$sorted = $parts | ForEach-Object { [pscustomobject]@{ r = $_[0]; n = $idx++; x = $_[1] } } | Sort-Object r, n
foreach ($p in $sorted) { $lines += $p.x }
$lines += "$i</field>"
return $lines -join "`n"
@@ -2172,7 +2185,47 @@ function Resolve-VariantSettings {
exit 1
}
function Ensure-SettingsChild($settings, [string]$childName, [string[]]$afterSiblings) {
# Порядок детей по XSD схемы компоновки: чтение по схеме (XDTO) отвергает нарушенный порядок,
# поэтому новый узел встаёт перед первым соседом, который по схеме идёт позже. Ключ — вид
# контейнера: settings, поле набора или xsi:type элемента структуры (без xsi:type — группа).
$script:XsdChildOrder = @{
'settings' = @('userFields','selection','filter','dataParameters','order','conditionalAppearance','outputParameters',
'item','additionalProperties','itemsViewMode','itemsUserSettingID','itemsUserSettingPresentation')
'StructureItemGroup' = @('use','name','groupItems','filter','order','selection','conditionalAppearance','outputParameters',
'item','id','viewMode','userSettingID','userSettingPresentation','itemsViewMode','itemsUserSettingID','itemsUserSettingPresentation','groupState')
'StructureItemTable' = @('use','name','column','row','selection','conditionalAppearance','outputParameters',
'id','viewMode','userSettingID','userSettingPresentation','columnsViewMode','columnsUserSettingID','columnsUserSettingPresentation',
'rowsViewMode','rowsUserSettingID','rowsUserSettingPresentation')
'StructureItemChart' = @('use','name','point','series','selection','conditionalAppearance','outputParameters',
'id','viewMode','userSettingID','userSettingPresentation','pointsViewMode','pointsUserSettingID','pointsUserSettingPresentation',
'seriesViewMode','seriesUserSettingID','seriesUserSettingPresentation')
'DataSetFieldField' = @('dataPath','field','title','useRestriction','attributeUseRestriction','role','presentationExpression',
'orderExpression','inHierarchyDataSet','inHierarchyDataSetParameter','valueType','appearance','availableValue','inputParameters')
}
function Get-XsdChildOrder($container) {
if ($container.LocalName -eq 'settings') { return $script:XsdChildOrder['settings'] }
if ($container.LocalName -eq 'field') { return $script:XsdChildOrder['DataSetFieldField'] }
$xt = $container.GetAttribute("type", "http://www.w3.org/2001/XMLSchema-instance")
$xt = ($xt -split ':')[-1]
if ($xt -and $script:XsdChildOrder.ContainsKey($xt)) { return $script:XsdChildOrder[$xt] }
return $script:XsdChildOrder['StructureItemGroup']
}
# Первый сосед, который по XSD идёт после $childName; $null — вставлять в конец
function Find-OrderedInsertRef($container, [string]$childName) {
$order = [string[]](Get-XsdChildOrder $container)
$rank = [array]::IndexOf($order, $childName)
if ($rank -lt 0) { return $null }
foreach ($ch in $container.ChildNodes) {
if ($ch.NodeType -ne 'Element') { continue }
$r = [array]::IndexOf($order, [string]$ch.LocalName)
if ($r -gt $rank) { return $ch }
}
return $null
}
function Ensure-SettingsChild($settings, [string]$childName) {
$el = Find-FirstElement $settings @($childName) $setNs
if ($el) { return $el }
@@ -2180,18 +2233,7 @@ function Ensure-SettingsChild($settings, [string]$childName, [string[]]$afterSib
$fragXml = "$indent<dcsset:$childName/>"
$nodes = Import-Fragment $xmlDoc $fragXml
$refNode = $null
foreach ($sibName in $afterSiblings) {
$sib = Find-FirstElement $settings @($sibName) $setNs
if ($sib) {
$refNode = $sib.NextSibling
while ($refNode -and ($refNode.NodeType -eq 'Whitespace' -or $refNode.NodeType -eq 'SignificantWhitespace')) {
$refNode = $refNode.NextSibling
}
break
}
}
$refNode = Find-OrderedInsertRef $settings $childName
foreach ($node in $nodes) {
Insert-BeforeElement $settings $node $refNode $indent
}
@@ -2309,7 +2351,7 @@ switch ($Operation) {
if (-not $NoSelection) {
$settings = Resolve-VariantSettings
$varName = Get-VariantName
$selection = Ensure-SettingsChild $settings "selection" @()
$selection = Ensure-SettingsChild $settings "selection"
$existingSel = Find-ElementByChildValue $selection "item" "field" $parsed.dataPath $setNs
if ($existingSel) {
Write-Host "[INFO] Field `"$($parsed.dataPath)`" already in selection — skipped"
@@ -2395,7 +2437,7 @@ switch ($Operation) {
if (-not $NoSelection) {
$settings = Resolve-VariantSettings
$varName = Get-VariantName
$selection = Ensure-SettingsChild $settings "selection" @()
$selection = Ensure-SettingsChild $settings "selection"
$existingSel = Find-ElementByChildValue $selection "item" "field" $parsed.dataPath $setNs
if ($existingSel) {
Write-Host "[INFO] Field `"$($parsed.dataPath)`" already in selection — skipped"
@@ -2956,7 +2998,7 @@ switch ($Operation) {
foreach ($val in $values) {
$parsed = Parse-FilterShorthand $val
$filterEl = Ensure-SettingsChild $settings "filter" @("selection")
$filterEl = Ensure-SettingsChild $settings "filter"
$filterIndent = Get-ContainerChildIndent $filterEl
$fragXml = Build-FilterItemFragment -parsed $parsed -indent $filterIndent
@@ -2976,7 +3018,7 @@ switch ($Operation) {
foreach ($val in $values) {
$parsed = Parse-DataParamShorthand $val
$dpEl = Ensure-SettingsChild $settings "dataParameters" @("outputParameters","conditionalAppearance","order","filter","selection")
$dpEl = Ensure-SettingsChild $settings "dataParameters"
$dpIndent = Get-ContainerChildIndent $dpEl
$fragXml = Build-DataParamFragment -parsed $parsed -indent $dpIndent
@@ -2996,7 +3038,7 @@ switch ($Operation) {
foreach ($val in $values) {
$parsed = Parse-OrderShorthand $val
$orderEl = Ensure-SettingsChild $settings "order" @("filter","selection")
$orderEl = Ensure-SettingsChild $settings "order"
$orderIndent = Get-ContainerChildIndent $orderEl
# Duplicate check
@@ -3063,7 +3105,7 @@ switch ($Operation) {
$targetEl = $settings
}
$selection = Ensure-SettingsChild $targetEl "selection" @()
$selection = Ensure-SettingsChild $targetEl "selection"
# Dedup: skip if SelectedItemAuto already exists
if ($fieldName -eq "Auto") {
@@ -3160,7 +3202,7 @@ switch ($Operation) {
foreach ($val in $values) {
$parsed = Parse-OutputParamShorthand $val
$outputEl = Ensure-SettingsChild $settings "outputParameters" @("conditionalAppearance","order","filter","selection")
$outputEl = Ensure-SettingsChild $settings "outputParameters"
$outputIndent = Get-ContainerChildIndent $outputEl
# Remove existing parameter with same key if present
@@ -3199,9 +3241,8 @@ switch ($Operation) {
$structItems = Parse-StructureShorthand $Value
$settingsIndent = Get-ChildIndent $settings
# Find insertion point — before outputParameters/dataParameters/conditionalAppearance/order/filter/selection or at end
$refNode = Find-FirstElement $settings @("outputParameters","dataParameters","conditionalAppearance","order","filter","selection","item") $setNs
if (-not $refNode) { $refNode = $null }
# Место по XSD: после outputParameters и прочих блоков, до additionalProperties/itemsViewMode
$refNode = Find-OrderedInsertRef $settings "item"
foreach ($structItem in $structItems) {
$fragXml = Build-StructureItemFragment -item $structItem -indent $settingsIndent
@@ -3445,7 +3486,7 @@ switch ($Operation) {
foreach ($val in $values) {
$parsed = Parse-ConditionalAppearanceShorthand $val
$caEl = Ensure-SettingsChild $settings "conditionalAppearance" @("outputParameters","order","filter","selection")
$caEl = Ensure-SettingsChild $settings "conditionalAppearance"
$caIndent = Get-ContainerChildIndent $caEl
$fragXml = Build-ConditionalAppearanceItemFragment -parsed $parsed -indent $caIndent
@@ -3801,11 +3842,8 @@ switch ($Operation) {
$lines += "$fieldIndent</role>"
$fragXml = $lines -join "`n"
# Insert before <valueType>, else before <inputParameters>, else at end
$refNode = $null
foreach ($ch in $fieldEl.ChildNodes) {
if ($ch.NodeType -eq 'Element' -and $ch.LocalName -in @('valueType','inputParameters') -and $ch.NamespaceURI -eq $schNs) { $refNode = $ch; break }
}
# Место по XSD: после attributeUseRestriction, до presentationExpression/orderExpression/valueType
$refNode = Find-OrderedInsertRef $fieldEl "role"
$nodes = Import-Fragment $xmlDoc $fragXml
foreach ($node in $nodes) {
Insert-BeforeElement $fieldEl $node $refNode $fieldIndent
.claude/skills/skd-edit/scripts/skd-edit.py
+83 -35
View File
@@ -1,4 +1,4 @@
# skd-edit v1.41 — Atomic 1C DCS editor (Python port)
# skd-edit v1.42 — Atomic 1C DCS editor (Python port)
# Source: https://github.com/Nikolay-Shirokov/cc-1c-skills
import argparse
import json
@@ -1163,10 +1163,11 @@ def build_restriction_xml(restrict, indent):
if not restrict:
return ""
restrict_map = {"noField": "field", "noFilter": "condition", "noCondition": "condition", "noGroup": "group", "noOrder": "order"}
# Флаги — в порядке XSD FieldUseRestriction (field condition group order), не в порядке ввода
given = [restrict_map.get(r) for r in restrict]
lines = [f"{indent}<useRestriction>"]
for r in restrict:
xml_name = restrict_map.get(r)
if xml_name:
for xml_name in ("field", "condition", "group", "order"):
if xml_name in given:
lines.append(f"{indent}\t<{xml_name}>true</{xml_name}>")
lines.append(f"{indent}</useRestriction>")
return "\n".join(lines)
@@ -1189,25 +1190,35 @@ def build_field_fragment(parsed, indent):
elif parsed.get("title"):
lines.append(build_mltext_xml("title", parsed["title"], f"{i}\t"))
# Остальные части собираем как (место по XSD, xml) и выводим по месту: сохранённые как есть
# узлы (attributeUseRestriction, presentationExpression, orderExpression, appearance, …)
# встают на своё место, а не в хвост после valueType. Незнакомые — в конец, как раньше.
field_order = XSD_CHILD_ORDER['DataSetFieldField']
parts = []
if parsed.get("restrict"):
lines.append(build_restriction_xml(parsed["restrict"], f"{i}\t"))
parts.append((field_order.index('useRestriction'), build_restriction_xml(parsed["restrict"], f"{i}\t")))
role_xml = build_role_xml(parsed.get("roles"), f"{i}\t")
if role_xml:
lines.append(role_xml)
parts.append((field_order.index('role'), role_xml))
vt_rank = field_order.index('valueType')
if parsed.get("rawValueType"):
# Preserve original <valueType> verbatim — keeps qualifiers (StringQualifiers,
# NumberQualifiers, DateQualifiers, …) that aren't expressible via shorthand.
lines.append(f"{i}\t" + parsed["rawValueType"])
parts.append((vt_rank, f"{i}\t" + parsed["rawValueType"]))
elif parsed.get("type"):
lines.append(f"{i}\t<valueType>")
lines.append(build_value_type_xml(parsed["type"], f"{i}\t\t"))
lines.append(f"{i}\t</valueType>")
vt = [f"{i}\t<valueType>", build_value_type_xml(parsed["type"], f"{i}\t\t"), f"{i}\t</valueType>"]
parts.append((vt_rank, "\n".join(vt)))
# Defense in depth: re-emit OuterXml of unknown children captured by Read.
for raw in (parsed.get("_unknownChildren") or []):
lines.append(f"{i}\t" + raw)
m = re.match(r'^<(?:[\w.-]+:)?([\w.-]+)', raw)
r = field_order.index(m.group(1)) if m and m.group(1) in field_order else len(field_order)
parts.append((r, f"{i}\t" + raw))
# Устойчивая сортировка по месту: при равенстве — порядок добавления
for _, x in sorted(parts, key=lambda t: t[0]):
lines.append(x)
lines.append(f"{i}</field>")
return "\n".join(lines)
@@ -1986,7 +1997,54 @@ def resolve_variant_settings():
sys.exit(1)
def ensure_settings_child(settings, child_name, after_siblings):
# Порядок детей по XSD схемы компоновки: чтение по схеме (XDTO) отвергает нарушенный порядок,
# поэтому новый узел встаёт перед первым соседом, который по схеме идёт позже. Ключ — вид
# контейнера: settings, поле набора или xsi:type элемента структуры (без xsi:type — группа).
XSD_CHILD_ORDER = {
'settings': ['userFields', 'selection', 'filter', 'dataParameters', 'order', 'conditionalAppearance', 'outputParameters',
'item', 'additionalProperties', 'itemsViewMode', 'itemsUserSettingID', 'itemsUserSettingPresentation'],
'StructureItemGroup': ['use', 'name', 'groupItems', 'filter', 'order', 'selection', 'conditionalAppearance', 'outputParameters',
'item', 'id', 'viewMode', 'userSettingID', 'userSettingPresentation', 'itemsViewMode', 'itemsUserSettingID',
'itemsUserSettingPresentation', 'groupState'],
'StructureItemTable': ['use', 'name', 'column', 'row', 'selection', 'conditionalAppearance', 'outputParameters',
'id', 'viewMode', 'userSettingID', 'userSettingPresentation', 'columnsViewMode', 'columnsUserSettingID',
'columnsUserSettingPresentation', 'rowsViewMode', 'rowsUserSettingID', 'rowsUserSettingPresentation'],
'StructureItemChart': ['use', 'name', 'point', 'series', 'selection', 'conditionalAppearance', 'outputParameters',
'id', 'viewMode', 'userSettingID', 'userSettingPresentation', 'pointsViewMode', 'pointsUserSettingID',
'pointsUserSettingPresentation', 'seriesViewMode', 'seriesUserSettingID', 'seriesUserSettingPresentation'],
'DataSetFieldField': ['dataPath', 'field', 'title', 'useRestriction', 'attributeUseRestriction', 'role', 'presentationExpression',
'orderExpression', 'inHierarchyDataSet', 'inHierarchyDataSetParameter', 'valueType', 'appearance',
'availableValue', 'inputParameters'],
}
def get_xsd_child_order(container):
if local_name(container) == 'settings':
return XSD_CHILD_ORDER['settings']
if local_name(container) == 'field':
return XSD_CHILD_ORDER['DataSetFieldField']
xt = (container.get('{http://www.w3.org/2001/XMLSchema-instance}type') or '').split(':')[-1]
if xt in XSD_CHILD_ORDER:
return XSD_CHILD_ORDER[xt]
return XSD_CHILD_ORDER['StructureItemGroup']
def find_ordered_insert_ref(container, child_name):
"""Первый сосед, который по XSD идёт после child_name; None — вставлять в конец."""
order = get_xsd_child_order(container)
if child_name not in order:
return None
rank = order.index(child_name)
for ch in container:
if not isinstance(ch.tag, str):
continue
ln = local_name(ch)
if ln in order and order.index(ln) > rank:
return ch
return None
def ensure_settings_child(settings, child_name):
el = find_first_element(settings, [child_name], SET_NS)
if el is not None:
return el
@@ -1995,19 +2053,7 @@ def ensure_settings_child(settings, child_name, after_siblings):
frag_xml = f"{indent}<dcsset:{child_name}/>"
nodes = import_fragment(xml_doc, frag_xml)
ref_node = None
for sib_name in after_siblings:
sib = find_first_element(settings, [sib_name], SET_NS)
if sib is not None:
# Get next element sibling
found = False
for ch in settings:
if found and isinstance(ch.tag, str):
ref_node = ch
break
if ch is sib:
found = True
break
ref_node = find_ordered_insert_ref(settings, child_name)
for node in nodes:
insert_before_element(settings, node, ref_node, indent)
@@ -2108,7 +2154,7 @@ if operation == "add-field":
if not no_selection:
settings = resolve_variant_settings()
var_name = get_variant_name()
selection = ensure_settings_child(settings, "selection", [])
selection = ensure_settings_child(settings, "selection")
existing_sel = find_element_by_child_value(selection, "item", "field", parsed["dataPath"], SET_NS)
if existing_sel is not None:
print(f'[INFO] Field "{parsed["dataPath"]}" already in selection -- skipped')
@@ -2186,7 +2232,7 @@ elif operation == "add-calculated-field":
if not no_selection:
settings = resolve_variant_settings()
var_name = get_variant_name()
selection = ensure_settings_child(settings, "selection", [])
selection = ensure_settings_child(settings, "selection")
existing_sel = find_element_by_child_value(selection, "item", "field", parsed["dataPath"], SET_NS)
if existing_sel is not None:
print(f'[INFO] Field "{parsed["dataPath"]}" already in selection -- skipped')
@@ -2582,7 +2628,7 @@ elif operation == "add-filter":
var_name = get_variant_name()
for val in values:
parsed = parse_filter_shorthand(val)
filter_el = ensure_settings_child(settings, "filter", ["selection"])
filter_el = ensure_settings_child(settings, "filter")
filter_indent = get_container_child_indent(filter_el)
frag_xml = build_filter_item_fragment(parsed, filter_indent)
nodes = import_fragment(xml_doc, frag_xml)
@@ -2595,7 +2641,7 @@ elif operation == "add-dataParameter":
var_name = get_variant_name()
for val in values:
parsed = parse_data_param_shorthand(val)
dp_el = ensure_settings_child(settings, "dataParameters", ["outputParameters", "conditionalAppearance", "order", "filter", "selection"])
dp_el = ensure_settings_child(settings, "dataParameters")
dp_indent = get_container_child_indent(dp_el)
frag_xml = build_data_param_fragment(parsed, dp_indent)
nodes = import_fragment(xml_doc, frag_xml)
@@ -2608,7 +2654,7 @@ elif operation == "add-order":
var_name = get_variant_name()
for val in values:
parsed = parse_order_shorthand(val)
order_el = ensure_settings_child(settings, "order", ["filter", "selection"])
order_el = ensure_settings_child(settings, "order")
order_indent = get_container_child_indent(order_el)
if parsed["field"] == "Auto":
@@ -2665,7 +2711,7 @@ elif operation == "add-selection":
else:
target_el = settings
selection = ensure_settings_child(target_el, "selection", [])
selection = ensure_settings_child(target_el, "selection")
# Dedup: skip if SelectedItemAuto already exists
if field_name == "Auto":
@@ -2737,7 +2783,7 @@ elif operation == "set-outputParameter":
var_name = get_variant_name()
for val in values:
parsed = parse_output_param_shorthand(val)
output_el = ensure_settings_child(settings, "outputParameters", ["conditionalAppearance", "order", "filter", "selection"])
output_el = ensure_settings_child(settings, "outputParameters")
output_indent = get_container_child_indent(output_el)
existing_param = find_element_by_child_value(output_el, "item", "parameter", parsed["key"], COR_NS)
@@ -2763,7 +2809,8 @@ elif operation == "set-structure":
struct_items = parse_structure_shorthand(value_arg)
settings_indent = get_child_indent(settings)
ref_node = find_first_element(settings, ["outputParameters", "dataParameters", "conditionalAppearance", "order", "filter", "selection", "item"], SET_NS)
# Место по XSD: после outputParameters и прочих блоков, до additionalProperties/itemsViewMode
ref_node = find_ordered_insert_ref(settings, "item")
for struct_item in struct_items:
frag_xml = build_structure_item_fragment(struct_item, settings_indent)
@@ -2967,7 +3014,7 @@ elif operation == "add-conditionalAppearance":
var_name = get_variant_name()
for val in values:
parsed = parse_conditional_appearance_shorthand(val)
ca_el = ensure_settings_child(settings, "conditionalAppearance", ["outputParameters", "order", "filter", "selection"])
ca_el = ensure_settings_child(settings, "conditionalAppearance")
ca_indent = get_container_child_indent(ca_el)
frag_xml = build_conditional_appearance_item_fragment(parsed, ca_indent)
nodes = import_fragment(xml_doc, frag_xml)
@@ -3256,7 +3303,8 @@ elif operation == "set-field-role":
lines.append(f"{field_indent}</role>")
frag_xml = "\n".join(lines)
ref_node = next((ch for ch in field_el if isinstance(ch.tag, str) and local_name(ch) in ("valueType", "inputParameters") and etree.QName(ch.tag).namespace == SCH_NS), None)
# Место по XSD: после attributeUseRestriction, до presentationExpression/orderExpression/valueType
ref_node = find_ordered_insert_ref(field_el, "role")
for node in import_fragment(xml_doc, frag_xml):
insert_before_element(field_el, node, ref_node, field_indent)
tests/skills/cases/skd-compile/snapshots/calc-shorthand-extended/Template.xml
+6 -6
View File
@@ -42,6 +42,12 @@
<v8:content>Имя ресурса</v8:content>
</v8:item>
</title>
<useRestriction>
<field>true</field>
<condition>true</condition>
<group>true</group>
<order>true</order>
</useRestriction>
<valueType>
<v8:Type>xs:string</v8:Type>
<v8:StringQualifiers>
@@ -49,12 +55,6 @@
<v8:AllowedLength>Variable</v8:AllowedLength>
</v8:StringQualifiers>
</valueType>
<useRestriction>
<field>true</field>
<condition>true</condition>
<group>true</group>
<order>true</order>
</useRestriction>
</calculatedField>
<calculatedField>
<dataPath>Маржа</dataPath>
tests/skills/cases/skd-compile/snapshots/empty-param-values/Template.xml
+1 -1
View File
@@ -165,11 +165,11 @@
<name>СоставнойТип</name>
<valueType>
<v8:Type>xs:string</v8:Type>
<v8:Type xmlns:d5p1="http://v8.1c.ru/8.1/data/enterprise/current-config">d5p1:CatalogRef.ПлоскийПростой</v8:Type>
<v8:StringQualifiers>
<v8:Length>10</v8:Length>
<v8:AllowedLength>Fixed</v8:AllowedLength>
</v8:StringQualifiers>
<v8:Type xmlns:d5p1="http://v8.1c.ru/8.1/data/enterprise/current-config">d5p1:CatalogRef.ПлоскийПростой</v8:Type>
</valueType>
<value xsi:nil="true"/>
<useRestriction>false</useRestriction>
tests/skills/cases/skd-compile/snapshots/field-appearance-and-presentation/Template.xml
+1 -1
View File
@@ -42,6 +42,7 @@
<v8:content>Описание</v8:content>
</v8:item>
</title>
<presentationExpression>ТекстСообщения</presentationExpression>
<valueType>
<v8:Type xmlns:d5p1="http://v8.1c.ru/8.1/data/enterprise/current-config">d5p1:CatalogRef.Организации</v8:Type>
</valueType>
@@ -51,7 +52,6 @@
<dcscor:value xsi:type="v8ui:HorizontalAlign">Right</dcscor:value>
</dcscor:item>
</appearance>
<presentationExpression>ТекстСообщения</presentationExpression>
</field>
<dataSource>ИсточникДанных1</dataSource>
<objectName>ЖурналОшибок</objectName>
tests/skills/cases/skd-compile/snapshots/field-restrictions/Template.xml
+1 -1
View File
@@ -59,9 +59,9 @@
<dataPath>Служебное</dataPath>
<field>Служебное</field>
<useRestriction>
<field>true</field>
<condition>true</condition>
<order>true</order>
<field>true</field>
</useRestriction>
<valueType>
<v8:Type>xs:string</v8:Type>
tests/skills/cases/skd-compile/snapshots/xsd-order-calc-field/Template.xml
+107
View File
@@ -0,0 +1,107 @@
<?xml version="1.0" encoding="UTF-8"?>
<DataCompositionSchema xmlns="http://v8.1c.ru/8.1/data-composition-system/schema" xmlns:dcscom="http://v8.1c.ru/8.1/data-composition-system/common" xmlns:dcscor="http://v8.1c.ru/8.1/data-composition-system/core" xmlns:dcsset="http://v8.1c.ru/8.1/data-composition-system/settings" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<dataSource>
<name>ИсточникДанных1</name>
<dataSourceType>Local</dataSourceType>
</dataSource>
<dataSet xsi:type="DataSetQuery">
<name>Основной</name>
<field xsi:type="DataSetFieldField">
<dataPath>Количество</dataPath>
<field>Количество</field>
<valueType>
<v8:Type>xs:decimal</v8:Type>
<v8:NumberQualifiers>
<v8:Digits>15</v8:Digits>
<v8:FractionDigits>3</v8:FractionDigits>
<v8:AllowedSign>Any</v8:AllowedSign>
</v8:NumberQualifiers>
</valueType>
</field>
<field xsi:type="DataSetFieldField">
<dataPath>Цена</dataPath>
<field>Цена</field>
<valueType>
<v8:Type>xs:decimal</v8:Type>
<v8:NumberQualifiers>
<v8:Digits>15</v8:Digits>
<v8:FractionDigits>2</v8:FractionDigits>
<v8:AllowedSign>Any</v8:AllowedSign>
</v8:NumberQualifiers>
</valueType>
</field>
<dataSource>ИсточникДанных1</dataSource>
<query>ВЫБРАТЬ Т.Количество, Т.Цена ИЗ Регистр КАК Т</query>
</dataSet>
<calculatedField>
<dataPath>Итого</dataPath>
<expression>Количество * Цена</expression>
<title xsi:type="v8:LocalStringType">
<v8:item>
<v8:lang>ru</v8:lang>
<v8:content>Итого</v8:content>
</v8:item>
</title>
<useRestriction>
<group>true</group>
<order>true</order>
</useRestriction>
<appearance>
<dcscor:item xsi:type="dcsset:SettingsParameterValue">
<dcscor:parameter>Формат</dcscor:parameter>
<dcscor:value xsi:type="v8:LocalStringType">
<v8:item>
<v8:lang>ru</v8:lang>
<v8:content>ЧДЦ=2</v8:content>
</v8:item>
</dcscor:value>
</dcscor:item>
</appearance>
<valueType>
<v8:Type>xs:decimal</v8:Type>
<v8:NumberQualifiers>
<v8:Digits>15</v8:Digits>
<v8:FractionDigits>2</v8:FractionDigits>
<v8:AllowedSign>Any</v8:AllowedSign>
</v8:NumberQualifiers>
</valueType>
</calculatedField>
<calculatedField>
<dataPath>Удвоенное</dataPath>
<expression>Количество * 2</expression>
<useRestriction>
<field>true</field>
<group>true</group>
</useRestriction>
<valueType>
<v8:Type>xs:decimal</v8:Type>
<v8:NumberQualifiers>
<v8:Digits>10</v8:Digits>
<v8:FractionDigits>0</v8:FractionDigits>
<v8:AllowedSign>Any</v8:AllowedSign>
</v8:NumberQualifiers>
</valueType>
</calculatedField>
<settingsVariant>
<dcsset:name>Основной</dcsset:name>
<dcsset:presentation xsi:type="v8:LocalStringType">
<v8:item>
<v8:lang>ru</v8:lang>
<v8:content>Основной</v8:content>
</v8:item>
</dcsset:presentation>
<dcsset:settings xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows">
<dcsset:selection>
<dcsset:item xsi:type="dcsset:SelectedItemAuto"/>
</dcsset:selection>
<dcsset:item xsi:type="dcsset:StructureItemGroup">
<dcsset:order>
<dcsset:item xsi:type="dcsset:OrderItemAuto"/>
</dcsset:order>
<dcsset:selection>
<dcsset:item xsi:type="dcsset:SelectedItemAuto"/>
</dcsset:selection>
</dcsset:item>
</dcsset:settings>
</settingsVariant>
</DataCompositionSchema>
tests/skills/cases/skd-compile/snapshots/xsd-order-dataset-field/Template.xml
+112
View File
@@ -0,0 +1,112 @@
<?xml version="1.0" encoding="UTF-8"?>
<DataCompositionSchema xmlns="http://v8.1c.ru/8.1/data-composition-system/schema" xmlns:dcscom="http://v8.1c.ru/8.1/data-composition-system/common" xmlns:dcscor="http://v8.1c.ru/8.1/data-composition-system/core" xmlns:dcsset="http://v8.1c.ru/8.1/data-composition-system/settings" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<dataSource>
<name>ИсточникДанных1</name>
<dataSourceType>Local</dataSourceType>
</dataSource>
<dataSet xsi:type="DataSetQuery">
<name>Основной</name>
<field xsi:type="DataSetFieldField">
<dataPath>Вид</dataPath>
<field>Вид</field>
<title xsi:type="v8:LocalStringType">
<v8:item>
<v8:lang>ru</v8:lang>
<v8:content>Вид операции</v8:content>
</v8:item>
</title>
<useRestriction>
<field>true</field>
<condition>true</condition>
<group>true</group>
<order>true</order>
</useRestriction>
<attributeUseRestriction>
<field>true</field>
<group>true</group>
</attributeUseRestriction>
<role>
<dcscom:dimension>true</dcscom:dimension>
</role>
<presentationExpression>ВЫБОР КОГДА Вид = 1 ТОГДА "Доход" ИНАЧЕ "Расход" КОНЕЦ</presentationExpression>
<orderExpression>
<dcscom:expression>Вид</dcscom:expression>
<dcscom:orderType>Desc</dcscom:orderType>
<dcscom:autoOrder>false</dcscom:autoOrder>
</orderExpression>
<valueType>
<v8:Type>xs:decimal</v8:Type>
<v8:NumberQualifiers>
<v8:Digits>1</v8:Digits>
<v8:FractionDigits>0</v8:FractionDigits>
<v8:AllowedSign>Any</v8:AllowedSign>
</v8:NumberQualifiers>
</valueType>
<appearance>
<dcscor:item xsi:type="dcsset:SettingsParameterValue">
<dcscor:parameter>Формат</dcscor:parameter>
<dcscor:value xsi:type="v8:LocalStringType">
<v8:item>
<v8:lang>ru</v8:lang>
<v8:content>ЧН=-</v8:content>
</v8:item>
</dcscor:value>
</dcscor:item>
</appearance>
<availableValue>
<value xsi:type="xs:decimal">1</value>
<presentation xsi:type="v8:LocalStringType">
<v8:item>
<v8:lang>ru</v8:lang>
<v8:content>Доход</v8:content>
</v8:item>
</presentation>
</availableValue>
<availableValue>
<value xsi:type="xs:decimal">2</value>
<presentation xsi:type="v8:LocalStringType">
<v8:item>
<v8:lang>ru</v8:lang>
<v8:content>Расход</v8:content>
</v8:item>
</presentation>
</availableValue>
</field>
<field xsi:type="DataSetFieldField">
<dataPath>Сумма</dataPath>
<field>Сумма</field>
<valueType>
<v8:Type>xs:decimal</v8:Type>
<v8:NumberQualifiers>
<v8:Digits>15</v8:Digits>
<v8:FractionDigits>2</v8:FractionDigits>
<v8:AllowedSign>Any</v8:AllowedSign>
</v8:NumberQualifiers>
</valueType>
</field>
<dataSource>ИсточникДанных1</dataSource>
<query>ВЫБРАТЬ Т.Вид, Т.Сумма ИЗ Регистр КАК Т</query>
</dataSet>
<settingsVariant>
<dcsset:name>Основной</dcsset:name>
<dcsset:presentation xsi:type="v8:LocalStringType">
<v8:item>
<v8:lang>ru</v8:lang>
<v8:content>Основной</v8:content>
</v8:item>
</dcsset:presentation>
<dcsset:settings xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows">
<dcsset:selection>
<dcsset:item xsi:type="dcsset:SelectedItemAuto"/>
</dcsset:selection>
<dcsset:item xsi:type="dcsset:StructureItemGroup">
<dcsset:order>
<dcsset:item xsi:type="dcsset:OrderItemAuto"/>
</dcsset:order>
<dcsset:selection>
<dcsset:item xsi:type="dcsset:SelectedItemAuto"/>
</dcsset:selection>
</dcsset:item>
</dcsset:settings>
</settingsVariant>
</DataCompositionSchema>
tests/skills/cases/skd-compile/snapshots/xsd-order-group-filter/Template.xml
+86
View File
@@ -0,0 +1,86 @@
<?xml version="1.0" encoding="UTF-8"?>
<DataCompositionSchema xmlns="http://v8.1c.ru/8.1/data-composition-system/schema" xmlns:dcscom="http://v8.1c.ru/8.1/data-composition-system/common" xmlns:dcscor="http://v8.1c.ru/8.1/data-composition-system/core" xmlns:dcsset="http://v8.1c.ru/8.1/data-composition-system/settings" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<dataSource>
<name>ИсточникДанных1</name>
<dataSourceType>Local</dataSourceType>
</dataSource>
<dataSet xsi:type="DataSetQuery">
<name>Основной</name>
<field xsi:type="DataSetFieldField">
<dataPath>Организация</dataPath>
<field>Организация</field>
<valueType>
<v8:Type xmlns:d5p1="http://v8.1c.ru/8.1/data/enterprise/current-config">d5p1:CatalogRef.Организации</v8:Type>
</valueType>
</field>
<field xsi:type="DataSetFieldField">
<dataPath>Сумма</dataPath>
<field>Сумма</field>
<valueType>
<v8:Type>xs:decimal</v8:Type>
<v8:NumberQualifiers>
<v8:Digits>15</v8:Digits>
<v8:FractionDigits>2</v8:FractionDigits>
<v8:AllowedSign>Any</v8:AllowedSign>
</v8:NumberQualifiers>
</valueType>
</field>
<dataSource>ИсточникДанных1</dataSource>
<query>ВЫБРАТЬ Т.Организация, Т.Сумма ИЗ Регистр КАК Т</query>
</dataSet>
<settingsVariant>
<dcsset:name>Основной</dcsset:name>
<dcsset:presentation xsi:type="v8:LocalStringType">
<v8:item>
<v8:lang>ru</v8:lang>
<v8:content>Основной</v8:content>
</v8:item>
</dcsset:presentation>
<dcsset:settings xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows">
<dcsset:selection>
<dcsset:item xsi:type="dcsset:SelectedItemField">
<dcsset:field>Сумма</dcsset:field>
</dcsset:item>
</dcsset:selection>
<dcsset:item xsi:type="dcsset:StructureItemGroup">
<dcsset:groupItems>
<dcsset:item xsi:type="dcsset:GroupItemField">
<dcsset:field>Организация</dcsset:field>
<dcsset:groupType>Items</dcsset:groupType>
<dcsset:periodAdditionType>None</dcsset:periodAdditionType>
<dcsset:periodAdditionBegin xsi:type="xs:dateTime">0001-01-01T00:00:00</dcsset:periodAdditionBegin>
<dcsset:periodAdditionEnd xsi:type="xs:dateTime">0001-01-01T00:00:00</dcsset:periodAdditionEnd>
</dcsset:item>
</dcsset:groupItems>
<dcsset:filter>
<dcsset:item xsi:type="dcsset:FilterItemComparison">
<dcsset:left xsi:type="dcscor:Field">Сумма</dcsset:left>
<dcsset:comparisonType>Greater</dcsset:comparisonType>
<dcsset:right xsi:type="xs:decimal">0</dcsset:right>
</dcsset:item>
</dcsset:filter>
<dcsset:order>
<dcsset:item xsi:type="dcsset:OrderItemAuto"/>
</dcsset:order>
<dcsset:selection>
<dcsset:item xsi:type="dcsset:SelectedItemAuto"/>
</dcsset:selection>
<dcsset:item xsi:type="dcsset:StructureItemGroup">
<dcsset:filter>
<dcsset:item xsi:type="dcsset:FilterItemComparison">
<dcsset:left xsi:type="dcscor:Field">Сумма</dcsset:left>
<dcsset:comparisonType>Less</dcsset:comparisonType>
<dcsset:right xsi:type="xs:decimal">1000</dcsset:right>
</dcsset:item>
</dcsset:filter>
<dcsset:order>
<dcsset:item xsi:type="dcsset:OrderItemAuto"/>
</dcsset:order>
<dcsset:selection>
<dcsset:item xsi:type="dcsset:SelectedItemAuto"/>
</dcsset:selection>
</dcsset:item>
</dcsset:item>
</dcsset:settings>
</settingsVariant>
</DataCompositionSchema>
tests/skills/cases/skd-compile/snapshots/xsd-order-settings/Template.xml
+155
View File
@@ -0,0 +1,155 @@
<?xml version="1.0" encoding="UTF-8"?>
<DataCompositionSchema xmlns="http://v8.1c.ru/8.1/data-composition-system/schema" xmlns:dcscom="http://v8.1c.ru/8.1/data-composition-system/common" xmlns:dcscor="http://v8.1c.ru/8.1/data-composition-system/core" xmlns:dcsset="http://v8.1c.ru/8.1/data-composition-system/settings" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<dataSource>
<name>ИсточникДанных1</name>
<dataSourceType>Local</dataSourceType>
</dataSource>
<dataSet xsi:type="DataSetQuery">
<name>Основной</name>
<field xsi:type="DataSetFieldField">
<dataPath>Организация</dataPath>
<field>Организация</field>
<valueType>
<v8:Type xmlns:d5p1="http://v8.1c.ru/8.1/data/enterprise/current-config">d5p1:CatalogRef.Организации</v8:Type>
</valueType>
</field>
<field xsi:type="DataSetFieldField">
<dataPath>Сумма</dataPath>
<field>Сумма</field>
<valueType>
<v8:Type>xs:decimal</v8:Type>
<v8:NumberQualifiers>
<v8:Digits>15</v8:Digits>
<v8:FractionDigits>2</v8:FractionDigits>
<v8:AllowedSign>Any</v8:AllowedSign>
</v8:NumberQualifiers>
</valueType>
</field>
<field xsi:type="DataSetFieldField">
<dataPath>Активна</dataPath>
<field>Активна</field>
<valueType>
<v8:Type>xs:boolean</v8:Type>
</valueType>
</field>
<dataSource>ИсточникДанных1</dataSource>
<query>ВЫБРАТЬ Т.Организация, Т.Сумма, Т.Активна ИЗ Регистр КАК Т</query>
</dataSet>
<parameter>
<name>Период</name>
<valueType>
<v8:Type>v8:StandardPeriod</v8:Type>
</valueType>
<value xsi:type="v8:StandardPeriod">
<v8:variant xsi:type="v8:StandardPeriodVariant">LastMonth</v8:variant>
</value>
<useRestriction>false</useRestriction>
</parameter>
<settingsVariant>
<dcsset:name>Основной</dcsset:name>
<dcsset:presentation xsi:type="v8:LocalStringType">
<v8:item>
<v8:lang>ru</v8:lang>
<v8:content>Основной</v8:content>
</v8:item>
</dcsset:presentation>
<dcsset:settings xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows">
<dcsset:selection>
<dcsset:item xsi:type="dcsset:SelectedItemField">
<dcsset:field>Организация</dcsset:field>
</dcsset:item>
<dcsset:item xsi:type="dcsset:SelectedItemField">
<dcsset:field>Сумма</dcsset:field>
</dcsset:item>
</dcsset:selection>
<dcsset:filter>
<dcsset:item xsi:type="dcsset:FilterItemComparison">
<dcsset:left xsi:type="dcscor:Field">Активна</dcsset:left>
<dcsset:comparisonType>Equal</dcsset:comparisonType>
<dcsset:right xsi:type="xs:boolean">true</dcsset:right>
</dcsset:item>
</dcsset:filter>
<dcsset:dataParameters>
<dcscor:item xsi:type="dcsset:SettingsParameterValue">
<dcscor:parameter>Период</dcscor:parameter>
<dcscor:value xsi:type="v8:StandardPeriod">
<v8:variant xsi:type="v8:StandardPeriodVariant">LastMonth</v8:variant>
</dcscor:value>
<dcsset:userSettingID>UUID-001</dcsset:userSettingID>
</dcscor:item>
</dcsset:dataParameters>
<dcsset:order>
<dcsset:item xsi:type="dcsset:OrderItemField">
<dcsset:field>Сумма</dcsset:field>
<dcsset:orderType>Desc</dcsset:orderType>
</dcsset:item>
</dcsset:order>
<dcsset:conditionalAppearance>
<dcsset:item>
<dcsset:selection/>
<dcsset:filter>
<dcsset:item xsi:type="dcsset:FilterItemComparison">
<dcsset:left xsi:type="dcscor:Field">Сумма</dcsset:left>
<dcsset:comparisonType>Less</dcsset:comparisonType>
<dcsset:right xsi:type="xs:decimal">0</dcsset:right>
</dcsset:item>
</dcsset:filter>
<dcsset:appearance>
<dcscor:item xsi:type="dcsset:SettingsParameterValue">
<dcscor:parameter>ЦветТекста</dcscor:parameter>
<dcscor:value xsi:type="v8ui:Color">web:Red</dcscor:value>
</dcscor:item>
<dcscor:item xsi:type="dcsset:SettingsParameterValue">
<dcscor:parameter>Видимость</dcscor:parameter>
<dcscor:value xsi:type="xs:boolean">false</dcscor:value>
</dcscor:item>
</dcsset:appearance>
</dcsset:item>
</dcsset:conditionalAppearance>
<dcsset:outputParameters>
<dcscor:item xsi:type="dcsset:SettingsParameterValue">
<dcscor:parameter>Заголовок</dcscor:parameter>
<dcscor:value xsi:type="v8:LocalStringType">
<v8:item>
<v8:lang>ru</v8:lang>
<v8:content>Отчёт</v8:content>
</v8:item>
</dcscor:value>
</dcscor:item>
</dcsset:outputParameters>
<dcsset:item xsi:type="dcsset:StructureItemGroup">
<dcsset:groupItems>
<dcsset:item xsi:type="dcsset:GroupItemField">
<dcsset:field>Организация</dcsset:field>
<dcsset:groupType>Items</dcsset:groupType>
<dcsset:periodAdditionType>None</dcsset:periodAdditionType>
<dcsset:periodAdditionBegin xsi:type="xs:dateTime">0001-01-01T00:00:00</dcsset:periodAdditionBegin>
<dcsset:periodAdditionEnd xsi:type="xs:dateTime">0001-01-01T00:00:00</dcsset:periodAdditionEnd>
</dcsset:item>
</dcsset:groupItems>
<dcsset:filter>
<dcsset:item xsi:type="dcsset:FilterItemComparison">
<dcsset:left xsi:type="dcscor:Field">Сумма</dcsset:left>
<dcsset:comparisonType>Greater</dcsset:comparisonType>
<dcsset:right xsi:type="xs:decimal">0</dcsset:right>
</dcsset:item>
</dcsset:filter>
<dcsset:order>
<dcsset:item xsi:type="dcsset:OrderItemField">
<dcsset:field>Сумма</dcsset:field>
<dcsset:orderType>Desc</dcsset:orderType>
</dcsset:item>
</dcsset:order>
<dcsset:selection>
<dcsset:item xsi:type="dcsset:SelectedItemAuto"/>
</dcsset:selection>
</dcsset:item>
<dcsset:additionalProperties>
<v8:Property name="ВариантНаименование">
<v8:Value xsi:type="xs:string">Основной</v8:Value>
</v8:Property>
</dcsset:additionalProperties>
<dcsset:itemsViewMode>Normal</dcsset:itemsViewMode>
</dcsset:settings>
</settingsVariant>
</DataCompositionSchema>
tests/skills/cases/skd-compile/snapshots/xsd-order-table-chart/Template.xml
+147
View File
@@ -0,0 +1,147 @@
<?xml version="1.0" encoding="UTF-8"?>
<DataCompositionSchema xmlns="http://v8.1c.ru/8.1/data-composition-system/schema" xmlns:dcscom="http://v8.1c.ru/8.1/data-composition-system/common" xmlns:dcscor="http://v8.1c.ru/8.1/data-composition-system/core" xmlns:dcsset="http://v8.1c.ru/8.1/data-composition-system/settings" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<dataSource>
<name>ИсточникДанных1</name>
<dataSourceType>Local</dataSourceType>
</dataSource>
<dataSet xsi:type="DataSetQuery">
<name>Основной</name>
<field xsi:type="DataSetFieldField">
<dataPath>Организация</dataPath>
<field>Организация</field>
<valueType>
<v8:Type xmlns:d5p1="http://v8.1c.ru/8.1/data/enterprise/current-config">d5p1:CatalogRef.Организации</v8:Type>
</valueType>
</field>
<field xsi:type="DataSetFieldField">
<dataPath>Период</dataPath>
<field>Период</field>
<valueType>
<v8:Type>xs:dateTime</v8:Type>
<v8:DateQualifiers>
<v8:DateFractions>Date</v8:DateFractions>
</v8:DateQualifiers>
</valueType>
</field>
<field xsi:type="DataSetFieldField">
<dataPath>Сумма</dataPath>
<field>Сумма</field>
<valueType>
<v8:Type>xs:decimal</v8:Type>
<v8:NumberQualifiers>
<v8:Digits>15</v8:Digits>
<v8:FractionDigits>2</v8:FractionDigits>
<v8:AllowedSign>Any</v8:AllowedSign>
</v8:NumberQualifiers>
</valueType>
</field>
<dataSource>ИсточникДанных1</dataSource>
<query>ВЫБРАТЬ Т.Организация, Т.Период, Т.Сумма ИЗ Регистр КАК Т</query>
</dataSet>
<settingsVariant>
<dcsset:name>Основной</dcsset:name>
<dcsset:presentation xsi:type="v8:LocalStringType">
<v8:item>
<v8:lang>ru</v8:lang>
<v8:content>Основной</v8:content>
</v8:item>
</dcsset:presentation>
<dcsset:settings xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows">
<dcsset:selection>
<dcsset:item xsi:type="dcsset:SelectedItemField">
<dcsset:field>Сумма</dcsset:field>
</dcsset:item>
</dcsset:selection>
<dcsset:item xsi:type="dcsset:StructureItemTable">
<dcsset:name>Таблица</dcsset:name>
<dcsset:column>
<dcsset:groupItems>
<dcsset:item xsi:type="dcsset:GroupItemField">
<dcsset:field>Период</dcsset:field>
<dcsset:groupType>Items</dcsset:groupType>
<dcsset:periodAdditionType>None</dcsset:periodAdditionType>
<dcsset:periodAdditionBegin xsi:type="xs:dateTime">0001-01-01T00:00:00</dcsset:periodAdditionBegin>
<dcsset:periodAdditionEnd xsi:type="xs:dateTime">0001-01-01T00:00:00</dcsset:periodAdditionEnd>
</dcsset:item>
</dcsset:groupItems>
<dcsset:order>
<dcsset:item xsi:type="dcsset:OrderItemAuto"/>
</dcsset:order>
<dcsset:selection>
<dcsset:item xsi:type="dcsset:SelectedItemAuto"/>
</dcsset:selection>
</dcsset:column>
<dcsset:row>
<dcsset:groupItems>
<dcsset:item xsi:type="dcsset:GroupItemField">
<dcsset:field>Организация</dcsset:field>
<dcsset:groupType>Items</dcsset:groupType>
<dcsset:periodAdditionType>None</dcsset:periodAdditionType>
<dcsset:periodAdditionBegin xsi:type="xs:dateTime">0001-01-01T00:00:00</dcsset:periodAdditionBegin>
<dcsset:periodAdditionEnd xsi:type="xs:dateTime">0001-01-01T00:00:00</dcsset:periodAdditionEnd>
</dcsset:item>
</dcsset:groupItems>
<dcsset:order>
<dcsset:item xsi:type="dcsset:OrderItemAuto"/>
</dcsset:order>
<dcsset:selection>
<dcsset:item xsi:type="dcsset:SelectedItemAuto"/>
</dcsset:selection>
</dcsset:row>
<dcsset:viewMode>Normal</dcsset:viewMode>
<dcsset:userSettingPresentation xsi:type="v8:LocalStringType">
<v8:item>
<v8:lang>ru</v8:lang>
<v8:content>Таблица</v8:content>
</v8:item>
</dcsset:userSettingPresentation>
<dcsset:columnsViewMode>Normal</dcsset:columnsViewMode>
<dcsset:rowsViewMode>QuickAccess</dcsset:rowsViewMode>
</dcsset:item>
<dcsset:item xsi:type="dcsset:StructureItemChart">
<dcsset:point>
<dcsset:groupItems>
<dcsset:item xsi:type="dcsset:GroupItemField">
<dcsset:field>Организация</dcsset:field>
<dcsset:groupType>Items</dcsset:groupType>
<dcsset:periodAdditionType>None</dcsset:periodAdditionType>
<dcsset:periodAdditionBegin xsi:type="xs:dateTime">0001-01-01T00:00:00</dcsset:periodAdditionBegin>
<dcsset:periodAdditionEnd xsi:type="xs:dateTime">0001-01-01T00:00:00</dcsset:periodAdditionEnd>
</dcsset:item>
</dcsset:groupItems>
<dcsset:order>
<dcsset:item xsi:type="dcsset:OrderItemAuto"/>
</dcsset:order>
<dcsset:selection>
<dcsset:item xsi:type="dcsset:SelectedItemAuto"/>
</dcsset:selection>
</dcsset:point>
<dcsset:series>
<dcsset:groupItems>
<dcsset:item xsi:type="dcsset:GroupItemField">
<dcsset:field>Период</dcsset:field>
<dcsset:groupType>Items</dcsset:groupType>
<dcsset:periodAdditionType>None</dcsset:periodAdditionType>
<dcsset:periodAdditionBegin xsi:type="xs:dateTime">0001-01-01T00:00:00</dcsset:periodAdditionBegin>
<dcsset:periodAdditionEnd xsi:type="xs:dateTime">0001-01-01T00:00:00</dcsset:periodAdditionEnd>
</dcsset:item>
</dcsset:groupItems>
<dcsset:order>
<dcsset:item xsi:type="dcsset:OrderItemAuto"/>
</dcsset:order>
<dcsset:selection>
<dcsset:item xsi:type="dcsset:SelectedItemAuto"/>
</dcsset:selection>
</dcsset:series>
<dcsset:selection>
<dcsset:item xsi:type="dcsset:SelectedItemField">
<dcsset:field>Сумма</dcsset:field>
</dcsset:item>
</dcsset:selection>
<dcsset:viewMode>Normal</dcsset:viewMode>
<dcsset:pointsViewMode>Normal</dcsset:pointsViewMode>
<dcsset:seriesViewMode>Inaccessible</dcsset:seriesViewMode>
</dcsset:item>
</dcsset:settings>
</settingsVariant>
</DataCompositionSchema>
tests/skills/cases/skd-compile/snapshots/xsd-values-bool-composite/Template.xml
+109
View File
@@ -0,0 +1,109 @@
<?xml version="1.0" encoding="UTF-8"?>
<DataCompositionSchema xmlns="http://v8.1c.ru/8.1/data-composition-system/schema" xmlns:dcscom="http://v8.1c.ru/8.1/data-composition-system/common" xmlns:dcscor="http://v8.1c.ru/8.1/data-composition-system/core" xmlns:dcsset="http://v8.1c.ru/8.1/data-composition-system/settings" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<dataSource>
<name>ИсточникДанных1</name>
<dataSourceType>Local</dataSourceType>
</dataSource>
<dataSet xsi:type="DataSetQuery">
<name>Основной</name>
<field xsi:type="DataSetFieldField">
<dataPath>Число</dataPath>
<field>Число</field>
<valueType>
<v8:Type>xs:string</v8:Type>
<v8:Type>xs:decimal</v8:Type>
<v8:Type>xs:dateTime</v8:Type>
<v8:Type xmlns:d5p1="http://v8.1c.ru/8.1/data/enterprise/current-config">d5p1:CatalogRef.Организации</v8:Type>
<v8:TypeSet xmlns:d5p1="http://v8.1c.ru/8.1/data/enterprise/current-config">d5p1:DocumentRef</v8:TypeSet>
<v8:NumberQualifiers>
<v8:Digits>10</v8:Digits>
<v8:FractionDigits>2</v8:FractionDigits>
<v8:AllowedSign>Any</v8:AllowedSign>
</v8:NumberQualifiers>
<v8:StringQualifiers>
<v8:Length>10</v8:Length>
<v8:AllowedLength>Variable</v8:AllowedLength>
</v8:StringQualifiers>
<v8:DateQualifiers>
<v8:DateFractions>Date</v8:DateFractions>
</v8:DateQualifiers>
</valueType>
</field>
<dataSource>ИсточникДанных1</dataSource>
<query>ВЫБРАТЬ 1 КАК Число</query>
</dataSet>
<parameter>
<name>Выключен</name>
<valueType>
<v8:Type>xs:boolean</v8:Type>
</valueType>
<value xsi:type="xs:boolean">false</value>
<useRestriction>false</useRestriction>
</parameter>
<parameter>
<name>Включен</name>
<valueType>
<v8:Type>xs:boolean</v8:Type>
</valueType>
<value xsi:type="xs:boolean">true</value>
<useRestriction>false</useRestriction>
</parameter>
<parameter>
<name>БезТипа</name>
<value xsi:type="xs:boolean">false</value>
<useRestriction>false</useRestriction>
</parameter>
<parameter>
<name>Составной</name>
<valueType>
<v8:Type>xs:decimal</v8:Type>
<v8:Type>xs:string</v8:Type>
<v8:Type xmlns:d5p1="http://v8.1c.ru/8.1/data/enterprise/current-config">d5p1:CatalogRef.Организации</v8:Type>
<v8:NumberQualifiers>
<v8:Digits>10</v8:Digits>
<v8:FractionDigits>2</v8:FractionDigits>
<v8:AllowedSign>Any</v8:AllowedSign>
</v8:NumberQualifiers>
<v8:StringQualifiers>
<v8:Length>20</v8:Length>
<v8:AllowedLength>Variable</v8:AllowedLength>
</v8:StringQualifiers>
</valueType>
<value xsi:nil="true"/>
<useRestriction>false</useRestriction>
</parameter>
<settingsVariant>
<dcsset:name>Основной</dcsset:name>
<dcsset:presentation xsi:type="v8:LocalStringType">
<v8:item>
<v8:lang>ru</v8:lang>
<v8:content>Основной</v8:content>
</v8:item>
</dcsset:presentation>
<dcsset:settings xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows">
<dcsset:selection>
<dcsset:item xsi:type="dcsset:SelectedItemField">
<dcsset:field>Число</dcsset:field>
</dcsset:item>
</dcsset:selection>
<dcsset:dataParameters>
<dcscor:item xsi:type="dcsset:SettingsParameterValue">
<dcscor:parameter>Выключен</dcscor:parameter>
<dcscor:value xsi:type="xs:boolean">false</dcscor:value>
</dcscor:item>
<dcscor:item xsi:type="dcsset:SettingsParameterValue">
<dcscor:parameter>Включен</dcscor:parameter>
<dcscor:value xsi:type="xs:boolean">true</dcscor:value>
</dcscor:item>
</dcsset:dataParameters>
<dcsset:item xsi:type="dcsset:StructureItemGroup">
<dcsset:order>
<dcsset:item xsi:type="dcsset:OrderItemAuto"/>
</dcsset:order>
<dcsset:selection>
<dcsset:item xsi:type="dcsset:SelectedItemAuto"/>
</dcsset:selection>
</dcsset:item>
</dcsset:settings>
</settingsVariant>
</DataCompositionSchema>
tests/skills/cases/skd-compile/xsd-order-calc-field.json
+24
View File
@@ -0,0 +1,24 @@
{
"name": "Вычисляемое поле с типом, ограничениями и оформлением — valueType последним",
"params": { "outputPath": "Template.xml" },
"input": {
"dataSets": [{
"name": "Основной",
"query": "ВЫБРАТЬ Т.Количество, Т.Цена ИЗ Регистр КАК Т",
"fields": ["Количество: decimal(15,3)", "Цена: decimal(15,2)"]
}],
"calculatedFields": [
{
"dataPath": "Итого",
"expression": "Количество * Цена",
"title": "Итого",
"type": "decimal(15,2)",
"restrict": ["noOrder", "noGroup"],
"appearance": { "Формат": "ЧДЦ=2" }
},
"Удвоенное: decimal(10) = Количество * 2 #noGroup #noField"
]
},
"validatePath": "Template.xml",
"expect": { "files": ["Template.xml"] }
}
tests/skills/cases/skd-compile/xsd-order-dataset-field.json
+31
View File
@@ -0,0 +1,31 @@
{
"name": "Поле набора со всеми частями — порядок по XSD, флаги ограничений не в порядке ввода",
"params": { "outputPath": "Template.xml" },
"input": {
"dataSets": [{
"name": "Основной",
"query": "ВЫБРАТЬ Т.Вид, Т.Сумма ИЗ Регистр КАК Т",
"fields": [
{
"dataPath": "Вид",
"field": "Вид",
"title": "Вид операции",
"type": "decimal(1)",
"role": { "dimension": true },
"restrict": ["noOrder", "noGroup", "noFilter", "noField"],
"attrRestrict": ["noGroup", "noField"],
"appearance": { "Формат": "ЧН=-" },
"presentationExpression": "ВЫБОР КОГДА Вид = 1 ТОГДА \"Доход\" ИНАЧЕ \"Расход\" КОНЕЦ",
"orderExpression": { "expression": "Вид", "orderType": "Desc", "autoOrder": false },
"availableValues": [
{ "value": 1, "presentation": "Доход" },
{ "value": 2, "presentation": "Расход" }
]
},
"Сумма: decimal(15,2)"
]
}]
},
"validatePath": "Template.xml",
"expect": { "files": ["Template.xml"] }
}
tests/skills/cases/skd-compile/xsd-order-group-filter.json
+23
View File
@@ -0,0 +1,23 @@
{
"name": "Группировка с отбором, порядком и полями — filter до order и selection",
"params": { "outputPath": "Template.xml" },
"input": {
"dataSets": [{
"name": "Основной",
"query": "ВЫБРАТЬ Т.Организация, Т.Сумма ИЗ Регистр КАК Т",
"fields": ["Организация: CatalogRef.Организации", "Сумма: decimal(15,2)"]
}],
"settingsVariants": [{
"name": "Основной",
"settings": {
"selection": ["Сумма"],
"structure": [
{ "type": "group", "groupBy": ["Организация"], "filter": ["Сумма > 0"],
"children": [{ "type": "group", "filter": ["Сумма < 1000"] }] }
]
}
}]
},
"validatePath": "Template.xml",
"expect": { "files": ["Template.xml"] }
}
tests/skills/cases/skd-compile/xsd-order-settings.json
+32
View File
@@ -0,0 +1,32 @@
{
"name": "Настройки варианта со всеми блоками и группировкой с отбором — порядок по XSD",
"params": { "outputPath": "Template.xml" },
"input": {
"dataSets": [{
"name": "Основной",
"query": "ВЫБРАТЬ Т.Организация, Т.Сумма, Т.Активна ИЗ Регистр КАК Т",
"fields": ["Организация: CatalogRef.Организации", "Сумма: decimal(15,2)", "Активна: boolean"]
}],
"parameters": ["Период: StandardPeriod = LastMonth"],
"settingsVariants": [{
"name": "Основной",
"settings": {
"selection": ["Организация", "Сумма"],
"filter": ["Активна = true"],
"order": ["Сумма desc"],
"conditionalAppearance": [
{ "filter": ["Сумма < 0"], "appearance": { "ЦветТекста": "web:Red", "Видимость": false } }
],
"outputParameters": { "Заголовок": "Отчёт" },
"dataParameters": ["Период = LastMonth @user"],
"structure": [
{ "type": "group", "groupBy": ["Организация"], "filter": ["Сумма > 0"], "order": ["Сумма desc"], "selection": ["Auto"] }
],
"itemsViewMode": "Normal",
"additionalProperties": { "ВариантНаименование": "Основной" }
}
}]
},
"validatePath": "Template.xml",
"expect": { "files": ["Template.xml"] }
}
tests/skills/cases/skd-compile/xsd-order-table-chart.json
+40
View File
@@ -0,0 +1,40 @@
{
"name": "Таблица и диаграмма с режимами доступности — viewMode до columns/pointsViewMode",
"params": { "outputPath": "Template.xml" },
"input": {
"dataSets": [{
"name": "Основной",
"query": "ВЫБРАТЬ Т.Организация, Т.Период, Т.Сумма ИЗ Регистр КАК Т",
"fields": ["Организация: CatalogRef.Организации", "Период: date", "Сумма: decimal(15,2)"]
}],
"settingsVariants": [{
"name": "Основной",
"settings": {
"selection": ["Сумма"],
"structure": [
{
"type": "table",
"name": "Таблица",
"rows": [{ "groupBy": ["Организация"] }],
"columns": [{ "groupBy": ["Период"] }],
"viewMode": "Normal",
"userSettingPresentation": "Таблица",
"columnsViewMode": "Normal",
"rowsViewMode": "QuickAccess"
},
{
"type": "chart",
"points": { "groupBy": ["Организация"] },
"series": { "groupBy": ["Период"] },
"selection": ["Сумма"],
"viewMode": "Normal",
"pointsViewMode": "Normal",
"seriesViewMode": "Inaccessible"
}
]
}
}]
},
"validatePath": "Template.xml",
"expect": { "files": ["Template.xml"] }
}
tests/skills/cases/skd-compile/xsd-values-bool-composite.json
+27
View File
@@ -0,0 +1,27 @@
{
"name": "Булевы значения из JSON и составной тип — true/false строчными, сначала типы, потом квалификаторы",
"params": { "outputPath": "Template.xml" },
"input": {
"dataSets": [{
"name": "Основной",
"query": "ВЫБРАТЬ 1 КАК Число",
"fields": [{ "dataPath": "Число", "field": "Число", "type": ["string(10)", "decimal(10,2)", "date", "CatalogRef.Организации", "DocumentRef"] }]
}],
"parameters": [
{ "name": "Выключен", "type": "boolean", "value": false },
{ "name": "Включен", "type": "boolean", "value": true },
{ "name": "БезТипа", "value": false },
{ "name": "Составной", "type": ["decimal(10,2)", "string(20)", "CatalogRef.Организации"] }
],
"settingsVariants": [{
"name": "Основной",
"settings": {
"selection": ["Число"],
"dataParameters": ["Выключен = false", "Включен = true"],
"structure": "details"
}
}]
},
"validatePath": "Template.xml",
"expect": { "files": ["Template.xml"] }
}
tests/skills/cases/skd-decompile/snapshots/calc-total-params/Template.xml
+6 -6
View File
@@ -58,6 +58,12 @@
<calculatedField>
<dataPath>Служебное</dataPath>
<expression>""</expression>
<useRestriction>
<field>true</field>
<condition>true</condition>
<group>true</group>
<order>true</order>
</useRestriction>
<valueType>
<v8:Type>xs:string</v8:Type>
<v8:StringQualifiers>
@@ -65,12 +71,6 @@
<v8:AllowedLength>Variable</v8:AllowedLength>
</v8:StringQualifiers>
</valueType>
<useRestriction>
<field>true</field>
<condition>true</condition>
<group>true</group>
<order>true</order>
</useRestriction>
</calculatedField>
<totalField>
<dataPath>Цена</dataPath>
tests/skills/cases/skd-decompile/snapshots/fields-types-and-restrictions/Template.xml
+1 -1
View File
@@ -140,10 +140,10 @@
<field xsi:type="DataSetFieldField">
<dataPath>СВыражениемПредставления</dataPath>
<field>СВыражениемПредставления</field>
<presentationExpression>Представление(СВыражениемПредставления)</presentationExpression>
<valueType>
<v8:Type xmlns:d5p1="http://v8.1c.ru/8.1/data/enterprise/current-config">d5p1:CatalogRef.Номенклатура</v8:Type>
</valueType>
<presentationExpression>Представление(СВыражениемПредставления)</presentationExpression>
</field>
<dataSource>ИсточникДанных1</dataSource>
<query>ВЫБРАТЬ * ИЗ Справочник.Номенклатура</query>
tests/skills/cases/skd-decompile/snapshots/variant-full/Template.xml
+15 -15
View File
@@ -307,6 +307,20 @@
</dcsset:item>
</dcsset:item>
</dcsset:filter>
<dcsset:dataParameters>
<dcscor:item xsi:type="dcsset:SettingsParameterValue">
<dcscor:parameter>Период</dcscor:parameter>
<dcscor:value xsi:type="v8:StandardPeriod">
<v8:variant xsi:type="v8:StandardPeriodVariant">LastMonth</v8:variant>
</dcscor:value>
<dcsset:userSettingID>UUID-002</dcsset:userSettingID>
</dcscor:item>
<dcscor:item xsi:type="dcsset:SettingsParameterValue">
<dcscor:parameter>Активные</dcscor:parameter>
<dcscor:value xsi:type="xs:boolean">true</dcscor:value>
<dcsset:userSettingID>UUID-003</dcsset:userSettingID>
</dcscor:item>
</dcsset:dataParameters>
<dcsset:order>
<dcsset:item xsi:type="dcsset:OrderItemField">
<dcsset:field>Сумма</dcsset:field>
@@ -332,7 +346,7 @@
</dcsset:appearance>
<dcsset:presentation xsi:type="xs:string">Большие суммы</dcsset:presentation>
<dcsset:viewMode>Normal</dcsset:viewMode>
<dcsset:userSettingID>UUID-002</dcsset:userSettingID>
<dcsset:userSettingID>UUID-004</dcsset:userSettingID>
</dcsset:item>
</dcsset:conditionalAppearance>
<dcsset:outputParameters>
@@ -346,20 +360,6 @@
</dcscor:value>
</dcscor:item>
</dcsset:outputParameters>
<dcsset:dataParameters>
<dcscor:item xsi:type="dcsset:SettingsParameterValue">
<dcscor:parameter>Период</dcscor:parameter>
<dcscor:value xsi:type="v8:StandardPeriod">
<v8:variant xsi:type="v8:StandardPeriodVariant">LastMonth</v8:variant>
</dcscor:value>
<dcsset:userSettingID>UUID-003</dcsset:userSettingID>
</dcscor:item>
<dcscor:item xsi:type="dcsset:SettingsParameterValue">
<dcscor:parameter>Активные</dcscor:parameter>
<dcscor:value xsi:type="xs:boolean">true</dcscor:value>
<dcsset:userSettingID>UUID-004</dcsset:userSettingID>
</dcscor:item>
</dcsset:dataParameters>
<dcsset:item xsi:type="dcsset:StructureItemGroup">
<dcsset:groupItems>
<dcsset:item xsi:type="dcsset:GroupItemField">
tests/skills/cases/skd-edit/snapshots/add-calculated-field-restrict/Template.xml
+1 -1
View File
@@ -38,8 +38,8 @@
<expression>""</expression>
<useRestriction>
<condition>true</condition>
<order>true</order>
<group>true</group>
<order>true</order>
</useRestriction>
<valueType>
<v8:Type>xs:string</v8:Type>
tests/skills/cases/skd-edit/snapshots/modify-structure-preserves-selection/Template.xml
+3 -3
View File
@@ -52,6 +52,9 @@
</v8:item>
</dcsset:presentation>
<dcsset:settings xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows">
<dcsset:selection>
<dcsset:item xsi:type="dcsset:SelectedItemAuto"/>
</dcsset:selection>
<dcsset:item xsi:type="dcsset:StructureItemGroup">
<dcsset:name>ДанныеОтчета</dcsset:name>
<dcsset:groupItems>
@@ -76,9 +79,6 @@
</dcsset:item>
</dcsset:selection>
</dcsset:item>
<dcsset:selection>
<dcsset:item xsi:type="dcsset:SelectedItemAuto"/>
</dcsset:selection>
</dcsset:settings>
</settingsVariant>
</DataCompositionSchema>
tests/skills/cases/skd-edit/snapshots/set-structure-multi-field/Template.xml
+3 -3
View File
@@ -51,6 +51,9 @@
</v8:item>
</dcsset:presentation>
<dcsset:settings xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows">
<dcsset:selection>
<dcsset:item xsi:type="dcsset:SelectedItemAuto"/>
</dcsset:selection>
<dcsset:item xsi:type="dcsset:StructureItemGroup">
<dcsset:name>ДанныеОтчета</dcsset:name>
<dcsset:groupItems>
@@ -83,9 +86,6 @@
<dcsset:item xsi:type="dcsset:SelectedItemAuto"/>
</dcsset:selection>
</dcsset:item>
<dcsset:selection>
<dcsset:item xsi:type="dcsset:SelectedItemAuto"/>
</dcsset:selection>
</dcsset:settings>
</settingsVariant>
</DataCompositionSchema>
tests/skills/cases/skd-edit/snapshots/set-structure-named/Template.xml
+3 -3
View File
@@ -65,6 +65,9 @@
</v8:item>
</dcsset:presentation>
<dcsset:settings xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows">
<dcsset:selection>
<dcsset:item xsi:type="dcsset:SelectedItemAuto"/>
</dcsset:selection>
<dcsset:item xsi:type="dcsset:StructureItemGroup">
<dcsset:name>ДанныеОтчета</dcsset:name>
<dcsset:groupItems>
@@ -104,9 +107,6 @@
</dcsset:item>
</dcsset:selection>
</dcsset:item>
<dcsset:selection>
<dcsset:item xsi:type="dcsset:SelectedItemAuto"/>
</dcsset:selection>
</dcsset:settings>
</settingsVariant>
</DataCompositionSchema>
tests/skills/cases/skd-edit/snapshots/xsd-order-add-conditionalAppearance/Template.xml
+95
View File
@@ -0,0 +1,95 @@
<?xml version="1.0" encoding="UTF-8"?>
<DataCompositionSchema xmlns="http://v8.1c.ru/8.1/data-composition-system/schema" xmlns:dcscom="http://v8.1c.ru/8.1/data-composition-system/common" xmlns:dcscor="http://v8.1c.ru/8.1/data-composition-system/core" xmlns:dcsset="http://v8.1c.ru/8.1/data-composition-system/settings" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<dataSource>
<name>ИсточникДанных1</name>
<dataSourceType>Local</dataSourceType>
</dataSource>
<dataSet xsi:type="DataSetQuery">
<name>Основной</name>
<field xsi:type="DataSetFieldField">
<dataPath>Вид</dataPath>
<field>Вид</field>
<valueType>
<v8:Type>xs:decimal</v8:Type>
<v8:NumberQualifiers>
<v8:Digits>1</v8:Digits>
<v8:FractionDigits>0</v8:FractionDigits>
<v8:AllowedSign>Any</v8:AllowedSign>
</v8:NumberQualifiers>
</valueType>
</field>
<field xsi:type="DataSetFieldField">
<dataPath>Сумма</dataPath>
<field>Сумма</field>
<valueType>
<v8:Type>xs:decimal</v8:Type>
<v8:NumberQualifiers>
<v8:Digits>15</v8:Digits>
<v8:FractionDigits>2</v8:FractionDigits>
<v8:AllowedSign>Any</v8:AllowedSign>
</v8:NumberQualifiers>
</valueType>
</field>
<dataSource>ИсточникДанных1</dataSource>
<query>ВЫБРАТЬ Т.Вид, Т.Сумма ИЗ Регистр КАК Т</query>
</dataSet>
<settingsVariant>
<dcsset:name>Основной</dcsset:name>
<dcsset:presentation xsi:type="v8:LocalStringType">
<v8:item>
<v8:lang>ru</v8:lang>
<v8:content>Основной</v8:content>
</v8:item>
</dcsset:presentation>
<dcsset:settings xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows">
<dcsset:selection>
<dcsset:item xsi:type="dcsset:SelectedItemField">
<dcsset:field>Сумма</dcsset:field>
</dcsset:item>
</dcsset:selection>
<dcsset:order>
<dcsset:item xsi:type="dcsset:OrderItemField">
<dcsset:field>Сумма</dcsset:field>
<dcsset:orderType>Desc</dcsset:orderType>
</dcsset:item>
</dcsset:order>
<dcsset:conditionalAppearance>
<dcsset:item>
<dcsset:selection/>
<dcsset:filter>
<dcsset:item xsi:type="dcsset:FilterItemComparison">
<dcsset:left xsi:type="dcscor:Field">Сумма</dcsset:left>
<dcsset:comparisonType>Less</dcsset:comparisonType>
<dcsset:right xsi:type="xs:decimal">0</dcsset:right>
</dcsset:item>
</dcsset:filter>
<dcsset:appearance>
<dcscor:item xsi:type="dcsset:SettingsParameterValue">
<dcscor:parameter>ЦветТекста</dcscor:parameter>
<dcscor:value xsi:type="v8ui:Color">web:Red</dcscor:value>
</dcscor:item>
</dcsset:appearance>
</dcsset:item>
</dcsset:conditionalAppearance>
<dcsset:outputParameters>
<dcscor:item xsi:type="dcsset:SettingsParameterValue">
<dcscor:parameter>Заголовок</dcscor:parameter>
<dcscor:value xsi:type="v8:LocalStringType">
<v8:item>
<v8:lang>ru</v8:lang>
<v8:content>Отчёт</v8:content>
</v8:item>
</dcscor:value>
</dcscor:item>
</dcsset:outputParameters>
<dcsset:item xsi:type="dcsset:StructureItemGroup">
<dcsset:order>
<dcsset:item xsi:type="dcsset:OrderItemAuto"/>
</dcsset:order>
<dcsset:selection>
<dcsset:item xsi:type="dcsset:SelectedItemAuto"/>
</dcsset:selection>
</dcsset:item>
</dcsset:settings>
</settingsVariant>
</DataCompositionSchema>
tests/skills/cases/skd-edit/snapshots/xsd-order-add-dataParameter/Template.xml
+123
View File
@@ -0,0 +1,123 @@
<?xml version="1.0" encoding="UTF-8"?>
<DataCompositionSchema xmlns="http://v8.1c.ru/8.1/data-composition-system/schema" xmlns:dcscom="http://v8.1c.ru/8.1/data-composition-system/common" xmlns:dcscor="http://v8.1c.ru/8.1/data-composition-system/core" xmlns:dcsset="http://v8.1c.ru/8.1/data-composition-system/settings" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<dataSource>
<name>ИсточникДанных1</name>
<dataSourceType>Local</dataSourceType>
</dataSource>
<dataSet xsi:type="DataSetQuery">
<name>Основной</name>
<field xsi:type="DataSetFieldField">
<dataPath>Вид</dataPath>
<field>Вид</field>
<valueType>
<v8:Type>xs:decimal</v8:Type>
<v8:NumberQualifiers>
<v8:Digits>1</v8:Digits>
<v8:FractionDigits>0</v8:FractionDigits>
<v8:AllowedSign>Any</v8:AllowedSign>
</v8:NumberQualifiers>
</valueType>
</field>
<field xsi:type="DataSetFieldField">
<dataPath>Сумма</dataPath>
<field>Сумма</field>
<valueType>
<v8:Type>xs:decimal</v8:Type>
<v8:NumberQualifiers>
<v8:Digits>15</v8:Digits>
<v8:FractionDigits>2</v8:FractionDigits>
<v8:AllowedSign>Any</v8:AllowedSign>
</v8:NumberQualifiers>
</valueType>
</field>
<dataSource>ИсточникДанных1</dataSource>
<query>ВЫБРАТЬ Т.Вид, Т.Сумма ИЗ Регистр КАК Т</query>
</dataSet>
<parameter>
<name>Период</name>
<valueType>
<v8:Type>v8:StandardPeriod</v8:Type>
</valueType>
<value xsi:type="v8:StandardPeriod">
<v8:variant xsi:type="v8:StandardPeriodVariant">LastMonth</v8:variant>
</value>
<useRestriction>false</useRestriction>
</parameter>
<settingsVariant>
<dcsset:name>Основной</dcsset:name>
<dcsset:presentation xsi:type="v8:LocalStringType">
<v8:item>
<v8:lang>ru</v8:lang>
<v8:content>Основной</v8:content>
</v8:item>
</dcsset:presentation>
<dcsset:settings xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows">
<dcsset:selection>
<dcsset:item xsi:type="dcsset:SelectedItemField">
<dcsset:field>Сумма</dcsset:field>
</dcsset:item>
</dcsset:selection>
<dcsset:filter>
<dcsset:item xsi:type="dcsset:FilterItemComparison">
<dcsset:left xsi:type="dcscor:Field">Сумма</dcsset:left>
<dcsset:comparisonType>Greater</dcsset:comparisonType>
<dcsset:right xsi:type="xs:decimal">0</dcsset:right>
</dcsset:item>
</dcsset:filter>
<dcsset:dataParameters>
<dcscor:item xsi:type="dcsset:SettingsParameterValue">
<dcscor:parameter>Период</dcscor:parameter>
<dcscor:value xsi:type="v8:StandardPeriod">
<v8:variant xsi:type="v8:StandardPeriodVariant">LastMonth</v8:variant>
<v8:startDate>0001-01-01T00:00:00</v8:startDate>
<v8:endDate>0001-01-01T00:00:00</v8:endDate>
</dcscor:value>
<dcsset:userSettingID>UUID-001</dcsset:userSettingID>
</dcscor:item>
</dcsset:dataParameters>
<dcsset:order>
<dcsset:item xsi:type="dcsset:OrderItemField">
<dcsset:field>Сумма</dcsset:field>
<dcsset:orderType>Desc</dcsset:orderType>
</dcsset:item>
</dcsset:order>
<dcsset:conditionalAppearance>
<dcsset:item>
<dcsset:selection/>
<dcsset:filter>
<dcsset:item xsi:type="dcsset:FilterItemComparison">
<dcsset:left xsi:type="dcscor:Field">Сумма</dcsset:left>
<dcsset:comparisonType>Less</dcsset:comparisonType>
<dcsset:right xsi:type="xs:decimal">0</dcsset:right>
</dcsset:item>
</dcsset:filter>
<dcsset:appearance>
<dcscor:item xsi:type="dcsset:SettingsParameterValue">
<dcscor:parameter>ЦветТекста</dcscor:parameter>
<dcscor:value xsi:type="v8ui:Color">web:Red</dcscor:value>
</dcscor:item>
</dcsset:appearance>
</dcsset:item>
</dcsset:conditionalAppearance>
<dcsset:outputParameters>
<dcscor:item xsi:type="dcsset:SettingsParameterValue">
<dcscor:parameter>Заголовок</dcscor:parameter>
<dcscor:value xsi:type="v8:LocalStringType">
<v8:item>
<v8:lang>ru</v8:lang>
<v8:content>Отчёт</v8:content>
</v8:item>
</dcscor:value>
</dcscor:item>
</dcsset:outputParameters>
<dcsset:item xsi:type="dcsset:StructureItemGroup">
<dcsset:order>
<dcsset:item xsi:type="dcsset:OrderItemAuto"/>
</dcsset:order>
<dcsset:selection>
<dcsset:item xsi:type="dcsset:SelectedItemAuto"/>
</dcsset:selection>
</dcsset:item>
</dcsset:settings>
</settingsVariant>
</DataCompositionSchema>
tests/skills/cases/skd-edit/snapshots/xsd-order-add-selection-first/Template.xml
+71
View File
@@ -0,0 +1,71 @@
<?xml version="1.0" encoding="UTF-8"?>
<DataCompositionSchema xmlns="http://v8.1c.ru/8.1/data-composition-system/schema" xmlns:dcscom="http://v8.1c.ru/8.1/data-composition-system/common" xmlns:dcscor="http://v8.1c.ru/8.1/data-composition-system/core" xmlns:dcsset="http://v8.1c.ru/8.1/data-composition-system/settings" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<dataSource>
<name>ИсточникДанных1</name>
<dataSourceType>Local</dataSourceType>
</dataSource>
<dataSet xsi:type="DataSetQuery">
<name>Основной</name>
<field xsi:type="DataSetFieldField">
<dataPath>Вид</dataPath>
<field>Вид</field>
<valueType>
<v8:Type>xs:decimal</v8:Type>
<v8:NumberQualifiers>
<v8:Digits>1</v8:Digits>
<v8:FractionDigits>0</v8:FractionDigits>
<v8:AllowedSign>Any</v8:AllowedSign>
</v8:NumberQualifiers>
</valueType>
</field>
<field xsi:type="DataSetFieldField">
<dataPath>Сумма</dataPath>
<field>Сумма</field>
<valueType>
<v8:Type>xs:decimal</v8:Type>
<v8:NumberQualifiers>
<v8:Digits>15</v8:Digits>
<v8:FractionDigits>2</v8:FractionDigits>
<v8:AllowedSign>Any</v8:AllowedSign>
</v8:NumberQualifiers>
</valueType>
</field>
<dataSource>ИсточникДанных1</dataSource>
<query>ВЫБРАТЬ Т.Вид, Т.Сумма ИЗ Регистр КАК Т</query>
</dataSet>
<settingsVariant>
<dcsset:name>Основной</dcsset:name>
<dcsset:presentation xsi:type="v8:LocalStringType">
<v8:item>
<v8:lang>ru</v8:lang>
<v8:content>Основной</v8:content>
</v8:item>
</dcsset:presentation>
<dcsset:settings xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows">
<dcsset:selection>
<dcsset:item xsi:type="dcsset:SelectedItemField">
<dcsset:field>Сумма</dcsset:field>
</dcsset:item>
</dcsset:selection>
<dcsset:outputParameters>
<dcscor:item xsi:type="dcsset:SettingsParameterValue">
<dcscor:parameter>Заголовок</dcscor:parameter>
<dcscor:value xsi:type="v8:LocalStringType">
<v8:item>
<v8:lang>ru</v8:lang>
<v8:content>Отчёт</v8:content>
</v8:item>
</dcscor:value>
</dcscor:item>
</dcsset:outputParameters>
<dcsset:item xsi:type="dcsset:StructureItemGroup">
<dcsset:order>
<dcsset:item xsi:type="dcsset:OrderItemAuto"/>
</dcsset:order>
<dcsset:selection>
<dcsset:item xsi:type="dcsset:SelectedItemAuto"/>
</dcsset:selection>
</dcsset:item>
</dcsset:settings>
</settingsVariant>
</DataCompositionSchema>
tests/skills/cases/skd-edit/snapshots/xsd-order-modify-field/Template.xml
+109
View File
@@ -0,0 +1,109 @@
<?xml version="1.0" encoding="UTF-8"?>
<DataCompositionSchema xmlns="http://v8.1c.ru/8.1/data-composition-system/schema" xmlns:dcscom="http://v8.1c.ru/8.1/data-composition-system/common" xmlns:dcscor="http://v8.1c.ru/8.1/data-composition-system/core" xmlns:dcsset="http://v8.1c.ru/8.1/data-composition-system/settings" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<dataSource>
<name>ИсточникДанных1</name>
<dataSourceType>Local</dataSourceType>
</dataSource>
<dataSet xsi:type="DataSetQuery">
<name>Основной</name>
<field xsi:type="DataSetFieldField">
<dataPath>Вид</dataPath>
<field>Вид</field>
<title xsi:type="v8:LocalStringType">
<v8:item>
<v8:lang>ru</v8:lang>
<v8:content>Вид операции</v8:content>
</v8:item>
</title>
<useRestriction>
<field>true</field>
<order>true</order>
</useRestriction>
<attributeUseRestriction>
<group>true</group>
</attributeUseRestriction>
<role>
<dcscom:dimension>true</dcscom:dimension>
</role>
<presentationExpression>ВЫБОР КОГДА Вид = 1 ТОГДА "Доход" ИНАЧЕ "Расход" КОНЕЦ</presentationExpression>
<orderExpression>
<dcscom:expression>Вид</dcscom:expression>
<dcscom:orderType>Desc</dcscom:orderType>
<dcscom:autoOrder>false</dcscom:autoOrder>
</orderExpression>
<valueType>
<v8:Type>xs:decimal</v8:Type>
<v8:NumberQualifiers>
<v8:Digits>2</v8:Digits>
<v8:FractionDigits>0</v8:FractionDigits>
<v8:AllowedSign>Any</v8:AllowedSign>
</v8:NumberQualifiers>
</valueType>
<appearance>
<dcscor:item xsi:type="dcsset:SettingsParameterValue">
<dcscor:parameter>Формат</dcscor:parameter>
<dcscor:value xsi:type="v8:LocalStringType">
<v8:item>
<v8:lang>ru</v8:lang>
<v8:content>ЧН=-</v8:content>
</v8:item>
</dcscor:value>
</dcscor:item>
</appearance>
<availableValue>
<value xsi:type="xs:decimal">1</value>
<presentation xsi:type="v8:LocalStringType">
<v8:item>
<v8:lang>ru</v8:lang>
<v8:content>Доход</v8:content>
</v8:item>
</presentation>
</availableValue>
<availableValue>
<value xsi:type="xs:decimal">2</value>
<presentation xsi:type="v8:LocalStringType">
<v8:item>
<v8:lang>ru</v8:lang>
<v8:content>Расход</v8:content>
</v8:item>
</presentation>
</availableValue>
</field>
<field xsi:type="DataSetFieldField">
<dataPath>Сумма</dataPath>
<field>Сумма</field>
<valueType>
<v8:Type>xs:decimal</v8:Type>
<v8:NumberQualifiers>
<v8:Digits>15</v8:Digits>
<v8:FractionDigits>2</v8:FractionDigits>
<v8:AllowedSign>Any</v8:AllowedSign>
</v8:NumberQualifiers>
</valueType>
</field>
<dataSource>ИсточникДанных1</dataSource>
<query>ВЫБРАТЬ Т.Вид, Т.Сумма ИЗ Регистр КАК Т</query>
</dataSet>
<settingsVariant>
<dcsset:name>Основной</dcsset:name>
<dcsset:presentation xsi:type="v8:LocalStringType">
<v8:item>
<v8:lang>ru</v8:lang>
<v8:content>Основной</v8:content>
</v8:item>
</dcsset:presentation>
<dcsset:settings xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows">
<dcsset:selection>
<dcsset:item xsi:type="dcsset:SelectedItemAuto"/>
</dcsset:selection>
<dcsset:item xsi:type="dcsset:StructureItemGroup">
<dcsset:order>
<dcsset:item xsi:type="dcsset:OrderItemAuto"/>
</dcsset:order>
<dcsset:selection>
<dcsset:item xsi:type="dcsset:SelectedItemAuto"/>
</dcsset:selection>
</dcsset:item>
</dcsset:settings>
</settingsVariant>
</DataCompositionSchema>
tests/skills/cases/skd-edit/snapshots/xsd-order-set-field-role/Template.xml
+105
View File
@@ -0,0 +1,105 @@
<?xml version="1.0" encoding="UTF-8"?>
<DataCompositionSchema xmlns="http://v8.1c.ru/8.1/data-composition-system/schema" xmlns:dcscom="http://v8.1c.ru/8.1/data-composition-system/common" xmlns:dcscor="http://v8.1c.ru/8.1/data-composition-system/core" xmlns:dcsset="http://v8.1c.ru/8.1/data-composition-system/settings" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<dataSource>
<name>ИсточникДанных1</name>
<dataSourceType>Local</dataSourceType>
</dataSource>
<dataSet xsi:type="DataSetQuery">
<name>Основной</name>
<field xsi:type="DataSetFieldField">
<dataPath>Вид</dataPath>
<field>Вид</field>
<title xsi:type="v8:LocalStringType">
<v8:item>
<v8:lang>ru</v8:lang>
<v8:content>Вид</v8:content>
</v8:item>
</title>
<attributeUseRestriction>
<group>true</group>
</attributeUseRestriction>
<role>
<dcscom:dimension>true</dcscom:dimension>
</role>
<presentationExpression>ВЫБОР КОГДА Вид = 1 ТОГДА "Доход" ИНАЧЕ "Расход" КОНЕЦ</presentationExpression>
<orderExpression>
<dcscom:expression>Вид</dcscom:expression>
<dcscom:orderType>Desc</dcscom:orderType>
<dcscom:autoOrder>false</dcscom:autoOrder>
</orderExpression>
<valueType>
<v8:Type>xs:decimal</v8:Type>
<v8:NumberQualifiers>
<v8:Digits>1</v8:Digits>
<v8:FractionDigits>0</v8:FractionDigits>
<v8:AllowedSign>Any</v8:AllowedSign>
</v8:NumberQualifiers>
</valueType>
<appearance>
<dcscor:item xsi:type="dcsset:SettingsParameterValue">
<dcscor:parameter>Формат</dcscor:parameter>
<dcscor:value xsi:type="v8:LocalStringType">
<v8:item>
<v8:lang>ru</v8:lang>
<v8:content>ЧН=-</v8:content>
</v8:item>
</dcscor:value>
</dcscor:item>
</appearance>
<availableValue>
<value xsi:type="xs:decimal">1</value>
<presentation xsi:type="v8:LocalStringType">
<v8:item>
<v8:lang>ru</v8:lang>
<v8:content>Доход</v8:content>
</v8:item>
</presentation>
</availableValue>
<availableValue>
<value xsi:type="xs:decimal">2</value>
<presentation xsi:type="v8:LocalStringType">
<v8:item>
<v8:lang>ru</v8:lang>
<v8:content>Расход</v8:content>
</v8:item>
</presentation>
</availableValue>
</field>
<field xsi:type="DataSetFieldField">
<dataPath>Сумма</dataPath>
<field>Сумма</field>
<valueType>
<v8:Type>xs:decimal</v8:Type>
<v8:NumberQualifiers>
<v8:Digits>15</v8:Digits>
<v8:FractionDigits>2</v8:FractionDigits>
<v8:AllowedSign>Any</v8:AllowedSign>
</v8:NumberQualifiers>
</valueType>
</field>
<dataSource>ИсточникДанных1</dataSource>
<query>ВЫБРАТЬ Т.Вид, Т.Сумма ИЗ Регистр КАК Т</query>
</dataSet>
<settingsVariant>
<dcsset:name>Основной</dcsset:name>
<dcsset:presentation xsi:type="v8:LocalStringType">
<v8:item>
<v8:lang>ru</v8:lang>
<v8:content>Основной</v8:content>
</v8:item>
</dcsset:presentation>
<dcsset:settings xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows">
<dcsset:selection>
<dcsset:item xsi:type="dcsset:SelectedItemAuto"/>
</dcsset:selection>
<dcsset:item xsi:type="dcsset:StructureItemGroup">
<dcsset:order>
<dcsset:item xsi:type="dcsset:OrderItemAuto"/>
</dcsset:order>
<dcsset:selection>
<dcsset:item xsi:type="dcsset:SelectedItemAuto"/>
</dcsset:selection>
</dcsset:item>
</dcsset:settings>
</settingsVariant>
</DataCompositionSchema>
tests/skills/cases/skd-edit/xsd-order-add-conditionalAppearance.json
+46
View File
@@ -0,0 +1,46 @@
{
"name": "add-conditionalAppearance при order и outputParameters — до outputParameters",
"preRun": [
{
"script": "skd-compile/scripts/skd-compile",
"input": {
"dataSets": [
{
"name": "Основной",
"query": "ВЫБРАТЬ Т.Вид, Т.Сумма ИЗ Регистр КАК Т",
"fields": [
"Вид: decimal(1)",
"Сумма: decimal(15,2)"
]
}
],
"settingsVariants": [
{
"name": "Основной",
"settings": {
"selection": [
"Сумма"
],
"order": [
"Сумма desc"
],
"outputParameters": {
"Заголовок": "Отчёт"
},
"structure": "details"
}
}
]
},
"args": {
"-DefinitionFile": "{inputFile}",
"-OutputPath": "{workDir}/Template.xml"
}
}
],
"params": {
"templatePath": "Template.xml",
"operation": "add-conditionalAppearance",
"value": "ЦветТекста = web:Red when Сумма < 0"
}
}
tests/skills/cases/skd-edit/xsd-order-add-dataParameter.json
+62
View File
@@ -0,0 +1,62 @@
{
"name": "add-dataParameter в заполненные настройки — сразу после filter, до order",
"preRun": [
{
"script": "skd-compile/scripts/skd-compile",
"input": {
"dataSets": [
{
"name": "Основной",
"query": "ВЫБРАТЬ Т.Вид, Т.Сумма ИЗ Регистр КАК Т",
"fields": [
"Вид: decimal(1)",
"Сумма: decimal(15,2)"
]
}
],
"parameters": [
"Период: StandardPeriod = LastMonth"
],
"settingsVariants": [
{
"name": "Основной",
"settings": {
"selection": [
"Сумма"
],
"filter": [
"Сумма > 0"
],
"order": [
"Сумма desc"
],
"conditionalAppearance": [
{
"filter": [
"Сумма < 0"
],
"appearance": {
"ЦветТекста": "web:Red"
}
}
],
"outputParameters": {
"Заголовок": "Отчёт"
},
"structure": "details"
}
}
]
},
"args": {
"-DefinitionFile": "{inputFile}",
"-OutputPath": "{workDir}/Template.xml"
}
}
],
"params": {
"templatePath": "Template.xml",
"operation": "add-dataParameter",
"value": "Период = LastMonth @user"
}
}
tests/skills/cases/skd-edit/xsd-order-add-selection-first.json
+40
View File
@@ -0,0 +1,40 @@
{
"name": "add-selection в вариант без selection — перед outputParameters и структурой, а не в конец",
"preRun": [
{
"script": "skd-compile/scripts/skd-compile",
"input": {
"dataSets": [
{
"name": "Основной",
"query": "ВЫБРАТЬ Т.Вид, Т.Сумма ИЗ Регистр КАК Т",
"fields": [
"Вид: decimal(1)",
"Сумма: decimal(15,2)"
]
}
],
"settingsVariants": [
{
"name": "Основной",
"settings": {
"outputParameters": {
"Заголовок": "Отчёт"
},
"structure": "details"
}
}
]
},
"args": {
"-DefinitionFile": "{inputFile}",
"-OutputPath": "{workDir}/Template.xml"
}
}
],
"params": {
"templatePath": "Template.xml",
"operation": "add-selection",
"value": "Сумма"
}
}
tests/skills/cases/skd-edit/xsd-order-modify-field.json
+56
View File
@@ -0,0 +1,56 @@
{
"name": "modify-field пересобирает поле — сохранённые части на своих местах по XSD",
"preRun": [
{
"script": "skd-compile/scripts/skd-compile",
"input": {
"dataSets": [
{
"name": "Основной",
"query": "ВЫБРАТЬ Т.Вид, Т.Сумма ИЗ Регистр КАК Т",
"fields": [
{
"dataPath": "Вид",
"field": "Вид",
"title": "Вид",
"type": "decimal(1)",
"attrRestrict": [
"noGroup"
],
"presentationExpression": "ВЫБОР КОГДА Вид = 1 ТОГДА \"Доход\" ИНАЧЕ \"Расход\" КОНЕЦ",
"orderExpression": {
"expression": "Вид",
"orderType": "Desc",
"autoOrder": false
},
"appearance": {
"Формат": "ЧН=-"
},
"availableValues": [
{
"value": 1,
"presentation": "Доход"
},
{
"value": 2,
"presentation": "Расход"
}
]
},
"Сумма: decimal(15,2)"
]
}
]
},
"args": {
"-DefinitionFile": "{inputFile}",
"-OutputPath": "{workDir}/Template.xml"
}
}
],
"params": {
"templatePath": "Template.xml",
"operation": "modify-field",
"value": "Вид [Вид операции]: decimal(2) @dimension #noOrder #noField"
}
}
tests/skills/cases/skd-edit/xsd-order-set-field-role.json
+56
View File
@@ -0,0 +1,56 @@
{
"name": "set-field-role на поле с presentationExpression и orderExpression — role перед ними",
"preRun": [
{
"script": "skd-compile/scripts/skd-compile",
"input": {
"dataSets": [
{
"name": "Основной",
"query": "ВЫБРАТЬ Т.Вид, Т.Сумма ИЗ Регистр КАК Т",
"fields": [
{
"dataPath": "Вид",
"field": "Вид",
"title": "Вид",
"type": "decimal(1)",
"attrRestrict": [
"noGroup"
],
"presentationExpression": "ВЫБОР КОГДА Вид = 1 ТОГДА \"Доход\" ИНАЧЕ \"Расход\" КОНЕЦ",
"orderExpression": {
"expression": "Вид",
"orderType": "Desc",
"autoOrder": false
},
"appearance": {
"Формат": "ЧН=-"
},
"availableValues": [
{
"value": 1,
"presentation": "Доход"
},
{
"value": 2,
"presentation": "Расход"
}
]
},
"Сумма: decimal(15,2)"
]
}
]
},
"args": {
"-DefinitionFile": "{inputFile}",
"-OutputPath": "{workDir}/Template.xml"
}
}
],
"params": {
"templatePath": "Template.xml",
"operation": "set-field-role",
"value": "Вид @dimension"
}
}