mirror of
https://github.com/Nikolay-Shirokov/cc-1c-skills.git
synced 2026-06-11 08:24:57 +03:00
fix(form-compile): skip ValueStorage attributes in --from-object mode
ValueStorage is a non-displayable type that cannot be bound to form elements. Filter it out in all generators: catalog item, catalog/document list columns, document item (unclaimed + footer). Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -268,6 +268,16 @@ function Load-Preset([string]$PresetName, [string]$ScriptDir) {
|
||||
}
|
||||
|
||||
# --- Helper: build a field element DSL entry ---
|
||||
# Non-displayable types — cannot be bound to form elements
|
||||
$script:nonDisplayableTypes = @('v8:ValueStorage', 'ValueStorage', 'ХранилищеЗначения')
|
||||
|
||||
function Test-DisplayableType([string]$typeStr) {
|
||||
foreach ($nd in $script:nonDisplayableTypes) {
|
||||
if ($typeStr -match [regex]::Escape($nd)) { return $false }
|
||||
}
|
||||
return $true
|
||||
}
|
||||
|
||||
function New-FieldElement {
|
||||
param([string]$attrName, [string]$dataPath, [string]$attrType, [hashtable]$fieldDefaults, [hashtable]$extraProps)
|
||||
|
||||
@@ -352,6 +362,7 @@ function Generate-CatalogListDSL($meta, [hashtable]$p) {
|
||||
}
|
||||
# Custom attributes
|
||||
foreach ($attr in $meta.Attributes) {
|
||||
if (-not (Test-DisplayableType $attr.Type)) { continue }
|
||||
$columns += [ordered]@{ labelField = $attr.Name; path = "Список.$($attr.Name)" }
|
||||
}
|
||||
# Hidden ref
|
||||
@@ -467,6 +478,7 @@ function Generate-CatalogItemDSL($meta, [hashtable]$p, [hashtable]$fd) {
|
||||
|
||||
foreach ($attr in $meta.Attributes) {
|
||||
if ($footerFieldNames -contains $attr.Name) { continue }
|
||||
if (-not (Test-DisplayableType $attr.Type)) { continue }
|
||||
$headerChildren += (New-FieldElement -attrName $attr.Name -dataPath "Объект.$($attr.Name)" -attrType $attr.Type -fieldDefaults $fd -extraProps @{})
|
||||
}
|
||||
|
||||
@@ -555,6 +567,7 @@ function Generate-DocumentListDSL($meta, [hashtable]$p) {
|
||||
$columns = @()
|
||||
# All custom attributes as labelField
|
||||
foreach ($attr in $meta.Attributes) {
|
||||
if (-not (Test-DisplayableType $attr.Type)) { continue }
|
||||
$columns += [ordered]@{ labelField = $attr.Name; path = "Список.$($attr.Name)" }
|
||||
}
|
||||
# Hidden ref
|
||||
@@ -629,7 +642,7 @@ function Generate-DocumentItemDSL($meta, [hashtable]$p, [hashtable]$fd) {
|
||||
|
||||
$unclaimed = @()
|
||||
foreach ($attr in $meta.Attributes) {
|
||||
if (-not $claimed.ContainsKey($attr.Name)) { $unclaimed += $attr }
|
||||
if (-not $claimed.ContainsKey($attr.Name) -and (Test-DisplayableType $attr.Type)) { $unclaimed += $attr }
|
||||
}
|
||||
|
||||
# Distribute unclaimed
|
||||
@@ -698,7 +711,7 @@ function Generate-DocumentItemDSL($meta, [hashtable]$p, [hashtable]$fd) {
|
||||
$footerElements = @()
|
||||
foreach ($fn in $footerFields) {
|
||||
$fAttr = $meta.Attributes | Where-Object { $_.Name -eq $fn }
|
||||
if ($fAttr) {
|
||||
if ($fAttr -and (Test-DisplayableType $fAttr.Type)) {
|
||||
$footerElements += (New-FieldElement -attrName $fAttr.Name -dataPath "Объект.$($fAttr.Name)" -attrType $fAttr.Type -fieldDefaults $fd -extraProps @{})
|
||||
}
|
||||
}
|
||||
|
||||
@@ -255,6 +255,12 @@ def load_preset(preset_name, script_dir, out_path_resolved):
|
||||
return defaults
|
||||
|
||||
|
||||
# Non-displayable types — cannot be bound to form elements
|
||||
NON_DISPLAYABLE_TYPES = ('ValueStorage', 'v8:ValueStorage', 'ХранилищеЗначения')
|
||||
|
||||
def is_displayable_type(type_str):
|
||||
return not any(nd in type_str for nd in NON_DISPLAYABLE_TYPES)
|
||||
|
||||
def new_field_element(attr_name, data_path, attr_type, field_defaults, extra_props=None):
|
||||
"""Build a field element DSL entry."""
|
||||
is_ref = bool(re.search(r'Ref\.', attr_type))
|
||||
@@ -339,6 +345,8 @@ def generate_catalog_list_dsl(meta, p):
|
||||
columns.append(OrderedDict([('labelField', '\u041a\u043e\u0434'), ('path', '\u0421\u043f\u0438\u0441\u043e\u043a.Code')]))
|
||||
# Custom attributes
|
||||
for attr in meta['Attributes']:
|
||||
if not is_displayable_type(attr['Type']):
|
||||
continue
|
||||
columns.append(OrderedDict([('labelField', attr['Name']), ('path', f"\u0421\u043f\u0438\u0441\u043e\u043a.{attr['Name']}")]))
|
||||
# Hidden ref
|
||||
if p.get('hiddenRef', True) is not False:
|
||||
@@ -444,6 +452,8 @@ def generate_catalog_item_dsl(meta, p, fd):
|
||||
for attr in meta['Attributes']:
|
||||
if attr['Name'] in footer_field_names:
|
||||
continue
|
||||
if not is_displayable_type(attr['Type']):
|
||||
continue
|
||||
header_children.append(new_field_element(attr['Name'], f"\u041e\u0431\u044a\u0435\u043a\u0442.{attr['Name']}", attr['Type'], fd))
|
||||
|
||||
# Build root elements
|
||||
@@ -520,6 +530,8 @@ def generate_document_list_dsl(meta, p):
|
||||
columns = []
|
||||
# All custom attributes as labelField
|
||||
for attr in meta['Attributes']:
|
||||
if not is_displayable_type(attr['Type']):
|
||||
continue
|
||||
columns.append(OrderedDict([('labelField', attr['Name']), ('path', f"\u0421\u043f\u0438\u0441\u043e\u043a.{attr['Name']}")]))
|
||||
# Hidden ref
|
||||
if p.get('hiddenRef', True):
|
||||
@@ -596,7 +608,7 @@ def generate_document_item_dsl(meta, p, fd):
|
||||
for fn in add_right:
|
||||
claimed[fn] = 'additional.right'
|
||||
|
||||
unclaimed = [attr for attr in meta['Attributes'] if attr['Name'] not in claimed]
|
||||
unclaimed = [attr for attr in meta['Attributes'] if attr['Name'] not in claimed and is_displayable_type(attr['Type'])]
|
||||
|
||||
# Distribute unclaimed
|
||||
left_attrs = []
|
||||
|
||||
Reference in New Issue
Block a user