поправлены удаления, и поправлено отображение в настройках SQL
This commit is contained in:
@@ -41,6 +41,7 @@
|
||||
mappingCatalog: null,
|
||||
mappingContextVariables: null,
|
||||
mappingSqlSources: null,
|
||||
mappingDatabaseSchema: null,
|
||||
mappingSelectedSqlSourceId: null,
|
||||
mappingSqlPreview: null,
|
||||
mappingSqlDraft: null,
|
||||
@@ -1316,16 +1317,18 @@
|
||||
try { return await request(url); }
|
||||
catch (error) { state.mappingLoadErrors[key] = error.message || String(error); return fallback; }
|
||||
};
|
||||
const [devices, profiles, variables, sources] = await Promise.all([
|
||||
const [devices, profiles, variables, sources, databaseSchema] = await Promise.all([
|
||||
safe("devices", "/api/hockey/admin/vmix-mapping/devices", { devices: [] }),
|
||||
safe("profiles", "/api/hockey/admin/vmix-mapping/profiles", { profiles: [] }),
|
||||
safe("variables", "/api/hockey/admin/mapping-context/variables", { variables: [] }),
|
||||
safe("sources", "/api/hockey/admin/mapping-data/sources", { sources: [] }),
|
||||
safe("databaseSchema", "/api/hockey/admin/mapping-data/database-schema", { tables: [], table_count: 0 }),
|
||||
]);
|
||||
state.mappingDevices = devices;
|
||||
state.mappingProfiles = profiles;
|
||||
state.mappingContextVariables = variables;
|
||||
state.mappingSqlSources = sources;
|
||||
state.mappingDatabaseSchema = databaseSchema;
|
||||
const id = profileId ?? state.mappingActiveProfile?.id ?? profiles.profiles?.[0]?.id ?? null;
|
||||
if (id) {
|
||||
try { state.mappingActiveProfile = await request(`/api/hockey/admin/vmix-mapping/profiles/${id}`); }
|
||||
@@ -1334,7 +1337,7 @@
|
||||
if (!state.mappingSelectedSqlSourceId && sources.sources?.length) state.mappingSelectedSqlSourceId = sources.sources[0].id;
|
||||
await loadMappingCatalog();
|
||||
if (state.mappingCatalog?.error) state.mappingLoadErrors.catalog = state.mappingCatalog.error;
|
||||
return { devices, profiles, variables, sources };
|
||||
return { devices, profiles, variables, sources, databaseSchema };
|
||||
}
|
||||
|
||||
function mappingInventoryInputs(profile) {
|
||||
@@ -2072,6 +2075,30 @@
|
||||
</section>`;
|
||||
}
|
||||
|
||||
function mappingSqlDatabaseReference() {
|
||||
const payload = state.mappingDatabaseSchema || {};
|
||||
const tables = Array.isArray(payload.tables) ? payload.tables : [];
|
||||
const count = Number(payload.table_count || tables.length || 0);
|
||||
const rows = tables.map((table) => {
|
||||
const columns = Array.isArray(table.columns) ? table.columns : [];
|
||||
const columnNames = columns.map((column) => String(column.name || "")).filter(Boolean);
|
||||
const compactColumns = columnNames.slice(0, 12).join(", ");
|
||||
const tail = columnNames.length > 12 ? ` … +${columnNames.length - 12}` : "";
|
||||
return `<button type="button" class="hockey-map-sql-table-ref" data-sql-table-name="${escapeHtml(table.name || "")}" title="Вставить ${escapeHtml(table.name || "")} в SQL">
|
||||
<strong>${escapeHtml(table.name || "")}</strong>
|
||||
<span>${Number(table.column_count || columns.length || 0)} колонок</span>
|
||||
<code>${escapeHtml(compactColumns)}${escapeHtml(tail)}</code>
|
||||
</button>`;
|
||||
}).join("");
|
||||
const body = payload.error
|
||||
? `<div class="hockey-directory-empty is-error">Не удалось получить схему БД: ${escapeHtml(payload.error)}</div>`
|
||||
: rows || `<div class="hockey-directory-empty">Таблицы не найдены.</div>`;
|
||||
return `<details class="hockey-map-sql-reference hockey-map-sql-schema-ref">
|
||||
<summary><span>▦</span><div><strong>Справочник таблиц БД</strong><small>${count} таблиц · клик по названию вставляет его в SQL</small></div></summary>
|
||||
<div class="hockey-map-sql-reference-body hockey-map-sql-table-list">${body}</div>
|
||||
</details>`;
|
||||
}
|
||||
|
||||
function mappingSqlHelp() {
|
||||
const snippets = [
|
||||
["Текст", "CONCAT_WS", "CONCAT_WS(' ', last_name, first_name)", "Склеить строки через разделитель"],
|
||||
@@ -2144,7 +2171,11 @@
|
||||
<label>Период, сек<input type="number" min="1" max="3600" step="1" data-sql-refresh-seconds value="${Math.max(1, Math.round(Number(draft.refresh_interval_ms || 1000) / 1000))}" ${draft.auto_refresh_enabled ? "" : "disabled"}></label>
|
||||
<small>Сервер повторяет только этот SQL. В vMix отправляются только связанные с ним поля и только если значение реально изменилось.</small>
|
||||
</div>
|
||||
<div class="hockey-map-sql-params"><span>Доступные параметры — клик вставляет в SQL</span><div>${variableChips}</div></div>
|
||||
<details class="hockey-map-sql-reference hockey-map-sql-params-ref">
|
||||
<summary><span>:</span><div><strong>Доступные параметры</strong><small>${(state.mappingCatalog?.variables || []).length} идентификаторов · клик вставляет <code>:параметр</code> в SQL</small></div></summary>
|
||||
<div class="hockey-map-sql-reference-body"><div class="hockey-map-sql-params"><div>${variableChips}</div></div></div>
|
||||
</details>
|
||||
${mappingSqlDatabaseReference()}
|
||||
${mappingSqlHelp()}
|
||||
<label class="hockey-map-sql-code"><span>SQL</span><textarea data-sql-text spellcheck="false">${escapeHtml(draft.sql_text || "")}</textarea></label>
|
||||
<div class="hockey-map-sql-actions"><label class="hockey-directory-check"><input type="checkbox" data-sql-enabled ${draft.enabled !== false ? "checked" : ""}><span>Источник включён</span></label><button type="button" data-sql-preview>Проверить SQL</button><button type="button" class="is-accent" data-sql-save>${draft.id ? "Сохранить источник" : "Создать источник"}</button>${draft.id ? `<button type="button" class="danger" data-sql-delete>Удалить</button>` : ""}</div>
|
||||
@@ -2366,6 +2397,18 @@
|
||||
textarea.focus(); textarea.setSelectionRange(start + token.length, start + token.length);
|
||||
}));
|
||||
|
||||
modal.querySelectorAll("[data-sql-table-name]").forEach((button) => button.addEventListener("click", () => {
|
||||
const textarea = modal.querySelector("[data-sql-text]");
|
||||
if (!textarea) return;
|
||||
const tableName = String(button.dataset.sqlTableName || "").trim();
|
||||
if (!tableName) return;
|
||||
const start = textarea.selectionStart ?? textarea.value.length;
|
||||
const end = textarea.selectionEnd ?? start;
|
||||
textarea.value = textarea.value.slice(0, start) + tableName + textarea.value.slice(end);
|
||||
textarea.focus(); textarea.setSelectionRange(start + tableName.length, start + tableName.length);
|
||||
state.mappingSqlDraft = null;
|
||||
}));
|
||||
|
||||
modal.querySelectorAll("[data-sql-snippet]").forEach((button) => button.addEventListener("click", () => {
|
||||
const textarea = modal.querySelector("[data-sql-text]");
|
||||
if (!textarea) return;
|
||||
|
||||
Reference in New Issue
Block a user