1、将每个代码仓库进行了隔离。2、优化了每个页面的ui对齐。3、增加了飞行器页面的所属项目显示。4、切换页面时对项目进行扫描，实时更新项目的结构，避免复制导致ui不显示的bug

out/panels/services/GitService.js

@@ -27,7 +27,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GitService = void 0;
-// src/panels/services/GitService.ts
 const fs = __importStar(require("fs"));
 const isomorphic_git_1 = __importDefault(require("isomorphic-git"));
 const node_1 = __importDefault(require("isomorphic-git/http/node"));
@@ -94,8 +93,7 @@ class GitService {
         }
         if (dirExists) {
             const dirContents = await fs.promises.readdir(localPath);
-            // 修正后的逻辑：过滤掉所有以 "." 开头的隐藏文件/目录。
-            // 只有当存在非 "." 开头的文件或目录时，才阻止克隆。
+            // 过滤掉所有以 "." 开头的隐藏文件/目录。
             const nonBenignFiles = dirContents.filter(item => !item.startsWith('.'));
             if (nonBenignFiles.length > 0) {
                 throw new Error('目标目录不为空，请清空目录或选择其他路径');
@@ -195,7 +193,6 @@ class GitService {
         if (username || token) {
             const u = encodeURIComponent(username || '');
             const t = encodeURIComponent(token || '');
-            // 注意: 仅在 URL 是 http/https 时添加 auth
             if (repoUrl.startsWith('http')) {
                 finalUrl = repoUrl.replace('://', `://${u}:${t}@`);
             }
@@ -226,7 +223,7 @@ class GitService {
         await execAsync(`git push -u origin "${branchName}" --force`, { cwd: localPath });
     }
     /**
-     * 使用Git命令提交并推送 (用于原有的 Git 模块更新)
+     * 使用Git命令提交并推送
      */
     static async commitAndPush(localPath) {
         await execAsync('git add .', { cwd: localPath });
@@ -263,15 +260,13 @@ class GitService {
         await execAsync(commands.join(' && '), { cwd: localPath });
     }
     /**
-     * 提交并推送到指定分支和远程 (用于 Project/Aircraft/Container 上传)
+     * 提交并推送到指定分支和远程
      */
-    static async commitAndPushToBranch(localPath, branchName, repoUrl, // 这里的 repoUrl 是为了构造带 auth 的 finalUrl
-    username, token) {
+    static async commitAndPushToBranch(localPath, branchName, repoUrl, username, token) {
         let finalUrl = repoUrl || 'origin';
         if (repoUrl && (username || token)) {
             const u = encodeURIComponent(username || '');
             const t = encodeURIComponent(token || '');
-            // 注意: 仅在 URL 是 http/https 时添加 auth
             if (repoUrl.startsWith('http')) {
                 finalUrl = repoUrl.replace('://', `://${u}:${t}@`);
             }
@@ -313,13 +308,10 @@ class GitService {
             const files = await fs.promises.readdir(dir);
             const tree = [];
             for (const file of files) {
-                // 1. 不要解析 .git
                 if (file === '.git')
                     continue;
-                // 2. 不要解析项目数据文件
                 if (file === 'dcsp-data.json')
                     continue;
-                // 3. 其它所有隐藏文件/目录统统忽略
                 if (file.startsWith('.'))
                     continue;
                 const filePath = path.join(dir, file);

out/panels/services/ProjectService.js

@@ -24,7 +24,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectService = void 0;
-// src/panels/services/ProjectService.ts
 const vscode = __importStar(require("vscode"));
 const path = __importStar(require("path"));
 const fs = __importStar(require("fs"));
@@ -53,17 +52,17 @@ class ProjectService {
      */
     sanitizeFileName(name) {
         let fileName = name.trim();
-        // 1. 替换所有空格为下划线
+        // 替换所有空格为下划线
         fileName = fileName.replace(/\s+/g, '_');
-        // 2. 移除特殊字符
+        // 移除特殊字符
         fileName = fileName.replace(/[^\u4e00-\u9fa5a-zA-Z0-9_\-\.]/g, '');
-        // 3. 确保不为空
+        // 确保不为空
         if (fileName.length === 0) {
             return 'config_file';
         }
         return fileName;
     }
-    // =============== 查重工具方法 (新增) ===============
+    // =============== 查重工具方法 ===============
     /** 检查项目名是否重复 */
     isProjectNameExists(name) {
         return this.projects.some(p => p.name === name);
@@ -218,7 +217,6 @@ class ProjectService {
         };
         this.containers.push(newContainer);
         await this.createContainerDirectory(newContainer);
-        await this.createDefaultConfigs(newContainer);
         return newId;
     }
     updateContainerName(containerId, newName) {
@@ -537,20 +535,6 @@ class ProjectService {
             console.error(`确保容器目录存在失败: ${error}`);
         }
     }
-    async createDefaultConfigs(container) {
-        this.configs.push({
-            id: this.generateUniqueId('cfg', this.configs),
-            name: '配置1',
-            fileName: 'dockerfile',
-            containerId: container.id
-        });
-        this.configs.push({
-            id: this.generateUniqueId('cfg', this.configs),
-            name: '配置2',
-            fileName: 'docker-compose.yml',
-            containerId: container.id
-        });
-    }
     // =============== 数据持久化 ===============
     async saveCurrentProjectData(projectId) {
         try {
@@ -688,12 +672,11 @@ class ProjectService {
         return true;
     }
     /**
-     * [新方法] 仅在内存中注册模块文件夹（用于监测到磁盘文件夹创建时）
+     * 仅在内存中注册模块文件夹（用于监测到磁盘文件夹创建时）
      */
     registerModuleFolderFromDisk(folderName, containerId, aircraftId, projectId, aircraftName, containerName, fullPath) {
         const relativePath = `/${projectId}/${aircraftName}/${containerName}/${folderName}`;
-        // 查重：只要同一个容器下，有任何一个模块指向了相同的文件夹名，就视为已存在
-        // 这样即使旧数据的 localPath 路径字符串是过时的，也不会重复添加
+        // 只要同一个容器下，有任何一个模块指向了相同的文件夹名，就视为已存在
         const existing = this.moduleFolders.find(f => {
             if (f.containerId !== containerId)
                 return false;
@@ -703,7 +686,7 @@ class ProjectService {
         });
         if (existing)
             return false;
-        // 智能检测：如果文件夹下有 .git，则标记为 git 类型
+        // 如果文件夹下有 .git，则标记为 git 类型
         let type = 'local';
         if (fullPath) {
             const gitDir = path.join(fullPath, '.git');
@@ -723,11 +706,9 @@ class ProjectService {
         return true;
     }
     /**
-     * [新方法] 处理磁盘删除事件：根据路径移除对应的 Config 或 ModuleFolder
+     * 处理磁盘删除事件：根据路径移除对应的 Config 或 ModuleFolder
      */
     removeEntityByPath(filePath, projectId) {
-        // 这里的 filePath 是绝对路径，需要反解出是哪个 Config 或 Folder
-        // 这是一个比较繁琐的过程，简化逻辑如下：
         let changed = false;
         const projectPath = this.projectPaths.get(projectId);
         if (!projectPath || !filePath.startsWith(projectPath))
@@ -760,7 +741,7 @@ class ProjectService {
         if (!projectPath || !fs.existsSync(projectPath))
             return false;
         let changed = false;
-        // 1. 扫描磁盘，添加缺失的飞行器
+        // 扫描磁盘，添加缺失的飞行器
         try {
             const entries = await fs.promises.readdir(projectPath, { withFileTypes: true });
             for (const entry of entries) {
@@ -780,7 +761,7 @@ class ProjectService {
         catch (e) {
             console.error('扫描项目目录失败:', e);
         }
-        // 2. 检查内存，移除磁盘不存在的飞行器 (清理无效数据)
+        // 检查内存，移除磁盘不存在的飞行器 (清理无效数据)
         const currentAircrafts = this.getAircraftsByProject(projectId);
         for (const aircraft of currentAircrafts) {
             const aircraftPath = path.join(projectPath, aircraft.name);
@@ -799,7 +780,7 @@ class ProjectService {
         if (!dirPath || !fs.existsSync(dirPath))
             return false;
         let changed = false;
-        // 1. 扫描磁盘，添加缺失的容器
+        // 扫描磁盘，添加缺失的容器
         try {
             const entries = await fs.promises.readdir(dirPath, { withFileTypes: true });
             for (const entry of entries) {
@@ -817,7 +798,7 @@ class ProjectService {
         catch (e) {
             console.error('扫描飞行器目录失败:', e);
         }
-        // 2. 检查内存，移除磁盘不存在的容器
+        // 检查内存，移除磁盘不存在的容器
         const currentContainers = this.getContainersByAircraft(aircraftId);
         for (const container of currentContainers) {
             const containerPath = path.join(dirPath, container.name);
@@ -842,7 +823,7 @@ class ProjectService {
         if (!aircraft)
             return false;
         let changed = false;
-        // 1. 扫描磁盘，添加缺失的配置和模块
+        // 扫描磁盘，添加缺失的配置和模块
         try {
             const entries = await fs.promises.readdir(dirPath, { withFileTypes: true });
             for (const entry of entries) {
@@ -865,7 +846,7 @@ class ProjectService {
         catch (e) {
             console.error('扫描容器目录失败:', e);
         }
-        // 2. 检查内存，移除磁盘不存在的 配置
+        // 检查内存，移除磁盘不存在的 配置
         const currentConfigs = this.getConfigsByContainer(containerId);
         for (const config of currentConfigs) {
             const configPath = path.join(dirPath, config.fileName);
@@ -874,12 +855,9 @@ class ProjectService {
                 changed = true;
             }
         }
-        // 3. 检查内存，移除磁盘不存在的 模块文件夹
+        // 检查内存，移除磁盘不存在的 模块文件夹
         const currentModules = this.getModuleFoldersByContainer(containerId);
         for (const folder of currentModules) {
-            // 注意：Git 类型的模块文件夹，其 localPath 也是指向这个目录的
-            // 这里我们简单拼接路径来检查
-            // folder.localPath 格式: /projectId/aircraft/container/folderName
             const folderName = folder.localPath.split('/').pop();
             if (folderName) {
                 const folderPath = path.join(dirPath, folderName);
@@ -892,7 +870,7 @@ class ProjectService {
         return changed;
     }
     /**
-     * [新增] 递归清理目录下所有的嵌套 .git 文件夹
+     * 递归清理目录下所有的嵌套 .git 文件夹
      * 作用：保留 rootDir 下的 .git，但删除所有子目录中的 .git
      * 解决父级上传时因包含子级仓库导致的冲突
      */
@@ -902,17 +880,17 @@ class ProjectService {
         try {
             const entries = await fs.promises.readdir(rootDir, { withFileTypes: true });
             for (const entry of entries) {
-                // 1. 如果遍历到的是当前目录下的 .git，直接跳过（这是我们要保留的主仓库）
+                // 如果遍历到的是当前目录下的 .git，直接跳过
                 if (entry.name === '.git')
                     continue;
-                // 2. 只处理目录
+                // 只处理目录
                 if (entry.isDirectory()) {
                     const subDir = path.join(rootDir, entry.name);
                     const nestedGit = path.join(subDir, '.git');
                     // 检查子目录下是否有 .git
                     if (fs.existsSync(nestedGit)) {
                         console.log(`🧹 发现嵌套 Git 仓库，正在移除以支持父级上传: ${nestedGit}`);
-                        // 使用您之前实现的强力删除方法（带权限处理）
+                        // 使用强力删除方法（带权限处理）
                         await this.deleteDirectoryFromDisk(nestedGit);
                     }
                     // 继续递归，防止有多层嵌套
@@ -922,7 +900,6 @@ class ProjectService {
         }
         catch (error) {
             console.error(`清理嵌套 Git 失败: ${error}`);
-            // 不抛出错误，尽力而为，以免打断上传流程
         }
     }
 }

out/panels/services/StorageService.js

@@ -24,7 +24,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StorageService = void 0;
-// src/panels/services/StorageService.ts
 const vscode = __importStar(require("vscode"));
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));

out/panels/services/StorageService.js.map

@@ -1 +1 @@
-{"version":3,"file":"StorageService.js","sourceRoot":"","sources":["../../../src/panels/services/StorageService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"StorageService.js","sourceRoot":"","sources":["../../../src/panels/services/StorageService.ts"],"names":[],"mappings":"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"}