From fdcc95ba09b0afde849c0cb4b42f11b3c3a1ac14 Mon Sep 17 00:00:00 2001 From: Wx-2025 <351320169@qq.com> Date: Sat, 27 Dec 2025 11:59:33 +0800 Subject: [PATCH] Update table-bindings.js --- ui/table-bindings.js | 71 ++++++++++++++------------------------------ 1 file changed, 22 insertions(+), 49 deletions(-) diff --git a/ui/table-bindings.js b/ui/table-bindings.js index 212c9d5..ad0aff9 100644 --- a/ui/table-bindings.js +++ b/ui/table-bindings.js @@ -12,6 +12,7 @@ import { safeCharLorebooks, safeLorebookEntries } from '../core/tavernhelper-com import { characters, this_chid, eventSource, event_types } from "/script.js"; import { fetchNccsModels, testNccsApiConnection } from '../core/api/NccsApi.js'; import { showGraphVisualization } from '../core/relationship-graph/visualizer.js'; +import { escapeHTML } from '../utils/utils.js'; const isTouchDevice = () => window.matchMedia('(pointer: coarse)').matches; const getAllTablesContainer = () => document.getElementById('all-tables-container'); @@ -129,7 +130,6 @@ function toggleColumnContextMenu(event) { } }; - // If the menu was opened, set up the listener to close it if (targetTh.classList.contains('amily2-menu-open')) { setTimeout(() => { document.addEventListener('click', closeMenu, true); @@ -178,15 +178,15 @@ function showInputDialog({ title, label, currentValue, placeholder, onSave }) {

- ${title} + ${escapeHTML(title)}

- + + placeholder="${escapeHTML(placeholder)}"> 提示：输入内容将用于更新项目。
@@ -321,7 +321,7 @@ export function renderTables() { } const highlights = TableManager.getHighlights(); - const updatedTables = TableManager.getUpdatedTables(); // 【V15.2 新增】获取被更新的表格 + const updatedTables = TableManager.getUpdatedTables(); const fragment = document.createDocumentFragment(); const placeholder = document.getElementById('add-table-placeholder'); @@ -334,9 +334,9 @@ export function renderTables() { header.className = 'amily2-table-header-container'; const title = document.createElement('h3'); if (updatedTables.has(tableIndex)) { - title.classList.add('table-updated'); // 【V15.2 新增】为更新的表格添加高亮 + title.classList.add('table-updated'); } - title.innerHTML = ` ${tableData.name}`; + title.innerHTML = ` ${escapeHTML(tableData.name)}`; const controls = document.createElement('div'); controls.className = 'table-controls'; @@ -368,7 +368,6 @@ export function renderTables() { if (tableData.headers) { tableData.headers.forEach((_, colIndex) => { const col = document.createElement('col'); - // Assign a default width of 120px if none is specified const colWidth = (tableData.columnWidths && tableData.columnWidths[colIndex]) ? tableData.columnWidths[colIndex] : 90; col.style.width = `${colWidth}px`; colgroup.appendChild(col); @@ -376,21 +375,14 @@ export function renderTables() { } tableElement.appendChild(colgroup); - // Explicitly calculate and set the total table width to override CSS conflicts let totalWidth = 0; const cols = colgroup.querySelectorAll('col'); cols.forEach(col => { totalWidth += parseInt(col.style.width, 10); }); - // Set min-width instead of fixed width to allow expansion tableElement.style.minWidth = '100%'; if (totalWidth > 0) { - // Only set explicit width if it exceeds the container (handled by min-width: 100% usually, - // but here we set it as a base to ensure columns don't shrink below their defined width) tableElement.style.width = `${Math.max(totalWidth, 0)}px`; - // Actually, to allow full width expansion, we should just use min-width and let CSS handle the rest - // unless we want to force scrolling. - // Let's try setting min-width to the calculated total, and width to 100%. tableElement.style.minWidth = `${totalWidth}px`; tableElement.style.width = '100%'; } @@ -403,8 +395,7 @@ export function renderTables() { indexTh.textContent = '#'; indexTh.style.cursor = 'pointer'; indexTh.title = '点击添加第一行'; - - // 为表头的 # 号添加特殊的上下文菜单（仅在表格为空时显示） + if (!tableData.rows || tableData.rows.length === 0) { const headerMenu = document.createElement('div'); headerMenu.className = 'amily2-context-menu amily2-header-menu'; @@ -422,13 +413,11 @@ export function renderTables() { headerMenu.appendChild(addRowButton); indexTh.appendChild(headerMenu); - // 为表头添加直接的点击事件监听器 indexTh.addEventListener('click', (e) => { e.preventDefault(); e.stopPropagation(); console.log('Header # clicked for table', tableIndex); - - // 直接执行添加行操作 + TableManager.addRow(tableIndex); renderTables(); toastr.success('已添加第一行'); @@ -444,7 +433,7 @@ export function renderTables() { const headerContent = document.createElement('span'); headerContent.className = 'amily2-header-text'; - headerContent.textContent = headerText; + headerContent.textContent = headerText; // textContent is safe th.appendChild(headerContent); const menu = document.createElement('div'); @@ -611,16 +600,13 @@ export function renderTables() { TableManager.insertRow(tableIndex, rowIndex, 'below'); break; case 'delete-row': - // 【延迟删除】不再需要确认，因为操作是可逆的 TableManager.deleteRow(tableIndex, rowIndex); break; case 'restore-row': TableManager.restoreRow(tableIndex, rowIndex); break; } - // For instant feedback, re-render is needed for delete/restore if (action === 'delete-row' || action === 'restore-row') { - // The manager functions now handle their own re-rendering } else { renderTables(); } @@ -634,10 +620,9 @@ export function renderTables() { const cellContent = document.createElement('div'); cellContent.className = 'amily2-cell-content'; - cellContent.textContent = cellData; + cellContent.textContent = cellData; cell.appendChild(cellContent); - // 【延迟删除】如果行正在待删除，则禁止编辑 if (rowStatus !== 'pending-deletion' && !isTouchDevice()) { cell.setAttribute('contenteditable', 'true'); } @@ -662,7 +647,6 @@ export function renderTables() { container.appendChild(placeholder); } - // Also update the in-chat table whenever the main tables are re-rendered updateOrInsertTableInChat(); } @@ -740,7 +724,6 @@ function openRuleEditor(tableIndex) { if (!tables || !tables[tableIndex]) return; const table = tables[tableIndex]; - // 兼容旧数据结构 if (table.charLimitRule && !table.charLimitRules) { table.charLimitRules = {}; if (table.charLimitRule.columnIndex !== -1) { @@ -754,7 +737,7 @@ function openRuleEditor(tableIndex) { const header = table.headers[colIndex] || `未知列 (${colIndex})`; return `
- ${header}: 不超过 ${limit} 字 + ${escapeHTML(header)}: 不超过 ${limit} 字 @@ -765,9 +748,8 @@ function openRuleEditor(tableIndex) { const getColumnOptions = (rules) => { return table.headers.map((header, index) => { - // 如果该列已存在规则，则不应出现在下拉菜单中 if (rules[index]) return ''; - return ``; + return ``; }).join(''); }; @@ -775,7 +757,7 @@ function openRuleEditor(tableIndex) {

- 编辑 “${table.name}” 的规则 + 编辑 “${escapeHTML(table.name)}” 的规则

@@ -864,8 +846,7 @@ function openRuleEditor(tableIndex) { toastr.warning('请选择一个列。'); return; } - - // 允许输入0，但0意味着“无限制”，所以我们不添加规则。 + if (isNaN(limitValue) || limitValue < 0) { toastr.warning('请输入一个有效的字数限制（大于等于0）。'); return; @@ -874,12 +855,10 @@ function openRuleEditor(tableIndex) { const currentRules = JSON.parse(dialogElement.find('#current-char-limit-rules').attr('data-rules') || '{}'); if (limitValue > 0) { - // 只有当限制大于0时，才添加或更新规则 currentRules[selectedColumn] = limitValue; dialogElement.find('#current-char-limit-rules').attr('data-rules', JSON.stringify(currentRules)); refreshRuleUI(); } else { - // 如果用户输入0，则视为不设置规则 toastr.info('字数限制为0表示不设置规则。'); } }); @@ -1152,7 +1131,7 @@ function bindWorldBookSettings() { const label = document.createElement('label'); label.htmlFor = checkbox.id; - label.textContent = entry.comment || '无标题条目'; + label.textContent = entry.comment || '无标题条目'; // textContent is safe div.appendChild(checkbox); div.appendChild(label); @@ -1193,7 +1172,7 @@ function bindWorldBookSettings() { const label = document.createElement('label'); label.htmlFor = `wb-check-${book.file_name}`; - label.textContent = book.name; + label.textContent = book.name; // textContent is safe div.appendChild(checkbox); div.appendChild(label); @@ -1265,11 +1244,8 @@ export function bindTableEvents() { log('开始为表格视图绑定交互事件...', 'info'); const fillingModeRadios = panel.querySelectorAll('input[name="filling-mode"]'); - - // 获取新的分步填表控制容器 const secondaryFillerControls = document.getElementById('secondary-filler-controls'); - - // 获取新的滑块元素 + const contextSlider = document.getElementById('secondary-filler-context'); const batchSlider = document.getElementById('secondary-filler-batch'); const bufferSlider = document.getElementById('secondary-filler-buffer'); @@ -1309,11 +1285,10 @@ export function bindTableEvents() { if (selectedMode === 'optimized') modeName = '优化中填表'; toastr.info(`填表模式已切换为 ${modeName}。`); - updateFillingModeUI(); // 更新UI以确保状态同步 + updateFillingModeUI(); }); }); - // 绑定上下文深度输入框 if (contextSlider) { const value = extension_settings[extensionName]?.secondary_filler_context || 2; contextSlider.value = value; @@ -1324,7 +1299,6 @@ export function bindTableEvents() { }); } - // 绑定填表批次输入框 if (batchSlider) { const value = extension_settings[extensionName]?.secondary_filler_batch || 0; batchSlider.value = value; @@ -1335,7 +1309,6 @@ export function bindTableEvents() { }); } - // 绑定保留楼层输入框 if (bufferSlider) { const value = extension_settings[extensionName]?.secondary_filler_buffer || 0; bufferSlider.value = value; @@ -1470,7 +1443,6 @@ export function bindTableEvents() { allTablesContainer.addEventListener('click', (event) => { const th = event.target.closest('th'); if (th && th.classList.contains('index-col')) { - // 处理表头 # 号的点击（用于空表格添加首行） toggleHeaderIndexContextMenu(event); return; } @@ -1649,7 +1621,7 @@ function bindReorganizeButton() { const tableListHtml = tables.map((table, index) => `
- +
`).join(''); @@ -2204,6 +2176,7 @@ function bindChatTableDisplaySetting() { toastr.info(`聊天内表格显示已${showInChatToggle.checked ? '开启' : '关闭'}。`); updateContinuousRenderState(); }); + continuousRenderToggle.addEventListener('change', () => { settings.render_on_every_message = continuousRenderToggle.checked; saveSettingsDebounced();