mirror of
https://github.com/Nikolay-Shirokov/cc-1c-skills.git
synced 2026-09-03 00:30:52 +03:00
feat(skd): periodAdditionBegin/End с типом dcscor:Field
GroupItemField может иметь periodAdditionBegin/End: - xsi:type="xs:dateTime" с конкретной датой - xsi:type="dcscor:Field" с путём к параметру/полю (например "ПараметрыДанных.ДатаНачала"). См. АнализДоходовРасходов @8933. Раньше эмитили захардкоженный default xs:dateTime 0001-01-01T00:00:00, теряя любые non-default значения. decompile: читаем оба элемента, сохраняем как string поля periodAdditionBegin/End в object form group field (если non-default). compile: auto-detect типа по pattern (ISO date → xs:dateTime, иначе → dcscor:Field). PS и Py compile синхронизированы.
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
#!/usr/bin/env python3
|
||||
# skd-compile v1.89 — Compile 1C DCS from JSON
|
||||
# skd-compile v1.90 — Compile 1C DCS from JSON
|
||||
# Source: https://github.com/Nikolay-Shirokov/cc-1c-skills
|
||||
import argparse
|
||||
import json
|
||||
@@ -2192,8 +2192,13 @@ def emit_group_items(lines, group_by, indent):
|
||||
lines.append(f'{indent}\t\t<dcsset:groupType>{esc_xml(gt)}</dcsset:groupType>')
|
||||
pat = str(field.get('periodAdditionType', 'None'))
|
||||
lines.append(f'{indent}\t\t<dcsset:periodAdditionType>{esc_xml(pat)}</dcsset:periodAdditionType>')
|
||||
lines.append(f'{indent}\t\t<dcsset:periodAdditionBegin xsi:type="xs:dateTime">0001-01-01T00:00:00</dcsset:periodAdditionBegin>')
|
||||
lines.append(f'{indent}\t\t<dcsset:periodAdditionEnd xsi:type="xs:dateTime">0001-01-01T00:00:00</dcsset:periodAdditionEnd>')
|
||||
# Auto-detect: ISO date → xs:dateTime, иначе → dcscor:Field (path).
|
||||
pab = str(field.get('periodAdditionBegin', '0001-01-01T00:00:00'))
|
||||
pae = str(field.get('periodAdditionEnd', '0001-01-01T00:00:00'))
|
||||
pab_t = 'xs:dateTime' if re.match(r'^\d{4}-\d{2}-\d{2}T', pab) else 'dcscor:Field'
|
||||
pae_t = 'xs:dateTime' if re.match(r'^\d{4}-\d{2}-\d{2}T', pae) else 'dcscor:Field'
|
||||
lines.append(f'{indent}\t\t<dcsset:periodAdditionBegin xsi:type="{pab_t}">{esc_xml(pab)}</dcsset:periodAdditionBegin>')
|
||||
lines.append(f'{indent}\t\t<dcsset:periodAdditionEnd xsi:type="{pae_t}">{esc_xml(pae)}</dcsset:periodAdditionEnd>')
|
||||
lines.append(f'{indent}\t</dcsset:item>')
|
||||
lines.append(f'{indent}</dcsset:groupItems>')
|
||||
|
||||
|
||||
Reference in New Issue
Block a user