odant-work 1.0.0 → 1.0.2

package/MODULES/Register/REGISTER/$register/$folder/$class/$register/handlers/pages/form/journal/$handler/journal.js

@@ -51,6 +51,74 @@ function _derivePacketsKey(from, to, fallback = '*') {
     return fallback || '*';
 }
 
+function _daysInMonth(y, m) {
+    return new Date(y, m, 0).getDate();
+}
+
+function _weekBounds(dt) {
+    const dow = dt.getDay();
+    const diffToMon = dow === 0 ? -6 : 1 - dow;
+    const mon = new Date(dt.getFullYear(), dt.getMonth(), dt.getDate() + diffToMon);
+    const sun = new Date(mon.getFullYear(), mon.getMonth(), mon.getDate() + 6);
+    return { from: _day(mon), to: _day(sun) };
+}
+
+function _boundsFromPacketsKey(key, defaultMode = 'month') {
+    const k = String(key || '').trim();
+    if (!k || k === '*')
+        return { from: '', to: '' };
+    if (k.startsWith('period:')) {
+        const [, s = '', e = ''] = k.split(':');
+        return { from: s, to: e };
+    }
+    if (k === 'now' || k.startsWith('now:')) {
+        const gran = k.startsWith('now:') ? k.slice(4) : defaultMode;
+        const now = new Date();
+        const y = now.getFullYear(), m = now.getMonth() + 1;
+        if (gran === 'day') {
+            const d = _day(now);
+            return { from: d, to: d };
+        }
+        if (gran === 'week')
+            return _weekBounds(now);
+        if (gran === 'quarter') {
+            const q = Math.floor((m - 1) / 3) + 1;
+            const m1 = String((q - 1) * 3 + 1).padStart(2, '0');
+            const m2 = (q - 1) * 3 + 3;
+            return { from: `${y}-${m1}-01`, to: `${y}-${String(m2).padStart(2, '0')}-${String(_daysInMonth(y, m2)).padStart(2, '0')}` };
+        }
+        if (gran === 'year')
+            return { from: `${y}-01-01`, to: `${y}-12-31` };
+        const ms = String(m).padStart(2, '0');
+        return { from: `${y}-${ms}-01`, to: `${y}-${ms}-${String(_daysInMonth(y, m)).padStart(2, '0')}` };
+    }
+    const clean = k.replace(/\*+$/, '');
+    if (/^\d{4}$/.test(clean))
+        return { from: `${clean}-01-01`, to: `${clean}-12-31` };
+    const qm = /^(\d{4})-q([1-4])$/i.exec(clean);
+    if (qm) {
+        const y = +qm[1], q = +qm[2];
+        const m1 = String((q - 1) * 3 + 1).padStart(2, '0');
+        const m2 = (q - 1) * 3 + 3;
+        return { from: `${y}-${m1}-01`, to: `${y}-${String(m2).padStart(2, '0')}-${String(_daysInMonth(y, m2)).padStart(2, '0')}` };
+    }
+    const mm = /^(\d{4})-(0[1-9]|1[0-2])$/.exec(clean);
+    if (mm) {
+        const y = +mm[1], m = +mm[2];
+        return { from: `${clean}-01`, to: `${clean}-${String(_daysInMonth(y, m)).padStart(2, '0')}` };
+    }
+    if (clean.startsWith('week:')) {
+        const monIso = clean.slice(5);
+        if (/^\d{4}-\d{2}-\d{2}$/.test(monIso)) {
+            const [y, m, d] = monIso.split('-').map(Number);
+            return _weekBounds(new Date(y, m - 1, d));
+        }
+    }
+    if (/^\d{4}-\d{2}-\d{2}$/.test(clean))
+        return { from: clean, to: clean };
+    return { from: '', to: '' };
+}
+
 const money = v => (Number(v) ? Number(v).toLocaleString('ru-RU', { minimumFractionDigits: 2, maximumFractionDigits: 2 }) : '');
 
 export default {
@@ -449,14 +517,23 @@ export default {
         if (!hasNavPeriod && (this.from || this.to))
             return;
         const saved = _readSavedPeriod();
-        const src = hasNavPeriod ? nav : saved;
+        const pk = typeof this.packetsKey === 'string' ? this.packetsKey : '';
+        const src = hasNavPeriod ? nav : (saved || (pk && pk !== '*' ? { packetsKey: pk } : null));
         if (!src)
             return;
         this._initializingPackets = true;
         try {
-            const from = String(src.from || '');
-            const to = String(src.to || '');
-            const key = _derivePacketsKey(from, to, typeof src.packetsKey === 'string' ? src.packetsKey : '*');
+            const rawKey = typeof src.packetsKey === 'string' && src.packetsKey ? src.packetsKey : (pk || '*');
+            let from = String(src.from || '');
+            let to = String(src.to || '');
+            if ((!from && !to && rawKey !== '*') || rawKey === 'now' || rawKey.startsWith('now:')) {
+                const derived = _boundsFromPacketsKey(rawKey, 'month');
+                if (derived.from && derived.to) {
+                    from = derived.from;
+                    to = derived.to;
+                }
+            }
+            const key = _derivePacketsKey(from, to, rawKey);
             this.from = from;
             this.to = to;
             this._packetFiltered = !!(from || to);
@@ -526,7 +603,9 @@ export default {
         this.packetsStart = r.start;
         this.packetsEnd = r.end;
         this.packetDays = Array.isArray(r.days) && r.days.length ? r.days : null;
-        if (this._packetFiltered && ((this.to && this.to < r.start) || (this.from && this.from > r.end))) {
+        const keyStr = typeof this.packetsKey === 'string' ? this.packetsKey : '';
+        const isNowKey = keyStr === 'now' || keyStr.startsWith('now:');
+        if (this._packetFiltered && !isNowKey && this.to && this.to < r.start) {
             this._initializingPackets = true;
             try {
                 this._packetFiltered = false;

package/MODULES/Register/REGISTER/$register/$folder/$class/$register/handlers/pages/form/sheet/$handler/sheet.js

@@ -53,6 +53,74 @@ function _derivePacketsKey(from, to, fallback = '*') {
     return fallback || '*';
 }
 
+function _daysInMonth(y, m) {
+    return new Date(y, m, 0).getDate();
+}
+
+function _weekBounds(dt) {
+    const dow = dt.getDay();
+    const diffToMon = dow === 0 ? -6 : 1 - dow;
+    const mon = new Date(dt.getFullYear(), dt.getMonth(), dt.getDate() + diffToMon);
+    const sun = new Date(mon.getFullYear(), mon.getMonth(), mon.getDate() + 6);
+    return { from: _day(mon), to: _day(sun) };
+}
+
+function _boundsFromPacketsKey(key, defaultMode = 'month') {
+    const k = String(key || '').trim();
+    if (!k || k === '*')
+        return { from: '', to: '' };
+    if (k.startsWith('period:')) {
+        const [, s = '', e = ''] = k.split(':');
+        return { from: s, to: e };
+    }
+    if (k === 'now' || k.startsWith('now:')) {
+        const gran = k.startsWith('now:') ? k.slice(4) : defaultMode;
+        const now = new Date();
+        const y = now.getFullYear(), m = now.getMonth() + 1;
+        if (gran === 'day') {
+            const d = _day(now);
+            return { from: d, to: d };
+        }
+        if (gran === 'week')
+            return _weekBounds(now);
+        if (gran === 'quarter') {
+            const q = Math.floor((m - 1) / 3) + 1;
+            const m1 = String((q - 1) * 3 + 1).padStart(2, '0');
+            const m2 = (q - 1) * 3 + 3;
+            return { from: `${y}-${m1}-01`, to: `${y}-${String(m2).padStart(2, '0')}-${String(_daysInMonth(y, m2)).padStart(2, '0')}` };
+        }
+        if (gran === 'year')
+            return { from: `${y}-01-01`, to: `${y}-12-31` };
+        const ms = String(m).padStart(2, '0');
+        return { from: `${y}-${ms}-01`, to: `${y}-${ms}-${String(_daysInMonth(y, m)).padStart(2, '0')}` };
+    }
+    const clean = k.replace(/\*+$/, '');
+    if (/^\d{4}$/.test(clean))
+        return { from: `${clean}-01-01`, to: `${clean}-12-31` };
+    const qm = /^(\d{4})-q([1-4])$/i.exec(clean);
+    if (qm) {
+        const y = +qm[1], q = +qm[2];
+        const m1 = String((q - 1) * 3 + 1).padStart(2, '0');
+        const m2 = (q - 1) * 3 + 3;
+        return { from: `${y}-${m1}-01`, to: `${y}-${String(m2).padStart(2, '0')}-${String(_daysInMonth(y, m2)).padStart(2, '0')}` };
+    }
+    const mm = /^(\d{4})-(0[1-9]|1[0-2])$/.exec(clean);
+    if (mm) {
+        const y = +mm[1], m = +mm[2];
+        return { from: `${clean}-01`, to: `${clean}-${String(_daysInMonth(y, m)).padStart(2, '0')}` };
+    }
+    if (clean.startsWith('week:')) {
+        const monIso = clean.slice(5);
+        if (/^\d{4}-\d{2}-\d{2}$/.test(monIso)) {
+            const [y, m, d] = monIso.split('-').map(Number);
+            return _weekBounds(new Date(y, m - 1, d));
+        }
+    }
+    if (/^\d{4}-\d{2}-\d{2}$/.test(clean))
+        return { from: clean, to: clean };
+    return { from: '', to: '' };
+}
+
 export default {
     imports: 'oda//button, oda//packets',
     template: /*html*/`
@@ -489,14 +557,23 @@ export default {
         if (!hasNavPeriod && (this.from || this.to))
             return;
         const saved = _readSavedPeriod();
-        const src = hasNavPeriod ? nav : saved;
+        const pk = typeof this.packetsKey === 'string' ? this.packetsKey : '';
+        const src = hasNavPeriod ? nav : (saved || (pk && pk !== '*' ? { packetsKey: pk } : null));
         if (!src)
             return;
         this._initializingPackets = true;
         try {
-            const from = String(src.from || '');
-            const to = String(src.to || '');
-            const key = _derivePacketsKey(from, to, typeof src.packetsKey === 'string' ? src.packetsKey : '*');
+            const rawKey = typeof src.packetsKey === 'string' && src.packetsKey ? src.packetsKey : (pk || '*');
+            let from = String(src.from || '');
+            let to = String(src.to || '');
+            if ((!from && !to && rawKey !== '*') || rawKey === 'now' || rawKey.startsWith('now:')) {
+                const derived = _boundsFromPacketsKey(rawKey, 'month');
+                if (derived.from && derived.to) {
+                    from = derived.from;
+                    to = derived.to;
+                }
+            }
+            const key = _derivePacketsKey(from, to, rawKey);
             this.from = from;
             this.to = to;
             this._packetFiltered = !!(from || to);
@@ -573,7 +650,9 @@ export default {
         this.packetsStart = r.start;
         this.packetsEnd = r.end;
         this.packetDays = Array.isArray(r.days) && r.days.length ? r.days : null;
-        if (this._packetFiltered && ((this.to && this.to < r.start) || (this.from && this.from > r.end))) {
+        const keyStr = typeof this.packetsKey === 'string' ? this.packetsKey : '';
+        const isNowKey = keyStr === 'now' || keyStr.startsWith('now:');
+        if (this._packetFiltered && !isNowKey && this.to && this.to < r.start) {
             this._initializingPackets = true;
             try {
                 this._packetFiltered = false;

package/data/authority-key.json

@@ -0,0 +1,5 @@
+{
+  "publicKey": "MCowBQYDK2VwAyEAWUaWWCwtQMu6P1vyw67NV4k1n+u2rWlKsYzqwMZWLBs=",
+  "privateKey": "MC4CAQAwBQYDK2VwBCIEIJ11hrseEgp+y+025hchZFmZDdMppBxHNQIU18YFCd6q",
+  "created": 1793258170482
+}

package/data/store.json

@@ -0,0 +1,182 @@
+{
+  "licenses": {
+    "WORK-PAK-300A0DD0": {
+      "licenseId": "WORK-PAK-300A0DD0",
+      "issuedAt": 1793262666169,
+      "updatedAt": 1793271130179,
+      "issuer": "work.odant.org",
+      "customer": {
+        "name": "ООО «Маслоторг»",
+        "inn": "",
+        "email": "admin@maslotorg.ru",
+        "phone": ""
+      },
+      "hardware": {
+        "hwid": "PAK-3C564FAE8C0E",
+        "nodeFingerprint": "",
+        "sku": "WORK-PAK-495-192-4T",
+        "cpu": "AMD Ryzen™ AI Max+ PRO 495 (Zen 5, 16 ядер / 32 потока, до 5.2 ГГц, кэш 80 МБ)",
+        "ramGb": 192,
+        "ssdTb": 4,
+        "warrantyYears": 1,
+        "warrantyUntil": 1824798666169,
+        "warrantyProvider": "Партнёр-интегратор WORK"
+      },
+      "partner": null,
+      "baseSeats": 10,
+      "perpetualBase": true,
+      "addonSubscriptions": [],
+      "support": {
+        "tier": "business",
+        "includedUntil": 1824798666169,
+        "ticketsUsed": 1,
+        "bindCode": "BIND-4D86AF"
+      },
+      "protocol": "WORK-LIC-v1",
+      "issuerPublicKey": "MCowBQYDK2VwAyEAWUaWWCwtQMu6P1vyw67NV4k1n+u2rWlKsYzqwMZWLBs=",
+      "signature": "JJ4b3YNiKbXO4enxRDYCVrE0+ZOSCpnaG268vW/RE/ucAFx+tJi9Xy4dLjfHogBxVw9Y5sAdivwCovq3yKTMBg=="
+    }
+  },
+  "orders": {
+    "ORD-MVTAMUDM-0F96": {
+      "orderId": "ORD-MVTAMUDM-0F96",
+      "licenseId": "WORK-PAK-300A0DD0",
+      "partnerId": "",
+      "partnerDiscountPercent": 0,
+      "partnerMarginRub": 0,
+      "includeBasePak": false,
+      "tier": "business",
+      "tierName": "Business",
+      "addonSeats": 10,
+      "years": 1,
+      "amountRub": 135000,
+      "items": [
+        {
+          "title": "Годовая лицензия ODANT-WORK на доп. рабочее место (уровень Business, 1 г., скидка −10% за объём)",
+          "quantity": 10,
+          "unitPriceRub": 13500,
+          "totalRub": 135000
+        }
+      ],
+      "customer": {
+        "name": "ООО «Маслоторг»",
+        "inn": "7701234567",
+        "email": "admin@maslotorg.ru",
+        "phone": ""
+      },
+      "status": "pending",
+      "paymentId": "yk_sandbox_2874a3734d40ab1b",
+      "confirmationUrl": "http://localhost:8020/pay/sandbox/ORD-MVTAMUDM-0F96",
+      "returnUrl": "https://work.odant.org",
+      "createdAt": 1793263243594,
+      "paidAt": null,
+      "yookassaMode": "sandbox"
+    },
+    "ORD-FR-MVTAMUET-FFAD": {
+      "orderId": "ORD-FR-MVTAMUET-FFAD",
+      "kind": "franchise_reservation",
+      "reservationId": "RES-TA-8EFAA5",
+      "licenseId": "RES-TA-8EFAA5",
+      "regionCode": "RU-TA",
+      "regionName": "Республика Татарстан",
+      "tierName": "Резерв франшизы (Республика Татарстан)",
+      "addonSeats": 1,
+      "years": 1,
+      "amountRub": 100000,
+      "franchiseFeeRub": 6500000,
+      "items": [
+        {
+          "title": "Невозвратный залог за резервирование региональной франшизы ODANT-WORK (Республика Татарстан, стоимость франшизы 6 500 000 ₽)",
+          "quantity": 1,
+          "unitPriceRub": 100000,
+          "totalRub": 100000
+        }
+      ],
+      "customer": {
+        "name": "ООО «Волга-Интеграция»",
+        "inn": "1655123456",
+        "email": "partner@volga-it.ru",
+        "phone": ""
+      },
+      "status": "pending",
+      "paymentId": "yk_sandbox_fae9588353cc1267",
+      "confirmationUrl": "http://localhost:8020/pay/sandbox/ORD-FR-MVTAMUET-FFAD",
+      "returnUrl": "https://work.odant.org",
+      "createdAt": 1793263243636,
+      "paidAt": null,
+      "yookassaMode": "sandbox"
+    }
+  },
+  "tickets": {
+    "TCK-0000-28BE": {
+      "ticketId": "TCK-0000-28BE",
+      "licenseId": "WORK-PAK-300A0DD0",
+      "customerName": "ООО «Маслоторг»",
+      "channel": "max",
+      "chatId": "client-101",
+      "userName": "Пользователь MAX",
+      "tier": "business",
+      "tierName": "Business",
+      "reactionMinutes": 120,
+      "reactionLabel": "до 2 часов",
+      "slaDeadlineAt": 1793270443784,
+      "status": "open",
+      "createdAt": 1793263243784,
+      "firstReplyAt": null,
+      "slaMet": null,
+      "messages": [
+        {
+          "from": "client",
+          "author": "Пользователь MAX",
+          "text": "Подскажите, как синхронизировать сертификат после докупки 10 мест?",
+          "time": 1793263243784
+        }
+      ]
+    }
+  },
+  "botBindings": {
+    "max:client-101": {
+      "channel": "max",
+      "chatId": "client-101",
+      "userName": "Пользователь MAX",
+      "licenseId": "WORK-PAK-300A0DD0",
+      "boundAt": 1793263243683
+    }
+  },
+  "partners": {},
+  "reservations": {
+    "RES-TA-8EFAA5": {
+      "reservationId": "RES-TA-8EFAA5",
+      "orderId": "ORD-FR-MVTAMUET-FFAD",
+      "regionCode": "RU-TA",
+      "regionName": "Республика Татарстан",
+      "district": "ПФО",
+      "companyName": "ООО «Волга-Интеграция»",
+      "inn": "1655123456",
+      "email": "partner@volga-it.ru",
+      "phone": "",
+      "contactPerson": "",
+      "franchiseFeeRub": 6500000,
+      "nonRefundableDepositRub": 100000,
+      "remainingFranchiseFeeRub": 6400000,
+      "status": "reserved_pending_deposit",
+      "depositPaid": false,
+      "createdAt": 1793263243636,
+      "expiresAt": 1794472843636
+    }
+  },
+  "certificates": {},
+  "users": {
+    "admin@maslotorg.ru": {
+      "userId": "USR-4DB3960551",
+      "email": "admin@maslotorg.ru",
+      "name": "ООО «Маслоторг»",
+      "companyName": "ООО «Маслоторг»",
+      "inn": "",
+      "licenseId": "WORK-PAK-300A0DD0",
+      "sessionKey": "wks_d0839169d8c9db42e8815c031140eb7c",
+      "createdAt": 1793262666168,
+      "lastLoginAt": 1793262666168
+    }
+  }
+}

package/oda/components/packets/packets.js

@@ -406,6 +406,12 @@ ODA({
                 this._nowItem.idleLabel = NOW_IDLE_LABELS[mode] || 'Месяц';
                 this._nowItem.label = this._nowItem.idleLabel;
             }
+        },
+        _onValueChanged(value) {
+            if (!this._allItem) return;
+            const currentKey = this._selectionKey(this.selection);
+            if (value === currentKey) return;
+            this._applySelection(this._itemsByKey(value) ?? [this._allItem]);
         }
     },
     _hasCustomDays: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "odant-work",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "WORK — платформа цифровой организации (учётная система уровня 1С, документооборот, чаты и локальный мультимодальный ИИ)",
   "type": "module",
   "main": "sources/work.js",
@@ -14,7 +14,7 @@
     "test": "node --test \"tests/**/*.test.js\"",
     "test:ci": "npm test",
     "setup-mirror": "powershell -NoProfile -ExecutionPolicy Bypass -File scripts/setup-svn-mirror.ps1",
-    "publish": "powershell -NoProfile -ExecutionPolicy Bypass -File scripts/svn-publish.ps1",
+    "svn:publish": "powershell -NoProfile -ExecutionPolicy Bypass -File scripts/svn-publish.ps1",
     "sync": "powershell -NoProfile -ExecutionPolicy Bypass -File scripts/svn-sync.ps1",
     "mirror": "powershell -NoProfile -ExecutionPolicy Bypass -File scripts/mirror-to-git.ps1",
     "test:ui": "node tests/ui/run.mjs",

package/sources/data/api.js

@@ -473,6 +473,179 @@ function withTargetPaths(db, schema) {
     return { ...schema, fields: walk(schema.fields), overlay: walk(schema.overlay) };
 }
 
+/**
+ * Собрать аналитические признаки по полям прилинкованного справочника слота счёта
+ * (Наименование + поля схемы $catalog, вложенных структур $struct и расширений OVERLAY у $virtual)
+ * со списком реально существующих значений для панели «Анализ счёта».
+ */
+function buildCatalogAnalyticFields(db, slotField) {
+    const slotId = slotField.id;
+    const slotLabel = slotField.label || slotId;
+    const targetPath = slotField.targetPath || slotField.target;
+    const targetSchema = slotField.target ? withTargetPaths(db, classSchema(db, slotField.target)) : null;
+    if (!targetSchema) {
+        return [{
+            id: slotId,
+            spec: slotId,
+            slotId,
+            fieldId: 'name',
+            label: 'Наименование',
+            slotLabel,
+            isObject: true,
+            type: 'link',
+            catalog: targetPath,
+            options: [],
+        }];
+    }
+    const isVirt = targetSchema.type === '$virtual';
+    const regCid = isVirt ? (targetSchema.source?.registry || targetSchema.cid) : targetSchema.cid;
+    const descCids = descendants(db, regCid);
+
+    let objRows = [];
+    if (descCids.length) {
+        objRows = db.prepare(
+            `SELECT id, cid, body FROM objects WHERE cid IN (${descCids.map(() => '?').join(',')}) AND status <> 'deleted' AND ext_of IS NULL ORDER BY updated DESC LIMIT 300`
+        ).all(...descCids);
+    }
+    const extByObj = new Map();
+    if (isVirt) {
+        const virtCids = descendants(db, targetSchema.cid);
+        if (virtCids.length) {
+            for (const r of db.prepare(
+                `SELECT ext_of, body FROM objects WHERE cid IN (${virtCids.map(() => '?').join(',')}) AND status <> 'deleted' AND ext_of IS NOT NULL LIMIT 300`
+            ).all(...virtCids)) {
+                try {
+                    extByObj.set(r.ext_of, JSON.parse(r.body || '{}'));
+                }
+                catch { /* ignore */ }
+            }
+        }
+    }
+
+    const parsedObjs = objRows.map(r => {
+        let body = {};
+        try { body = JSON.parse(r.body || '{}'); } catch { /* ignore */ }
+        const title = String(body.name || body.label || body.title || r.id).trim();
+        return { id: r.id, title, body, ext: extByObj.get(r.id) || null };
+    });
+
+    const objectOptions = parsedObjs
+        .map(o => ({ value: o.id, label: o.title || o.id }))
+        .sort((a, b) => a.label.localeCompare(b.label, 'ru', { numeric: true }));
+
+    const fieldDefs = [];
+    const seenFieldIds = new Set(['name', 'time']);
+    const collectFields = (list, isOverlay = false, prefix = '', prefixLabel = '') => {
+        for (const f of list || []) {
+            if (!f?.id || f.type === 'table')
+                continue;
+            const fullId = prefix ? `${prefix}.${f.id}` : f.id;
+            const fullLabel = prefixLabel ? `${prefixLabel}: ${f.label || f.id}` : (f.label || f.id);
+            if (f.type === 'struct' && Array.isArray(f.fields) && f.fields.length) {
+                collectFields(f.fields, isOverlay, fullId, fullLabel);
+                continue;
+            }
+            if (seenFieldIds.has(fullId))
+                continue;
+            seenFieldIds.add(fullId);
+            fieldDefs.push({
+                fieldId: fullId,
+                label: fullLabel,
+                type: f.type || 'string',
+                target: f.target,
+                values: f.values || f.options,
+                isOverlay,
+            });
+        }
+    };
+
+    collectFields(targetSchema.fields, false);
+    if (isVirt)
+        collectFields(targetSchema.overlay, true);
+    for (const cid of descCids) {
+        if (cid === targetSchema.cid)
+            continue;
+        const cs = classSchema(db, cid);
+        if (cs)
+            collectFields(cs.fields, false);
+    }
+
+    const refIdsToResolve = new Set();
+    const rawValuesByField = new Map();
+    for (const fd of fieldDefs) {
+        const vals = new Set();
+        for (const o of parsedObjs) {
+            let v;
+            if (fd.isOverlay && o.ext) {
+                v = o.ext[fd.fieldId];
+            }
+            else {
+                let cur = o.body;
+                for (const part of fd.fieldId.split('.')) {
+                    if (!cur || typeof cur !== 'object') { cur = undefined; break; }
+                    cur = cur[part];
+                }
+                v = cur;
+            }
+            if (v === undefined || v === null || v === '' || typeof v === 'object')
+                continue;
+            const strVal = String(v).trim();
+            if (!strVal)
+                continue;
+            vals.add(strVal);
+            if (fd.type === 'link')
+                refIdsToResolve.add(strVal);
+        }
+        rawValuesByField.set(fd.fieldId, [...vals]);
+    }
+
+    const refNames = refIdsToResolve.size ? namesOf(db, [...refIdsToResolve]).objects : {};
+
+    const out = [{
+        id: slotId,
+        spec: slotId,
+        slotId,
+        fieldId: 'name',
+        label: 'Наименование',
+        slotLabel,
+        isObject: true,
+        type: 'link',
+        catalog: targetPath,
+        options: objectOptions,
+    }];
+
+    for (const fd of fieldDefs) {
+        const rawVals = rawValuesByField.get(fd.fieldId) || [];
+        let options = [];
+        if (fd.type === 'boolean') {
+            options = [{ value: '1', label: 'Да' }, { value: '0', label: 'Нет' }];
+        }
+        else if (fd.type === 'enum' && Array.isArray(fd.values) && fd.values.length) {
+            options = fd.values.map(v => (v && typeof v === 'object'
+                ? { value: String(v.id ?? v.value), label: String(v.label ?? v.id ?? v.value) }
+                : { value: String(v), label: String(v) }));
+        }
+        else {
+            options = rawVals.map(v => ({
+                value: v,
+                label: fd.type === 'link' ? (refNames[v] || v) : v,
+            })).sort((a, b) => a.label.localeCompare(b.label, 'ru', { numeric: true }));
+        }
+        out.push({
+            id: `${slotId}.${fd.fieldId}`,
+            spec: `${slotId}.${fd.fieldId}`,
+            slotId,
+            fieldId: fd.fieldId,
+            label: fd.label,
+            slotLabel,
+            isObject: false,
+            type: fd.type,
+            options,
+        });
+    }
+    return out;
+}
+
 /**
  * Поддерево класса для форм: `classes` (cid → описание потомков), `leaves` (листья для создания
  * объектов в группе) и `slots` (слоты аналитик счёта или журнала по всему поддереву счетов).
@@ -508,7 +681,13 @@ function schemaSubtree(db, cls) {
             for (const f of analyticSlots(s || { fields: [] })) {
                 if (!seenSlots.has(f.id)) {
                     seenSlots.add(f.id);
-                    slots.push({ id: f.id, label: f.label || f.id, target: f.target, targetPath: f.targetPath || f.target });
+                    slots.push({
+                        id: f.id,
+                        label: f.label || f.id,
+                        target: f.target,
+                        targetPath: f.targetPath || f.target,
+                        fields: buildCatalogAnalyticFields(db, f),
+                    });
                 }
             }
         }