admin/nexus-terminal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update focusSwitcher.store.ts

Browse Source
This commit is contained in:
Baobhan Sith
2025-05-07 23:47:11 +08:00
parent 3f386a5653
commit adfefec1b3
1 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/frontend/src/stores/focusSwitcher.store.ts
+27 -27
View File
@@ -70,10 +70,10 @@ export const useFocusSwitcherStore = defineStore('focusSwitcher', () => {
// +++ 修改：从后端加载配置（包括快捷键） +++ // +++ 修改：从后端加载配置（包括快捷键） +++
async function loadConfigurationFromBackend() { async function loadConfigurationFromBackend() {
const apiUrl = '/api/v1/settings/focus-switcher-sequence'; // 假设 API 端点不变，但返回结构改变 const apiUrl = '/api/v1/settings/focus-switcher-sequence'; // 假设 API 端点不变，但返回结构改变
console.log(`[FocusSwitcherStore] Attempting to load full configuration (sequence & shortcuts) from backend via: ${apiUrl}`); // console.log(`[FocusSwitcherStore] Attempting to load full configuration (sequence & shortcuts) from backend via: ${apiUrl}`);
try { try {
const response = await fetch(apiUrl); const response = await fetch(apiUrl);
console.log(`[FocusSwitcherStore] Received response from ${apiUrl}. Status: ${response.status}`); // console.log(`[FocusSwitcherStore] Received response from ${apiUrl}. Status: ${response.status}`);
if (!response.ok) { if (!response.ok) {
console.error(`[FocusSwitcherStore] HTTP error from ${apiUrl}. Status: ${response.status}`); console.error(`[FocusSwitcherStore] HTTP error from ${apiUrl}. Status: ${response.status}`);
@@ -82,7 +82,7 @@ export const useFocusSwitcherStore = defineStore('focusSwitcher', () => {
// *** 假设后端返回 FocusSwitcherFullConfig 结构 *** // *** 假设后端返回 FocusSwitcherFullConfig 结构 ***
const loadedFullConfig: FocusSwitcherFullConfig = await response.json(); const loadedFullConfig: FocusSwitcherFullConfig = await response.json();
console.log(`[FocusSwitcherStore] Raw JSON received from backend:`, JSON.stringify(loadedFullConfig)); // console.log(`[FocusSwitcherStore] Raw JSON received from backend:`, JSON.stringify(loadedFullConfig));
// --- 验证和设置 --- // --- 验证和设置 ---
const availableIds = new Set(availableInputs.value.map(input => input.id)); const availableIds = new Set(availableInputs.value.map(input => input.id));
@@ -90,7 +90,7 @@ export const useFocusSwitcherStore = defineStore('focusSwitcher', () => {
// 验证 sequence // 验证 sequence
if (Array.isArray(loadedFullConfig?.sequence) && loadedFullConfig.sequence.every(id => typeof id === 'string' && availableIds.has(id))) { if (Array.isArray(loadedFullConfig?.sequence) && loadedFullConfig.sequence.every(id => typeof id === 'string' && availableIds.has(id))) {
sequenceOrder.value = loadedFullConfig.sequence; sequenceOrder.value = loadedFullConfig.sequence;
console.log('[FocusSwitcherStore] Successfully loaded and set sequenceOrder:', JSON.stringify(sequenceOrder.value)); // console.log('[FocusSwitcherStore] Successfully loaded and set sequenceOrder:', JSON.stringify(sequenceOrder.value));
} else { } else {
console.warn('[FocusSwitcherStore] Invalid or missing sequence in loaded config. Resetting to empty array.'); console.warn('[FocusSwitcherStore] Invalid or missing sequence in loaded config. Resetting to empty array.');
sequenceOrder.value = []; sequenceOrder.value = [];
@@ -113,7 +113,7 @@ export const useFocusSwitcherStore = defineStore('focusSwitcher', () => {
} }
} }
itemConfigs.value = validConfigs; itemConfigs.value = validConfigs;
console.log('[FocusSwitcherStore] Successfully loaded and set itemConfigs:', JSON.stringify(itemConfigs.value)); // console.log('[FocusSwitcherStore] Successfully loaded and set itemConfigs:', JSON.stringify(itemConfigs.value));
} else { } else {
console.warn('[FocusSwitcherStore] Invalid or missing shortcuts in loaded config. Resetting to empty object.'); console.warn('[FocusSwitcherStore] Invalid or missing shortcuts in loaded config. Resetting to empty object.');
itemConfigs.value = {}; itemConfigs.value = {};
@@ -123,20 +123,20 @@ export const useFocusSwitcherStore = defineStore('focusSwitcher', () => {
console.error(`[FocusSwitcherStore] Failed to load or parse configuration from backend (${apiUrl}):`, error); console.error(`[FocusSwitcherStore] Failed to load or parse configuration from backend (${apiUrl}):`, error);
sequenceOrder.value = []; sequenceOrder.value = [];
itemConfigs.value = {}; itemConfigs.value = {};
console.log('[FocusSwitcherStore] Reset sequenceOrder and itemConfigs due to loading error.'); // console.log('[FocusSwitcherStore] Reset sequenceOrder and itemConfigs due to loading error.');
} }
} }
async function saveConfigurationToBackend() { async function saveConfigurationToBackend() {
const apiUrl = '/api/v1/settings/focus-switcher-sequence'; // 假设 API 端点不变，但接受结构改变 const apiUrl = '/api/v1/settings/focus-switcher-sequence'; // 假设 API 端点不变，但接受结构改变
console.log(`[FocusSwitcherStore] Attempting to save full configuration (sequence & shortcuts) to backend via PUT: ${apiUrl}`); // console.log(`[FocusSwitcherStore] Attempting to save full configuration (sequence & shortcuts) to backend via PUT: ${apiUrl}`);
try { try {
// *** 构造 FocusSwitcherFullConfig 结构发送给后端 *** // *** 构造 FocusSwitcherFullConfig 结构发送给后端 ***
const configToSave: FocusSwitcherFullConfig = { const configToSave: FocusSwitcherFullConfig = {
sequence: sequenceOrder.value, sequence: sequenceOrder.value,
shortcuts: itemConfigs.value, shortcuts: itemConfigs.value,
}; };
console.log('[FocusSwitcherStore] Full configuration data to save:', JSON.stringify(configToSave)); // console.log('[FocusSwitcherStore] Full configuration data to save:', JSON.stringify(configToSave));
const response = await fetch(apiUrl, { const response = await fetch(apiUrl, {
method: 'PUT', method: 'PUT',
headers: { headers: {
@@ -145,7 +145,7 @@ export const useFocusSwitcherStore = defineStore('focusSwitcher', () => {
}, },
body: JSON.stringify(configToSave), // *** 发送包含 sequence 和 shortcuts 的对象 *** body: JSON.stringify(configToSave), // *** 发送包含 sequence 和 shortcuts 的对象 ***
}); });
console.log(`[FocusSwitcherStore] Received response from PUT ${apiUrl}. Status: ${response.status}`); // console.log(`[FocusSwitcherStore] Received response from PUT ${apiUrl}. Status: ${response.status}`);
if (!response.ok) { if (!response.ok) {
const errorData = await response.json().catch(() => ({})); const errorData = await response.json().catch(() => ({}));
@@ -154,7 +154,7 @@ export const useFocusSwitcherStore = defineStore('focusSwitcher', () => {
} }
const result = await response.json(); const result = await response.json();
console.log('[FocusSwitcherStore] Configuration successfully saved to backend. Response message:', result.message); // console.log('[FocusSwitcherStore] Configuration successfully saved to backend. Response message:', result.message);
} catch (error) { } catch (error) {
console.error(`[FocusSwitcherStore] Failed to save configuration to backend (${apiUrl}):`, error); console.error(`[FocusSwitcherStore] Failed to save configuration to backend (${apiUrl}):`, error);
// Notify user of failure // Notify user of failure
@@ -164,17 +164,17 @@ export const useFocusSwitcherStore = defineStore('focusSwitcher', () => {
function triggerTerminalSearchActivation() { function triggerTerminalSearchActivation() {
activateTerminalSearchTrigger.value++; activateTerminalSearchTrigger.value++;
console.log('[FocusSwitcherStore] Triggering Terminal search activation.'); // console.log('[FocusSwitcherStore] Triggering Terminal search activation.');
} }
function triggerFileManagerSearchActivation() { function triggerFileManagerSearchActivation() {
activateFileManagerSearchTrigger.value++; activateFileManagerSearchTrigger.value++;
console.log('[FocusSwitcherStore] Triggering FileManager search activation.'); // console.log('[FocusSwitcherStore] Triggering FileManager search activation.');
} }
function toggleConfigurator(visible?: boolean) { function toggleConfigurator(visible?: boolean) {
isConfiguratorVisible.value = visible === undefined ? !isConfiguratorVisible.value : visible; isConfiguratorVisible.value = visible === undefined ? !isConfiguratorVisible.value : visible;
console.log(`[FocusSwitcherStore] Configurator visibility set to: ${isConfiguratorVisible.value}`); // console.log(`[FocusSwitcherStore] Configurator visibility set to: ${isConfiguratorVisible.value}`);
} }
// --- 移除旧的 loadConfiguration --- // --- 移除旧的 loadConfiguration ---
@@ -193,13 +193,13 @@ export const useFocusSwitcherStore = defineStore('focusSwitcher', () => {
// +++ 修改：更新完整配置（包括顺序和所有快捷键） +++ // +++ 修改：更新完整配置（包括顺序和所有快捷键） +++
function updateConfiguration(newFullConfig: FocusSwitcherFullConfig) { function updateConfiguration(newFullConfig: FocusSwitcherFullConfig) {
console.log('[FocusSwitcherStore] updateConfiguration called with new full configuration:', JSON.stringify(newFullConfig)); // console.log('[FocusSwitcherStore] updateConfiguration called with new full configuration:', JSON.stringify(newFullConfig));
const availableIds = new Set(availableInputs.value.map(input => input.id)); const availableIds = new Set(availableInputs.value.map(input => input.id));
// 更新 sequenceOrder (过滤无效 ID) // 更新 sequenceOrder (过滤无效 ID)
if (Array.isArray(newFullConfig?.sequence)) { if (Array.isArray(newFullConfig?.sequence)) {
sequenceOrder.value = newFullConfig.sequence.filter(id => availableIds.has(id)); sequenceOrder.value = newFullConfig.sequence.filter(id => availableIds.has(id));
console.log('[FocusSwitcherStore] sequenceOrder updated locally to:', JSON.stringify(sequenceOrder.value)); // console.log('[FocusSwitcherStore] sequenceOrder updated locally to:', JSON.stringify(sequenceOrder.value));
} else { } else {
console.warn('[FocusSwitcherStore] Invalid sequence provided in updateConfiguration. Keeping existing sequence.'); console.warn('[FocusSwitcherStore] Invalid sequence provided in updateConfiguration. Keeping existing sequence.');
} }
@@ -218,7 +218,7 @@ export const useFocusSwitcherStore = defineStore('focusSwitcher', () => {
} }
} }
itemConfigs.value = validConfigs; itemConfigs.value = validConfigs;
console.log('[FocusSwitcherStore] itemConfigs updated locally to:', JSON.stringify(itemConfigs.value)); // console.log('[FocusSwitcherStore] itemConfigs updated locally to:', JSON.stringify(itemConfigs.value));
} else { } else {
console.warn('[FocusSwitcherStore] Invalid shortcuts provided in updateConfiguration. Keeping existing configs.'); console.warn('[FocusSwitcherStore] Invalid shortcuts provided in updateConfiguration. Keeping existing configs.');
} }
@@ -238,7 +238,7 @@ export const useFocusSwitcherStore = defineStore('focusSwitcher', () => {
const actions = registeredActions.value.get(id) || []; const actions = registeredActions.value.get(id) || [];
actions.push(action); actions.push(action);
registeredActions.value.set(id, actions); registeredActions.value.set(id, actions);
console.log(`[FocusSwitcherStore] Registered focus action for ID: ${id}. Total actions for this ID: ${actions.length}`); // console.log(`[FocusSwitcherStore] Registered focus action for ID: ${id}. Total actions for this ID: ${actions.length}`);
// 返回一个用于注销此特定动作的函数 // 返回一个用于注销此特定动作的函数
const unregister = () => { const unregister = () => {
@@ -247,11 +247,11 @@ export const useFocusSwitcherStore = defineStore('focusSwitcher', () => {
const index = currentActions.indexOf(action); const index = currentActions.indexOf(action);
if (index > -1) { if (index > -1) {
currentActions.splice(index, 1); currentActions.splice(index, 1);
console.log(`[FocusSwitcherStore] Unregistered a focus action for ID: ${id}. Remaining actions: ${currentActions.length}`); // console.log(`[FocusSwitcherStore] Unregistered a focus action for ID: ${id}. Remaining actions: ${currentActions.length}`);
// 如果数组为空，可以从 Map 中移除该 ID // 如果数组为空，可以从 Map 中移除该 ID
if (currentActions.length === 0) { if (currentActions.length === 0) {
registeredActions.value.delete(id); registeredActions.value.delete(id);
console.log(`[FocusSwitcherStore] Removed ID ${id} from registeredActions map as it has no more actions.`); // console.log(`[FocusSwitcherStore] Removed ID ${id} from registeredActions map as it has no more actions.`);
} }
} else { } else {
console.warn(`[FocusSwitcherStore] Attempted to unregister an action for ID ${id} that was not found.`); console.warn(`[FocusSwitcherStore] Attempted to unregister an action for ID ${id} that was not found.`);
@@ -269,7 +269,7 @@ export const useFocusSwitcherStore = defineStore('focusSwitcher', () => {
// 修改：统一的聚焦目标 Action，现在迭代 Map 中的动作数组 // 修改：统一的聚焦目标 Action，现在迭代 Map 中的动作数组
async function focusTarget(id: string): Promise<boolean> { async function focusTarget(id: string): Promise<boolean> {
console.log(`[FocusSwitcherStore] Attempting to focus target ID: ${id}`); // console.log(`[FocusSwitcherStore] Attempting to focus target ID: ${id}`);
const actions = registeredActions.value.get(id); const actions = registeredActions.value.get(id);
if (!actions || actions.length === 0) { if (!actions || actions.length === 0) {
@@ -277,7 +277,7 @@ export const useFocusSwitcherStore = defineStore('focusSwitcher', () => {
return false; return false;
} }
console.log(`[FocusSwitcherStore] Found ${actions.length} action(s) for ID: ${id}. Iterating...`); // console.log(`[FocusSwitcherStore] Found ${actions.length} action(s) for ID: ${id}. Iterating...`);
for (const action of actions) { for (const action of actions) {
try { try {
@@ -286,14 +286,14 @@ export const useFocusSwitcherStore = defineStore('focusSwitcher', () => {
if (result === true) { if (result === true) {
// 如果动作返回 true，表示成功聚焦，停止迭代并返回 true // 如果动作返回 true，表示成功聚焦，停止迭代并返回 true
console.log(`[FocusSwitcherStore] Successfully focused ${id} via one of its actions.`); // console.log(`[FocusSwitcherStore] Successfully focused ${id} via one of its actions.`);
return true; return true;
} else if (result === false) { } else if (result === false) {
// 如果动作返回 false，表示尝试但失败，记录日志并继续下一个动作 // 如果动作返回 false，表示尝试但失败，记录日志并继续下一个动作
console.log(`[FocusSwitcherStore] An action for ${id} returned false (failed). Trying next action if available.`); // console.log(`[FocusSwitcherStore] An action for ${id} returned false (failed). Trying next action if available.`);
} else if (result === undefined) { } else if (result === undefined) {
// 如果动作返回 undefined，表示跳过（例如非活动实例），记录日志并继续下一个动作 // 如果动作返回 undefined，表示跳过（例如非活动实例），记录日志并继续下一个动作
console.log(`[FocusSwitcherStore] An action for ${id} returned undefined (skipped). Trying next action if available.`); // console.log(`[FocusSwitcherStore] An action for ${id} returned undefined (skipped). Trying next action if available.`);
} }
// 如果 result 是其他值，也视为跳过或未处理 // 如果 result 是其他值，也视为跳过或未处理
@@ -304,7 +304,7 @@ export const useFocusSwitcherStore = defineStore('focusSwitcher', () => {
} }
// 如果遍历完所有动作都没有成功聚焦 (没有返回 true) // 如果遍历完所有动作都没有成功聚焦 (没有返回 true)
console.log(`[FocusSwitcherStore] All actions for ${id} executed, but none returned true. Focus failed.`); // console.log(`[FocusSwitcherStore] All actions for ${id} executed, but none returned true. Focus failed.`);
// 尝试激活搜索框（如果适用），这里的逻辑可能需要重新审视， // 尝试激活搜索框（如果适用），这里的逻辑可能需要重新审视，
// 因为激活应该由返回 false 的动作内部触发，或者由调用 focusTarget 的地方处理 // 因为激活应该由返回 false 的动作内部触发，或者由调用 focusTarget 的地方处理
if (id === 'fileManagerSearch') { if (id === 'fileManagerSearch') {
@@ -392,9 +392,9 @@ export const useFocusSwitcherStore = defineStore('focusSwitcher', () => {
// --- Initialization --- // --- Initialization ---
// Store 创建时自动从后端加载配置 // Store 创建时自动从后端加载配置
console.log('[FocusSwitcherStore] Initializing store and scheduling loadConfigurationFromBackend...'); // 使用新名称 // console.log('[FocusSwitcherStore] Initializing store and scheduling loadConfigurationFromBackend...'); // 使用新名称
nextTick(() => { nextTick(() => {
console.log('[FocusSwitcherStore] nextTick triggered, calling loadConfigurationFromBackend.'); // 使用新名称 // console.log('[FocusSwitcherStore] nextTick triggered, calling loadConfigurationFromBackend.'); // 使用新名称
loadConfigurationFromBackend(); // 调用重命名后的加载函数 loadConfigurationFromBackend(); // 调用重命名后的加载函数
}); });