From 4d067c3e9caee5b7b96ca7657070387780229044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=AE=D1=80=D0=B8=D0=B9=20=D0=A7=D0=B5=D1=80=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=BA=D0=BE?= Date: Tue, 15 Sep 2026 16:41:56 +0300 Subject: [PATCH] =?UTF-8?q?BUILD141=20=E2=80=94=20=D0=B8=D1=81=D0=BF=D1=80?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D0=BA=D1=80=D1=83=D1=82=D0=BA=D0=B8=20SQL-=D1=82=D0=B0=D0=B1?= =?UTF-8?q?=D0=BB=D0=B8=D1=86=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.py | 2 +- hockey_data/static/admin-directories.css | 62 ++++++++++++++++++++++++ hockey_data/static/admin-directories.js | 52 +++++++++++++++++++- 3 files changed, 113 insertions(+), 3 deletions(-) diff --git a/app.py b/app.py index 2877a80..b3a3364 100644 --- a/app.py +++ b/app.py @@ -29,7 +29,7 @@ from ui_builder import install_ui_builder from khl_site.khl_data_center import APP as khl_site_app BASE_DIR = Path(__file__).resolve().parent -BUILD_VERSION = "2026.09.15.8" +BUILD_VERSION = "2026.09.15.9" # compatibility: BUILD_VERSION = "2026.08.26.1" # compatibility: BUILD_VERSION = "2026.08.25.1" # compatibility: BUILD_VERSION = "2026.08.24.15" diff --git a/hockey_data/static/admin-directories.css b/hockey_data/static/admin-directories.css index 360845e..381770c 100644 --- a/hockey_data/static/admin-directories.css +++ b/hockey_data/static/admin-directories.css @@ -2412,3 +2412,65 @@ body.hockey-admin-settings-open { overflow: hidden; } .hockey-map-table-grid table{width:max-content!important;min-width:100%} .hockey-map-table-grid thead th{min-width:118px;white-space:nowrap} .hockey-map-table-picker>summary>b{max-width:none;white-space:nowrap} + +/* BUILD141: keep the manual SQL table horizontally reachable inside the visual Mapping viewport. */ +.hockey-map-table-column-nav{ + display:grid; + grid-template-columns:auto 30px 30px minmax(90px,1fr) 30px 30px; + align-items:center; + gap:5px; + min-height:30px; + padding:3px 5px; + border:1px solid #263d51; + border-radius:8px; + background:#0a141e; +} +.hockey-map-table-column-nav>span{ + padding-right:3px; + color:#69c9ef; + font-size:8px; + font-weight:950; + letter-spacing:.1em; +} +.hockey-map-table-column-nav>small{ + min-width:0; + color:#71889e; + font-size:8px; + text-align:center; + overflow:hidden; + text-overflow:ellipsis; + white-space:nowrap; +} +.hockey-map-table-column-nav>button{ + width:30px; + height:25px; + padding:0; + border:1px solid #36516a; + border-radius:6px; + background:#132337; + color:#b8d8ef; + cursor:pointer; + font-size:14px; + line-height:1; +} +.hockey-map-table-column-nav>button:hover{border-color:#69c9ef;background:#173149;color:#eef8ff} +.hockey-map-table-grid{ + max-height:min(360px,34dvh)!important; + scrollbar-color:#4d789d #09131d; + scrollbar-width:auto; +} +.hockey-map-table-grid::-webkit-scrollbar{width:12px;height:14px} +.hockey-map-table-grid::-webkit-scrollbar-track{background:#09131d;border-top:1px solid #263d51} +.hockey-map-table-grid::-webkit-scrollbar-thumb{background:#456d91;border:2px solid #09131d;border-radius:8px} +.hockey-map-table-grid::-webkit-scrollbar-thumb:hover{background:#5a8db8} +.hockey-map-table-grid::after{ + content:""; + position:sticky; + right:0; + pointer-events:none; +} +@media(max-width:700px){ + .hockey-map-table-column-nav{grid-template-columns:auto 28px 28px 1fr 28px 28px} + .hockey-map-table-column-nav>small{font-size:0} + .hockey-map-table-column-nav>small::after{content:"⇆";font-size:11px} +} diff --git a/hockey_data/static/admin-directories.js b/hockey_data/static/admin-directories.js index 9009952..2394435 100644 --- a/hockey_data/static/admin-directories.js +++ b/hockey_data/static/admin-directories.js @@ -35,6 +35,8 @@ mappingSelectedTableRow: 1, mappingSelectedTableColumn: "", mappingTableRowSearch: "", + mappingTableScrollLeft: 0, + mappingTableScrollTop: 0, mappingSqlCellOpen: false, mappingSqlTableOpen: false, mappingOpenDataGroups: {}, @@ -2370,7 +2372,10 @@ }); const visibleRows = filteredRows.slice(0, 120); const columns = manualColumns; - const tableGridHeight = Math.min(430, Math.max(230, visibleRows.length * 44 + 42)); + // BUILD141: keep the horizontal scrollbar inside the visible Mapping viewport. + // A tall SQL table used to extend below the clipped data browser, hiding the + // horizontal scrollbar and making right-side columns unreachable. + const tableGridHeight = Math.min(360, Math.max(210, visibleRows.length * 44 + 42)); const cells = visibleRows.map((row) => ` ${Number(row.index || 0)}${escapeHtml(row.label || `Строка ${row.index}`)} @@ -2388,8 +2393,16 @@ +
+ КОЛОНКИ + + + горизонтальная прокрутка + + +
${selectedTable?.skipped ? `
Не хватает параметров: ${escapeHtml((selectedTable.missing || []).map((x) => `:${x}`).join(", "))}
` : selectedTable?.error ? `
${escapeHtml(selectedTable.error)}
` : ` -
${columns.map((column) => ``).join("")}${cells || ``}
Строка${escapeHtml(column.label || column.key)}${column.localized ? ` AUTO ${String(column.language || selectedTable?.language || "ru").toUpperCase()}` : ""}${escapeHtml(column.key)}
Нет строк
+
${columns.map((column) => ``).join("")}${cells || ``}
Строка${escapeHtml(column.label || column.key)}${column.localized ? ` AUTO ${String(column.language || selectedTable?.language || "ru").toUpperCase()}` : ""}${escapeHtml(column.key)}
Нет строк
${filteredRows.length > visibleRows.length ? `Показаны первые ${visibleRows.length} из ${filteredRows.length} строк. Используйте поиск строки.` : ""}`} `; } @@ -3313,6 +3326,8 @@ state.mappingSelectedTableRow = 1; state.mappingSelectedTableColumn = ""; state.mappingTableRowSearch = ""; + state.mappingTableScrollLeft = 0; + state.mappingTableScrollTop = 0; renderMapping(); }); modal.querySelectorAll("[data-map-data-group]").forEach((details) => details.addEventListener("toggle", (event) => { @@ -3325,10 +3340,43 @@ modal.querySelector("[data-map-sql-table-details]")?.addEventListener("toggle", (event) => { state.mappingSqlTableOpen = Boolean(event.currentTarget.open); }); + + // BUILD141: the SQL picker lives inside a clipped flex panel. Keep its own + // scroll position and provide explicit horizontal navigation so every SQL + // column remains reachable even on a 1440x760 operator screen. + const manualSqlGrid = modal.querySelector(".hockey-map-table-grid"); + if (manualSqlGrid) { + requestAnimationFrame(() => { + const maxLeft = Math.max(0, manualSqlGrid.scrollWidth - manualSqlGrid.clientWidth); + const maxTop = Math.max(0, manualSqlGrid.scrollHeight - manualSqlGrid.clientHeight); + manualSqlGrid.scrollLeft = Math.min(Math.max(0, Number(state.mappingTableScrollLeft || 0)), maxLeft); + manualSqlGrid.scrollTop = Math.min(Math.max(0, Number(state.mappingTableScrollTop || 0)), maxTop); + }); + manualSqlGrid.addEventListener("scroll", () => { + state.mappingTableScrollLeft = manualSqlGrid.scrollLeft; + state.mappingTableScrollTop = manualSqlGrid.scrollTop; + }, { passive: true }); + manualSqlGrid.addEventListener("wheel", (event) => { + if (!event.shiftKey || manualSqlGrid.scrollWidth <= manualSqlGrid.clientWidth) return; + event.preventDefault(); + manualSqlGrid.scrollLeft += event.deltaY || event.deltaX; + }, { passive: false }); + modal.querySelectorAll("[data-map-table-scroll]").forEach((button) => button.addEventListener("click", () => { + const direction = String(button.dataset.mapTableScroll || ""); + const step = Math.max(180, Math.round(manualSqlGrid.clientWidth * 0.72)); + if (direction === "start") manualSqlGrid.scrollLeft = 0; + else if (direction === "end") manualSqlGrid.scrollLeft = manualSqlGrid.scrollWidth; + else if (direction === "left") manualSqlGrid.scrollLeft -= step; + else if (direction === "right") manualSqlGrid.scrollLeft += step; + state.mappingTableScrollLeft = manualSqlGrid.scrollLeft; + })); + } modal.querySelector("[data-map-quick-table-source]")?.addEventListener("change", (event) => { state.mappingSelectedTableSource = event.currentTarget.value; state.mappingSelectedTableRow = 1; state.mappingSelectedTableColumn = ""; + state.mappingTableScrollLeft = 0; + state.mappingTableScrollTop = 0; renderMapping(); }); modal.querySelector("[data-map-quick-table-row]")?.addEventListener("change", (event) => {