mirror of
https://github.com/Nikolay-Shirokov/cc-1c-skills.git
synced 2026-07-15 07:15:17 +03:00
Nick Shirokov
83b289de32
Fix-pack from skills-improvements-v4 feedback addressing 6 issues found during real-world ФСД report development. skd-compile (v1.10 → v1.11): - @autoDates: emit canonical БСП pattern for ДатаНачала/ДатаОкончания — with title, useRestriction=true, value 0001-01-01T00:00:00, expression. Removed availableAsField=false so БСП creates two separate Start/End fields in the quick settings panel (was rendering as a single picker). - StandardPeriod value: always emit v8:startDate/v8:endDate to match how 1C Designer saves the schema (avoids spurious diff on first re-save). - parameter shorthand: support [Title] syntax mirroring add-field. skd-edit (v1.9 → v1.10): - modify-filter / modify-dataParameter: preserve <use> when @off/@on not explicitly set (was silently stripping <use>false</use>). Tristate parser: None=don't touch, False=@off, True=@on. - modify-parameter: support [Title] for setting/replacing <title>. - rename-parameter: new operation "OldName => NewName" — atomically renames parameter, updates &Name references in expressions of other parameters (full identifier match only), and dcscor:parameter entries in dataParameters of all variants. Query text is not touched. - reorder-parameters: new operation "Name1, Name2, ..." — partial list, named params go first in given order, rest preserve original order. - StandardPeriod value: same v8:startDate/v8:endDate fix as compile. Tests: 4 new test cases (rename-parameter, reorder-parameters, modify-parameter-title, modify-dataParameter-preserves-use). 48/48 passing on both PowerShell and Python runtimes. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
175 lines
6.5 KiB
XML
175 lines
6.5 KiB
XML
<?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>НаборДанных1</name>
|
|
<field xsi:type="DataSetFieldField">
|
|
<dataPath>Номенклатура</dataPath>
|
|
<field>Номенклатура</field>
|
|
<role>
|
|
<dcscom:dimension>true</dcscom:dimension>
|
|
</role>
|
|
<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>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>
|
|
<totalField>
|
|
<dataPath>Количество</dataPath>
|
|
<expression>Сумма(Количество)</expression>
|
|
</totalField>
|
|
<totalField>
|
|
<dataPath>Сумма</dataPath>
|
|
<expression>Сумма(Сумма)</expression>
|
|
</totalField>
|
|
<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>
|
|
<v8:startDate>0001-01-01T00:00:00</v8:startDate>
|
|
<v8:endDate>0001-01-01T00:00:00</v8:endDate>
|
|
</value>
|
|
</parameter>
|
|
<parameter>
|
|
<name>ДатаНачала</name>
|
|
<title xsi:type="v8:LocalStringType">
|
|
<v8:item>
|
|
<v8:lang>ru</v8:lang>
|
|
<v8:content>Начало периода</v8:content>
|
|
</v8:item>
|
|
</title>
|
|
<valueType>
|
|
<v8:Type>xs:dateTime</v8:Type>
|
|
<v8:DateQualifiers>
|
|
<v8:DateFractions>Date</v8:DateFractions>
|
|
</v8:DateQualifiers>
|
|
</valueType>
|
|
<value xsi:type="xs:dateTime">0001-01-01T00:00:00</value>
|
|
<useRestriction>true</useRestriction>
|
|
<expression>&Период.ДатаНачала</expression>
|
|
</parameter>
|
|
<parameter>
|
|
<name>ДатаОкончания</name>
|
|
<title xsi:type="v8:LocalStringType">
|
|
<v8:item>
|
|
<v8:lang>ru</v8:lang>
|
|
<v8:content>Конец периода</v8:content>
|
|
</v8:item>
|
|
</title>
|
|
<valueType>
|
|
<v8:Type>xs:dateTime</v8:Type>
|
|
<v8:DateQualifiers>
|
|
<v8:DateFractions>Date</v8:DateFractions>
|
|
</v8:DateQualifiers>
|
|
</valueType>
|
|
<value xsi:type="xs:dateTime">0001-01-01T00:00:00</value>
|
|
<useRestriction>true</useRestriction>
|
|
<expression>&Период.ДатаОкончания</expression>
|
|
</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:item xsi:type="dcsset:SelectedItemField">
|
|
<dcsset:field>Сумма</dcsset:field>
|
|
</dcsset:item>
|
|
</dcsset:selection>
|
|
<dcsset:filter>
|
|
<dcsset:item xsi:type="dcsset:FilterItemComparison">
|
|
<dcsset:use>false</dcsset:use>
|
|
<dcsset:left xsi:type="dcscor:Field">Организация</dcsset:left>
|
|
<dcsset:comparisonType>Equal</dcsset:comparisonType>
|
|
<dcsset:userSettingID>UUID-001</dcsset:userSettingID>
|
|
</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-002</dcsset:userSettingID>
|
|
</dcscor:item>
|
|
</dcsset:dataParameters>
|
|
<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: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: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>
|