slvccans/ST-Amily2-Chat-Optimisation-SecFix
1
0
Fork 0
mirror of https://github.com/SilenceLurker/ST-Amily2-Chat-Optimisation.git synced 2026-06-06 10:05:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update cwb_uiManager.js

Browse Source
This commit is contained in:
Wx-2025
2025-10-25 15:30:24 +08:00
committed by GitHub
parent 73032b19c3
commit 5a26dd7d60
1 changed files with 84 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

186
CharacterWorldBook/src/cwb_uiManager.js
View File

@@ -145,7 +145,7 @@ function createCharCardViewerPopupHtml(displayItems) {
if (charData.psyche_profile) html += renderCard('心智侧写', charData.psyche_profile, 'psyche_profile'); if (charData.psyche_profile) html += renderCard('心智侧写', charData.psyche_profile, 'psyche_profile');
if (charData.social_matrix) html += renderCard('社交矩阵', charData.social_matrix, 'social_matrix'); if (charData.social_matrix) html += renderCard('社交矩阵', charData.social_matrix, 'social_matrix');
if (charData.narrative_essence) html += renderCard('叙事精粹', charData.narrative_essence, 'narrative_essence'); if (charData.narrative_essence) html += renderCard('叙事精粹', charData.narrative_essence, 'narrative_essence');
html += `<div class="cwb-cyber-card cwb-insertion-settings-card"> html += `<div class="cwb-cyber-card cwb-insertion-settings-card">
<h4 class="cwb-cyber-card__title">注入设置</h4> <h4 class="cwb-cyber-card__title">注入设置</h4>
<div class="cwb-cyber-card__content cwb-insertion-settings-content"> <div class="cwb-cyber-card__content cwb-insertion-settings-content">
@@ -184,7 +184,7 @@ function createCharCardViewerPopupHtml(displayItems) {
} }
function bindCharCardViewerPopupEvents($popup) { function bindCharCardViewerPopupEvents($popup) {
$popup.on('change', '.cwb-insertion-position', function () { $popup.on('change', '.cwb-insertion-position', function() {
const $this = $(this); const $this = $(this);
const $depthContainer = $this.closest('.cwb-insertion-settings-content').find('.cwb-insertion-depth-container'); const $depthContainer = $this.closest('.cwb-insertion-settings-content').find('.cwb-insertion-depth-container');
if ($this.val() === 'at_depth') { if ($this.val() === 'at_depth') {
@@ -200,7 +200,7 @@ function bindCharCardViewerPopupEvents($popup) {
showCharCardViewerPopup(); showCharCardViewerPopup();
}); });
$popup.find('#cwb-manual-update-btn').on('click', async function () { $popup.find('#cwb-manual-update-btn').on('click', async function() {
const $button = $(this); const $button = $(this);
$button.prop('disabled', true).html('<i class="fas fa-spinner fa-spin"></i> 更新中...'); $button.prop('disabled', true).html('<i class="fas fa-spinner fa-spin"></i> 更新中...');
await manualUpdateLogic(); await manualUpdateLogic();
@@ -217,7 +217,7 @@ function bindCharCardViewerPopupEvents($popup) {
$popup.find(`#cwb-char-content-${targetUid}`).addClass('active'); $popup.find(`#cwb-char-content-${targetUid}`).addClass('active');
}); });
$popup.find('.cwb-cyber-tab__delete').on('click', async function (e) { $popup.find('.cwb-cyber-tab__delete').on('click', async function(e) {
e.stopPropagation(); e.stopPropagation();
if (confirm('您确定要删除这个角色条目吗？此操作不可撤销。')) { if (confirm('您确定要删除这个角色条目吗？此操作不可撤销。')) {
const uidToDelete = $(this).data('char-uid'); const uidToDelete = $(this).data('char-uid');
@@ -235,9 +235,9 @@ function bindCharCardViewerPopupEvents($popup) {
} }
}); });
$popup.find('#cwb-viewer-delete-all').on('click', async function () { $popup.find('#cwb-viewer-delete-all').on('click', async function() {
if (confirm('您确定要清除当前聊天中的所有角色卡和总览吗？此操作将删除所有相关条目，且不可撤销。')) { if (confirm('您确定要清除当前聊天中的所有角色卡和总览吗？此操作将删除所有相关条目，且不可撤销。')) {
const allUids = $popup.find('.cwb-cyber-tab__button').map(function () { const allUids = $popup.find('.cwb-cyber-tab__button').map(function() {
return $(this).data('char-uid'); return $(this).data('char-uid');
}).get(); }).get();
if (allUids.length > 0) { if (allUids.length > 0) {
@@ -278,18 +278,10 @@ function bindCharCardViewerPopupEvents($popup) {
if ($field.data('is-array')) { if ($field.data('is-array')) {
value = value.split('\n').map(l => l.trim()).filter(Boolean); value = value.split('\n').map(l => l.trim()).filter(Boolean);
} }
if (path) { if(path){
setNestedValue(collectedData, path, value); setNestedValue(collectedData, path, value);
} }
}); });
let localTavernHelper = TavernHelper;
if (!localTavernHelper) {
// TavernHelper 未定义的情况下触发，但是为什么？
(localTavernHelper = window.TavernHelper);
if (localTavernHelper) {
TavernHelper = localTavernHelper;
}
}
const finalContentToSave = buildCustomFormat(collectedData); const finalContentToSave = buildCustomFormat(collectedData);
const allEntries = await TavernHelper.getLorebookEntries(book); const allEntries = await TavernHelper.getLorebookEntries(book);
const entryToUpdate = allEntries.find(e => e.uid === targetUid); const entryToUpdate = allEntries.find(e => e.uid === targetUid);
@@ -307,7 +299,7 @@ function bindCharCardViewerPopupEvents($popup) {
const positionMap = { const positionMap = {
'before_char': 'before_character_definition', 'before_char': 'before_character_definition',
'after_char': 'after_character_definition', 'after_char': 'after_character_definition',
'before_an': 'before_author_note', 'before_an': 'before_author_note',
'after_an': 'after_author_note', 'after_an': 'after_author_note',
'at_depth': 'at_depth_as_system' 'at_depth': 'at_depth_as_system'
@@ -317,7 +309,7 @@ function bindCharCardViewerPopupEvents($popup) {
finalEntryData.content = finalContentToSave; finalEntryData.content = finalContentToSave;
finalEntryData.uid = targetUid; finalEntryData.uid = targetUid;
const newPosition = positionMap[insertionPosition]; const newPosition = positionMap[insertionPosition];
finalEntryData.position = newPosition || 'before_character_definition'; finalEntryData.position = newPosition || 'before_character_definition';
if (insertionPosition === 'at_depth') { if (insertionPosition === 'at_depth') {
@@ -325,7 +317,7 @@ function bindCharCardViewerPopupEvents($popup) {
} else { } else {
finalEntryData.depth = null; finalEntryData.depth = null;
} }
finalEntryData.order = isNaN(insertionOrder) ? 7001 : insertionOrder; finalEntryData.order = isNaN(insertionOrder) ? 7001 : insertionOrder;
logDebug(`[DEBUG] 最终保存数据 UID:${targetUid}`, { logDebug(`[DEBUG] 最终保存数据 UID:${targetUid}`, {
@@ -334,14 +326,7 @@ function bindCharCardViewerPopupEvents($popup) {
order: finalEntryData.order, order: finalEntryData.order,
hasDepthField: 'depth' in finalEntryData hasDepthField: 'depth' in finalEntryData
}); });
localTavernHelper = TavernHelper;
if (!localTavernHelper) {
// TavernHelper 未定义的情况下触发，但是为什么？
(localTavernHelper = window.TavernHelper);
if (localTavernHelper) {
TavernHelper = localTavernHelper;
}
}
await TavernHelper.setLorebookEntries(book, [finalEntryData]); await TavernHelper.setLorebookEntries(book, [finalEntryData]);
showToastr('success', '角色卡已成功保存！'); showToastr('success', '角色卡已成功保存！');
} catch (error) { } catch (error) {
@@ -358,7 +343,7 @@ function closeCharCardViewerPopup() {
} }
export async function showCharCardViewerPopup() { export async function showCharCardViewerPopup() {
if (!isCwbEnabled()) return; if (!isCwbEnabled()) return;
closeCharCardViewerPopup(); closeCharCardViewerPopup();
try { try {
const book = await getTargetWorldBook(); const book = await getTargetWorldBook();
@@ -368,14 +353,6 @@ export async function showCharCardViewerPopup() {
bindCharCardViewerPopupEvents($(`#${CHAR_CARD_VIEWER_POPUP_ID}`)); bindCharCardViewerPopupEvents($(`#${CHAR_CARD_VIEWER_POPUP_ID}`));
return; return;
} }
let localTavernHelper = TavernHelper;
if (!localTavernHelper) {
// TavernHelper 未定义的情况下触发，但是为什么？
(localTavernHelper = window.TavernHelper);
if (localTavernHelper) {
TavernHelper = localTavernHelper;
}
}
const allEntries = await TavernHelper.getLorebookEntries(book); const allEntries = await TavernHelper.getLorebookEntries(book);
let currentChatId = state.currentChatFileIdentifier; let currentChatId = state.currentChatFileIdentifier;
@@ -385,7 +362,7 @@ export async function showCharCardViewerPopup() {
bindCharCardViewerPopupEvents($(`#${CHAR_CARD_VIEWER_POPUP_ID}`)); bindCharCardViewerPopupEvents($(`#${CHAR_CARD_VIEWER_POPUP_ID}`));
return; return;
} }
const cleanChatId = currentChatId.replace(/ imported/g, ''); const cleanChatId = currentChatId.replace(/ imported/g, '');
let displayItems = []; let displayItems = [];
@@ -402,76 +379,81 @@ export async function showCharCardViewerPopup() {
return false; return false;
} }
} }
return false; return false;
}); });
} else { } else {
relevantEntries = allEntries.filter(entry => relevantEntries = allEntries.filter(entry =>
entry.enabled && entry.enabled &&
Array.isArray(entry.keys) && Array.isArray(entry.keys) &&
entry.keys.includes(cleanChatId) entry.keys.includes(cleanChatId)
); );
} }
const rosterEntries = relevantEntries.filter(entry => const rosterEntries = relevantEntries.filter(entry =>
entry.keys.includes('Amily2角色总集') && entry.keys.includes('角色总览') entry.keys.includes('Amily2角色总集') && entry.keys.includes('角色总览')
); );
rosterEntries.forEach((entry, index) => { rosterEntries.forEach((entry, index) => {
displayItems.push({ displayItems.push({
uid: entry.uid, uid: entry.uid,
isRoster: true, isRoster: true,
comment: entry.comment, comment: entry.comment,
content: entry.content, content: entry.content,
rosterIndex: index rosterIndex: index
}); });
}); });
const characterEntries = relevantEntries const characterEntries = relevantEntries
.filter(entry => !entry.keys.includes('Amily2角色总集')) .filter(entry => !entry.keys.includes('Amily2角色总集'))
.map(entry => { .map(entry => {
logDebug(`[DEBUG] 原始条目数据 UID:${entry.uid}`, { try {
position: entry.position, logDebug(`[DEBUG] 原始条目数据 UID:${entry.uid}`, {
depth: entry.depth, position: entry.position,
order: entry.order, depth: entry.depth,
comment: entry.comment order: entry.order,
}); comment: entry.comment
});
const positionStringMap = { const positionStringMap = {
0: 'before_char', 0: 'before_char',
1: 'after_char', 1: 'after_char',
2: 'before_an', 2: 'before_an',
3: 'after_an', 3: 'after_an',
4: 'at_depth', 4: 'at_depth',
'before_character_definition': 'before_char', 'before_character_definition': 'before_char',
'after_character_definition': 'after_char', 'after_character_definition': 'after_char',
'before_author_note': 'before_an', 'before_author_note': 'before_an',
'after_author_note': 'after_an', 'after_author_note': 'after_an',
'at_depth_as_system': 'at_depth' 'at_depth_as_system': 'at_depth'
}; };
const position = entry.position; const position = entry.position;
const mappedPosition = positionStringMap[position] || 'at_depth'; const mappedPosition = positionStringMap[position] || 'at_depth';
const finalDepth = (position === 4 || position === 'at_depth_as_system') ? (entry.depth ?? 0) : 0; const finalDepth = (position === 4 || position === 'at_depth_as_system') ? (entry.depth ?? 0) : 0;
logDebug(`[DEBUG] 映射结果 UID:${entry.uid}`, { logDebug(`[DEBUG] 映射结果 UID:${entry.uid}`, {
originalPosition: position, originalPosition: position,
mappedPosition: mappedPosition, mappedPosition: mappedPosition,
finalDepth: finalDepth finalDepth: finalDepth
}); });
return { return {
uid: entry.uid, uid: entry.uid,
isRoster: false, isRoster: false,
comment: entry.comment, comment: entry.comment,
content: entry.content, content: entry.content,
parsed: parseCustomFormat(entry.content), parsed: parseCustomFormat(entry.content),
insertionPosition: mappedPosition, insertionPosition: mappedPosition,
insertionDepth: finalDepth, insertionDepth: finalDepth,
insertionOrder: entry.order ?? 7001, insertionOrder: entry.order ?? 7001,
}; };
} catch (e) {
logError(`解析角色条目失败 (UID: ${entry.uid})，已跳过。`, e);
return null;
}
}) })
.filter(c => c.parsed && Object.keys(c.parsed).length > 0); .filter(c => c && c.parsed && Object.keys(c.parsed).length > 0);
displayItems = displayItems.concat(characterEntries); displayItems = displayItems.concat(characterEntries);
const popupHtml = createCharCardViewerPopupHtml(displayItems); const popupHtml = createCharCardViewerPopupHtml(displayItems);
@@ -576,7 +558,7 @@ function makeButtonDraggable($button) {
export function initializeCharCardViewer() { export function initializeCharCardViewer() {
const $existingButton = $(`#${CHAR_CARD_VIEWER_BUTTON_ID}`); const $existingButton = $(`#${CHAR_CARD_VIEWER_BUTTON_ID}`);
if ($existingButton.length > 0) { if ($existingButton.length > 0) {
console.log('[CWB] Char card viewer button already exists'); console.log('[CWB] Char card viewer button already exists');
setTimeout(() => { setTimeout(() => {
@@ -586,12 +568,12 @@ export function initializeCharCardViewer() {
}, 100); }, 100);
return; return;
} }
const buttonHtml = `<div id="${CHAR_CARD_VIEWER_BUTTON_ID}" title="查看角色世界书" class="fa-solid fa-book-open"></div>`; const buttonHtml = `<div id="${CHAR_CARD_VIEWER_BUTTON_ID}" title="查看角色世界书" class="fa-solid fa-book-open"></div>`;
$('body').append(buttonHtml); $('body').append(buttonHtml);
const $viewerButton = $(`#${CHAR_CARD_VIEWER_BUTTON_ID}`); const $viewerButton = $(`#${CHAR_CARD_VIEWER_BUTTON_ID}`);
makeButtonDraggable($viewerButton); makeButtonDraggable($viewerButton);
const savedPosition = JSON.parse(localStorage.getItem(state.STORAGE_KEY_VIEWER_BUTTON_POS) || 'null'); const savedPosition = JSON.parse(localStorage.getItem(state.STORAGE_KEY_VIEWER_BUTTON_POS) || 'null');
if (savedPosition) { if (savedPosition) {
$viewerButton.css({ top: savedPosition.top, left: savedPosition.left }); $viewerButton.css({ top: savedPosition.top, left: savedPosition.left });
@@ -604,9 +586,9 @@ export function initializeCharCardViewer() {
$viewerButton.toggle(shouldShow); $viewerButton.toggle(shouldShow);
console.log(`[CWB] New button created with visibility: ${shouldShow}`); console.log(`[CWB] New button created with visibility: ${shouldShow}`);
}, 100); }, 100);
console.log('[CWB] Char card viewer button initialized'); console.log('[CWB] Char card viewer button initialized');
let resizeTimeout; let resizeTimeout;
$(window).on('resize.cwbViewer', function () { $(window).on('resize.cwbViewer', function () {
clearTimeout(resizeTimeout); clearTimeout(resizeTimeout);
@@ -617,9 +599,9 @@ export function initializeCharCardViewer() {
export function updateViewerButtonVisibility() { export function updateViewerButtonVisibility() {
const $button = $(`#${CHAR_CARD_VIEWER_BUTTON_ID}`); const $button = $(`#${CHAR_CARD_VIEWER_BUTTON_ID}`);
const shouldShow = isCwbEnabled() && state.viewerEnabled; const shouldShow = isCwbEnabled() && state.viewerEnabled;
console.log(`[CWB] Updating viewer button visibility: ${shouldShow} (master: ${isCwbEnabled()}, viewer: ${state.viewerEnabled})`); console.log(`[CWB] Updating viewer button visibility: ${shouldShow} (master: ${isCwbEnabled()}, viewer: ${state.viewerEnabled})`);
if ($button.length > 0) { if ($button.length > 0) {
$button.toggle(shouldShow); $button.toggle(shouldShow);
console.log(`[CWB] Viewer button visibility set to: ${shouldShow}`); console.log(`[CWB] Viewer button visibility set to: ${shouldShow}`);
@@ -630,7 +612,7 @@ export function updateViewerButtonVisibility() {
initializeCharCardViewer(); initializeCharCardViewer();
}, 500); }, 500);
} }
logDebug('悬浮窗按钮显示状态更新:', { logDebug('悬浮窗按钮显示状态更新:', {
masterEnabled: isCwbEnabled(), masterEnabled: isCwbEnabled(),
viewerEnabled: state.viewerEnabled, viewerEnabled: state.viewerEnabled,
@@ -640,43 +622,43 @@ export function updateViewerButtonVisibility() {
export function bindCwbApiEvents() { export function bindCwbApiEvents() {
console.log('[CWB] Binding API events'); console.log('[CWB] Binding API events');
$('#cwb-api-url').off('input').on('input', function () { $('#cwb-api-url').off('input').on('input', function() {
const value = $(this).val(); const value = $(this).val();
extension_settings[extensionName].cwb_api_url = value; extension_settings[extensionName].cwb_api_url = value;
saveSettingsDebounced(); saveSettingsDebounced();
}); });
$('#cwb-api-key').off('input').on('input', function () { $('#cwb-api-key').off('input').on('input', function() {
const value = $(this).val(); const value = $(this).val();
extension_settings[extensionName].cwb_api_key = value; extension_settings[extensionName].cwb_api_key = value;
saveSettingsDebounced(); saveSettingsDebounced();
}); });
$('#cwb-model').off('input').on('input', function () { $('#cwb-model').off('input').on('input', function() {
const value = $(this).val(); const value = $(this).val();
extension_settings[extensionName].cwb_model = value; extension_settings[extensionName].cwb_model = value;
saveSettingsDebounced(); saveSettingsDebounced();
}); });
$('#cwb-temperature').off('input').on('input', function () { $('#cwb-temperature').off('input').on('input', function() {
const value = parseFloat($(this).val()); const value = parseFloat($(this).val());
$('#cwb-temperature-value').text(value); $('#cwb-temperature-value').text(value);
extension_settings[extensionName].cwb_temperature = value; extension_settings[extensionName].cwb_temperature = value;
saveSettingsDebounced(); saveSettingsDebounced();
}); });
$('#cwb-max-tokens').off('input').on('input', function () { $('#cwb-max-tokens').off('input').on('input', function() {
const value = parseInt($(this).val()); const value = parseInt($(this).val());
$('#cwb-max-tokens-value').text(value); $('#cwb-max-tokens-value').text(value);
extension_settings[extensionName].cwb_max_tokens = value; extension_settings[extensionName].cwb_max_tokens = value;
saveSettingsDebounced(); saveSettingsDebounced();
}); });
$('#cwb-test-connection').off('click').on('click', async function () { $('#cwb-test-connection').off('click').on('click', async function() {
const $button = $(this); const $button = $(this);
$button.prop('disabled', true).html('<i class="fas fa-spinner fa-spin"></i> 测试中...'); $button.prop('disabled', true).html('<i class="fas fa-spinner fa-spin"></i> 测试中...');
try { try {
await testCwbConnection(); await testCwbConnection();
} catch (error) { } catch (error) {
@@ -686,15 +668,15 @@ export function bindCwbApiEvents() {
} }
}); });
$('#cwb-fetch-models').off('click').on('click', async function () { $('#cwb-fetch-models').off('click').on('click', async function() {
const $button = $(this); const $button = $(this);
$button.prop('disabled', true).html('<i class="fas fa-spinner fa-spin"></i> 获取中...'); $button.prop('disabled', true).html('<i class="fas fa-spinner fa-spin"></i> 获取中...');
try { try {
const models = await fetchCwbModels(); const models = await fetchCwbModels();
const $modelSelect = $('#cwb-model'); const $modelSelect = $('#cwb-model');
$modelSelect.empty(); $modelSelect.empty();
if (models && models.length > 0) { if (models && models.length > 0) {
models.forEach(model => { models.forEach(model => {
$modelSelect.append(new Option(model.name, model.id)); $modelSelect.append(new Option(model.name, model.id));