From 3f80f936ae50d80cc3a40c7a8db480545001c088 Mon Sep 17 00:00:00 2001 From: Nick Shirokov Date: Tue, 11 Aug 2026 19:23:18 +0300 Subject: [PATCH] =?UTF-8?q?fix(mxl-compile):=20=D1=84=D0=BE=D1=80=D0=BC?= =?UTF-8?q?=D0=B0=D1=82=20=D0=BF=D0=BE=20=D1=83=D0=BC=D0=BE=D0=BB=D1=87?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8E=20=E2=80=94=20=D0=BF=D0=BE=D1=81=D0=BB?= =?UTF-8?q?=D0=B5=D0=B4=D0=BD=D1=8F=D1=8F=20=D0=B7=D0=B0=D0=BF=D0=B8=D1=81?= =?UTF-8?q?=D1=8C=20=D0=BF=D0=B0=D0=BB=D0=B8=D1=82=D1=80=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Мы регистрировали формат по умолчанию первым, из-за чего вся палитра шла со сдвигом относительно платформенной. На корпусе он последний в 8285 макетах из 10 863, первым — в 25. Подтверждено контролируемым стендом: в макетах, где ширины заданы на уровне документа, палитра идёт «ширины колонок в порядке колонок, умолчание последним». Порядок палитры не виден в семантическом диффе (правило palette-index разрешает ссылки и тем самым его прячет), поэтому мерялся отдельно: на пилоте совпавших с оригиналом записей с начала палитры стало 467 из 2274 против 23, палитр, совпавших целиком, — 4 против 2. Co-Authored-By: Claude Opus 5 (1M context) --- .../mxl-compile/scripts/mxl-compile.ps1 | 9 +- .../skills/mxl-compile/scripts/mxl-compile.py | 9 +- .../snapshots/column-sets/Template.xml | 26 +++--- .../snapshots/column-styles/Template.xml | 28 +++--- .../snapshots/column-widths/Template.xml | 34 +++---- .../snapshots/empty-rows/Template.xml | 18 ++-- .../font-fractional-size/Template.xml | 12 +-- .../snapshots/format-strings/Template.xml | 28 +++--- .../snapshots/merged-cells/Template.xml | 32 +++---- .../snapshots/multiple-areas/Template.xml | 36 ++++---- .../snapshots/named-areas-coords/Template.xml | 16 ++-- .../parameters-and-templates/Template.xml | 24 ++--- .../snapshots/row-own-format/Template.xml | 26 +++--- .../snapshots/shorthand-merges/Template.xml | 16 ++-- .../snapshots/shorthand-rows/Template.xml | 14 +-- .../style-full-properties/Template.xml | 18 ++-- .../styles-fonts-borders/Template.xml | 46 +++++----- .../snapshots/text-multilang/Template.xml | 10 +-- .../snapshots/unnamed-blocks/Template.xml | 14 +-- .../roundtrip-merged-cells/Template.xml | 20 ++--- .../roundtrip-multiple-areas/Template.xml | 26 +++--- .../snapshots/roundtrip-styles/Template.xml | 14 +-- .../roundtrip-templates/Template.xml | 10 +-- .../snapshots/areas-and-params/Template.xml | 88 +++++++++---------- .../snapshots/detail-params/Template.xml | 16 ++-- .../snapshots/json-format/Template.xml | 12 +-- .../mxl-info/snapshots/with-text/Template.xml | 16 ++-- .../snapshots/valid-complex/Template.xml | 74 ++++++++-------- .../valid-with-detailed/Template.xml | 14 +-- 29 files changed, 358 insertions(+), 348 deletions(-) diff --git a/.claude/skills/mxl-compile/scripts/mxl-compile.ps1 b/.claude/skills/mxl-compile/scripts/mxl-compile.ps1 index 41e39c5a..8acb1e82 100644 --- a/.claude/skills/mxl-compile/scripts/mxl-compile.ps1 +++ b/.claude/skills/mxl-compile/scripts/mxl-compile.ps1 @@ -1,4 +1,4 @@ -# mxl-compile v1.33 — Compile 1C spreadsheet from JSON +# mxl-compile v1.34 — Compile 1C spreadsheet from JSON # Source: https://github.com/Nikolay-Shirokov/cc-1c-skills param( [Parameter(Mandatory)] @@ -731,7 +731,9 @@ function Register-Format { } # 6a. Default width format -$defaultFormatIndex = Register-Format @{ width = $defaultWidth } +# Формат по умолчанию платформа кладёт в палитру ПОСЛЕДНИМ: на корпусе он последний +# в 8285 макетах из 10 863, первым — в 25. Поэтому регистрируем его после всех остальных, +# уже за пре-проходом; здесь только запоминаем ширину. # 6b. Column formats — по одной карте на каждую колоночную раскладку. # У колонки бывает и ширина, и оформление: формат один, свойства складываются. @@ -1016,6 +1018,9 @@ foreach ($area in $def.areas) { } } +# Формат по умолчанию — последняя запись палитры (см. выше). +$defaultFormatIndex = Register-Format @{ width = $defaultWidth } + # --- 7. Generate XML --- $xml = New-Object System.Text.StringBuilder 4096 diff --git a/.claude/skills/mxl-compile/scripts/mxl-compile.py b/.claude/skills/mxl-compile/scripts/mxl-compile.py index 255a4a38..3b27e8ee 100644 --- a/.claude/skills/mxl-compile/scripts/mxl-compile.py +++ b/.claude/skills/mxl-compile/scripts/mxl-compile.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# mxl-compile v1.33 — Compile 1C spreadsheet from JSON +# mxl-compile v1.34 — Compile 1C spreadsheet from JSON # Source: https://github.com/Nikolay-Shirokov/cc-1c-skills import argparse import hashlib @@ -808,7 +808,9 @@ def main(): return format_order.index(key) + 1 # 6a. Default width format - default_format_index = register_format({'width': default_width}) + # Формат по умолчанию платформа кладёт в палитру ПОСЛЕДНИМ: на корпусе он последний + # в 8285 макетах из 10 863, первым — в 25. Поэтому регистрируем его после всех остальных, + # уже за пре-проходом; здесь только запоминаем ширину. # 6b. Column formats — по одной карте на каждую колоночную раскладку. # У колонки бывает и ширина, и оформление: формат один, свойства складываются. @@ -1039,6 +1041,9 @@ def main(): ft = get_fill_type(cell) register_cell_format(cell_style, ft) + # Формат по умолчанию — последняя запись палитры (см. выше). + default_format_index = register_format({'width': default_width}) + # --- 7. Generate XML --- lines = [] diff --git a/tests/skills/cases/mxl-compile/snapshots/column-sets/Template.xml b/tests/skills/cases/mxl-compile/snapshots/column-sets/Template.xml index 16e47633..c8bd8735 100644 --- a/tests/skills/cases/mxl-compile/snapshots/column-sets/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/column-sets/Template.xml @@ -14,19 +14,19 @@ 0 - 2 + 1 1 - 2 + 1 2 - 2 + 1 @@ -36,19 +36,19 @@ 0 - 3 + 2 1 - 3 + 2 2 - 3 + 2 @@ -96,26 +96,26 @@ 12320174-2b07-3806-9f7f-ec3834007fdb - 4 + 3 Товар - 4 + 3 Кол - 4 + 3 Сумма true - 1 + 4 2 2 @@ -139,9 +139,6 @@ - - 10 - 20 @@ -152,4 +149,7 @@ 0 Parameter + + 10 + \ No newline at end of file diff --git a/tests/skills/cases/mxl-compile/snapshots/column-styles/Template.xml b/tests/skills/cases/mxl-compile/snapshots/column-styles/Template.xml index 961a4e6c..cef1c421 100644 --- a/tests/skills/cases/mxl-compile/snapshots/column-styles/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/column-styles/Template.xml @@ -14,25 +14,25 @@ 0 - 2 + 1 1 - 3 + 2 2 - 3 + 2 3 - 4 + 3 @@ -42,19 +42,19 @@ 0 - 5 + 4 1 - 6 + 5 2 - 6 + 5 @@ -80,26 +80,26 @@ 01f06d2d-2103-3169-8cc8-32872f100129 - 7 + 6 Код - 7 + 6 Имя - 7 + 6 Сумма true - 1 + 7 2 2 @@ -129,9 +129,6 @@ - - 20 - 30 Center @@ -153,4 +150,7 @@ 0 Parameter + + 20 + \ No newline at end of file diff --git a/tests/skills/cases/mxl-compile/snapshots/column-widths/Template.xml b/tests/skills/cases/mxl-compile/snapshots/column-widths/Template.xml index e89989af..17a6ca0d 100644 --- a/tests/skills/cases/mxl-compile/snapshots/column-widths/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/column-widths/Template.xml @@ -14,47 +14,47 @@ 0 - 2 + 1 1 - 3 + 2 2 - 3 + 2 3 - 3 + 2 4 - 4 + 3 5 - 4 + 3 0 - 5 + 4 - 6 + 5 ru @@ -65,7 +65,7 @@ - 6 + 5 ru @@ -76,7 +76,7 @@ - 6 + 5 ru @@ -87,7 +87,7 @@ - 6 + 5 ru @@ -98,7 +98,7 @@ - 6 + 5 ru @@ -109,7 +109,7 @@ - 6 + 5 ru @@ -121,7 +121,7 @@ true - 1 + 6 1 1 @@ -138,9 +138,6 @@ Solid - - 20 - 10 @@ -157,4 +154,7 @@ 0 0 + + 20 + \ No newline at end of file diff --git a/tests/skills/cases/mxl-compile/snapshots/empty-rows/Template.xml b/tests/skills/cases/mxl-compile/snapshots/empty-rows/Template.xml index 01cf1a4f..95e70cb5 100644 --- a/tests/skills/cases/mxl-compile/snapshots/empty-rows/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/empty-rows/Template.xml @@ -17,7 +17,7 @@ - 2 + 1 ru @@ -38,29 +38,29 @@ 3 - 3 + 2 - 5 + 4 Код - 5 + 4 Имя - 5 + 4 Значение true - 1 + 5 4 4 @@ -93,9 +93,6 @@ - - 10 - 1 Center @@ -112,4 +109,7 @@ 0 Parameter + + 10 + \ No newline at end of file diff --git a/tests/skills/cases/mxl-compile/snapshots/font-fractional-size/Template.xml b/tests/skills/cases/mxl-compile/snapshots/font-fractional-size/Template.xml index 301c29a4..ddf3e8bb 100644 --- a/tests/skills/cases/mxl-compile/snapshots/font-fractional-size/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/font-fractional-size/Template.xml @@ -17,7 +17,7 @@ - 2 + 1 ru @@ -28,7 +28,7 @@ - 3 + 2 ru @@ -40,7 +40,7 @@ true - 1 + 3 1 1 @@ -56,13 +56,13 @@ - - 10 - 2 1 + + 10 + \ No newline at end of file diff --git a/tests/skills/cases/mxl-compile/snapshots/format-strings/Template.xml b/tests/skills/cases/mxl-compile/snapshots/format-strings/Template.xml index ad386d14..158221b7 100644 --- a/tests/skills/cases/mxl-compile/snapshots/format-strings/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/format-strings/Template.xml @@ -15,10 +15,10 @@ 0 - 2 + 1 - 3 + 2 ru @@ -29,7 +29,7 @@ - 3 + 2 ru @@ -40,7 +40,7 @@ - 3 + 2 ru @@ -51,7 +51,7 @@ - 3 + 2 ru @@ -65,35 +65,35 @@ 1 - 4 + 3 - 6 + 5 Дата - 7 + 6 Товар - 8 + 7 Количество - 8 + 7 Цена true - 1 + 8 2 2 @@ -120,9 +120,6 @@ Solid - - 10 - 0 Center @@ -168,4 +165,7 @@ + + 10 + \ No newline at end of file diff --git a/tests/skills/cases/mxl-compile/snapshots/merged-cells/Template.xml b/tests/skills/cases/mxl-compile/snapshots/merged-cells/Template.xml index e061c767..740c3090 100644 --- a/tests/skills/cases/mxl-compile/snapshots/merged-cells/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/merged-cells/Template.xml @@ -15,10 +15,10 @@ 0 - 2 + 1 - 4 + 3 ru @@ -29,7 +29,7 @@ - 4 + 3 ru @@ -41,7 +41,7 @@ 3 - 4 + 3 ru @@ -55,11 +55,11 @@ 1 - 2 + 1 1 - 5 + 4 ru @@ -70,7 +70,7 @@ - 5 + 4 ru @@ -84,35 +84,35 @@ 2 - 2 + 1 - 6 + 5 Номер - 7 + 6 Наименование - 7 + 6 Артикул - 7 + 6 Итого true - 1 + 7 3 3 @@ -157,9 +157,6 @@ - - 10 - 0 @@ -188,4 +185,7 @@ 0 Parameter + + 10 + \ No newline at end of file diff --git a/tests/skills/cases/mxl-compile/snapshots/multiple-areas/Template.xml b/tests/skills/cases/mxl-compile/snapshots/multiple-areas/Template.xml index 147c8f28..f2d4a8a8 100644 --- a/tests/skills/cases/mxl-compile/snapshots/multiple-areas/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/multiple-areas/Template.xml @@ -15,10 +15,10 @@ 0 - 2 + 1 - 3 + 2 ТекстЗаголовка @@ -27,10 +27,10 @@ 1 - 4 + 3 - 5 + 4 ru @@ -41,7 +41,7 @@ - 5 + 4 ru @@ -52,7 +52,7 @@ - 5 + 4 ru @@ -63,7 +63,7 @@ - 5 + 4 ru @@ -77,29 +77,29 @@ 2 - 4 + 3 - 6 + 5 НомерСтроки - 6 + 5 Товар Номенклатура - 7 + 6 Количество - 7 + 6 Сумма @@ -111,7 +111,7 @@ 2 - 8 + 7 ru @@ -122,14 +122,14 @@ - 9 + 8 Всего true - 1 + 9 4 4 @@ -183,9 +183,6 @@ - - 30 - 20 @@ -223,4 +220,7 @@ Right Parameter + + 30 + \ No newline at end of file diff --git a/tests/skills/cases/mxl-compile/snapshots/named-areas-coords/Template.xml b/tests/skills/cases/mxl-compile/snapshots/named-areas-coords/Template.xml index 9bbffb68..090b3f0b 100644 --- a/tests/skills/cases/mxl-compile/snapshots/named-areas-coords/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/named-areas-coords/Template.xml @@ -66,32 +66,32 @@ - 2 + 1 П1 - 2 + 1 П2 - 2 + 1 П3 - 2 + 1 П4 true - 1 + 2 2 2 @@ -135,11 +135,11 @@ - - 10 - 0 Parameter + + 10 + \ No newline at end of file diff --git a/tests/skills/cases/mxl-compile/snapshots/parameters-and-templates/Template.xml b/tests/skills/cases/mxl-compile/snapshots/parameters-and-templates/Template.xml index 46ec87d3..842b590a 100644 --- a/tests/skills/cases/mxl-compile/snapshots/parameters-and-templates/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/parameters-and-templates/Template.xml @@ -17,7 +17,7 @@ - 2 + 1 ru @@ -28,7 +28,7 @@ - 3 + 2 ru @@ -44,7 +44,7 @@ - 2 + 1 ru @@ -55,7 +55,7 @@ - 3 + 2 ru @@ -69,29 +69,29 @@ 2 - 4 + 3 - 6 + 5 Позиция - 6 + 5 Товар - 6 + 5 Цена true - 1 + 6 3 3 @@ -129,9 +129,6 @@ - - 10 - 1 @@ -151,4 +148,7 @@ 0 Parameter + + 10 + \ No newline at end of file diff --git a/tests/skills/cases/mxl-compile/snapshots/row-own-format/Template.xml b/tests/skills/cases/mxl-compile/snapshots/row-own-format/Template.xml index ca52436f..6022a489 100644 --- a/tests/skills/cases/mxl-compile/snapshots/row-own-format/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/row-own-format/Template.xml @@ -15,7 +15,7 @@ 0 - 2 + 1 0 @@ -32,10 +32,10 @@ 1 - 3 + 2 - 4 + 3 ru @@ -46,12 +46,12 @@ - 4 + 3 - 4 + 3 @@ -59,7 +59,7 @@ 2 - 5 + 4 0 @@ -78,7 +78,7 @@ - 6 + 5 ru @@ -89,18 +89,18 @@ - 6 + 5 - 6 + 5 true - 1 + 6 4 4 @@ -118,9 +118,6 @@ - - 20 - 20 true @@ -139,4 +136,7 @@ 0 0 + + 20 + \ No newline at end of file diff --git a/tests/skills/cases/mxl-compile/snapshots/shorthand-merges/Template.xml b/tests/skills/cases/mxl-compile/snapshots/shorthand-merges/Template.xml index 2f4de2ab..86d2171a 100644 --- a/tests/skills/cases/mxl-compile/snapshots/shorthand-merges/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/shorthand-merges/Template.xml @@ -84,32 +84,32 @@ - 2 + 1 Вид - 2 + 1 Нач - 2 + 1 Кон - 2 + 1 Итог true - 1 + 2 3 3 @@ -140,11 +140,11 @@ - - 10 - 0 Parameter + + 10 + \ No newline at end of file diff --git a/tests/skills/cases/mxl-compile/snapshots/shorthand-rows/Template.xml b/tests/skills/cases/mxl-compile/snapshots/shorthand-rows/Template.xml index 5c80071d..798d21fb 100644 --- a/tests/skills/cases/mxl-compile/snapshots/shorthand-rows/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/shorthand-rows/Template.xml @@ -66,20 +66,20 @@ - 2 + 1 Товар - 2 + 1 Кол 3 - 3 + 2 ru @@ -91,7 +91,7 @@ true - 1 + 3 2 2 @@ -108,9 +108,6 @@ Solid - - 10 - 0 Parameter @@ -120,4 +117,7 @@ 0 Center + + 10 + \ No newline at end of file diff --git a/tests/skills/cases/mxl-compile/snapshots/style-full-properties/Template.xml b/tests/skills/cases/mxl-compile/snapshots/style-full-properties/Template.xml index 9954db26..6c8b5105 100644 --- a/tests/skills/cases/mxl-compile/snapshots/style-full-properties/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/style-full-properties/Template.xml @@ -17,7 +17,7 @@ - 2 + 1 ru @@ -33,7 +33,7 @@ - 3 + 2 ru @@ -44,7 +44,7 @@ - 4 + 3 ru @@ -55,13 +55,13 @@ - 5 + 4 Скрытое - 6 + 5 ru @@ -73,7 +73,7 @@ true - 1 + 6 2 2 @@ -115,9 +115,6 @@ - - 20 - 1 Center @@ -150,4 +147,7 @@ 0 3 + + 20 + \ No newline at end of file diff --git a/tests/skills/cases/mxl-compile/snapshots/styles-fonts-borders/Template.xml b/tests/skills/cases/mxl-compile/snapshots/styles-fonts-borders/Template.xml index 68298ccd..09d72786 100644 --- a/tests/skills/cases/mxl-compile/snapshots/styles-fonts-borders/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/styles-fonts-borders/Template.xml @@ -15,10 +15,10 @@ 0 - 2 + 1 - 3 + 2 ru @@ -34,7 +34,7 @@ - 4 + 3 ru @@ -46,7 +46,7 @@ 2 - 5 + 4 Поставщик @@ -55,10 +55,10 @@ 2 - 6 + 5 - 6 + 5 ru @@ -69,7 +69,7 @@ - 6 + 5 ru @@ -80,7 +80,7 @@ - 6 + 5 ru @@ -91,7 +91,7 @@ - 6 + 5 ru @@ -102,7 +102,7 @@ - 6 + 5 ru @@ -116,34 +116,34 @@ 3 - 7 + 6 - 9 + 8 НомерСтроки - 10 + 9 Товар - 11 + 10 Количество - 11 + 10 Цена - 11 + 10 Сумма @@ -155,7 +155,7 @@ 3 - 12 + 11 ru @@ -166,7 +166,7 @@ - 13 + 12 Всего @@ -177,7 +177,7 @@ - 14 + 13 ru @@ -189,7 +189,7 @@ true - 1 + 14 6 6 @@ -284,9 +284,6 @@ - - 25 - 25 @@ -346,4 +343,7 @@ 4 Center + + 25 + \ No newline at end of file diff --git a/tests/skills/cases/mxl-compile/snapshots/text-multilang/Template.xml b/tests/skills/cases/mxl-compile/snapshots/text-multilang/Template.xml index 169d0d7a..0f61d33d 100644 --- a/tests/skills/cases/mxl-compile/snapshots/text-multilang/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/text-multilang/Template.xml @@ -43,7 +43,7 @@ - 2 + 1 ru @@ -59,7 +59,7 @@ true - 1 + 2 1 1 @@ -73,11 +73,11 @@ - - 10 - 0 Template + + 10 + \ No newline at end of file diff --git a/tests/skills/cases/mxl-compile/snapshots/unnamed-blocks/Template.xml b/tests/skills/cases/mxl-compile/snapshots/unnamed-blocks/Template.xml index eaf2cd23..e3418876 100644 --- a/tests/skills/cases/mxl-compile/snapshots/unnamed-blocks/Template.xml +++ b/tests/skills/cases/mxl-compile/snapshots/unnamed-blocks/Template.xml @@ -71,26 +71,26 @@ - 2 + 1 П1 - 2 + 1 П2 - 2 + 1 П3 true - 1 + 2 3 3 @@ -119,11 +119,11 @@ - - 10 - 0 Parameter + + 10 + \ No newline at end of file diff --git a/tests/skills/cases/mxl-decompile/snapshots/roundtrip-merged-cells/Template.xml b/tests/skills/cases/mxl-decompile/snapshots/roundtrip-merged-cells/Template.xml index e0e3f088..4bb0a7f4 100644 --- a/tests/skills/cases/mxl-decompile/snapshots/roundtrip-merged-cells/Template.xml +++ b/tests/skills/cases/mxl-decompile/snapshots/roundtrip-merged-cells/Template.xml @@ -15,10 +15,10 @@ 0 - 2 + 1 - 4 + 3 ru @@ -29,7 +29,7 @@ - 4 + 3 ru @@ -43,11 +43,11 @@ 1 - 2 + 1 1 - 3 + 2 ru @@ -58,7 +58,7 @@ - 3 + 2 ru @@ -70,7 +70,7 @@ true - 1 + 4 2 2 @@ -99,9 +99,6 @@ - - 10 - 0 @@ -114,4 +111,7 @@ 0 Center + + 10 + \ No newline at end of file diff --git a/tests/skills/cases/mxl-decompile/snapshots/roundtrip-multiple-areas/Template.xml b/tests/skills/cases/mxl-decompile/snapshots/roundtrip-multiple-areas/Template.xml index 5aadb3bf..e643acb8 100644 --- a/tests/skills/cases/mxl-decompile/snapshots/roundtrip-multiple-areas/Template.xml +++ b/tests/skills/cases/mxl-decompile/snapshots/roundtrip-multiple-areas/Template.xml @@ -15,10 +15,10 @@ 0 - 2 + 1 - 3 + 2 Заголовок @@ -27,28 +27,28 @@ 1 - 4 + 3 - 6 + 5 Номер - 6 + 5 Товар - 7 + 6 Количество - 7 + 6 Сумма @@ -60,7 +60,7 @@ 2 - 8 + 7 ru @@ -71,14 +71,14 @@ - 9 + 8 Всего true - 1 + 9 3 3 @@ -121,9 +121,6 @@ - - 30 - 20 @@ -160,4 +157,7 @@ Right Parameter + + 30 + \ No newline at end of file diff --git a/tests/skills/cases/mxl-decompile/snapshots/roundtrip-styles/Template.xml b/tests/skills/cases/mxl-decompile/snapshots/roundtrip-styles/Template.xml index 8698e389..27fa6f04 100644 --- a/tests/skills/cases/mxl-decompile/snapshots/roundtrip-styles/Template.xml +++ b/tests/skills/cases/mxl-decompile/snapshots/roundtrip-styles/Template.xml @@ -17,7 +17,7 @@ - 2 + 1 ru @@ -28,7 +28,7 @@ - 3 + 2 ru @@ -39,7 +39,7 @@ - 4 + 3 ru @@ -51,7 +51,7 @@ true - 1 + 4 1 1 @@ -70,9 +70,6 @@ - - 10 - 1 0 @@ -86,4 +83,7 @@ 0 0 + + 10 + \ No newline at end of file diff --git a/tests/skills/cases/mxl-decompile/snapshots/roundtrip-templates/Template.xml b/tests/skills/cases/mxl-decompile/snapshots/roundtrip-templates/Template.xml index 823de7b0..bf8c9f16 100644 --- a/tests/skills/cases/mxl-decompile/snapshots/roundtrip-templates/Template.xml +++ b/tests/skills/cases/mxl-decompile/snapshots/roundtrip-templates/Template.xml @@ -28,7 +28,7 @@ - 2 + 1 ru @@ -40,7 +40,7 @@ true - 1 + 2 1 1 @@ -54,11 +54,11 @@ - - 10 - 0 Template + + 10 + \ No newline at end of file diff --git a/tests/skills/cases/mxl-info/snapshots/areas-and-params/Template.xml b/tests/skills/cases/mxl-info/snapshots/areas-and-params/Template.xml index 95d06fee..d50850ec 100644 --- a/tests/skills/cases/mxl-info/snapshots/areas-and-params/Template.xml +++ b/tests/skills/cases/mxl-info/snapshots/areas-and-params/Template.xml @@ -17,7 +17,7 @@ - 2 + 1 ТекстЗаголовка @@ -40,7 +40,7 @@ 2 - 2 + 1 ПредставлениеПоставщика Поставщик @@ -50,35 +50,35 @@ 2 - 3 + 2 - 5 + 4 НомерСтроки - 5 + 4 Товар Номенклатура - 6 + 5 Количество - 6 + 5 Цена - 6 + 5 Сумма @@ -90,7 +90,7 @@ 3 - 7 + 6 ru @@ -101,14 +101,14 @@ - 8 + 7 Всего true - 1 + 8 4 4 @@ -171,40 +171,40 @@ + + 0 + Parameter + + + 0 + + + 0 + 0 + + + 0 + 0 + Parameter + + + 0 + 0 + Right + Parameter + + + 1 + 0 + Right + + + 1 + 0 + Right + Parameter + 10 - - 0 - Parameter - - - 0 - - - 0 - 0 - - - 0 - 0 - Parameter - - - 0 - 0 - Right - Parameter - - - 1 - 0 - Right - - - 1 - 0 - Right - Parameter - \ No newline at end of file diff --git a/tests/skills/cases/mxl-info/snapshots/detail-params/Template.xml b/tests/skills/cases/mxl-info/snapshots/detail-params/Template.xml index 9c20df2e..8bc20706 100644 --- a/tests/skills/cases/mxl-info/snapshots/detail-params/Template.xml +++ b/tests/skills/cases/mxl-info/snapshots/detail-params/Template.xml @@ -15,30 +15,30 @@ 0 - 2 + 1 - 4 + 3 НомерСтроки - 4 + 3 Товар Номенклатура - 4 + 3 Сумма true - 1 + 4 1 1 @@ -55,9 +55,6 @@ Solid - - 10 - 0 @@ -70,4 +67,7 @@ 0 Parameter + + 10 + \ No newline at end of file diff --git a/tests/skills/cases/mxl-info/snapshots/json-format/Template.xml b/tests/skills/cases/mxl-info/snapshots/json-format/Template.xml index 19b60d10..ffaa1ed9 100644 --- a/tests/skills/cases/mxl-info/snapshots/json-format/Template.xml +++ b/tests/skills/cases/mxl-info/snapshots/json-format/Template.xml @@ -17,20 +17,20 @@ - 2 + 1 Ключ - 2 + 1 Значение true - 1 + 2 1 1 @@ -44,11 +44,11 @@ - - 10 - 0 Parameter + + 10 + \ No newline at end of file diff --git a/tests/skills/cases/mxl-info/snapshots/with-text/Template.xml b/tests/skills/cases/mxl-info/snapshots/with-text/Template.xml index 0020bd0a..ffa85712 100644 --- a/tests/skills/cases/mxl-info/snapshots/with-text/Template.xml +++ b/tests/skills/cases/mxl-info/snapshots/with-text/Template.xml @@ -28,7 +28,7 @@ - 2 + 1 ru @@ -82,26 +82,26 @@ - 3 + 2 Код - 3 + 2 Наименование - 3 + 2 Сумма true - 1 + 3 3 3 @@ -140,9 +140,6 @@ - - 10 - 0 Template @@ -151,4 +148,7 @@ 0 Parameter + + 10 + \ No newline at end of file diff --git a/tests/skills/cases/mxl-validate/snapshots/valid-complex/Template.xml b/tests/skills/cases/mxl-validate/snapshots/valid-complex/Template.xml index aa941671..0577bc47 100644 --- a/tests/skills/cases/mxl-validate/snapshots/valid-complex/Template.xml +++ b/tests/skills/cases/mxl-validate/snapshots/valid-complex/Template.xml @@ -17,7 +17,7 @@ - 2 + 1 Заголовок @@ -26,10 +26,10 @@ 1 - 3 + 2 - 3 + 2 ru @@ -40,7 +40,7 @@ - 3 + 2 ru @@ -52,7 +52,7 @@ 3 - 3 + 2 ru @@ -66,11 +66,11 @@ 2 - 4 + 3 1 - 5 + 4 ru @@ -81,7 +81,7 @@ - 5 + 4 ru @@ -95,35 +95,35 @@ 3 - 4 + 3 - 6 + 5 Номер - 6 + 5 Имя - 6 + 5 Код - 6 + 5 Сумма true - 1 + 6 4 4 @@ -183,30 +183,30 @@ + + 1 + 0 + Center + Parameter + + + 1 + 0 + Center + + + 0 + + + 0 + 0 + + + 0 + 0 + Parameter + 10 - - 1 - 0 - Center - Parameter - - - 1 - 0 - Center - - - 0 - - - 0 - 0 - - - 0 - 0 - Parameter - \ No newline at end of file diff --git a/tests/skills/cases/mxl-validate/snapshots/valid-with-detailed/Template.xml b/tests/skills/cases/mxl-validate/snapshots/valid-with-detailed/Template.xml index ae9e2cd7..9cf6a8b5 100644 --- a/tests/skills/cases/mxl-validate/snapshots/valid-with-detailed/Template.xml +++ b/tests/skills/cases/mxl-validate/snapshots/valid-with-detailed/Template.xml @@ -15,23 +15,23 @@ 0 - 2 + 1 - 4 + 3 Ключ - 4 + 3 Значение true - 1 + 4 1 1 @@ -48,9 +48,6 @@ Solid - - 10 - 0 @@ -63,4 +60,7 @@ 0 Parameter + + 10 + \ No newline at end of file