修复了合并的第一个BUG，两个类型文件的命名问题

out/panels/ConfigPanel.js

@@ -207,7 +207,7 @@ class ConfigPanel {
                         await this.importGitFile(data.filePath);
                         break;
                     case 'openGitRepoInVSCode':
-                        await this.openGitRepoInVSCode(data.repoId);
+                        await this.openTheModuleFolder('git', data.repoId);
                         break;
                     case 'openConfigFileInVSCode':
                         await this.openConfigFileInVSCode(data.configId);
@@ -219,10 +219,13 @@ class ConfigPanel {
                         await this.deleteMergedFolder(data.folderId);
                         break;
                     case 'openMergedFolderInVSCode':
-                        await this.openMergedFolderInVSCode(data.folderId);
+                        await this.openTheModuleFolder('merged', data.folderId);
                         break;
                     case 'loadMergedFolder':
-                        await this.loadMergedFolder(data.folderId);
+                        await this.openTheModuleFolder('merged', data.folderId);
+                        break;
+                    case 'openTheModuleFolder':
+                        await this.openTheModuleFolder(data.moduleType, data.id);
                         break;
                 }
             }
@@ -1504,26 +1507,50 @@ class ConfigPanel {
             vscode.window.showErrorMessage(`打开合并文件夹失败: ${error}`);
         }
     }
-    async loadMergedFolder(folderId) {
+    /**
-        const folder = this.mergedFolders.find(f => f.id === folderId);
+     * 统一方法：在 VSCode 中打开模块文件夹中的文件
-        if (!folder) {
+     * @param type 模块类型：'git' 或 'merged'
-            vscode.window.showErrorMessage('未找到指定的合并文件夹');
+     * @param id 模块 ID
+     */
+    async openTheModuleFolder(type, id) {
+        let folderPath;
+        let folderName;
+        if (type === 'git') {
+            const repo = this.gitRepos.find(r => r.id === id);
+            if (!repo) {
+                vscode.window.showErrorMessage('未找到指定的 Git 仓库');
+                return;
+            }
+            folderPath = repo.localPath;
+            folderName = repo.name;
+        }
+        else if (type === 'merged') {
+            const folder = this.mergedFolders.find(f => f.id === id);
+            if (!folder) {
+                vscode.window.showErrorMessage('未找到指定的合并文件夹');
+                return;
+            }
+            folderPath = folder.path;
+            folderName = folder.displayName;
+        }
+        if (!folderPath) {
+            vscode.window.showErrorMessage('未找到文件夹路径');
             return;
         }
         try {
             // 检查文件夹是否存在
-            if (!fs.existsSync(folder.path)) {
+            if (!fs.existsSync(folderPath)) {
-                vscode.window.showErrorMessage('合并文件夹目录不存在');
+                vscode.window.showErrorMessage(`${type === 'git' ? 'Git 仓库' : '合并文件夹'}目录不存在`);
                 return;
             }
             // 使用 VSCode 的文件选择器让用户选择要打开的文件
             const fileUri = await vscode.window.showOpenDialog({
-                defaultUri: vscode.Uri.file(folder.path),
+                defaultUri: vscode.Uri.file(folderPath),
                 canSelectFiles: true,
                 canSelectFolders: false,
                 canSelectMany: false,
                 openLabel: '选择要打开的文件',
-                title: `在合并文件夹 ${folder.displayName} 中选择文件`
+                title: `在 ${folderName} 中选择文件`
             });
             if (fileUri && fileUri.length > 0) {
                 // 打开选中的文件
@@ -1533,7 +1560,7 @@ class ConfigPanel {
             }
         }
         catch (error) {
-            vscode.window.showErrorMessage(`打开合并文件夹文件失败: ${error}`);
+            vscode.window.showErrorMessage(`打开${type === 'git' ? 'Git 仓库' : '合并文件夹'}文件失败: ${error}`);
         }
     }
 }

out/panels/views/ConfigView.js

@@ -38,7 +38,7 @@ class ConfigView extends BaseView_1.BaseView {
                     </div>
                 </td>
                 <td>
-                    <span class="clickable" onclick="loadMergedFolder('${folder.id}')">${folder.folderName}</span>
+                    <span class="clickable" onclick="openTheModuleFolder('${folder.id}', 'merged')">${folder.folderName}</span>
                 </td>
                 <td>
                     <button class="btn-delete" onclick="deleteMergedFolder('${folder.id}')">删除</button>
@@ -60,7 +60,7 @@ class ConfigView extends BaseView_1.BaseView {
                     </div>
                 </td>
                 <td>
-                    <span class="clickable" onclick="openGitRepoInVSCode('${repo.id}')">${branchName}</span>
+                    <span class="clickable" onclick="openTheModuleFolder('${repo.id}', 'git')">${branchName}</span>
                 </td>
                 <td>
                     <button class="btn-delete" onclick="deleteGitRepo('${repo.id}')">删除</button>
@@ -325,22 +325,15 @@ class ConfigView extends BaseView_1.BaseView {
         }
 
 
-        // 新功能：加载合并文件夹（与 Git 仓库行为一致）
+        // 统一功能：打开模块文件夹（合并 Git 仓库和合并文件夹功能）
-        function loadMergedFolder(folderId) {
+        function openTheModuleFolder(id, type) {
-            console.log('📂 加载合并文件夹:', folderId);
+            console.log('📂 打开模块文件夹:', { id, type });
             vscode.postMessage({
-                type: 'loadMergedFolder',
+                type: 'openTheModuleFolder',
-                folderId: folderId
+                id: id,
+                moduleType: type
             });
         }
-        
-        function openGitRepoInVSCode(repoId) {
-    console.log('📂 在 VSCode 中打开 Git 仓库文件选择器:', repoId);
-    vscode.postMessage({
-        type: 'openGitRepoInVSCode',
-        repoId: repoId
-    });
-}
 
         function createNewConfig() {
             showPromptDialog(

src/panels/ConfigPanel.ts

@@ -308,7 +308,7 @@ export class ConfigPanel {
                         break;
 
                     case 'openGitRepoInVSCode':
-                        await this.openGitRepoInVSCode(data.repoId);
+                        await this.openTheModuleFolder('git', data.repoId);
                         break;
 
                     case 'openConfigFileInVSCode':
@@ -324,11 +324,15 @@ export class ConfigPanel {
                         break;
 
                     case 'openMergedFolderInVSCode':
-                        await this.openMergedFolderInVSCode(data.folderId);
+                        await this.openTheModuleFolder('merged', data.folderId);
                         break;
 
                     case 'loadMergedFolder':
-                        await this.loadMergedFolder(data.folderId);
+                        await this.openTheModuleFolder('merged', data.folderId);
+                        break;
+
+                    case 'openTheModuleFolder':
+                        await this.openTheModuleFolder(data.moduleType, data.id);
                         break;
                 }
             } catch (error) {
@@ -1835,39 +1839,64 @@ private async openMergedFolderInVSCode(folderId: string): Promise<void> {
     }
 }
 
-private async loadMergedFolder(folderId: string): Promise<void> {
+    /**
-    const folder = this.mergedFolders.find(f => f.id === folderId);
+     * 统一方法：在 VSCode 中打开模块文件夹中的文件
-    if (!folder) {
+     * @param type 模块类型：'git' 或 'merged'
-        vscode.window.showErrorMessage('未找到指定的合并文件夹');
+     * @param id 模块 ID
-        return;
+     */
-    }
+    private async openTheModuleFolder(type: 'git' | 'merged', id: string): Promise<void> {
+        let folderPath: string | undefined;
+        let folderName: string | undefined;
 
-    try {
+        if (type === 'git') {
-        // 检查文件夹是否存在
+            const repo = this.gitRepos.find(r => r.id === id);
-        if (!fs.existsSync(folder.path)) {
+            if (!repo) {
-            vscode.window.showErrorMessage('合并文件夹目录不存在');
+                vscode.window.showErrorMessage('未找到指定的 Git 仓库');
+                return;
+            }
+            folderPath = repo.localPath;
+            folderName = repo.name;
+        } else if (type === 'merged') {
+            const folder = this.mergedFolders.find(f => f.id === id);
+            if (!folder) {
+                vscode.window.showErrorMessage('未找到指定的合并文件夹');
+                return;
+            }
+            folderPath = folder.path;
+            folderName = folder.displayName;
+        }
+
+        if (!folderPath) {
+            vscode.window.showErrorMessage('未找到文件夹路径');
             return;
         }
 
-        // 使用 VSCode 的文件选择器让用户选择要打开的文件
+        try {
-        const fileUri = await vscode.window.showOpenDialog({
+            // 检查文件夹是否存在
-            defaultUri: vscode.Uri.file(folder.path),
+            if (!fs.existsSync(folderPath)) {
-            canSelectFiles: true,
+                vscode.window.showErrorMessage(`${type === 'git' ? 'Git 仓库' : '合并文件夹'}目录不存在`);
-            canSelectFolders: false,
+                return;
-            canSelectMany: false,
+            }
-            openLabel: '选择要打开的文件',
-            title: `在合并文件夹 ${folder.displayName} 中选择文件`
-        });
 
-        if (fileUri && fileUri.length > 0) {
+            // 使用 VSCode 的文件选择器让用户选择要打开的文件
-            // 打开选中的文件
+            const fileUri = await vscode.window.showOpenDialog({
-            const document = await vscode.workspace.openTextDocument(fileUri[0]);
+                defaultUri: vscode.Uri.file(folderPath),
-            await vscode.window.showTextDocument(document);
+                canSelectFiles: true,
-            vscode.window.showInformationMessage(`已打开文件: ${path.basename(fileUri[0].fsPath)}`);
+                canSelectFolders: false,
+                canSelectMany: false,
+                openLabel: '选择要打开的文件',
+                title: `在 ${folderName} 中选择文件`
+            });
+
+            if (fileUri && fileUri.length > 0) {
+                // 打开选中的文件
+                const document = await vscode.workspace.openTextDocument(fileUri[0]);
+                await vscode.window.showTextDocument(document);
+                vscode.window.showInformationMessage(`已打开文件: ${path.basename(fileUri[0].fsPath)}`);
+            }
+
+        } catch (error) {
+            vscode.window.showErrorMessage(`打开${type === 'git' ? 'Git 仓库' : '合并文件夹'}文件失败: ${error}`);
         }
-
-    } catch (error) {
-        vscode.window.showErrorMessage(`打开合并文件夹文件失败: ${error}`);
     }
 }
-}

src/panels/views/ConfigView.ts

@@ -106,7 +106,7 @@ export class ConfigView extends BaseView {
                     </div>
                 </td>
                 <td>
-                    <span class="clickable" onclick="loadMergedFolder('${folder.id}')">${folder.folderName}</span>
+                    <span class="clickable" onclick="openTheModuleFolder('${folder.id}', 'merged')">${folder.folderName}</span>
                 </td>
                 <td>
                     <button class="btn-delete" onclick="deleteMergedFolder('${folder.id}')">删除</button>
@@ -130,7 +130,7 @@ export class ConfigView extends BaseView {
                     </div>
                 </td>
                 <td>
-                    <span class="clickable" onclick="openGitRepoInVSCode('${repo.id}')">${branchName}</span>
+                    <span class="clickable" onclick="openTheModuleFolder('${repo.id}', 'git')">${branchName}</span>
                 </td>
                 <td>
                     <button class="btn-delete" onclick="deleteGitRepo('${repo.id}')">删除</button>
@@ -397,22 +397,15 @@ export class ConfigView extends BaseView {
         }
 
 
-        // 新功能：加载合并文件夹（与 Git 仓库行为一致）
+        // 统一功能：打开模块文件夹（合并 Git 仓库和合并文件夹功能）
-        function loadMergedFolder(folderId) {
+        function openTheModuleFolder(id, type) {
-            console.log('📂 加载合并文件夹:', folderId);
+            console.log('📂 打开模块文件夹:', { id, type });
             vscode.postMessage({
-                type: 'loadMergedFolder',
+                type: 'openTheModuleFolder',
-                folderId: folderId
+                id: id,
+                moduleType: type
             });
         }
-        
-        function openGitRepoInVSCode(repoId) {
-    console.log('📂 在 VSCode 中打开 Git 仓库文件选择器:', repoId);
-    vscode.postMessage({
-        type: 'openGitRepoInVSCode',
-        repoId: repoId
-    });
-}
 
         function createNewConfig() {
             showPromptDialog(
@@ -1039,4 +1032,4 @@ export class ConfigView extends BaseView {
         });
         return count;
     }
-}
+}