naeel
353e07bfa8
Opus review fixes: - executor.py: tracker_add inside executor after instance_uid, before params/run (A3, orphan protection) - executor.py: descr parameter (version/context instead of hardcoded) - api_test.py: pass client_id/stand/descr, remove duplicate tracker_add - scenario.py: pass client_id/stand/descr with scenario context - params-render.js: fix labelCls ReferenceError in renderMapFixedRow (pre-existing bug) - index.html: params-render.js already before operations.js (verified)
83 lines
5.0 KiB
JavaScript
83 lines
5.0 KiB
JavaScript
// params-render.js — общий рендер параметров операций
|
|
// Используется: operations.js (ручной режим), scenario-form.js (редактор сценариев)
|
|
// Зависимости: _esc() из utils.js, validateJson() из utils.js
|
|
|
|
function renderParamRow(p, allInst) {
|
|
const req = p.isRequired;
|
|
const hasDfl = p.defaultValue !== null && p.defaultValue !== undefined && p.defaultValue !== '';
|
|
const labelCls = req ? (hasDfl ? 'req' : 'req-nodfl') : '';
|
|
const dfl = hasDfl ? p.defaultValue : (req ? '' : '');
|
|
const vl = p.valueList;
|
|
const isMap = (p.dataType || '').startsWith('map');
|
|
let input;
|
|
if (vl && Array.isArray(vl)) {
|
|
input = `<select name="p_${p.svcOperationCfsParamId}" data-type="${_esc(p.dataType)}">${vl.map(v => `<option value="${_esc(v)}" ${v == dfl ? 'selected' : ''}>${_esc(v)}</option>`).join('')}</select>`;
|
|
} else if (p.refSvcId) {
|
|
const refInsts = allInst.filter(i => i.serviceId === p.refSvcId && i.explainedStatus !== 'deleted');
|
|
let opts = refInsts.map(i => `<option value="${_esc(i.instanceUid)}" ${i.instanceUid === dfl ? 'selected' : ''}>${_esc(i.displayName)}</option>`).join('');
|
|
if (!dfl) opts = '<option value="">— выбрать —</option>' + opts;
|
|
input = `<select name="p_${p.svcOperationCfsParamId}" data-type="ref">${opts}</select>`;
|
|
} else if (p.dataType === 'boolean') {
|
|
input = `<select name="p_${p.svcOperationCfsParamId}" data-type="boolean"><option value="true" ${dfl === 'true' || dfl === true ? 'selected' : ''}>true</option><option value="false" ${dfl === 'false' || dfl === false ? 'selected' : ''}>false</option></select>`;
|
|
} else if (p.dataDescriptor && isMap) {
|
|
return renderMapFixedRow(p, dfl);
|
|
} else {
|
|
const dt = isMap ? 'map' : '';
|
|
input = `<input type="text" name="p_${p.svcOperationCfsParamId}" value="${_esc(dfl)}" data-type="${dt}" placeholder="${req && !hasDfl ? 'обязательно' : ''}"${isMap ? ' onblur="validateJson(this)"' : ''}>`;
|
|
if (isMap) input += `<span class="json-err" style="display:none;color:var(--destructive);font-size:10px;margin-left:4px;"></span>`;
|
|
}
|
|
return `<div class="param-row"><label class="${labelCls}">${_esc(p.name)}</label>${input}</div>`;
|
|
}
|
|
|
|
function renderMapFixedRow(p, dfl) {
|
|
const dd = p.dataDescriptor;
|
|
const labelCls = p.isRequired ? (dfl ? 'req' : 'req-nodfl') : '';
|
|
let subHtml = '';
|
|
let dflObj = {};
|
|
try { dflObj = JSON.parse(dfl || '{}'); } catch (e) { }
|
|
Object.keys(dd).forEach(subKey => {
|
|
const sub = dd[subKey];
|
|
const subDfl = dflObj[subKey] !== undefined ? dflObj[subKey] : (sub.defaultValue || '');
|
|
const subVl = sub.valueList;
|
|
const subReq = sub.isRequired;
|
|
const subNoDfl = subReq && !subDfl && subDfl !== 0 && subDfl !== false;
|
|
const subLblCls = subNoDfl ? 'req-nodfl' : '';
|
|
let si;
|
|
if (subVl && Array.isArray(subVl)) {
|
|
si = `<select name="p_${p.svcOperationCfsParamId}.${subKey}" data-type="mapchild">${subVl.map(v => `<option value="${_esc(v)}" ${v == subDfl ? 'selected' : ''}>${_esc(v)}</option>`).join('')}</select>`;
|
|
} else if (sub.dataType === 'boolean') {
|
|
si = `<select name="p_${p.svcOperationCfsParamId}.${subKey}" data-type="mapchild"><option value="true" ${subDfl === 'true' || subDfl === true ? 'selected' : ''}>true</option><option value="false" ${subDfl === 'false' || subDfl === false ? 'selected' : ''}>false</option></select>`;
|
|
} else {
|
|
si = `<input type="text" name="p_${p.svcOperationCfsParamId}.${subKey}" value="${_esc(subDfl)}" data-type="mapchild">`;
|
|
}
|
|
subHtml += `<div class="param-row"><label class="${subLblCls}">${_esc(subKey)}</label>${si}</div>`;
|
|
});
|
|
return `<div class="param-row"><label class="${labelCls}">${_esc(p.name)}</label></div><div style="border-left:2px solid var(--brand-gray);margin-left:8px;padding:0 0 4px 8px;">${subHtml}</div>`;
|
|
}
|
|
|
|
function collectParams(containerSelector) {
|
|
containerSelector = containerSelector || '#params-form';
|
|
const pp = {};
|
|
const nested = {};
|
|
const container = document.querySelector(containerSelector);
|
|
if (!container) return pp;
|
|
container.querySelectorAll('[name^="p_"]').forEach(el => {
|
|
let v = el.value;
|
|
const dt = el.dataset.type || '';
|
|
if (dt === 'mapchild') {
|
|
const name = el.name.replace('p_', '');
|
|
const dot = name.indexOf('.');
|
|
const parentKey = name.substring(0, dot);
|
|
const subKey = name.substring(dot + 1);
|
|
if (!nested[parentKey]) nested[parentKey] = {};
|
|
nested[parentKey][subKey] = v;
|
|
return;
|
|
}
|
|
if (dt === 'array' || dt.startsWith('array')) v = JSON.stringify([v]);
|
|
if (dt === 'map' || dt === 'map-fixed') v = v || '{}';
|
|
pp[el.name.replace('p_', '')] = v;
|
|
});
|
|
for (const pk in nested) pp[pk] = JSON.stringify(nested[pk]);
|
|
return pp;
|
|
}
|