This commit is contained in:
Baobhan Sith
2025-04-24 21:56:11 +08:00
parent 8143f3f938
commit ab1176993b
3 changed files with 66 additions and 3 deletions
@@ -7,6 +7,7 @@ import * as schema from './schema';
import { tableDefinitions } from './schema.registry';
// presetTerminalThemes might still be needed if passed directly, but likely handled in registry now
// import { presetTerminalThemes } from '../config/preset-themes-definition';
// Removed import for default-layout-data as logic is now in settings repository
// --- Revert to original path and filename ---
// 使用 process.cwd() 获取项目根目录,然后拼接路径,确保路径一致性
@@ -117,6 +118,9 @@ const runDatabaseInitializations = async (db: sqlite3.Database): Promise<void> =
}
}
// Default layout/sidebar data is now handled within settingsRepository.ensureDefaultSettingsExist
// No separate call needed here anymore.
// Migrations (if any) would run after initial schema setup
// import { runMigrations } from './migrations';
// await runMigrations(db);
@@ -1,6 +1,6 @@
// packages/backend/src/repositories/settings.repository.ts
import { getDbInstance, runDb, getDb as getDbRow, allDb } from '../database/connection';
import { SidebarConfig } from '../types/settings.types'; // <-- Correct import path
import { SidebarConfig, LayoutNode, PaneName } from '../types/settings.types'; // <-- Import LayoutNode and PaneName
import * as sqlite3 from 'sqlite3'; // Import sqlite3 for Database type hint
// Define keys for specific settings
@@ -154,6 +154,53 @@ export const setSidebarConfig = async (config: SidebarConfig): Promise<void> =>
* @param db - The active database instance
*/
export const ensureDefaultSettingsExist = async (db: sqlite3.Database): Promise<void> => {
// --- Define Default Structures Here ---
// Use OmitIdRecursive helper type if needed, or define structure without IDs
type OmitIdRecursive<T> = T extends object
? { [K in keyof Omit<T, 'id'>]: OmitIdRecursive<T[K]> }
: T;
const defaultLayoutTreeStructure: OmitIdRecursive<LayoutNode> = {
type: "container",
direction: "horizontal",
children: [
{
type: "container",
direction: "vertical",
children: [
{ type: "pane", component: "statusMonitor", size: 44.56 },
{ type: "pane", component: "commandHistory", size: 26.24 },
{ type: "pane", component: "quickCommands", size: 29.20 }
],
size: 14.59
},
{
type: "container",
direction: "vertical",
size: 58.03,
children: [
{ type: "pane", component: "terminal", size: 59.95 },
{ type: "pane", component: "commandBar", size: 5 },
{ type: "pane", component: "fileManager", size: 35.05 }
]
},
{
type: "container",
direction: "vertical",
size: 27.38,
children: [
{ type: "pane", component: "editor", size: 100 }
]
}
]
};
const defaultSidebarPanesStructure: SidebarConfig = {
left: ["connections", "dockerManager"],
right: []
};
// --- Define All Default Settings ---
const defaultSettings: Record<string, string> = {
language: 'en', // Default language
ipWhitelistEnabled: 'false',
@@ -162,14 +209,14 @@ export const ensureDefaultSettingsExist = async (db: sqlite3.Database): Promise<
loginBanDuration: '300', // 5 minutes in seconds
focusSwitcherSequence: JSON.stringify(["quickCommandsSearch", "commandHistorySearch", "fileManagerSearch", "commandInput", "terminalSearch"]), // Default focus sequence
navBarVisible: 'true', // Default nav bar visibility
layoutTree: 'null', // Default layout tree (null initially)
layoutTree: JSON.stringify(defaultLayoutTreeStructure), // Use the defined structure
autoCopyOnSelect: 'false', // Default auto copy setting
showPopupFileEditor: 'false', // Default popup editor setting
shareFileEditorTabs: 'true', // Default editor tab sharing
dockerStatusIntervalSeconds: '5', // Default Docker refresh interval
dockerDefaultExpand: 'false', // Default Docker expand state
statusMonitorIntervalSeconds: '3', // Default Status Monitor interval
[SIDEBAR_CONFIG_KEY]: JSON.stringify({ left: [], right: [] }), // Default sidebar config
[SIDEBAR_CONFIG_KEY]: JSON.stringify(defaultSidebarPanesStructure), // Use the defined structure
// Add other default settings here
};
const nowSeconds = Math.floor(Date.now() / 1000);
@@ -3,6 +3,18 @@
// Define PaneName here as it's logically related to layout/sidebar settings
export type PaneName = 'connections' | 'terminal' | 'commandBar' | 'fileManager' | 'editor' | 'statusMonitor' | 'commandHistory' | 'quickCommands' | 'dockerManager';
/**
* 布局节点接口 (Mirrors frontend definition for backend use)
*/
export interface LayoutNode {
id: string; // 唯一 ID (Note: Backend might not always use/store this)
type: 'pane' | 'container'; // 节点类型:面板或容器
component?: PaneName; // 如果 type 是 'pane',指定要渲染的组件
direction?: 'horizontal' | 'vertical'; // 如果 type 是 'container',指定分割方向
children?: LayoutNode[]; // 如果 type 是 'container',包含子节点数组
size?: number; // 节点在父容器中的大小比例 (例如 20, 50, 30)
}
/**
* 侧栏配置数据结构 (Managed by Settings Repository/Service)
*/