';
- branches.forEach(branch => {
- const branchId = 'branch-' + branch.name.replace(/[^a-zA-Z0-9]/g, '-');
- html += '
';
- html += '
';
- html += '
';
+ // 构建分支树
+ const branchTree = this.buildBranchTree(branches);
+ let html = '
';
+ html += '
🌳 分支树
';
+ html += '
';
+ html += '';
+ html += '';
+ html += '
';
+ html += '
';
+ html += this.renderBranchTreeNodes(branchTree, 0);
+ html += '
';
+ html += '
';
+ html += '';
+ html += '';
html += '
';
return html;
}
+ /**
+ * 构建分支树状结构
+ */
+ buildBranchTree(branches) {
+ const root = [];
+ branches.forEach(branch => {
+ const parts = branch.name.split('/');
+ let currentLevel = root;
+ for (let i = 0; i < parts.length; i++) {
+ const part = parts[i];
+ const isLeaf = i === parts.length - 1;
+ const fullName = parts.slice(0, i + 1).join('/');
+ let node = currentLevel.find(n => n.name === part);
+ if (!node) {
+ node = {
+ name: part,
+ fullName: fullName,
+ isLeaf: isLeaf,
+ children: [],
+ level: i
+ };
+ currentLevel.push(node);
+ }
+ if (isLeaf) {
+ node.branch = branch;
+ }
+ else {
+ node.expanded = node.expanded || true; // 默认展开
+ }
+ currentLevel = node.children;
+ }
+ });
+ return root;
+ }
+ /**
+ * 渲染分支树节点
+ */
+ renderBranchTreeNodes(nodes, level) {
+ let html = '';
+ nodes.forEach(node => {
+ const indent = level * 20;
+ const nodeId = node.fullName.replace(/[^a-zA-Z0-9-]/g, '-');
+ if (node.isLeaf) {
+ // 叶子节点（实际分支）
+ html += '
';
+ html += '';
+ html += '🌿';
+ html += '';
+ html += node.name;
+ html += (node.branch && node.branch.isCurrent ? ' ⭐' : '');
+ html += '';
+ html += '
';
+ }
+ else {
+ // 文件夹节点
+ html += '
';
+ html += '';
+ html += (node.expanded ? '🪵' : '🪵');
+ html += '';
+ html += '🪵';
+ html += '' + node.name + '';
+ html += '
';
+ if (node.expanded && node.children && node.children.length > 0) {
+ html += '
';
+ html += this.renderBranchTreeNodes(node.children, level + 1);
+ html += '
';
+ }
+ }
+ });
+ return html;
+ }
+ /**
+ * 计算叶子节点数量
+ */
+ countLeafNodes(nodes) {
+ let count = 0;
+ nodes.forEach(node => {
+ if (node.isLeaf) {
+ count++;
+ }
+ else {
+ count += this.countLeafNodes(node.children);
+ }
+ });
+ return count;
+ }
}
exports.ConfigView = ConfigView;
//# sourceMappingURL=ConfigView.js.map
\ No newline at end of file
diff --git a/out/panels/views/ConfigView.js.map b/out/panels/views/ConfigView.js.map
index 4c30176..8f0fea2 100644
--- a/out/panels/views/ConfigView.js.map
+++ b/out/panels/views/ConfigView.js.map
@@ -1 +1 @@
-{"version":3,"file":"ConfigView.js","sourceRoot":"","sources":["../../../src/panels/views/ConfigView.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"ConfigView.js","sourceRoot":"","sources":["../../../src/panels/views/ConfigView.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/src/panels/ConfigPanel.ts b/src/panels/ConfigPanel.ts
index 4287a5d..41ba0ee 100755
--- a/src/panels/ConfigPanel.ts
+++ b/src/panels/ConfigPanel.ts
@@ -64,7 +64,6 @@ interface ProjectData {
interface GitBranch {
name: string;
isCurrent: boolean;
- isRemote: boolean;
selected?: boolean;
}
@@ -1300,89 +1299,133 @@ export class ConfigPanel {
// === Git 分支管理 ===
private async fetchBranches(url: string): Promise
{
- try {
- console.log('🌿 开始获取分支列表:', url);
-
- await vscode.window.withProgress({
- location: vscode.ProgressLocation.Notification,
- title: '正在获取分支信息',
- cancellable: false
- }, async (progress) => {
- progress.report({ increment: 0, message: '连接远程仓库...' });
+ try {
+ console.log('🌿 开始获取分支列表:', url);
+
+ await vscode.window.withProgress({
+ location: vscode.ProgressLocation.Notification,
+ title: '正在获取分支信息',
+ cancellable: false
+ }, async (progress) => {
+ progress.report({ increment: 0, message: '连接远程仓库...' });
- try {
- // 使用 isomorphic-git 的 listServerRefs
- progress.report({ increment: 30, message: '获取远程引用...' });
+ try {
+ // 使用 isomorphic-git 的 listServerRefs
+ progress.report({ increment: 30, message: '获取远程引用...' });
+
+ console.log('🔍 使用 listServerRefs 获取分支信息...');
+
+ const refs = await git.listServerRefs({
+ http: http,
+ url: url
+ });
+
+ console.log('📋 获取到的引用:', refs);
+
+ // 过滤出分支引用 (refs/heads/ 和 refs/remotes/origin/)
+ const branchRefs = refs.filter(ref =>
+ ref.ref.startsWith('refs/heads/') || ref.ref.startsWith('refs/remotes/origin/')
+ );
+
+ console.log('🌿 过滤后的分支引用:', branchRefs);
+
+ // 构建分支数据 - 修复分支名称显示
+ const branches: GitBranch[] = branchRefs.map(ref => {
+ let branchName: string;
- console.log('🔍 使用 listServerRefs 获取分支信息...');
-
- const refs = await git.listServerRefs({
- http: http,
- url: url
- });
-
- console.log('📋 获取到的引用:', refs);
-
- // 过滤出分支引用 (refs/heads/ 和 refs/remotes/origin/)
- const branchRefs = refs.filter(ref =>
- ref.ref.startsWith('refs/heads/') || ref.ref.startsWith('refs/remotes/origin/')
- );
-
- console.log('🌿 过滤后的分支引用:', branchRefs);
-
- // 构建分支数据 - 修复分支名称显示
- const branches: GitBranch[] = branchRefs.map(ref => {
- const isRemote = ref.ref.startsWith('refs/remotes/');
- let branchName: string;
-
- if (isRemote) {
- // 远程分支：移除 refs/remotes/origin/ 前缀
- branchName = ref.ref.replace('refs/remotes/origin/', '');
- } else {
- // 本地分支：移除 refs/heads/ 前缀
- branchName = ref.ref.replace('refs/heads/', '');
- }
-
- return {
- name: branchName,
- isCurrent: branchName === 'main' || branchName === 'master',
- isRemote: isRemote,
- selected: false // 所有分支默认不选中
- };
- });
-
- console.log('🎯 最终分支列表:', branches);
-
- if (branches.length === 0) {
- throw new Error('未找到任何分支');
+ if (ref.ref.startsWith('refs/remotes/')) {
+ // 远程分支：移除 refs/remotes/origin/ 前缀
+ branchName = ref.ref.replace('refs/remotes/origin/', '');
+ } else {
+ // 本地分支：移除 refs/heads/ 前缀
+ branchName = ref.ref.replace('refs/heads/', '');
}
-
- progress.report({ increment: 80, message: '处理分支数据...' });
-
- // 发送分支数据到前端
- if (!this.isWebviewDisposed) {
- this.panel.webview.postMessage({
- type: 'branchesFetched',
- branches: branches,
- repoUrl: url
- });
- }
-
- progress.report({ increment: 100, message: '完成' });
-
- } catch (error) {
- console.error('❌ 使用 listServerRefs 获取分支失败:', error);
- // 只在右下角显示分支获取失败的通知，不模拟分支数据
- vscode.window.showErrorMessage(`获取分支失败: ${error}`);
+ return {
+ name: branchName,
+ isCurrent: branchName === 'main' || branchName === 'master',
+ selected: false // 所有分支默认不选中
+ };
+ });
+
+ console.log('🎯 最终分支列表:', branches);
+
+ if (branches.length === 0) {
+ throw new Error('未找到任何分支');
}
- });
- } catch (error) {
- console.error('❌ 获取分支失败:', error);
- vscode.window.showErrorMessage(`获取分支失败: ${error}`);
- }
+ progress.report({ increment: 80, message: '处理分支数据...' });
+
+ // === 新增：构建分支树状结构 ===
+ const branchTree = this.buildBranchTree(branches);
+ console.log('🌳 构建的分支树结构:', branchTree);
+
+ // 发送分支数据到前端 - 同时包含扁平列表和树状结构
+ if (!this.isWebviewDisposed) {
+ this.panel.webview.postMessage({
+ type: 'branchesFetched',
+ branches: branches,
+ branchTree: branchTree, // 新增树状结构数据
+ repoUrl: url
+ });
+ }
+
+ progress.report({ increment: 100, message: '完成' });
+
+ } catch (error) {
+ console.error('❌ 使用 listServerRefs 获取分支失败:', error);
+
+ // 只在右下角显示分支获取失败的通知，不模拟分支数据
+ vscode.window.showErrorMessage(`获取分支失败: ${error}`);
+ }
+ });
+
+ } catch (error) {
+ console.error('❌ 获取分支失败:', error);
+ vscode.window.showErrorMessage(`获取分支失败: ${error}`);
}
+}
+
+/**
+ * 构建分支树状结构
+ */
+private buildBranchTree(branches: GitBranch[]): any[] {
+ const root: any[] = [];
+
+ branches.forEach(branch => {
+ const parts = branch.name.split('/');
+ let currentLevel = root;
+
+ for (let i = 0; i < parts.length; i++) {
+ const part = parts[i];
+ const isLeaf = i === parts.length - 1;
+ const fullName = parts.slice(0, i + 1).join('/');
+
+ let node = currentLevel.find((n: any) => n.name === part);
+
+ if (!node) {
+ node = {
+ name: part,
+ fullName: fullName,
+ isLeaf: isLeaf,
+ children: [],
+ level: i,
+ expanded: true // 默认展开
+ };
+ currentLevel.push(node);
+ }
+
+ if (isLeaf) {
+ // 叶子节点存储分支信息
+ node.branch = branch;
+ }
+
+ currentLevel = node.children;
+ }
+ });
+
+ return root;
+}
private async cloneBranches(url: string, branches: string[]): Promise {
try {
diff --git a/src/panels/views/ConfigView.ts b/src/panels/views/ConfigView.ts
index 455b86d..2885454 100755
--- a/src/panels/views/ConfigView.ts
+++ b/src/panels/views/ConfigView.ts
@@ -5,10 +5,19 @@ import { ContainerConfigData, ConfigViewData } from '../types/ViewTypes';
interface GitBranch {
name: string;
isCurrent: boolean;
- isRemote: boolean;
selected?: boolean;
}
+interface BranchTreeNode {
+ name: string;
+ fullName: string;
+ isLeaf: boolean;
+ children: BranchTreeNode[];
+ level: number;
+ expanded?: boolean;
+ branch?: GitBranch;
+}
+
// Git 文件树接口
interface GitFileTree {
name: string;
@@ -28,6 +37,17 @@ interface GitRepo {
containerId: string;
}
+// 树状分支节点接口
+interface BranchTreeNode {
+ name: string;
+ fullName: string;
+ isLeaf: boolean;
+ children: BranchTreeNode[];
+ level: number;
+ expanded?: boolean;
+ branch?: GitBranch;
+}
+
export class ConfigView extends BaseView {
render(data?: ContainerConfigData & {
gitRepos?: GitRepo[];
@@ -86,8 +106,8 @@ export class ConfigView extends BaseView {
`;
}).join('');
- // 生成分支选择的 HTML
- const branchesHtml = gitBranches.length > 0 ? this.generateBranchesHtml(gitBranches) : '';
+ // 生成分支选择的 HTML - 使用树状结构
+ const branchesHtml = gitBranches.length > 0 ? this.generateBranchesTreeHtml(gitBranches) : '';
return `
@@ -131,6 +151,65 @@ export class ConfigView extends BaseView {
background: var(--vscode-inputValidation-errorBackground);
opacity: 0.8;
}
+
+ /* 树状分支样式 */
+ .branch-tree {
+ font-family: 'Courier New', monospace;
+ user-select: none;
+ margin: 0;
+ padding: 0;
+ }
+ .branch-node {
+ padding: 2px 0;
+ display: flex;
+ align-items: center;
+ cursor: pointer;
+ line-height: 1.2;
+ }
+ .branch-node:hover {
+ background: var(--vscode-list-hoverBackground);
+ }
+ .branch-icon {
+ margin-right: 4px;
+ font-size: 16px;
+ width: 16px;
+ text-align: center;
+ }
+ .branch-expand {
+ margin-right: 2px;
+ cursor: pointer;
+ width: 14px;
+ text-align: center;
+ }
+ .branch-checkbox {
+ margin-right: 6px;
+ }
+ .branch-name {
+ flex: 1;
+ font-size: 13px;
+ }
+ .branch-children {
+ margin-left: 16px;
+ border-left: 1px solid var(--vscode-panel-border);
+ padding-left: 8px;
+ }
+ .branch-leaf {
+ margin-left: 16px;
+ }
+ .current-branch {
+ color: var(--vscode-gitDecoration-untrackedResourceForeground);
+ font-weight: bold;
+ }
+
+ /* 树图标样式 */
+ .tree-icon {
+ font-size: 2em;
+ }
+
+ /* 分支树标题样式 */
+ .branch-tree-title {
+ font-size: 1.2em;
+ }
@@ -188,6 +267,7 @@ export class ConfigView extends BaseView {
let currentConfigId = null;
let selectedBranches = new Set();
let currentRepoUrl = '';
+ let branchTreeData = [];
// 配置管理功能
function editConfigName(configId, currentName) {
@@ -309,7 +389,7 @@ export class ConfigView extends BaseView {
}
function toggleBranch(branchName) {
- const checkbox = document.getElementById('branch-' + branchName.replace(/[^a-zA-Z0-9]/g, '-'));
+ const checkbox = document.getElementById('branch-' + branchName.replace(/[^a-zA-Z0-9-]/g, '-'));
if (checkbox.checked) {
selectedBranches.add(branchName);
} else {
@@ -370,35 +450,124 @@ export class ConfigView extends BaseView {
});
}
- // 动态渲染分支选择区域
- function renderBranchSelection(branches, repoUrl) {
+ // 树状分支功能
+ function toggleBranchNode(nodeId) {
+ const node = findNodeById(branchTreeData, nodeId);
+ if (node && !node.isLeaf) {
+ node.expanded = !node.expanded;
+ renderBranchTree(branchTreeData);
+ }
+ }
+
+ function expandAllBranches() {
+ setAllExpanded(branchTreeData, true);
+ renderBranchTree(branchTreeData);
+ }
+
+ function collapseAllBranches() {
+ setAllExpanded(branchTreeData, false);
+ renderBranchTree(branchTreeData);
+ }
+
+ function setAllExpanded(nodes, expanded) {
+ nodes.forEach(node => {
+ if (!node.isLeaf) {
+ node.expanded = expanded;
+ if (node.children) {
+ setAllExpanded(node.children, expanded);
+ }
+ }
+ });
+ }
+
+ function findNodeById(nodes, nodeId) {
+ for (const node of nodes) {
+ if (node.fullName === nodeId) return node;
+ if (node.children) {
+ const found = findNodeById(node.children, nodeId);
+ if (found) return found;
+ }
+ }
+ return null;
+ }
+
+ // 动态渲染树状分支
+ function renderBranchTree(treeData) {
const container = document.getElementById('branchSelectionContainer');
- if (branches.length === 0) {
+ if (!treeData || treeData.length === 0) {
container.innerHTML = '未找到分支
';
return;
}
- let branchesHtml = '';
- branchesHtml += '
🌿 选择要克隆的分支 (共 ' + branches.length + ' 个)
';
- branchesHtml += '
';
+ let html = '
';
+ html += '
🌳 分支树
';
- branches.forEach(branch => {
- branchesHtml += '
';
- branchesHtml += '';
- branchesHtml += '
';
+ // 展开/收起按钮
+ html += '
';
+ html += '';
+ html += '';
+ html += '
';
+
+ html += '
';
+ html += renderBranchNodes(treeData, 0);
+ html += '
';
+
+ html += '
';
+ html += '';
+ html += '';
+ html += '
';
+
+ container.innerHTML = html;
+ }
+
+ function renderBranchNodes(nodes, level) {
+ let html = '';
+ nodes.forEach(node => {
+ const indent = level * 20;
+ const nodeId = node.fullName.replace(/[^a-zA-Z0-9-]/g, '-');
+
+ if (node.isLeaf) {
+ // 叶子节点（实际分支）
+ html += '
';
+ html += '';
+ html += '🌿';
+ html += '';
+ html += node.name;
+ html += (node.branch && node.branch.isCurrent ? ' ⭐' : '');
+ html += '';
+ html += '
';
+ } else {
+ // 文件夹节点
+ html += '
';
+ html += '';
+ html += (node.expanded ? '🪵' : '🪵');
+ html += '';
+ html += '🪵';
+ html += '' + node.name + '';
+ html += '
';
+
+ if (node.expanded && node.children) {
+ html += '
';
+ html += renderBranchNodes(node.children, level + 1);
+ html += '
';
+ }
+ }
});
-
- branchesHtml += '
';
- branchesHtml += '
';
- branchesHtml += '';
- branchesHtml += '';
- branchesHtml += '
';
- html += '
🌿 选择要克隆的分支 (共 ' + branches.length + ' 个)
';
- html += '
';
+ // 构建分支树
+ const branchTree = this.buildBranchTree(branches);
- branches.forEach(branch => {
- const branchId = 'branch-' + branch.name.replace(/[^a-zA-Z0-9]/g, '-');
- html += '
';
- html += '';
- html += '
';
- });
-
- html += '
';
- html += '
';
- html += '
';
+ let html = '
';
+ html += '
🌳 分支树
';
+ html += '
';
+ html += '';
+ html += '';
+ html += '
';
+ html += '
';
+ html += this.renderBranchTreeNodes(branchTree, 0);
+ html += '
';
+ html += '
';
+ html += '';
+ html += '';
html += '
';
return html;
}
+
+ /**
+ * 构建分支树状结构
+ */
+ private buildBranchTree(branches: GitBranch[]): BranchTreeNode[] {
+ const root: BranchTreeNode[] = [];
+
+ branches.forEach(branch => {
+ const parts = branch.name.split('/');
+ let currentLevel = root;
+
+ for (let i = 0; i < parts.length; i++) {
+ const part = parts[i];
+ const isLeaf = i === parts.length - 1;
+ const fullName = parts.slice(0, i + 1).join('/');
+
+ let node = currentLevel.find(n => n.name === part);
+
+ if (!node) {
+ node = {
+ name: part,
+ fullName: fullName,
+ isLeaf: isLeaf,
+ children: [],
+ level: i
+ };
+ currentLevel.push(node);
+ }
+
+ if (isLeaf) {
+ node.branch = branch;
+ } else {
+ node.expanded = node.expanded || true; // 默认展开
+ }
+
+ currentLevel = node.children;
+ }
+ });
+
+ return root;
+ }
+
+ /**
+ * 渲染分支树节点
+ */
+ private renderBranchTreeNodes(nodes: BranchTreeNode[], level: number): string {
+ let html = '';
+
+ nodes.forEach(node => {
+ const indent = level * 20;
+ const nodeId = node.fullName.replace(/[^a-zA-Z0-9-]/g, '-');
+
+ if (node.isLeaf) {
+ // 叶子节点（实际分支）
+ html += '
';
+ html += '';
+ html += '🌿';
+ html += '';
+ html += node.name;
+ html += (node.branch && node.branch.isCurrent ? ' ⭐' : '');
+ html += '';
+ html += '
';
+ } else {
+ // 文件夹节点
+ html += '
';
+ html += '';
+ html += (node.expanded ? '🪵' : '🪵');
+ html += '';
+ html += '🪵';
+ html += '' + node.name + '';
+ html += '
';
+
+ if (node.expanded && node.children && node.children.length > 0) {
+ html += '
';
+ html += this.renderBranchTreeNodes(node.children, level + 1);
+ html += '
';
+ }
+ }
+ });
+
+ return html;
+ }
+
+ /**
+ * 计算叶子节点数量
+ */
+ private countLeafNodes(nodes: BranchTreeNode[]): number {
+ let count = 0;
+ nodes.forEach(node => {
+ if (node.isLeaf) {
+ count++;
+ } else {
+ count += this.countLeafNodes(node.children);
+ }
+ });
+ return count;
+ }
}