odant-work 1.0.1 → 1.0.2

package/$server/$folder/$class/$structure/$server/handlers/pages/form/license/$handler/license.js

@@ -204,19 +204,19 @@ export default {
                         <oda-icon icon="carbon:user-multiple" :icon-size="20"></oda-icon>
                         <span>Одновременные сессии (рабочие места)</span>
                     </div>
-                    <span class="badge">Вечная база: {{status?.baseSeats || 5}} мест</span>
+                    <span class="badge">Вечная база: {{status?.baseSeats || 10}} мест</span>
                 </div>
                 <div class="seats-meter">
-                    <span class="seats-big">{{status?.activeSeatsCount || 0}} / {{status?.totalSeats || 5}}</span>
-                    <span>активных сессий ({{status?.baseSeats || 5}} вечных + {{status?.addonSeats || 0}} срочных годовых)</span>
+                    <span class="seats-big">{{status?.activeSeatsCount || 0}} / {{status?.totalSeats || 10}}</span>
+                    <span>активных сессий ({{status?.baseSeats || 10}} вечных + {{status?.addonSeats || 0}} срочных годовых)</span>
                 </div>
                 <div class="kv-list">
                     <div class="kv-row">
                         <span class="kv-label">Уровень поддержки (SLA)</span>
-                        <span class="kv-val">{{status?.support?.tierName || 'Business'}} ({{status?.support?.reactionText || 'до 2 часов'}})</span>
+                        <span class="kv-val">{{status?.support?.tierName || 'Enterprise'}} ({{status?.support?.reactionText || 'до 15 минут'}})</span>
                     </div>
                     <div class="kv-row">
-                        <span class="kv-label">Включённый 1-й год поддержки ПАК</span>
+                        <span class="kv-label">Включённый 1-й год поддержки ПАК (Enterprise, далее — по желанию)</span>
                         <span class="kv-val">{{baseSupportText}}</span>
                     </div>
                     <div class="kv-row">
@@ -240,7 +240,10 @@ export default {
                     <oda-icon icon="carbon:machine-learning-model" :icon-size="20"></oda-icon>
                     <span>Предустановленный локальный стек ИИ ODANT-WORK</span>
                 </div>
-                <span class="badge">Встроенная система учёта, документооборота, процессов и приватный ИИ</span>
+                <span class="badge">Базовые операции локально · мощные ИИ — через API из любого источника</span>
+            </div>
+            <div style="font-size:12.5px; color:var(--text-muted, #64748b); margin-bottom:10px;">
+                Интегрированные модели предназначены для базовых ежедневных операций. Если требуются более мощные модели ИИ, их можно подключить через API из любого внешнего или корпоративного источника в разделе <code>/MODELS</code>.
             </div>
             <div class="models-grid">
                 <div class="model-box" ~for="status?.preinstalledModels || []">

package/$server/$folder/$class/handlers/pages/form/object/$handler/class.js

@@ -0,0 +1,27 @@
+/**
+ * Мета хендлера form/object — стандартное представление редактора объекта/документа на форме.
+ * allowTools: false отключает верхний тулбар с кнопками хендлеров (Скрин 6).
+ */
+export default {
+    icon: 'icons:description',
+    label: 'Объект',
+    allowTools: false,
+    allowSave: true,
+    hiddenInViewList: true,
+    roles: ['BOSS', 'USER'],
+    async allowUse($context, params) {
+        const t = $context?.type;
+        if (t && t !== '$catalog' && t !== '$operation' && t !== '$class' && !($context?.DATA?.METADATA?.FIELDS?.length))
+            return false;
+        try {
+            const s = (await $context?.db_schema?.({ session: params?.session }))?.schema;
+            if (s)
+                return (s.family === 'operation' || s.family === 'catalog') && s.type !== '$virtual' && (s.fields.length > 0 || !s.leaf);
+        }
+        catch {
+            return false;
+        }
+        const md = await $context?.METADATA;
+        return Array.isArray(md?.FIELDS) && md.FIELDS.length > 0;
+    },
+}

package/$server/$folder/$class/handlers/pages/form/object/$handler/object.js

@@ -0,0 +1,352 @@
+/**
+ * form/object — стандартная вьюха редактора объекта/документа на стандартной форме work-form (Скрин 6).
+ * Верхний тулбар хендлеров отключён через allowTools: false у хендлера.
+ * Сервисные действия (Провести / Проведен / Отменить, Печать, Удалить / Восстановить) выводятся
+ * в левой части подвала формы (#focusedTools), а кнопки OK / Сохранить / Закрыть и вкладки — в правой.
+ */
+import objectsProto from '../../objects/$handler/objects.js';
+
+function _day(d) {
+    return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
+}
+const _today = () => _day(new Date());
+
+const proto = Object.defineProperties({}, Object.getOwnPropertyDescriptors(objectsProto));
+
+Object.assign(proto, {
+    imports: 'oda//button, oda//icon, ~/lib//editor-form',
+    isObjectView: true,
+    template: /*html*/`
+    <style>
+        :host {
+            @apply --vertical;
+            @apply --flex;
+            background: var(--content-background, #fff);
+            color: var(--content-color, #222);
+            overflow: hidden;
+            font-size: 13px;
+        }
+        .obj-header {
+            @apply --horizontal;
+            align-items: center;
+            justify-content: space-between;
+            gap: 12px;
+            padding: 8px 16px 4px;
+            flex-shrink: 0;
+        }
+        .obj-title {
+            font-size: 16px;
+            font-weight: 700;
+            color: light-dark(#3b28a8, #93c5fd);
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
+        .context {
+            @apply --horizontal;
+            align-items: center;
+            gap: 6px;
+            font-size: 12px;
+            flex-shrink: 0;
+        }
+        .context select {
+            padding: 2px 6px;
+            font-size: 12px;
+            border: 1px solid var(--border-color);
+            border-radius: 3px;
+            background: var(--content-background);
+            color: var(--content-color);
+        }
+        .obj-scroll {
+            @apply --vertical;
+            flex: 1;
+            min-height: 0;
+            overflow-y: auto;
+            padding-bottom: 8px;
+        }
+        oda-editor-form {
+            flex-shrink: 0;
+        }
+        .error {
+            padding: 6px 16px;
+            color: var(--error-color, #c53030);
+            background: light-dark(#fff5f5, rgba(229, 62, 62, 0.15));
+            border-top: 1px solid var(--error-color, #feb2b2);
+            border-bottom: 1px solid var(--error-color, #feb2b2);
+            white-space: break-spaces;
+            font-size: 12.5px;
+        }
+        .entries {
+            @apply --vertical;
+            gap: 3px;
+            margin: 6px 16px 0;
+            padding: 8px 10px;
+            font-size: 12px;
+            background: light-dark(#f8f7f2, #22232a);
+            border: 1px solid light-dark(#d8d7ce, #3e4049);
+            border-radius: 4px;
+        }
+        .entries-title {
+            font-weight: 700;
+            color: light-dark(#444, #cbd5e1);
+            margin-bottom: 2px;
+        }
+        .trajectory {
+            @apply --vertical;
+            gap: 4px;
+            margin: 6px 16px 0;
+            padding: 8px 10px;
+            font-size: 12px;
+            background: light-dark(#f8f7f2, #22232a);
+            border: 1px solid light-dark(#d8d7ce, #3e4049);
+            border-radius: 4px;
+        }
+        .trajectory-title {
+            font-weight: 700;
+            color: light-dark(#444, #cbd5e1);
+        }
+        .traj-row {
+            @apply --horizontal;
+            gap: 8px;
+            align-items: center;
+        }
+        .traj-link {
+            cursor: pointer;
+            text-decoration: underline;
+            color: light-dark(#1d4ed8, #93c5fd);
+        }
+        .traj-num {
+            margin-left: auto;
+            text-align: right;
+            font-variant-numeric: tabular-nums;
+        }
+    </style>
+    <div class="obj-header">
+        <div class="obj-title" :title="editorTitle">{{editorTitle}}</div>
+        <label class="context" ~if="showContext && !editing?.id">От места:
+            <select @change="contextKey = $this.value">
+                <option ~for="contexts" :value="contextKeyOf($for.item)"
+                    :selected="contextKeyOf($for.item) === contextKeyOf(context)">{{contextTitle($for.item)}}</option>
+            </select>
+        </label>
+    </div>
+    <div class="error" ~if="error">{{error}}</div>
+    <div class="obj-scroll">
+        <oda-editor-form ~if="editing" :metadata="activeSchema" :data="editing" :field-errors="fieldErrors"
+            @input="onFormInput" @change="onFormInput" @cell-changed="onFormInput"></oda-editor-form>
+        <div class="entries" ~if="entries?.length">
+            <div class="entries-title">Проводки:</div>
+            <div class="entry" ~for="entries">{{entryText($for.item)}}</div>
+        </div>
+        <div class="trajectory" ~if="objectBalances?.length || trajectory?.length">
+            <div class="trajectory-title" ~if="objectBalances?.length">Остатки по счетам</div>
+            <div class="traj-row" ~for="objectBalances">
+                <span class="traj-link" @tap="openBalanceAccount($for.item)">{{$for.item.label}}</span>
+                <span class="traj-num">{{$for.item.balance}}{{$for.item.qty ? ' (' + $for.item.qty + ')' : ''}}</span>
+            </div>
+            <div class="trajectory-title" ~if="trajectory?.length">Движения ({{trajectory.length}})</div>
+            <div class="traj-row" ~for="trajectory">
+                <span>{{$for.item.date}}</span>
+                <span class="traj-link" @tap="openTrajectoryOp($for.item)">{{$for.item.op}}</span>
+                <span>{{$for.item.account}}</span>
+                <span class="traj-num">{{$for.item.debit ? '+' + $for.item.debit : ($for.item.credit ? '−' + $for.item.credit : $for.item.qty)}} → {{$for.item.balance}}</span>
+            </div>
+        </div>
+    </div>
+    `,
+    mountToolbarSlots() {
+        // У формы объекта верхнего тулбара нет (allowTools: false)
+    },
+    getItemButtons() {
+        return [];
+    },
+    getFocusedButtons() {
+        return [];
+    },
+    getFocusedServices() {
+        const list = [];
+        if (this.isOperation) {
+            if (this.canRegister) {
+                list.push({
+                    id: 'post',
+                    label: 'Провести',
+                    icon: 'icons:settings',
+                    isService: true,
+                    service: true,
+                    order: 1,
+                    disabled: this.busy,
+                    execute: async () => {
+                        await this.post();
+                        this._notifyForm();
+                    },
+                });
+            }
+            else if (this.canCancel) {
+                list.push({
+                    id: 'cancel',
+                    label: 'Проведен (Отменить)',
+                    icon: 'icons:settings',
+                    isService: true,
+                    service: true,
+                    order: 1,
+                    disabled: this.busy,
+                    execute: async () => {
+                        await this.cancelOperation();
+                        this._notifyForm();
+                    },
+                });
+            }
+            for (let i = 0; i < (this.printForms || []).length; i++) {
+                const pf = this.printForms[i];
+                list.push({
+                    id: `print_${pf.name}`,
+                    label: pf.label || pf.name || 'Печать',
+                    icon: 'icons:print',
+                    isService: true,
+                    service: true,
+                    order: 2 + i,
+                    disabled: this.busy,
+                    execute: () => this.printForm(pf.name),
+                });
+            }
+        }
+        if (this.canRemove) {
+            list.push({
+                id: 'remove',
+                label: 'Удалить',
+                icon: 'icons:delete',
+                isService: true,
+                service: true,
+                order: 10,
+                disabled: this.busy,
+                execute: async () => {
+                    if (await this.removeObject()) {
+                        this._findFormHost()?.closeActiveTab?.(true);
+                    }
+                },
+            });
+        }
+        if (this.canRestore) {
+            list.push({
+                id: 'restore',
+                label: 'Восстановить',
+                icon: 'icons:restore',
+                isService: true,
+                service: true,
+                order: 11,
+                disabled: this.busy,
+                execute: async () => {
+                    await this.restoreObject();
+                    this._notifyForm();
+                },
+            });
+        }
+        return list;
+    },
+    onFormInput() {
+        if (this.fieldErrors && Object.keys(this.fieldErrors).length)
+            this.fieldErrors = {};
+        this.schedulePreview?.();
+        const host = this._findFormHost();
+        host?.updateActiveTabLabel?.(this.editorTitle);
+    },
+    async attached() {
+        try {
+            await Promise.all([this.loadSchema(), this.loadScope()]);
+        }
+        catch (e) {
+            this.error = String(e?.message || e);
+            return;
+        }
+        if (this._pendingNav) {
+            const nav = this._pendingNav;
+            this._pendingNav = null;
+            await this.applyNav(nav);
+        }
+        else if (!this.editing) {
+            await this.initFromNav({});
+        }
+    },
+    async applyNav(nav = {}) {
+        if (!this.schema) {
+            this._pendingNav = nav;
+            return;
+        }
+        await this.initFromNav(nav);
+    },
+    async initFromNav(nav = {}) {
+        this.clearError();
+        if (nav.leafCid) {
+            await this.loadLeafSchema(nav.leafCid);
+        }
+        else {
+            this.leafCid = '';
+            this.leafSchema = null;
+        }
+        if (nav.id) {
+            await this.select({ id: String(nav.id), cid: nav.leafCid || '' });
+        }
+        else if (nav.copyFrom) {
+            const found = await this.$item.fetch('db_read', { id: String(nav.copyFrom) });
+            if (found?.names && typeof found.names === 'object')
+                this.names = { ...(this.names || {}), ...found.names };
+            await this.loadLeafSchema(found?.cid || nav.leafCid || '');
+            const baseBody = { ...(found?.body || {}) };
+            delete baseBody.id;
+            delete baseBody.version;
+            delete baseBody.status;
+            this.editing = this.isOperation ? { ...baseBody, time: _today() } : baseBody;
+            this.entries = [];
+            this.entryNames = { objects: {}, classes: {} };
+            this.objectBalances = [];
+            this.trajectory = [];
+            this.printForms = [];
+            if (this.isOperation)
+                this.schedulePreview();
+        }
+        else {
+            this.editing = this.isOperation ? { time: _today(), ...(nav.initialData || {}) } : { ...(nav.initialData || {}) };
+            this.entries = [];
+            this.entryNames = { objects: {}, classes: {} };
+            this.objectBalances = [];
+            this.trajectory = [];
+            this.printForms = [];
+            if (this.isOperation)
+                this.schedulePreview();
+        }
+        this.focusedItem = this.editing || { id: nav.id || 'new' };
+        this.snapshot();
+        this.async(() => {
+            if (this.isConnected)
+                this.snapshot();
+        });
+        const host = this._findFormHost();
+        host?.updateActiveTabLabel?.(this.editorTitle);
+        this._notifyForm();
+    },
+    async saveAndStay() {
+        const ok = await this.save();
+        if (ok) {
+            if (this.editing?.id) {
+                await this.loadEntries();
+                await this.loadPrints();
+                await this.loadTrajectory();
+            }
+            const host = this._findFormHost();
+            host?.updateActiveTabLabel?.(this.editorTitle);
+            this._notifyForm();
+        }
+        return ok;
+    },
+    async saveAndClose() {
+        if (this.canSave) {
+            const ok = await this.save();
+            if (!ok)
+                return false;
+        }
+        this._findFormHost()?.closeActiveTab?.(true);
+        return true;
+    },
+});
+
+export default proto;

package/$server/$folder/$class/handlers/pages/form/objects/$handler/objects.js

@@ -1117,10 +1117,21 @@ export default {
         const qty = e.qty ? ` (${e.doc_qty ?? e.qty}${e.doc_unit ? ' ' + e.doc_unit : ''})` : '';
         return `Дт ${side(e.debit, e.debit_analytics)} — Кт ${side(e.credit, e.credit_analytics)}: ${Number(e.amount || 0).toLocaleString('ru-RU', { minimumFractionDigits: 2 })}${qty}`;
     },
-    /** Загрузить объект и открыть окно редактора. */
+    /** Загрузить объект и открыть вьюху редактора (внутри work-form — на вкладке form/object, автономно — модально). */
     async openEditor(row) {
         if (!row?.id || this.editorOpen)
             return;
+        const formHost = this._findFormHost();
+        if (formHost && typeof formHost.openInForm === 'function') {
+            const target = await this.targetItem(row.cid || '');
+            await formHost.openInForm(target || this.$item, {
+                view: 'object',
+                id: row.id,
+                leafCid: row.cid || '',
+                label: row.name || row.title || row.id,
+            });
+            return;
+        }
         this.editorOpen = true;
         this.editing = null;
         try {
@@ -1287,10 +1298,10 @@ export default {
             return;
         if (!this.schema)
             await this.loadSchema().catch(() => {});
+        let chosenCid = '';
         if (!this.schema?.leaf) {
             if (!this.leaves?.length)
                 return;
-            let chosenCid = '';
             if (typeof WORK?.showModal === 'function' && typeof document !== 'undefined') {
                 chosenCid = await this.pickTargetLeafClass();
                 if (!chosenCid)
@@ -1299,6 +1310,21 @@ export default {
             else {
                 chosenCid = this.leafCid || this.leaves[0].cid;
             }
+        }
+        const formHost = this._findFormHost();
+        if (formHost && typeof formHost.openInForm === 'function') {
+            const target = chosenCid ? await this.targetItem(chosenCid) : this.$item;
+            const leafLabel = chosenCid ? (this.classes?.[chosenCid]?.label || this.leaves?.find(l => l.cid === chosenCid)?.label || '') : '';
+            const title = leafLabel || this.schema?.title || 'Объект';
+            await formHost.openInForm(target || this.$item, {
+                view: 'object',
+                create: true,
+                leafCid: chosenCid || '',
+                label: `${title} · новый объект`,
+            });
+            return;
+        }
+        if (chosenCid) {
             this.editorOpen = true;
             await this.loadLeafSchema(chosenCid);
         }
@@ -1326,6 +1352,17 @@ export default {
     async copyRow(row = this.focusedRow) {
         if (!row?.id || this.editorOpen || !this.canCreate)
             return;
+        const formHost = this._findFormHost();
+        if (formHost && typeof formHost.openInForm === 'function') {
+            const target = await this.targetItem(row.cid || '');
+            await formHost.openInForm(target || this.$item, {
+                view: 'object',
+                copyFrom: row.id,
+                leafCid: row.cid || '',
+                label: `${row.name || 'Объект'} (копия)`,
+            });
+            return;
+        }
         this.editorOpen = true;
         this.clearError();
         try {