Merge remote-tracking branch 'upstream/main'

This commit is contained in:
2025-10-14 19:46:55 +08:00
2 changed files with 15 additions and 5 deletions

View File

@@ -5,6 +5,7 @@ import { extensionName } from "../../utils/settings.js";
import { convertTablesToCsvString, saveStateToMessage, getMemoryState, updateTableFromText, getBatchFillerRuleTemplate, getBatchFillerFlowTemplate } from './manager.js'; import { convertTablesToCsvString, saveStateToMessage, getMemoryState, updateTableFromText, getBatchFillerRuleTemplate, getBatchFillerFlowTemplate } from './manager.js';
import { getPresetPrompts, getMixedOrder } from '../../PresetSettings/index.js'; import { getPresetPrompts, getMixedOrder } from '../../PresetSettings/index.js';
import { callAI, generateRandomSeed } from '../api.js'; import { callAI, generateRandomSeed } from '../api.js';
import { callNccsAI } from '../api/NccsApi.js';
export async function reorganizeTableContent() { export async function reorganizeTableContent() {
const settings = extension_settings[extensionName]; const settings = extension_settings[extensionName];
@@ -60,7 +61,14 @@ export async function reorganizeTableContent() {
console.dir(messages); console.dir(messages);
console.groupEnd(); console.groupEnd();
const rawContent = await callAI(messages); let rawContent;
if (settings.nccsEnabled) {
console.log('[Amily2-重新整理] 使用 Nccs API 进行表格重整...');
rawContent = await callNccsAI(messages);
} else {
console.log('[Amily2-重新整理] 使用默认 API 进行表格重整...');
rawContent = await callAI(messages);
}
if (!rawContent) { if (!rawContent) {
console.error('[Amily2-重新整理] 未能获取AI响应内容。'); console.error('[Amily2-重新整理] 未能获取AI响应内容。');

View File

@@ -320,14 +320,13 @@ export function renderTables() {
} }
const highlights = TableManager.getHighlights(); const highlights = TableManager.getHighlights();
const fragment = document.createDocumentFragment();
const placeholder = document.getElementById('add-table-placeholder'); const placeholder = document.getElementById('add-table-placeholder');
if (placeholder) { if (placeholder) {
placeholder.remove(); placeholder.remove();
} }
container.innerHTML = '';
tables.forEach((tableData, tableIndex) => { tables.forEach((tableData, tableIndex) => {
const header = document.createElement('div'); const header = document.createElement('div');
header.style.display = 'flex'; header.style.display = 'flex';
@@ -349,7 +348,7 @@ export function renderTables() {
`; `;
header.appendChild(title); header.appendChild(title);
header.appendChild(controls); header.appendChild(controls);
container.appendChild(header); fragment.appendChild(header);
const tableWrapper = document.createElement('div'); const tableWrapper = document.createElement('div');
tableWrapper.className = 'amily2-table-wrapper'; tableWrapper.className = 'amily2-table-wrapper';
@@ -616,9 +615,12 @@ export function renderTables() {
}); });
} }
tableWrapper.appendChild(tableElement); tableWrapper.appendChild(tableElement);
container.appendChild(tableWrapper); fragment.appendChild(tableWrapper);
}); });
container.innerHTML = '';
container.appendChild(fragment);
if (placeholder) { if (placeholder) {
container.appendChild(placeholder); container.appendChild(placeholder);
} }