diff --git a/.claude/skills/cfe-borrow/scripts/cfe-borrow.ps1 b/.claude/skills/cfe-borrow/scripts/cfe-borrow.ps1 index e9d6136cb..a30f0ead9 100644 --- a/.claude/skills/cfe-borrow/scripts/cfe-borrow.ps1 +++ b/.claude/skills/cfe-borrow/scripts/cfe-borrow.ps1 @@ -1,4 +1,4 @@ -# cfe-borrow v1.41 — Borrow objects from configuration into extension (CFE) +# cfe-borrow v1.42 — Borrow objects from configuration into extension (CFE) # Source: https://github.com/Nikolay-Shirokov/cc-1c-skills [CmdletBinding(PositionalBinding=$false)] param( @@ -1059,6 +1059,11 @@ function Borrow-Form { $srcMainInfo = Get-MainAttributeInfo $srcFormEl $nsStripPattern $srcMainAttrName = if ($srcMainInfo) { $srcMainInfo.Name } else { "" } $formAttrIds = Get-FormAttributeIds $srcFormEl + # Условное оформление формы Конфигуратор копирует как есть в обе части, внутрь + # после реквизитов — и без основного реквизита тоже; ссылки на незаимствованные реквизиты формы + # платформа принимает (эталоны УТ StdPic, StdPic_WithMain, CAStyle, УНФ Номенклатура) + $srcCondAppearance = $srcFormEl.SelectSingleNode("*[local-name()='Attributes']/*[local-name()='ConditionalAppearance']") + $srcCondAppearanceXml = if ($srcCondAppearance) { [regex]::Replace($srcCondAppearance.OuterXml, $nsStripPattern, '') } else { "" } $mainAttrInfo = if ($BorrowMainAttr) { $srcMainInfo } else { $null } $mainAttrName = if ($mainAttrInfo) { $mainAttrInfo.Name } else { "" } if ($BorrowMainAttr -and -not $mainAttrInfo) { @@ -1191,13 +1196,17 @@ function Borrow-Form { } } - # Auto-borrow StyleItems referenced in ChildItems + # Auto-borrow StyleItems referenced in ChildItems and in the form's conditional appearance + # (стиль только из оформления Конфигуратор тоже заимствует — эталон УТ CAStyle) # Pattern 1: , # Pattern 2: style:XXX, style:XXX, etc. - $referencedStyles = @{} - $styleRefs1 = [regex]::Matches($childItemsXml, 'ref="style:(\w+)"[^>]*kind="StyleItem"') + # Порядок первого упоминания — как в Python-порте (от него зависит порядок в ChildObjects) + $styleScanXml = $childItemsXml + $srcCondAppearanceXml + $referencedStyles = [ordered]@{} + $styleRefs1 = [regex]::Matches($styleScanXml, 'ref="style:(\w+)"[^>]*kind="StyleItem"') foreach ($m in $styleRefs1) { $referencedStyles[$m.Groups[1].Value] = $true } - $styleRefs2 = [regex]::Matches($childItemsXml, '>style:(\w+)') + # Закрывающий тег может быть с префиксом: в оформлении значение — style:X + $styleRefs2 = [regex]::Matches($styleScanXml, '>style:(\w+)') foreach ($m in $styleRefs2) { $referencedStyles[$m.Groups[1].Value] = $true } foreach ($styleName in $referencedStyles.Keys) { @@ -1333,10 +1342,12 @@ function Borrow-Form { $formXmlSb.Append("`t$childItemsXml") | Out-Null $formXmlSb.Append("`r`n") | Out-Null } - # Attributes: empty or with MainAttribute when BorrowMainAttr - if ($BorrowMainAttr -and $mainAttrInfo) { + # Attributes: основной реквизит (с -BorrowMainAttribute) и условное оформление формы — после него + $withMainAttr = $BorrowMainAttr -and $mainAttrInfo + if ($withMainAttr -or $srcCondAppearanceXml) { $formXmlSb.Append("`t`r`n") | Out-Null - $formXmlSb.Append("`t`t$($mainAttrInfo.Xml)`r`n") | Out-Null + if ($withMainAttr) { $formXmlSb.Append("`t`t$($mainAttrInfo.Xml)`r`n") | Out-Null } + if ($srcCondAppearanceXml) { $formXmlSb.Append("`t`t$srcCondAppearanceXml`r`n") | Out-Null } $formXmlSb.Append("`t") | Out-Null } else { $formXmlSb.Append("`t") | Out-Null @@ -1359,10 +1370,11 @@ function Borrow-Form { } # BaseForm Attributes: same as main section - if ($BorrowMainAttr -and $mainAttrInfo) { + if ($withMainAttr -or $srcCondAppearanceXml) { $formXmlSb.Append("`t`t`r`n") | Out-Null # В BaseForm та же секция на уровень глубже — сдвиг тот же, что у ChildItems - $formXmlSb.Append((Get-BaseFormIndented $mainAttrInfo.Xml "`t`t`t") + "`r`n") | Out-Null + if ($withMainAttr) { $formXmlSb.Append((Get-BaseFormIndented $mainAttrInfo.Xml "`t`t`t") + "`r`n") | Out-Null } + if ($srcCondAppearanceXml) { $formXmlSb.Append((Get-BaseFormIndented $srcCondAppearanceXml "`t`t`t") + "`r`n") | Out-Null } $formXmlSb.Append("`t`t") | Out-Null } else { $formXmlSb.Append("`t`t") | Out-Null diff --git a/.claude/skills/cfe-borrow/scripts/cfe-borrow.py b/.claude/skills/cfe-borrow/scripts/cfe-borrow.py index c8d505dd4..09d8d1722 100644 --- a/.claude/skills/cfe-borrow/scripts/cfe-borrow.py +++ b/.claude/skills/cfe-borrow/scripts/cfe-borrow.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# cfe-borrow v1.41 — Borrow objects from configuration into extension (CFE) +# cfe-borrow v1.42 — Borrow objects from configuration into extension (CFE) # Source: https://github.com/Nikolay-Shirokov/cc-1c-skills import argparse @@ -2078,6 +2078,18 @@ def main(): src_main_info = get_main_attribute_info(src_form_el, ns_strip_pattern) src_main_attr_name = src_main_info["Name"] if src_main_info else "" form_attr_ids = get_form_attribute_ids(src_form_el) + # Условное оформление формы Конфигуратор копирует как есть в обе части, внутрь + # после реквизитов — и без основного реквизита тоже; ссылки на незаимствованные реквизиты формы + # платформа принимает (эталоны УТ StdPic, StdPic_WithMain, CAStyle, УНФ Номенклатура) + src_cond_appearance_xml = "" + for attrs_el in src_form_el: + if isinstance(attrs_el.tag, str) and localname(attrs_el) == "Attributes": + for ca_el in attrs_el: + if isinstance(ca_el.tag, str) and localname(ca_el) == "ConditionalAppearance": + src_cond_appearance_xml = ns_strip_pattern.sub("", decode_numeric_entities( + etree.tostring(ca_el, encoding="unicode", with_tail=False))) + break + break # Основной реквизит исходной формы: его имя — корень путей к данным, которые нужно сохранить # («Объект.» у формы объекта, «Список.» у формы списка, «Запись.» у формы записи регистра) @@ -2201,12 +2213,16 @@ def main(): if cp_name not in borrowed_pic_set: auto_cmd_xml = auto_cmd_xml[:pm.start()] + auto_cmd_xml[pm.end():] - # Auto-borrow StyleItems referenced in ChildItems - referenced_styles = set() - for m in re.finditer(r'ref="style:(\w+)"[^>]*kind="StyleItem"', child_items_xml): - referenced_styles.add(m.group(1)) - for m in re.finditer(r'>style:(\w+)', child_items_xml): - referenced_styles.add(m.group(1)) + # Auto-borrow StyleItems referenced in ChildItems and in the form's conditional appearance + # (стиль только из оформления Конфигуратор тоже заимствует — эталон УТ CAStyle). + # Порядок первого упоминания — как в PS-порте (от него зависит порядок в ChildObjects) + style_scan_xml = child_items_xml + src_cond_appearance_xml + referenced_styles = {} + for m in re.finditer(r'ref="style:(\w+)"[^>]*kind="StyleItem"', style_scan_xml): + referenced_styles[m.group(1)] = True + # Закрывающий тег может быть с префиксом: в оформлении значение — style:X + for m in re.finditer(r'>style:(\w+)', style_scan_xml): + referenced_styles[m.group(1)] = True for style_name in referenced_styles: if not test_object_borrowed("StyleItem", style_name): @@ -2325,10 +2341,14 @@ def main(): if child_items_xml: parts.append(f"\t{child_items_xml}\r\n") - # Attributes: empty or with MainAttribute when borrow_main_attr - if borrow_main_attr and main_attr_info: + # Attributes: основной реквизит (с -BorrowMainAttribute) и условное оформление формы — после него + with_main_attr = bool(borrow_main_attr and main_attr_info) + if with_main_attr or src_cond_appearance_xml: parts.append("\t\r\n") - parts.append(f"\t\t{main_attr_info['Xml']}\r\n") + if with_main_attr: + parts.append(f"\t\t{main_attr_info['Xml']}\r\n") + if src_cond_appearance_xml: + parts.append(f"\t\t{src_cond_appearance_xml}\r\n") parts.append("\t") else: parts.append("\t") @@ -2346,10 +2366,13 @@ def main(): parts.append(indent_for_base_form(child_items_xml, "\t\t") + "\r\n") # BaseForm Attributes: same as main section - if borrow_main_attr and main_attr_info: + if with_main_attr or src_cond_appearance_xml: parts.append("\t\t\r\n") # В BaseForm та же секция на уровень глубже — сдвиг тот же, что у ChildItems - parts.append(indent_for_base_form(main_attr_info['Xml'], "\t\t\t") + "\r\n") + if with_main_attr: + parts.append(indent_for_base_form(main_attr_info['Xml'], "\t\t\t") + "\r\n") + if src_cond_appearance_xml: + parts.append(indent_for_base_form(src_cond_appearance_xml, "\t\t\t") + "\r\n") parts.append("\t\t") else: parts.append("\t\t") diff --git a/docs/1c-extension-spec.md b/docs/1c-extension-spec.md index 04bf76eca..30a336a84 100644 --- a/docs/1c-extension-spec.md +++ b/docs/1c-extension-spec.md @@ -457,6 +457,8 @@ Form.xml заимствованной формы — **двухчастный ф 3. **Attributes** — по умолчанию пустой `` в обеих секциях. Атрибуты базовой конфигурации **не включаются**. Реквизиты расширения (id ≥ 1000000) добавляются только в Part 1. + **Условное оформление формы** (`` внутри ``) копируется из исходной формы как есть в обе секции, после реквизитов; без основного реквизита — единственным ребёнком ``. Ссылки оформления на незаимствованные реквизиты формы остаются — платформа их принимает. Элементы стиля, на которые ссылается оформление (`style:X`), заимствуются, даже если больше нигде в форме не упомянуты (эталоны Конфигуратора УТ 8.3.27 и УНФ 8.5). + **Вариант с заимствованным основным реквизитом**: если реквизиты объекта заимствованы (см. раздел 5.3), секция `` содержит основной реквизит формы: ```xml diff --git a/tests/skills/cases/cfe-borrow/form-conditional-appearance-main.json b/tests/skills/cases/cfe-borrow/form-conditional-appearance-main.json new file mode 100644 index 000000000..e0733dd91 --- /dev/null +++ b/tests/skills/cases/cfe-borrow/form-conditional-appearance-main.json @@ -0,0 +1,123 @@ +{ + "name": "Условное оформление формы с основным реквизитом: после реквизита в обеих частях", + "preRun": [ + { + "script": "meta-compile/scripts/meta-compile", + "input": { + "type": "Catalog", + "name": "Товары", + "attributes": [ + "Остаток: Number(15,3)" + ] + }, + "args": { + "-JsonPath": "{inputFile}", + "-OutputDir": "{workDir}" + } + }, + { + "writeFile": { + "path": "StyleItems/ПоясняющийТекст.xml", + "content": "\n\n\t\n\t\t\n\t\t\tПоясняющийТекст\n\t\t\t\n\t\t\t\t\n\t\t\t\t\tru\n\t\t\t\t\tПоясняющий текст\n\t\t\t\t\n\t\t\t\n\t\t\tОформление справочного текста в форме\n\t\t\tColor\n\t\t\t#807A59\n\t\t\n\t\n" + } + }, + { + "script": "cf-edit/scripts/cf-edit", + "args": { + "-ConfigPath": "{workDir}", + "-Operation": "add-childObject", + "-Value": "StyleItem.ПоясняющийТекст" + } + }, + { + "script": "form-add/scripts/form-add", + "args": { + "-ObjectPath": "{workDir}/Catalogs/Товары.xml", + "-FormName": "ФормаЭлемента" + } + }, + { + "script": "form-compile/scripts/form-compile", + "input": { + "title": "Товар", + "elements": [ + { + "input": "Остаток", + "path": "Объект.Остаток" + }, + { + "check": "Режим", + "path": "Режим" + } + ], + "attributes": [ + { + "name": "Объект", + "type": "CatalogObject.Товары", + "main": true + }, + { + "name": "Режим", + "type": "boolean" + } + ], + "conditionalAppearance": [ + { + "selection": [ + "Остаток" + ], + "filter": [ + "Режим = true" + ], + "appearance": { + "ЦветТекста": "style:ПоясняющийТекст" + } + }, + { + "selection": [ + "Остаток" + ], + "filter": [ + "Объект.Остаток < 0" + ], + "appearance": { + "ЦветТекста": "web:Red" + } + } + ] + }, + "args": { + "-JsonPath": "{inputFile}", + "-OutputPath": "{workDir}/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form.xml" + } + }, + { + "script": "cfe-init/scripts/cfe-init", + "args": { + "-Name": "Тест", + "-OutputDir": "{workDir}/cfe", + "-ConfigPath": "{workDir}" + } + } + ], + "params": { + "extensionPath": "cfe", + "object": "Catalog.Товары.Form.ФормаЭлемента" + }, + "expect": { + "files": [ + "cfe/StyleItems/ПоясняющийТекст.xml" + ], + "fileContains": { + "file": "cfe/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form.xml", + "text": [ + "", + "style:ПоясняющийТекст" + ] + } + }, + "args_extra": [ + "-BorrowMainAttribute", + "Form" + ] +} diff --git a/tests/skills/cases/cfe-borrow/form-conditional-appearance.json b/tests/skills/cases/cfe-borrow/form-conditional-appearance.json new file mode 100644 index 000000000..5c4b236b6 --- /dev/null +++ b/tests/skills/cases/cfe-borrow/form-conditional-appearance.json @@ -0,0 +1,124 @@ +{ + "name": "Условное оформление формы переносится в обе части, стиль из оформления заимствуется", + "preRun": [ + { + "script": "meta-compile/scripts/meta-compile", + "input": { + "type": "Catalog", + "name": "Товары", + "attributes": [ + "Остаток: Number(15,3)" + ] + }, + "args": { + "-JsonPath": "{inputFile}", + "-OutputDir": "{workDir}" + } + }, + { + "writeFile": { + "path": "StyleItems/ПоясняющийТекст.xml", + "content": "\n\n\t\n\t\t\n\t\t\tПоясняющийТекст\n\t\t\t\n\t\t\t\t\n\t\t\t\t\tru\n\t\t\t\t\tПоясняющий текст\n\t\t\t\t\n\t\t\t\n\t\t\tОформление справочного текста в форме\n\t\t\tColor\n\t\t\t#807A59\n\t\t\n\t\n" + } + }, + { + "script": "cf-edit/scripts/cf-edit", + "args": { + "-ConfigPath": "{workDir}", + "-Operation": "add-childObject", + "-Value": "StyleItem.ПоясняющийТекст" + } + }, + { + "script": "form-add/scripts/form-add", + "args": { + "-ObjectPath": "{workDir}/Catalogs/Товары.xml", + "-FormName": "ФормаЭлемента" + } + }, + { + "script": "form-compile/scripts/form-compile", + "input": { + "title": "Товар", + "elements": [ + { + "input": "Остаток", + "path": "Объект.Остаток" + }, + { + "check": "Режим", + "path": "Режим" + } + ], + "attributes": [ + { + "name": "Объект", + "type": "CatalogObject.Товары", + "main": true + }, + { + "name": "Режим", + "type": "boolean" + } + ], + "conditionalAppearance": [ + { + "selection": [ + "Остаток" + ], + "filter": [ + "Режим = true" + ], + "appearance": { + "ЦветТекста": "style:ПоясняющийТекст" + } + }, + { + "selection": [ + "Остаток" + ], + "filter": [ + "Объект.Остаток < 0" + ], + "appearance": { + "ЦветТекста": "web:Red" + } + } + ] + }, + "args": { + "-JsonPath": "{inputFile}", + "-OutputPath": "{workDir}/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form.xml" + } + }, + { + "script": "cfe-init/scripts/cfe-init", + "args": { + "-Name": "Тест", + "-OutputDir": "{workDir}/cfe", + "-ConfigPath": "{workDir}" + } + } + ], + "params": { + "extensionPath": "cfe", + "object": "Catalog.Товары.Form.ФормаЭлемента" + }, + "expect": { + "files": [ + "cfe/StyleItems/ПоясняющийТекст.xml" + ], + "fileContains": { + "file": "cfe/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form.xml", + "text": [ + "", + "style:ПоясняющийТекст", + "Объект.Остаток" + ] + }, + "fileNotContains": { + "file": "cfe/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form.xml", + "text": "" + } + } +} diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/Catalogs/Товары.xml b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/Catalogs/Товары.xml new file mode 100644 index 000000000..b9fe3022d --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/Catalogs/Товары.xml @@ -0,0 +1,138 @@ + + + + + + UUID-002 + UUID-003 + + + UUID-004 + UUID-005 + + + UUID-006 + UUID-007 + + + UUID-008 + UUID-009 + + + UUID-010 + UUID-011 + + + + Товары + + + ru + Товары + + + + false + HierarchyFoldersAndItems + false + 2 + true + true + + ToItems + 9 + 25 + String + Variable + WholeCatalog + false + true + AsDescription + + Auto + InDialog + false + BothWays + + Catalog.Товары.StandardAttribute.Description + Catalog.Товары.StandardAttribute.Code + + Begin + DontUse + Directly + Catalog.Товары.Form.ФормаЭлемента + + + + + + + + + + false + + + Managed + Use + + + + + + Use + Auto + DontUse + false + false + + + + + Остаток + + + ru + Остаток + + + + + xs:decimal + + 15 + 3 + Any + + + false + + + + false + + false + false + + + false + 0 + DontCheck + Items + + + Auto + Auto + + + Auto + ForItem + DontIndex + Use + Use + + +
ФормаЭлемента
+
+
+
\ No newline at end of file diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/Catalogs/Товары/Ext/ObjectModule.bsl b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/Catalogs/Товары/Ext/ObjectModule.bsl new file mode 100644 index 000000000..e69de29bb diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/Catalogs/Товары/Forms/ФормаЭлемента.xml b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/Catalogs/Товары/Forms/ФормаЭлемента.xml new file mode 100644 index 000000000..e64cb98b6 --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/Catalogs/Товары/Forms/ФормаЭлемента.xml @@ -0,0 +1,21 @@ + + +
+ + ФормаЭлемента + + + ru + ФормаЭлемента + + + + Managed + false + + PlatformApplication + MobilePlatformApplication + + +
+
\ No newline at end of file diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form.xml b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form.xml new file mode 100644 index 000000000..346d0806b --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form.xml @@ -0,0 +1,87 @@ + +
+ + <v8:item> + <v8:lang>ru</v8:lang> + <v8:content>Товар</v8:content> + </v8:item> + + false + + + + Объект.Остаток + + + + + Режим + Auto + Right + + + + + + + + cfg:CatalogObject.Товары + + true + true + + + + <v8:item> + <v8:lang>ru</v8:lang> + <v8:content>Режим</v8:content> + </v8:item> + + + xs:boolean + + + + + + + Остаток + + + + + Режим + Equal + true + + + + + ЦветТекста + style:ПоясняющийТекст + + + + + + + Остаток + + + + + Объект.Остаток + Less + 0 + + + + + ЦветТекста + web:Red + + + + + + \ No newline at end of file diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form/Module.bsl b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form/Module.bsl new file mode 100644 index 000000000..8ead4cec0 --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form/Module.bsl @@ -0,0 +1,19 @@ +#Область ОбработчикиСобытийФормы + +#КонецОбласти + +#Область ОбработчикиСобытийЭлементовФормы + +#КонецОбласти + +#Область ОбработчикиКомандФормы + +#КонецОбласти + +#Область ОбработчикиОповещений + +#КонецОбласти + +#Область СлужебныеПроцедурыИФункции + +#КонецОбласти \ No newline at end of file diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/Configuration.xml b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/Configuration.xml new file mode 100644 index 000000000..ece38c858 --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/Configuration.xml @@ -0,0 +1,253 @@ + + + + + + UUID-002 + UUID-003 + + + UUID-004 + UUID-005 + + + UUID-006 + UUID-007 + + + UUID-008 + UUID-009 + + + UUID-010 + UUID-011 + + + UUID-012 + UUID-013 + + + UUID-014 + UUID-015 + + + + TestConfig + + + ru + TestConfig + + + + + Version8_3_24 + ManagedApplication + + PlatformApplication + + Russian + + + + + false + false + false + + + + + + + + + + + + + + + + + + + + + + Biometrics + true + + + Location + false + + + BackgroundLocation + false + + + BluetoothPrinters + false + + + WiFiPrinters + false + + + Contacts + false + + + Calendars + false + + + PushNotifications + false + + + LocalNotifications + false + + + InAppPurchases + false + + + PersonalComputerFileExchange + false + + + Ads + false + + + NumberDialing + false + + + CallProcessing + false + + + CallLog + false + + + AutoSendSMS + false + + + ReceiveSMS + false + + + SMSLog + false + + + Camera + false + + + Microphone + false + + + MusicLibrary + false + + + PictureAndVideoLibraries + false + + + AudioPlaybackAndVibration + false + + + BackgroundAudioPlaybackAndVibration + false + + + InstallPackages + false + + + OSBackup + true + + + ApplicationUsageStatistics + false + + + BarcodeScanning + false + + + BackgroundAudioRecording + false + + + AllFilesAccess + false + + + Videoconferences + false + + + NFC + false + + + DocumentScanning + false + + + SpeechToText + false + + + Geofences + false + + + IncomingShareRequests + false + + + AllIncomingShareRequestsTypesProcessing + false + + + + + + Normal + + + Language.Русский + + + + + + Managed + NotAutoFree + DontUse + DontUse + TaxiEnableVersion8_2 + DontUse + Version8_3_24 + + + + Русский + ПоясняющийТекст + Товары + + + \ No newline at end of file diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/Ext/ClientApplicationInterface.xml b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/Ext/ClientApplicationInterface.xml new file mode 100644 index 000000000..3c1161b2d --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/Ext/ClientApplicationInterface.xml @@ -0,0 +1,18 @@ + + + + + UUID-002 + + + + + UUID-004 + + + + + + + + \ No newline at end of file diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/Languages/Русский.xml b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/Languages/Русский.xml new file mode 100644 index 000000000..37c60d786 --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/Languages/Русский.xml @@ -0,0 +1,16 @@ + + + + + Русский + + + ru + Русский + + + + ru + + + \ No newline at end of file diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/StyleItems/ПоясняющийТекст.xml b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/StyleItems/ПоясняющийТекст.xml new file mode 100644 index 000000000..057d316f3 --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/StyleItems/ПоясняющийТекст.xml @@ -0,0 +1,17 @@ + + + + + ПоясняющийТекст + + + ru + Поясняющий текст + + + Оформление справочного текста в форме + Color + #807A59 + + + \ No newline at end of file diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/cfe/Catalogs/Товары.xml b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/cfe/Catalogs/Товары.xml new file mode 100644 index 000000000..2f2e93caa --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/cfe/Catalogs/Товары.xml @@ -0,0 +1,52 @@ + + + + + + UUID-002 + UUID-003 + + + UUID-004 + UUID-005 + + + UUID-006 + UUID-007 + + + UUID-008 + UUID-009 + + + UUID-010 + UUID-011 + + + + Adopted + Товары + + UUID-012 + false + 9 + 25 + String + Variable + + +
ФормаЭлемента
+ + + + + Adopted + Остаток + + UUID-014 + xs:decimal153Any + + +
+
+
\ No newline at end of file diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/cfe/Catalogs/Товары/Forms/ФормаЭлемента.xml b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/cfe/Catalogs/Товары/Forms/ФормаЭлемента.xml new file mode 100644 index 000000000..4e3c364d6 --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/cfe/Catalogs/Товары/Forms/ФормаЭлемента.xml @@ -0,0 +1,13 @@ + + +
+ + + Adopted + ФормаЭлемента + + UUID-002 + Managed + + +
\ No newline at end of file diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/cfe/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form.xml b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/cfe/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form.xml new file mode 100644 index 000000000..01f60403a --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/cfe/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form.xml @@ -0,0 +1,149 @@ + +
+ + <v8:item> + <v8:lang>ru</v8:lang> + <v8:content>Товар</v8:content> + </v8:item> + + false + + + + Объект.Остаток + + + + + Auto + Right + + + + + + + + cfg:CatalogObject.Товары + + true + true + + + + + + Остаток + + + + + Режим + Equal + true + + + + + ЦветТекста + style:ПоясняющийТекст + + + + + + + Остаток + + + + + Объект.Остаток + Less + 0 + + + + + ЦветТекста + web:Red + + + + + + + + <v8:item> + <v8:lang>ru</v8:lang> + <v8:content>Товар</v8:content> + </v8:item> + + false + + + + Объект.Остаток + + + + + Auto + Right + + + + + + + + cfg:CatalogObject.Товары + + true + true + + + + + + Остаток + + + + + Режим + Equal + true + + + + + ЦветТекста + style:ПоясняющийТекст + + + + + + + Остаток + + + + + Объект.Остаток + Less + 0 + + + + + ЦветТекста + web:Red + + + + + + + \ No newline at end of file diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/cfe/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form/Module.bsl b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/cfe/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form/Module.bsl new file mode 100644 index 000000000..e69de29bb diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/cfe/Configuration.xml b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/cfe/Configuration.xml new file mode 100644 index 000000000..c30891943 --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/cfe/Configuration.xml @@ -0,0 +1,73 @@ + + + + + + UUID-002 + UUID-003 + + + UUID-004 + UUID-005 + + + UUID-006 + UUID-007 + + + UUID-008 + UUID-009 + + + UUID-010 + UUID-011 + + + UUID-012 + UUID-013 + + + UUID-014 + UUID-015 + + + + Adopted + Тест + + + ru + Тест + + + + Customization + true + Тест_ + Version8_3_24 + ManagedApplication + + PlatformApplication + + Russian + + Role.Тест_ОсновнаяРоль + + + + Language.Русский + + + + + + TaxiEnableVersion8_2 + + + Русский + ПоясняющийТекст + Тест_ОсновнаяРоль + Товары + + + \ No newline at end of file diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/cfe/Languages/Русский.xml b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/cfe/Languages/Русский.xml new file mode 100644 index 000000000..c21624f52 --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/cfe/Languages/Русский.xml @@ -0,0 +1,13 @@ + + + + + + Adopted + Русский + + UUID-002 + ru + + + \ No newline at end of file diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/cfe/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/cfe/Roles/Тест_ОсновнаяРоль.xml new file mode 100644 index 000000000..ec9dfbaf6 --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/cfe/Roles/Тест_ОсновнаяРоль.xml @@ -0,0 +1,10 @@ + + + + + Тест_ОсновнаяРоль + + + + + \ No newline at end of file diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/cfe/StyleItems/ПоясняющийТекст.xml b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/cfe/StyleItems/ПоясняющийТекст.xml new file mode 100644 index 000000000..d3111798f --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance-main/cfe/StyleItems/ПоясняющийТекст.xml @@ -0,0 +1,12 @@ + + + + + + Adopted + ПоясняющийТекст + + UUID-002 + + + \ No newline at end of file diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/Catalogs/Товары.xml b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/Catalogs/Товары.xml new file mode 100644 index 000000000..b9fe3022d --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/Catalogs/Товары.xml @@ -0,0 +1,138 @@ + + + + + + UUID-002 + UUID-003 + + + UUID-004 + UUID-005 + + + UUID-006 + UUID-007 + + + UUID-008 + UUID-009 + + + UUID-010 + UUID-011 + + + + Товары + + + ru + Товары + + + + false + HierarchyFoldersAndItems + false + 2 + true + true + + ToItems + 9 + 25 + String + Variable + WholeCatalog + false + true + AsDescription + + Auto + InDialog + false + BothWays + + Catalog.Товары.StandardAttribute.Description + Catalog.Товары.StandardAttribute.Code + + Begin + DontUse + Directly + Catalog.Товары.Form.ФормаЭлемента + + + + + + + + + + false + + + Managed + Use + + + + + + Use + Auto + DontUse + false + false + + + + + Остаток + + + ru + Остаток + + + + + xs:decimal + + 15 + 3 + Any + + + false + + + + false + + false + false + + + false + 0 + DontCheck + Items + + + Auto + Auto + + + Auto + ForItem + DontIndex + Use + Use + + +
ФормаЭлемента
+
+
+
\ No newline at end of file diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/Catalogs/Товары/Ext/ObjectModule.bsl b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/Catalogs/Товары/Ext/ObjectModule.bsl new file mode 100644 index 000000000..e69de29bb diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/Catalogs/Товары/Forms/ФормаЭлемента.xml b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/Catalogs/Товары/Forms/ФормаЭлемента.xml new file mode 100644 index 000000000..e64cb98b6 --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/Catalogs/Товары/Forms/ФормаЭлемента.xml @@ -0,0 +1,21 @@ + + +
+ + ФормаЭлемента + + + ru + ФормаЭлемента + + + + Managed + false + + PlatformApplication + MobilePlatformApplication + + +
+
\ No newline at end of file diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form.xml b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form.xml new file mode 100644 index 000000000..346d0806b --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form.xml @@ -0,0 +1,87 @@ + +
+ + <v8:item> + <v8:lang>ru</v8:lang> + <v8:content>Товар</v8:content> + </v8:item> + + false + + + + Объект.Остаток + + + + + Режим + Auto + Right + + + + + + + + cfg:CatalogObject.Товары + + true + true + + + + <v8:item> + <v8:lang>ru</v8:lang> + <v8:content>Режим</v8:content> + </v8:item> + + + xs:boolean + + + + + + + Остаток + + + + + Режим + Equal + true + + + + + ЦветТекста + style:ПоясняющийТекст + + + + + + + Остаток + + + + + Объект.Остаток + Less + 0 + + + + + ЦветТекста + web:Red + + + + + + \ No newline at end of file diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form/Module.bsl b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form/Module.bsl new file mode 100644 index 000000000..8ead4cec0 --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form/Module.bsl @@ -0,0 +1,19 @@ +#Область ОбработчикиСобытийФормы + +#КонецОбласти + +#Область ОбработчикиСобытийЭлементовФормы + +#КонецОбласти + +#Область ОбработчикиКомандФормы + +#КонецОбласти + +#Область ОбработчикиОповещений + +#КонецОбласти + +#Область СлужебныеПроцедурыИФункции + +#КонецОбласти \ No newline at end of file diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/Configuration.xml b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/Configuration.xml new file mode 100644 index 000000000..ece38c858 --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/Configuration.xml @@ -0,0 +1,253 @@ + + + + + + UUID-002 + UUID-003 + + + UUID-004 + UUID-005 + + + UUID-006 + UUID-007 + + + UUID-008 + UUID-009 + + + UUID-010 + UUID-011 + + + UUID-012 + UUID-013 + + + UUID-014 + UUID-015 + + + + TestConfig + + + ru + TestConfig + + + + + Version8_3_24 + ManagedApplication + + PlatformApplication + + Russian + + + + + false + false + false + + + + + + + + + + + + + + + + + + + + + + Biometrics + true + + + Location + false + + + BackgroundLocation + false + + + BluetoothPrinters + false + + + WiFiPrinters + false + + + Contacts + false + + + Calendars + false + + + PushNotifications + false + + + LocalNotifications + false + + + InAppPurchases + false + + + PersonalComputerFileExchange + false + + + Ads + false + + + NumberDialing + false + + + CallProcessing + false + + + CallLog + false + + + AutoSendSMS + false + + + ReceiveSMS + false + + + SMSLog + false + + + Camera + false + + + Microphone + false + + + MusicLibrary + false + + + PictureAndVideoLibraries + false + + + AudioPlaybackAndVibration + false + + + BackgroundAudioPlaybackAndVibration + false + + + InstallPackages + false + + + OSBackup + true + + + ApplicationUsageStatistics + false + + + BarcodeScanning + false + + + BackgroundAudioRecording + false + + + AllFilesAccess + false + + + Videoconferences + false + + + NFC + false + + + DocumentScanning + false + + + SpeechToText + false + + + Geofences + false + + + IncomingShareRequests + false + + + AllIncomingShareRequestsTypesProcessing + false + + + + + + Normal + + + Language.Русский + + + + + + Managed + NotAutoFree + DontUse + DontUse + TaxiEnableVersion8_2 + DontUse + Version8_3_24 + + + + Русский + ПоясняющийТекст + Товары + + + \ No newline at end of file diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/Ext/ClientApplicationInterface.xml b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/Ext/ClientApplicationInterface.xml new file mode 100644 index 000000000..3c1161b2d --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/Ext/ClientApplicationInterface.xml @@ -0,0 +1,18 @@ + + + + + UUID-002 + + + + + UUID-004 + + + + + + + + \ No newline at end of file diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/Languages/Русский.xml b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/Languages/Русский.xml new file mode 100644 index 000000000..37c60d786 --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/Languages/Русский.xml @@ -0,0 +1,16 @@ + + + + + Русский + + + ru + Русский + + + + ru + + + \ No newline at end of file diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/StyleItems/ПоясняющийТекст.xml b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/StyleItems/ПоясняющийТекст.xml new file mode 100644 index 000000000..057d316f3 --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/StyleItems/ПоясняющийТекст.xml @@ -0,0 +1,17 @@ + + + + + ПоясняющийТекст + + + ru + Поясняющий текст + + + Оформление справочного текста в форме + Color + #807A59 + + + \ No newline at end of file diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/cfe/Catalogs/Товары.xml b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/cfe/Catalogs/Товары.xml new file mode 100644 index 000000000..af6775aae --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/cfe/Catalogs/Товары.xml @@ -0,0 +1,36 @@ + + + + + + UUID-002 + UUID-003 + + + UUID-004 + UUID-005 + + + UUID-006 + UUID-007 + + + UUID-008 + UUID-009 + + + UUID-010 + UUID-011 + + + + Adopted + Товары + + UUID-012 + + +
ФормаЭлемента
+
+
+
\ No newline at end of file diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/cfe/Catalogs/Товары/Forms/ФормаЭлемента.xml b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/cfe/Catalogs/Товары/Forms/ФормаЭлемента.xml new file mode 100644 index 000000000..4e3c364d6 --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/cfe/Catalogs/Товары/Forms/ФормаЭлемента.xml @@ -0,0 +1,13 @@ + + +
+ + + Adopted + ФормаЭлемента + + UUID-002 + Managed + + +
\ No newline at end of file diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/cfe/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form.xml b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/cfe/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form.xml new file mode 100644 index 000000000..a6848a90e --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/cfe/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form.xml @@ -0,0 +1,133 @@ + +
+ + <v8:item> + <v8:lang>ru</v8:lang> + <v8:content>Товар</v8:content> + </v8:item> + + false + + + + + + + + Auto + Right + + + + + + + + + + Остаток + + + + + Режим + Equal + true + + + + + ЦветТекста + style:ПоясняющийТекст + + + + + + + Остаток + + + + + Объект.Остаток + Less + 0 + + + + + ЦветТекста + web:Red + + + + + + + + <v8:item> + <v8:lang>ru</v8:lang> + <v8:content>Товар</v8:content> + </v8:item> + + false + + + + + + + + Auto + Right + + + + + + + + + + Остаток + + + + + Режим + Equal + true + + + + + ЦветТекста + style:ПоясняющийТекст + + + + + + + Остаток + + + + + Объект.Остаток + Less + 0 + + + + + ЦветТекста + web:Red + + + + + + + \ No newline at end of file diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/cfe/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form/Module.bsl b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/cfe/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form/Module.bsl new file mode 100644 index 000000000..e69de29bb diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/cfe/Configuration.xml b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/cfe/Configuration.xml new file mode 100644 index 000000000..c30891943 --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/cfe/Configuration.xml @@ -0,0 +1,73 @@ + + + + + + UUID-002 + UUID-003 + + + UUID-004 + UUID-005 + + + UUID-006 + UUID-007 + + + UUID-008 + UUID-009 + + + UUID-010 + UUID-011 + + + UUID-012 + UUID-013 + + + UUID-014 + UUID-015 + + + + Adopted + Тест + + + ru + Тест + + + + Customization + true + Тест_ + Version8_3_24 + ManagedApplication + + PlatformApplication + + Russian + + Role.Тест_ОсновнаяРоль + + + + Language.Русский + + + + + + TaxiEnableVersion8_2 + + + Русский + ПоясняющийТекст + Тест_ОсновнаяРоль + Товары + + + \ No newline at end of file diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/cfe/Languages/Русский.xml b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/cfe/Languages/Русский.xml new file mode 100644 index 000000000..c21624f52 --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/cfe/Languages/Русский.xml @@ -0,0 +1,13 @@ + + + + + + Adopted + Русский + + UUID-002 + ru + + + \ No newline at end of file diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/cfe/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/cfe/Roles/Тест_ОсновнаяРоль.xml new file mode 100644 index 000000000..ec9dfbaf6 --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/cfe/Roles/Тест_ОсновнаяРоль.xml @@ -0,0 +1,10 @@ + + + + + Тест_ОсновнаяРоль + + + + + \ No newline at end of file diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/cfe/StyleItems/ПоясняющийТекст.xml b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/cfe/StyleItems/ПоясняющийТекст.xml new file mode 100644 index 000000000..d3111798f --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-conditional-appearance/cfe/StyleItems/ПоясняющийТекст.xml @@ -0,0 +1,12 @@ + + + + + + Adopted + ПоясняющийТекст + + UUID-002 + + + \ No newline at end of file