From 8677770eea2ec227c979595b5492d0cba02dc637 Mon Sep 17 00:00:00 2001 From: Nick Shirokov Date: Sun, 27 Sep 2026 14:33:59 +0300 Subject: [PATCH] =?UTF-8?q?fix(cfe-borrow):=20=D0=BC=D0=BD=D0=BE=D0=B3?= =?UTF-8?q?=D0=BE=D1=81=D1=82=D1=80=D0=BE=D1=87=D0=BD=D1=8B=D0=B9=20=D1=82?= =?UTF-8?q?=D0=B5=D0=BA=D1=81=D1=82=20=D0=B2=20BaseForm=20=D0=BA=D0=BE?= =?UTF-8?q?=D0=BF=D0=B8=D1=80=D1=83=D0=B5=D1=82=D1=81=D1=8F=20=D0=B1=D0=B5?= =?UTF-8?q?=D0=B7=20=D1=81=D0=B4=D0=B2=D0=B8=D0=B3=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BaseForm собирался построчным сдвигом: таб дописывался к каждой строке, в том числе к строкам продолжения многострочного текста (, текст запроса динамического списка). Снимок получал «Адрес передачи↵⇥товара» при «Адрес передачи↵товара» в форме — форма расходилась со своей BaseForm, и Конфигуратор показывал такие значения изменёнными в расширении. Теперь таб добавляется только в межтеговые пробельные промежутки; пробельное значение элемента (↵) не трогается. Сдвиг один для всех четырёх блоков BaseForm — заодно многострочные свойства формы (CommandSet, Title) получают отступ как у Конфигуратора, раньше сдвигалась только первая строка. Оба порта, v1.40. Сверка с Конфигуратором (УНФ 8.5, Номенклатура.ФормаЭлемента): до правки все 41 многострочный текст BaseForm расходились с эталоном, после — совпадают; всё до совпадает с эталоном байт в байт. Эталоны кейсов: 13 — только межтеговые отступы, form-main-attr-list-query — текст запроса в BaseForm больше без лишних табов. Новый кейс form-multiline-text. Проблема, замеры и первое решение — PR #105. Co-Authored-By: Sergei Pleshanov <2357qwr@gmail.com> Co-Authored-By: Claude Opus 5.5 (1M context) --- .../skills/cfe-borrow/scripts/cfe-borrow.ps1 | 50 ++-- .../skills/cfe-borrow/scripts/cfe-borrow.py | 48 ++-- docs/1c-extension-spec.md | 2 +- .../cases/cfe-borrow/form-multiline-text.json | 47 ++++ .../Товары/Forms/ФормаЭлемента/Ext/Form.xml | 10 +- .../Forms/ФормаДокумента/Ext/Form.xml | 10 +- .../Forms/ФормаДокумента/Ext/Form.xml | 10 +- .../Forms/ФормаДокумента/Ext/Form.xml | 10 +- .../Forms/ФормаДокумента/Ext/Form.xml | 10 +- .../Forms/ФормаДокумента/Ext/Form.xml | 10 +- .../Forms/ФормаДокумента/Ext/Form.xml | 10 +- .../Расход/Forms/ФормаДокумента/Ext/Form.xml | 18 +- .../Расход/Forms/ФормаДокумента/Ext/Form.xml | 18 +- .../Расход/Forms/ФормаДокумента/Ext/Form.xml | 18 +- .../Forms/ФормаДокумента/Ext/Form.xml | 10 +- .../Forms/ФормаСпискаЗапрос/Ext/Form.xml | 20 +- .../form-multiline-text/Configuration.xml | 252 ++++++++++++++++++ .../Documents/Доставка.xml | 84 ++++++ .../Documents/Доставка/Ext/ObjectModule.bsl | 0 .../Доставка/Forms/ФормаДокумента.xml | 21 ++ .../Forms/ФормаДокумента/Ext/Form.xml | 44 +++ .../Forms/ФормаДокумента/Ext/Form/Module.bsl | 19 ++ .../Ext/ClientApplicationInterface.xml | 18 ++ .../form-multiline-text/Languages/Русский.xml | 16 ++ .../form-multiline-text/cfe/Configuration.xml | 72 +++++ .../cfe/Documents/Доставка.xml | 36 +++ .../Доставка/Forms/ФормаДокумента.xml | 13 + .../Forms/ФормаДокумента/Ext/Form.xml | 71 +++++ .../Forms/ФормаДокумента/Ext/Form/Module.bsl | 0 .../cfe/Languages/Русский.xml | 13 + .../cfe/Roles/Тест_ОсновнаяРоль.xml | 10 + .../Расход/Forms/ФормаДокумента/Ext/Form.xml | 18 +- .../Расход/Forms/ФормаДокумента/Ext/Form.xml | 18 +- 33 files changed, 866 insertions(+), 140 deletions(-) create mode 100644 tests/skills/cases/cfe-borrow/form-multiline-text.json create mode 100644 tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/Configuration.xml create mode 100644 tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/Documents/Доставка.xml create mode 100644 tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/Documents/Доставка/Ext/ObjectModule.bsl create mode 100644 tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/Documents/Доставка/Forms/ФормаДокумента.xml create mode 100644 tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/Documents/Доставка/Forms/ФормаДокумента/Ext/Form.xml create mode 100644 tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/Documents/Доставка/Forms/ФормаДокумента/Ext/Form/Module.bsl create mode 100644 tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/Ext/ClientApplicationInterface.xml create mode 100644 tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/Languages/Русский.xml create mode 100644 tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/cfe/Configuration.xml create mode 100644 tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/cfe/Documents/Доставка.xml create mode 100644 tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/cfe/Documents/Доставка/Forms/ФормаДокумента.xml create mode 100644 tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/cfe/Documents/Доставка/Forms/ФормаДокумента/Ext/Form.xml create mode 100644 tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/cfe/Documents/Доставка/Forms/ФормаДокумента/Ext/Form/Module.bsl create mode 100644 tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/cfe/Languages/Русский.xml create mode 100644 tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/.claude/skills/cfe-borrow/scripts/cfe-borrow.ps1 b/.claude/skills/cfe-borrow/scripts/cfe-borrow.ps1 index e9ed0270c..87031e947 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.39 — Borrow objects from configuration into extension (CFE) +# cfe-borrow v1.40 — Borrow objects from configuration into extension (CFE) # Source: https://github.com/Nikolay-Shirokov/cc-1c-skills [CmdletBinding(PositionalBinding=$false)] param( @@ -60,6 +60,26 @@ function Strip-FormBindings { return $xml } +# Сдвиг блока на уровень вглубь для ; $firstIndent — отступ первой строки. +# Таб добавляется только в пробельные промежутки между тегами: строки продолжения многострочного +# текста (, текст запроса) — часть значения. Со сдвигом снимок расходился с формой, +# и Конфигуратор показывал такой текст изменённым в расширении. Пробельный промежуток между +# открывающим и закрывающим тегом одного элемента — тоже значение, его не сдвигаем. +function Get-BaseFormIndented { + param([string]$xml, [string]$firstIndent) + $parts = [regex]::Split($xml, '(<(?:[^>"'']|"[^"]*"|''[^'']*'')*>)') + for ($i = 0; $i -lt $parts.Count; $i += 2) { + $seg = $parts[$i] + if (-not $seg.Contains("`n") -or $seg.Trim()) { continue } + $prevTag = if ($i -gt 0) { $parts[$i - 1] } else { '' } + $nextTag = if ($i + 1 -lt $parts.Count) { $parts[$i + 1] } else { '' } + $m = [regex]::Match($prevTag, '^<([\w:.-]+)[^>]*(?$') + if ($m.Success -and $nextTag -ceq "") { continue } + $parts[$i] = $seg.Replace("`n", "`n`t") + } + return $firstIndent + ($parts -join '') +} + # Ссылки параметров выбора (/) — привязка особого рода: путь лежит # в и обычным стриппингом не снимается. Текстовое имя в расширении разрешается только # если его корень объявлен в самой заимствованной формы; иначе платформа отвергает @@ -1210,42 +1230,26 @@ function Borrow-Form { } $formXmlSb.Append("`r`n") | Out-Null - # BaseForm: same content, indented one more level + # BaseForm: same content, indented one more level (многострочный текст не сдвигается) $formXmlSb.Append("`t") | Out-Null $formXmlSb.Append("`r`n") | Out-Null foreach ($propXml in $formProps) { $propXml = [regex]::Replace($propXml, $nsStripPattern, '') - $formXmlSb.Append("`t`t$propXml`r`n") | Out-Null + $formXmlSb.Append((Get-BaseFormIndented $propXml "`t`t") + "`r`n") | Out-Null } if ($autoCmdXml) { - $acLines = $autoCmdXml -split "`r?`n" - for ($li = 0; $li -lt $acLines.Count; $li++) { - if ($li -eq 0) { $formXmlSb.Append("`t`t$($acLines[$li])") | Out-Null } - else { $formXmlSb.Append("`t$($acLines[$li])") | Out-Null } - $formXmlSb.Append("`r`n") | Out-Null - } + $formXmlSb.Append((Get-BaseFormIndented $autoCmdXml "`t`t") + "`r`n") | Out-Null } if ($childItemsXml) { - # Reindent ChildItems for BaseForm (+1 tab level) - $ciLines = $childItemsXml -split "`r?`n" - for ($li = 0; $li -lt $ciLines.Count; $li++) { - if ($li -eq 0) { $formXmlSb.Append("`t`t$($ciLines[$li])") | Out-Null } - else { $formXmlSb.Append("`t$($ciLines[$li])") | Out-Null } - $formXmlSb.Append("`r`n") | Out-Null - } + $formXmlSb.Append((Get-BaseFormIndented $childItemsXml "`t`t") + "`r`n") | Out-Null } # BaseForm Attributes: same as main section if ($BorrowMainAttr -and $mainAttrInfo) { $formXmlSb.Append("`t`t`r`n") | Out-Null - # В BaseForm та же секция на уровень глубже — приём переиндентации тот же, что у ChildItems - $maLines = $mainAttrInfo.Xml -split "`r?`n" - for ($li = 0; $li -lt $maLines.Count; $li++) { - if ($li -eq 0) { $formXmlSb.Append("`t`t`t$($maLines[$li])") | Out-Null } - else { $formXmlSb.Append("`t$($maLines[$li])") | Out-Null } - $formXmlSb.Append("`r`n") | Out-Null - } + # В BaseForm та же секция на уровень глубже — сдвиг тот же, что у ChildItems + $formXmlSb.Append((Get-BaseFormIndented $mainAttrInfo.Xml "`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 9a05aaafd..230b74700 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.39 — Borrow objects from configuration into extension (CFE) +# cfe-borrow v1.40 — Borrow objects from configuration into extension (CFE) # Source: https://github.com/Nikolay-Shirokov/cc-1c-skills import argparse @@ -77,6 +77,26 @@ def strip_form_bindings(xml, main_attr_name): return xml +def indent_for_base_form(xml, first_indent): + """Сдвиг блока на уровень вглубь для ; first_indent — отступ первой строки. + Таб добавляется только в пробельные промежутки между тегами: строки продолжения многострочного + текста (, текст запроса) — часть значения. Со сдвигом снимок расходился с формой, + и Конфигуратор показывал такой текст изменённым в расширении. Пробельный промежуток между + открывающим и закрывающим тегом одного элемента — тоже значение, его не сдвигаем.""" + parts = re.split(r'''(<(?:[^>"']|"[^"]*"|'[^']*')*>)''', xml) + for i in range(0, len(parts), 2): + seg = parts[i] + if '\n' not in seg or seg.strip(): + continue + prev_tag = parts[i - 1] if i > 0 else '' + next_tag = parts[i + 1] if i + 1 < len(parts) else '' + m = re.match(r'<([\w:.-]+)[^>]*(?$', prev_tag) + if m and next_tag == f'': + continue + parts[i] = seg.replace('\n', '\n\t') + return first_indent + ''.join(parts) + + DROPPED_LINKS = [] @@ -2149,36 +2169,22 @@ def main(): parts.append("\t") parts.append("\r\n") - # BaseForm: same content, indented one more level + # BaseForm: same content, indented one more level (многострочный текст не сдвигается) parts.append(f'\t\r\n') for prop_xml in form_props: prop_xml_clean = ns_strip_pattern.sub("", prop_xml) - parts.append(f"\t\t{prop_xml_clean}\r\n") + parts.append(indent_for_base_form(prop_xml_clean, "\t\t") + "\r\n") if auto_cmd_xml: - ac_lines = auto_cmd_xml.split("\n") - for li, line in enumerate(ac_lines): - if li == 0: - parts.append(f"\t\t{line}") - else: - parts.append(f"\t{line}") - parts.append("\r\n") + parts.append(indent_for_base_form(auto_cmd_xml, "\t\t") + "\r\n") if child_items_xml: - ci_lines = child_items_xml.split("\n") - for li, line in enumerate(ci_lines): - if li == 0: - parts.append(f"\t\t{line}") - else: - parts.append(f"\t{line}") - parts.append("\r\n") + 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: parts.append("\t\t\r\n") - # В BaseForm та же секция на уровень глубже — приём переиндентации тот же, что у ChildItems - for li, line in enumerate(main_attr_info['Xml'].split('\n')): - parts.append(f"\t\t\t{line}" if li == 0 else f"\t{line}") - parts.append("\r\n") + # В BaseForm та же секция на уровень глубже — сдвиг тот же, что у ChildItems + parts.append(indent_for_base_form(main_attr_info['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 7d8c9662a..e76756663 100644 --- a/docs/1c-extension-spec.md +++ b/docs/1c-extension-spec.md @@ -469,7 +469,7 @@ Form.xml заимствованной формы — **двухчастный ф ``` Присутствует в обеих секциях (Part 1 и BaseForm). Тип зависит от родительского объекта: `CatalogObject`, `DocumentObject` и т.д. -4. **BaseForm** — последний элемент в `
`, атрибут `version`. В BaseForm **нет** Events, Commands, Parameters. +4. **BaseForm** — последний элемент в ``, атрибут `version`. В BaseForm **нет** Events, Commands, Parameters. Содержимое на уровень глубже, но сдвигаются только межтеговые отступы: многострочный текст (``, текст запроса) копируется как есть, строки продолжения без добавочного таба. Иначе значение в снимке расходится с формой, и Конфигуратор показывает его изменённым в расширении (эталон Конфигуратора: 41 многострочный текст, в форме и BaseForm байт в байт). 5. **DataPath** — два варианта в зависимости от наличия заимствованного основного реквизита: - **Без основного реквизита**: все `` удаляются в обеих секциях (ссылаются на реквизиты, не включённые в расширение). diff --git a/tests/skills/cases/cfe-borrow/form-multiline-text.json b/tests/skills/cases/cfe-borrow/form-multiline-text.json new file mode 100644 index 000000000..df2cecf23 --- /dev/null +++ b/tests/skills/cases/cfe-borrow/form-multiline-text.json @@ -0,0 +1,47 @@ +{ + "name": "Заимствование формы: многострочный текст в BaseForm не получает лишний таб — снимок совпадает с формой и источником", + "preRun": [ + { + "script": "meta-compile/scripts/meta-compile", + "input": { "type": "Document", "name": "Доставка" }, + "args": { "-JsonPath": "{inputFile}", "-OutputDir": "{workDir}" } + }, + { + "script": "form-add/scripts/form-add", + "args": { "-ObjectPath": "{workDir}/Documents/Доставка.xml", "-FormName": "ФормаДокумента" } + }, + { + "script": "form-compile/scripts/form-compile", + "input": { + "title": "Доставка", + "elements": [ + { "label": "АдресПередачи", "title": "Адрес передачи\nтовара" }, + { "label": "Пояснение", "title": "Режим используется при позднем получении документов.\n" } + ], + "attributes": [ { "name": "Объект", "type": "DocumentObject.Доставка", "main": true } ] + }, + "args": { "-JsonPath": "{inputFile}", "-OutputPath": "{workDir}/Documents/Доставка/Forms/ФормаДокумента/Ext/Form.xml" } + }, + { + "script": "cfe-init/scripts/cfe-init", + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } + } + ], + "params": { "extensionPath": "cfe", "object": "Document.Доставка.Form.ФормаДокумента" }, + "expect": { + "fileContains": { + "file": "cfe/Documents/Доставка/Forms/ФормаДокумента/Ext/Form.xml", + "text": [ + "Адрес передачи\r\nтовара", + "документов.\r\n" + ] + }, + "fileNotContains": { + "file": "cfe/Documents/Доставка/Forms/ФормаДокумента/Ext/Form.xml", + "text": [ + "\tтовара", + "документов.\r\n\t" + ] + } + } +} diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-bindings/cfe/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form.xml b/tests/skills/cases/cfe-borrow/snapshots/form-bindings/cfe/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form.xml index cc8a43913..80369c0b6 100644 --- a/tests/skills/cases/cfe-borrow/snapshots/form-bindings/cfe/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form.xml +++ b/tests/skills/cases/cfe-borrow/snapshots/form-bindings/cfe/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form.xml @@ -40,11 +40,11 @@ - <v8:item> - <v8:lang>ru</v8:lang> - <v8:content>Тест</v8:content> - </v8:item> - + + ru + Тест + + false diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-dangling/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-dangling/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml index 9edb08fb9..cd0d498d9 100644 --- a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-dangling/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml +++ b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-dangling/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml @@ -17,11 +17,11 @@ - <v8:item> - <v8:lang>ru</v8:lang> - <v8:content>Размещение</v8:content> - </v8:item> - + + ru + Размещение + + false diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr-main/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr-main/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml index 46faaaef5..442844e00 100644 --- a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr-main/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml +++ b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr-main/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml @@ -33,11 +33,11 @@ - <v8:item> - <v8:lang>ru</v8:lang> - <v8:content>Размещение</v8:content> - </v8:item> - + + ru + Размещение + + false diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml index f5459f420..cfb1abcb5 100644 --- a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml +++ b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml @@ -24,11 +24,11 @@ - <v8:item> - <v8:lang>ru</v8:lang> - <v8:content>Размещение</v8:content> - </v8:item> - + + ru + Размещение + + false diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-items/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-items/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml index 0808972b0..6d3de837a 100644 --- a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-items/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml +++ b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-items/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml @@ -52,11 +52,11 @@ - <v8:item> - <v8:lang>ru</v8:lang> - <v8:content>Размещение</v8:content> - </v8:item> - + + ru + Размещение + + false diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-standard-field/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-standard-field/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml index d5e7cb81e..16b9f3bbe 100644 --- a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-standard-field/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml +++ b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-standard-field/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml @@ -33,11 +33,11 @@ - <v8:item> - <v8:lang>ru</v8:lang> - <v8:content>Размещение</v8:content> - </v8:item> - + + ru + Размещение + + false diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-param-links/cfe/Documents/ЗаказПоставщику/Forms/ФормаДокумента/Ext/Form.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-param-links/cfe/Documents/ЗаказПоставщику/Forms/ФормаДокумента/Ext/Form.xml index 038802bf4..ac9375519 100644 --- a/tests/skills/cases/cfe-borrow/snapshots/form-choice-param-links/cfe/Documents/ЗаказПоставщику/Forms/ФормаДокумента/Ext/Form.xml +++ b/tests/skills/cases/cfe-borrow/snapshots/form-choice-param-links/cfe/Documents/ЗаказПоставщику/Forms/ФормаДокумента/Ext/Form.xml @@ -28,11 +28,11 @@ - <v8:item> - <v8:lang>ru</v8:lang> - <v8:content>Заказ поставщику</v8:content> - </v8:item> - + + ru + Заказ поставщику + + false diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-item-pictures-missing-source/cfe/Documents/Расход/Forms/ФормаДокумента/Ext/Form.xml b/tests/skills/cases/cfe-borrow/snapshots/form-item-pictures-missing-source/cfe/Documents/Расход/Forms/ФормаДокумента/Ext/Form.xml index b8c916da6..211e7bb4b 100644 --- a/tests/skills/cases/cfe-borrow/snapshots/form-item-pictures-missing-source/cfe/Documents/Расход/Forms/ФормаДокумента/Ext/Form.xml +++ b/tests/skills/cases/cfe-borrow/snapshots/form-item-pictures-missing-source/cfe/Documents/Расход/Forms/ФормаДокумента/Ext/Form.xml @@ -122,17 +122,17 @@ - <v8:item> - <v8:lang>ru</v8:lang> - <v8:content>Расход</v8:content> - </v8:item> - + + ru + Расход + + false - Post - PostAndClose - Write - + Post + PostAndClose + Write + DontUse Regular false diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-item-pictures-reborrow/cfe/Documents/Расход/Forms/ФормаДокумента/Ext/Form.xml b/tests/skills/cases/cfe-borrow/snapshots/form-item-pictures-reborrow/cfe/Documents/Расход/Forms/ФормаДокумента/Ext/Form.xml index b8c916da6..211e7bb4b 100644 --- a/tests/skills/cases/cfe-borrow/snapshots/form-item-pictures-reborrow/cfe/Documents/Расход/Forms/ФормаДокумента/Ext/Form.xml +++ b/tests/skills/cases/cfe-borrow/snapshots/form-item-pictures-reborrow/cfe/Documents/Расход/Forms/ФормаДокумента/Ext/Form.xml @@ -122,17 +122,17 @@ - <v8:item> - <v8:lang>ru</v8:lang> - <v8:content>Расход</v8:content> - </v8:item> - + + ru + Расход + + false - Post - PostAndClose - Write - + Post + PostAndClose + Write + DontUse Regular false diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-item-pictures/cfe/Documents/Расход/Forms/ФормаДокумента/Ext/Form.xml b/tests/skills/cases/cfe-borrow/snapshots/form-item-pictures/cfe/Documents/Расход/Forms/ФормаДокумента/Ext/Form.xml index b8c916da6..211e7bb4b 100644 --- a/tests/skills/cases/cfe-borrow/snapshots/form-item-pictures/cfe/Documents/Расход/Forms/ФормаДокумента/Ext/Form.xml +++ b/tests/skills/cases/cfe-borrow/snapshots/form-item-pictures/cfe/Documents/Расход/Forms/ФормаДокумента/Ext/Form.xml @@ -122,17 +122,17 @@ - <v8:item> - <v8:lang>ru</v8:lang> - <v8:content>Расход</v8:content> - </v8:item> - + + ru + Расход + + false - Post - PostAndClose - Write - + Post + PostAndClose + Write + DontUse Regular false diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-columns/cfe/Documents/ЗаказКлиента/Forms/ФормаДокумента/Ext/Form.xml b/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-columns/cfe/Documents/ЗаказКлиента/Forms/ФормаДокумента/Ext/Form.xml index 7104c943e..87cd2a15c 100644 --- a/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-columns/cfe/Documents/ЗаказКлиента/Forms/ФормаДокумента/Ext/Form.xml +++ b/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-columns/cfe/Documents/ЗаказКлиента/Forms/ФормаДокумента/Ext/Form.xml @@ -90,11 +90,11 @@ - <v8:item> - <v8:lang>ru</v8:lang> - <v8:content>Заказ клиента</v8:content> - </v8:item> - + + ru + Заказ клиента + + false diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-list-query/cfe/Documents/Расход/Forms/ФормаСпискаЗапрос/Ext/Form.xml b/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-list-query/cfe/Documents/Расход/Forms/ФормаСпискаЗапрос/Ext/Form.xml index bb0873a3a..dbfd22bb1 100644 --- a/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-list-query/cfe/Documents/Расход/Forms/ФормаСпискаЗапрос/Ext/Form.xml +++ b/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-list-query/cfe/Documents/Расход/Forms/ФормаСпискаЗапрос/Ext/Form.xml @@ -73,17 +73,17 @@ true true ВЫБРАТЬ - ДокументРасход.Ссылка, - ДокументРасход.Комментарий, - ДокументРасход.Склад - ИЗ - Документ.Расход КАК ДокументРасход + ДокументРасход.Ссылка, + ДокументРасход.Комментарий, + ДокументРасход.Склад +ИЗ + Документ.Расход КАК ДокументРасход ВЫБРАТЬ - ДокументРасход.Ссылка, - ДокументРасход.Комментарий, - ДокументРасход.Склад - ИЗ - Документ.Расход КАК ДокументРасход + ДокументРасход.Ссылка, + ДокументРасход.Комментарий, + ДокументРасход.Склад +ИЗ + Документ.Расход КАК ДокументРасход diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/Configuration.xml b/tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/Configuration.xml new file mode 100644 index 000000000..bca2f0980 --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/Configuration.xml @@ -0,0 +1,252 @@ + + + + + + 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-multiline-text/Documents/Доставка.xml b/tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/Documents/Доставка.xml new file mode 100644 index 000000000..9703fef07 --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/Documents/Доставка.xml @@ -0,0 +1,84 @@ + + + + + + UUID-002 + UUID-003 + + + UUID-004 + UUID-005 + + + UUID-006 + UUID-007 + + + UUID-008 + UUID-009 + + + UUID-010 + UUID-011 + + + + Доставка + + + ru + Доставка + + + + true + + String + 11 + Variable + Year + true + true + + + + Document.Доставка.StandardAttribute.Number + + Use + Begin + DontUse + Directly + Document.Доставка.Form.ФормаДокумента + + + + + + Allow + Deny + AutoDelete + WriteSelected + AutoFill + + true + true + false + + Managed + Use + + + + + + Auto + DontUse + false + false + + + ФормаДокумента + + + \ No newline at end of file diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/Documents/Доставка/Ext/ObjectModule.bsl b/tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/Documents/Доставка/Ext/ObjectModule.bsl new file mode 100644 index 000000000..e69de29bb diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/Documents/Доставка/Forms/ФормаДокумента.xml b/tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/Documents/Доставка/Forms/ФормаДокумента.xml new file mode 100644 index 000000000..21cbf33a8 --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/Documents/Доставка/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-multiline-text/Documents/Доставка/Forms/ФормаДокумента/Ext/Form.xml b/tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/Documents/Доставка/Forms/ФормаДокумента/Ext/Form.xml new file mode 100644 index 000000000..02b1d4971 --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/Documents/Доставка/Forms/ФормаДокумента/Ext/Form.xml @@ -0,0 +1,44 @@ + +
+ + <v8:item> + <v8:lang>ru</v8:lang> + <v8:content>Доставка</v8:content> + </v8:item> + + false + + + + + <v8:item> + <v8:lang>ru</v8:lang> + <v8:content>Адрес передачи +товара</v8:content> + </v8:item> + + + + + + + <v8:item> + <v8:lang>ru</v8:lang> + <v8:content>Режим используется при позднем получении документов. +</v8:content> + </v8:item> + + + + + + + + + cfg:DocumentObject.Доставка + + true + true + + + \ No newline at end of file diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/Documents/Доставка/Forms/ФормаДокумента/Ext/Form/Module.bsl b/tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/Documents/Доставка/Forms/ФормаДокумента/Ext/Form/Module.bsl new file mode 100644 index 000000000..8ead4cec0 --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/Documents/Доставка/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-multiline-text/Ext/ClientApplicationInterface.xml b/tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/Ext/ClientApplicationInterface.xml new file mode 100644 index 000000000..3c1161b2d --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/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-multiline-text/Languages/Русский.xml b/tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/Languages/Русский.xml new file mode 100644 index 000000000..37c60d786 --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/Languages/Русский.xml @@ -0,0 +1,16 @@ + + + + + Русский + + + ru + Русский + + + + ru + + + \ No newline at end of file diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/cfe/Configuration.xml b/tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/cfe/Configuration.xml new file mode 100644 index 000000000..272d96d9f --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/cfe/Configuration.xml @@ -0,0 +1,72 @@ + + + + + + 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-multiline-text/cfe/Documents/Доставка.xml b/tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/cfe/Documents/Доставка.xml new file mode 100644 index 000000000..0c7049fe6 --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/cfe/Documents/Доставка.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-multiline-text/cfe/Documents/Доставка/Forms/ФормаДокумента.xml b/tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/cfe/Documents/Доставка/Forms/ФормаДокумента.xml new file mode 100644 index 000000000..1c49cbb8c --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/cfe/Documents/Доставка/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-multiline-text/cfe/Documents/Доставка/Forms/ФормаДокумента/Ext/Form.xml b/tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/cfe/Documents/Доставка/Forms/ФормаДокумента/Ext/Form.xml new file mode 100644 index 000000000..df8310b5b --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/cfe/Documents/Доставка/Forms/ФормаДокумента/Ext/Form.xml @@ -0,0 +1,71 @@ + +
+ + <v8:item> + <v8:lang>ru</v8:lang> + <v8:content>Доставка</v8:content> + </v8:item> + + false + + + + + <v8:item> + <v8:lang>ru</v8:lang> + <v8:content>Адрес передачи +товара</v8:content> + </v8:item> + + + + + + + <v8:item> + <v8:lang>ru</v8:lang> + <v8:content>Режим используется при позднем получении документов. +</v8:content> + </v8:item> + + + + + + + + + <v8:item> + <v8:lang>ru</v8:lang> + <v8:content>Доставка</v8:content> + </v8:item> + + false + + + + + <v8:item> + <v8:lang>ru</v8:lang> + <v8:content>Адрес передачи +товара</v8:content> + </v8:item> + + + + + + + <v8:item> + <v8:lang>ru</v8:lang> + <v8:content>Режим используется при позднем получении документов. +</v8:content> + </v8:item> + + + + + + + + \ No newline at end of file diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/cfe/Documents/Доставка/Forms/ФормаДокумента/Ext/Form/Module.bsl b/tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/cfe/Documents/Доставка/Forms/ФормаДокумента/Ext/Form/Module.bsl new file mode 100644 index 000000000..e69de29bb diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/cfe/Languages/Русский.xml b/tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/cfe/Languages/Русский.xml new file mode 100644 index 000000000..c21624f52 --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/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-multiline-text/cfe/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/cfe/Roles/Тест_ОсновнаяРоль.xml new file mode 100644 index 000000000..ec9dfbaf6 --- /dev/null +++ b/tests/skills/cases/cfe-borrow/snapshots/form-multiline-text/cfe/Roles/Тест_ОсновнаяРоль.xml @@ -0,0 +1,10 @@ + + + + + Тест_ОсновнаяРоль + + + + + \ No newline at end of file diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-props-after-commandset/cfe/Documents/Расход/Forms/ФормаДокумента/Ext/Form.xml b/tests/skills/cases/cfe-borrow/snapshots/form-props-after-commandset/cfe/Documents/Расход/Forms/ФормаДокумента/Ext/Form.xml index 7c9c41153..8981de5e4 100644 --- a/tests/skills/cases/cfe-borrow/snapshots/form-props-after-commandset/cfe/Documents/Расход/Forms/ФормаДокумента/Ext/Form.xml +++ b/tests/skills/cases/cfe-borrow/snapshots/form-props-after-commandset/cfe/Documents/Расход/Forms/ФормаДокумента/Ext/Form.xml @@ -32,17 +32,17 @@ - <v8:item> - <v8:lang>ru</v8:lang> - <v8:content>Расход</v8:content> - </v8:item> - + + ru + Расход + + false - Post - PostAndClose - Write - + Post + PostAndClose + Write + DontUse Regular false diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-row-picture-path/cfe/Documents/Расход/Forms/ФормаДокумента/Ext/Form.xml b/tests/skills/cases/cfe-borrow/snapshots/form-row-picture-path/cfe/Documents/Расход/Forms/ФормаДокумента/Ext/Form.xml index 86bf20459..e5cf7ad7a 100644 --- a/tests/skills/cases/cfe-borrow/snapshots/form-row-picture-path/cfe/Documents/Расход/Forms/ФормаДокумента/Ext/Form.xml +++ b/tests/skills/cases/cfe-borrow/snapshots/form-row-picture-path/cfe/Documents/Расход/Forms/ФормаДокумента/Ext/Form.xml @@ -44,17 +44,17 @@ - <v8:item> - <v8:lang>ru</v8:lang> - <v8:content>Расход</v8:content> - </v8:item> - + + ru + Расход + + false - Post - PostAndClose - Write - + Post + PostAndClose + Write + DontUse Regular false