@@ -288,6 +288,20 @@ class ProjectView extends BaseView_1.BaseView {
}
);
}
+
+ // 新增上传功能
+ function uploadProject(projectId, projectName) {
+ showConfirmDialog(
+ '上传项目仓库',
+ '确定将此项目目录（包括所有子文件夹和文件）上传到一个新的 Git 仓库分支吗？',
+ function() {
+ vscode.postMessage({
+ type: 'openRepoSelectForProjectUpload',
+ projectId: projectId
+ });
+ }
+ );
+ }
// 项目名称编辑功能
document.addEventListener('DOMContentLoaded', function() {
diff --git a/out/panels/views/ProjectView.js.map b/out/panels/views/ProjectView.js.map
index c39025b..93b8fa5 100644
--- a/out/panels/views/ProjectView.js.map
+++ b/out/panels/views/ProjectView.js.map
@@ -1 +1 @@
-{"version":3,"file":"ProjectView.js","sourceRoot":"","sources":["../../../src/panels/views/ProjectView.ts"],"names":[],"mappings":";;;AAAA,yCAAsC;AAGtC,MAAa,WAAY,SAAQ,mBAAQ;IACrC,MAAM,CAAC,IAA0E;QAC7E,MAAM,QAAQ,GAAG,IAAI,EAAE,QAAQ,IAAI,EAAE,CAAC;QACtC,MAAM,YAAY,GAAG,IAAI,EAAE,YAAY,IAAI,IAAI,GAAG,EAAE,CAAC;QAErD,MAAM,YAAY,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAwB,EAAE,EAAE;YAC3D,MAAM,YAAY,GAAG,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAClD,MAAM,UAAU,GAAG,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;YAC7C,MAAM,UAAU,GAAG,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;YAEhD,OAAO;;;kEAG+C,OAAO,CAAC,EAAE,KAAK,UAAU,IAAI,OAAO,CAAC,IAAI;;0BAEjF,UAAU,GAAG,YAAY,CAAC,CAAC,CAAC,MAAM,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE;;;;yEAItB,OAAO,CAAC,EAAE,OAAO,OAAO,CAAC,IAAI,MAAM,YAAY;0BAC9F,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI;;;;yEAIqB,OAAO,CAAC,EAAE;;;SAG1E,CAAA;QAAA,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAEb,OAAO;;;;;;MAMT,IAAI,CAAC,SAAS,EAAE;MAChB,IAAI,CAAC,mBAAmB,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;cAgKlB,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA4RlB,CAAC;IACL,CAAC;CACJ;AAleD,kCAkeC"}
\ No newline at end of file
+{"version":3,"file":"ProjectView.js","sourceRoot":"","sources":["../../../src/panels/views/ProjectView.ts"],"names":[],"mappings":";;;AAAA,yCAAsC;AAGtC,MAAa,WAAY,SAAQ,mBAAQ;IACrC,MAAM,CAAC,IAA0E;QAC7E,MAAM,QAAQ,GAAG,IAAI,EAAE,QAAQ,IAAI,EAAE,CAAC;QACtC,MAAM,YAAY,GAAG,IAAI,EAAE,YAAY,IAAI,IAAI,GAAG,EAAE,CAAC;QAErD,MAAM,YAAY,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAwB,EAAE,EAAE;YAC3D,MAAM,YAAY,GAAG,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAClD,MAAM,UAAU,GAAG,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;YAC7C,MAAM,UAAU,GAAG,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;YAEhD,OAAO;;;kEAG+C,OAAO,CAAC,EAAE,KAAK,UAAU,IAAI,OAAO,CAAC,IAAI;;0BAEjF,UAAU,GAAG,YAAY,CAAC,CAAC,CAAC,MAAM,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE;;;;yEAItB,OAAO,CAAC,EAAE,OAAO,OAAO,CAAC,IAAI,MAAM,YAAY;0BAC9F,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI;;;;sBAI9B,YAAY,CAAC,CAAC,CAAC,sDAAsD,OAAO,CAAC,EAAE,OAAO,OAAO,CAAC,IAAI,4CAA4C,CAAC,CAAC,CAAC,EAAE;yEAChG,OAAO,CAAC,EAAE;;;SAG1E,CAAA;QAAA,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAEb,OAAO;;;;;;MAMT,IAAI,CAAC,SAAS,EAAE;MAChB,IAAI,CAAC,mBAAmB,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;cAgKlB,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAySlB,CAAC;IACL,CAAC;CACJ;AAhfD,kCAgfC"}
\ No newline at end of file
diff --git a/src/panels/ConfigPanel.ts b/src/panels/ConfigPanel.ts
index dd1efb9..4ec80b2 100755
--- a/src/panels/ConfigPanel.ts
+++ b/src/panels/ConfigPanel.ts
@@ -150,7 +150,7 @@ export class ConfigPanel {
}
/**
- * 弹出“上传代码”时的仓库 + 分支选择弹窗
+ * 弹出“上传代码”时的仓库 + 分支选择弹窗 (模块文件夹专用)
*/
private async openUploadRepoSelect(folderId: string, folderType: 'git' | 'local'): Promise
{
await this.loadRepoConfigs();
@@ -169,6 +169,30 @@ export class ConfigPanel {
folderType
});
}
+
+ /**
+ * 弹出“上传代码”时的仓库 + 分支选择弹窗 (Project/Aircraft/Container 专用)
+ */
+ private async openUploadRepoSelectForScope(
+ scope: 'project' | 'aircraft' | 'container',
+ id: string
+ ): Promise {
+ await this.loadRepoConfigs();
+
+ if (this.repoConfigs.length === 0) {
+ vscode.window.showWarningMessage('尚未配置任何仓库，请先点击右上角 "仓库配置" 按钮编辑 dcsp-repos.json。');
+ return;
+ }
+
+ if (this.isWebviewDisposed) return;
+
+ this.panel.webview.postMessage({
+ type: 'showUploadRepoSelect',
+ repos: this.repoConfigs.map(r => ({ name: r.name })),
+ folderId: id,
+ folderType: scope // 传递 scope 作为类型
+ });
+ }
/**
* “获取仓库”弹窗确认后：用于拉取分支
@@ -187,11 +211,11 @@ export class ConfigPanel {
}
/**
- * “上传代码”弹窗确认后：根据 folderType 决定上传逻辑，并使用用户输入的 branchName
+ * “上传代码”弹窗确认后：根据 type 决定上传逻辑，并使用用户输入的 branchName
*/
private async handleUploadRepoSelected(
- folderId: string,
- folderType: 'git' | 'local',
+ id: string, // 现在是通用 ID (folderId, projectId, aircraftId, containerId)
+ type: 'git' | 'local' | 'project' | 'aircraft' | 'container', // 扩展类型
repoName: string,
branchName: string
): Promise {
@@ -208,18 +232,21 @@ export class ConfigPanel {
return;
}
- if (folderType === 'local') {
- // 本地模块 -> 选中仓库 + 指定分支
+ if (type === 'local') {
+ // 本地模块 -> 选中仓库 + 指定分支 (原逻辑)
await this.uploadLocalModuleFolder(
- folderId,
+ id,
repo.url,
trimmedBranch,
repo.username,
repo.token
);
+ } else if (type === 'git') {
+ // Git 模块 -> 选中仓库 + 指定分支 (原逻辑)
+ await this.processGitUploadWithBranch(id, repo, trimmedBranch);
} else {
- // Git 模块 -> 选中仓库 + 指定分支
- await this.processGitUploadWithBranch(folderId, repo, trimmedBranch);
+ // 新增逻辑：Project, Aircraft, Container 上传
+ await this.uploadProjectAircraftContainer(id, type, repo, trimmedBranch);
}
}
@@ -264,6 +291,7 @@ export class ConfigPanel {
try {
progress.report({ increment: 0, message: '准备上传...' });
+ // 这里使用 GitService.pushToRepoUrl，它负责 checkout 和 push
await GitService.pushToRepoUrl(
fullPath,
repo.url,
@@ -367,16 +395,21 @@ export class ConfigPanel {
'openTheModuleFolder': (data) => this.openTheModuleFolder(data.moduleType, data.id),
'renameModuleFolder': (data) => this.renameModuleFolder(data.folderId, data.newName),
- // 上传功能
+ // 模块上传功能 (原逻辑)
'uploadGitModuleFolder': (data) => this.uploadGitModuleFolder(data.folderId, data.username, data.password),
'openRepoSelectForUpload': (data) => this.openUploadRepoSelect(data.folderId, 'local'),
'uploadLocalModuleFolder': (data) => this.uploadLocalModuleFolder(data.folderId, data.repoUrl, data.branchName),
'openRepoSelectForGitUpload': (data) => this.openUploadRepoSelect(data.folderId, 'git'),
+
+ // 新增：Project/Aircraft/Container 上传
+ 'openRepoSelectForProjectUpload': (data) => this.openUploadRepoSelectForScope('project', data.projectId),
+ 'openRepoSelectForAircraftUpload': (data) => this.openUploadRepoSelectForScope('aircraft', data.aircraftId),
+ 'openRepoSelectForContainerUpload': (data) => this.openUploadRepoSelectForScope('container', data.containerId),
- // 上传时 仓库+分支 选择确认
+ // 统一的上传时 仓库+分支 选择确认
'uploadRepoSelected': (data) => this.handleUploadRepoSelected(
data.folderId,
- data.folderType,
+ data.folderType, // 此时 data.folderType 可能是 'project' | 'aircraft' | 'container'
data.repoName,
data.branchName
)
@@ -1350,6 +1383,98 @@ export class ConfigPanel {
// =============================================
// 上传功能方法
// =============================================
+
+ /**
+ * 上传 Project / Aircraft / Container 目录到 Git 仓库
+ */
+ private async uploadProjectAircraftContainer(
+ id: string,
+ type: 'project' | 'aircraft' | 'container',
+ repo: RepoConfigItem,
+ branchName: string
+ ): Promise {
+ let fullPath: string | null = null;
+ let name: string = '';
+
+ // 1. 获取目标目录的完整路径和名称
+ if (type === 'project') {
+ fullPath = this.projectService.getProjectPath(id) || null;
+ name = this.projectService.getProjects().find(p => p.id === id)?.name || 'Project';
+ } else if (type === 'aircraft') {
+ const aircraft = this.projectService.getAircraftsByProject(this.currentProjectId).find(a => a.id === id);
+ name = aircraft?.name || 'Aircraft';
+ if (aircraft) {
+ fullPath = path.join(this.projectService.getProjectPath(aircraft.projectId) || '', aircraft.name);
+ }
+ } else if (type === 'container') {
+ const container = this.projectService.getContainersByAircraft(this.currentAircraftId).find(c => c.id === id);
+ name = container?.name || 'Container';
+ if (container) {
+ const aircraft = this.projectService.getAircraftsByProject(this.currentProjectId).find(a => a.id === container.aircraftId);
+ if (aircraft) {
+ fullPath = path.join(this.projectService.getProjectPath(aircraft.projectId) || '', aircraft.name, container.name);
+ }
+ }
+ }
+
+ if (!fullPath || !require('fs').existsSync(fullPath)) {
+ vscode.window.showErrorMessage(`无法获取 ${type} "${name}" 的有效路径或目录不存在。请先配置项目路径并确保目录存在。`);
+ return;
+ }
+
+ await vscode.window.withProgress({
+ location: vscode.ProgressLocation.Notification,
+ title: `正在上传 ${type}: ${name}`,
+ cancellable: false
+ }, async (progress) => {
+ try {
+ progress.report({ increment: 0, message: '检查目录...' });
+
+ const fs = require('fs');
+ // 检查目录是否为空
+ const dirContents = await fs.promises.readdir(fullPath!);
+ if (dirContents.length === 0) {
+ throw new Error('目录为空，无法上传');
+ }
+
+ // 2. 检查是否为 Git 仓库并初始化
+ let isGitRepo = false;
+ try {
+ // Check for .git directory
+ if (fs.existsSync(path.join(fullPath!, '.git'))) {
+ isGitRepo = true;
+ }
+ } catch (e) { /* ignore */ }
+
+ if (!isGitRepo) {
+ progress.report({ increment: 10, message: '初始化 Git 仓库...' });
+ // initRepository 内部会创建并切换到指定分支
+ await GitService.initRepository(fullPath!, branchName);
+ }
+
+ // 3. 配置远程仓库
+ progress.report({ increment: 20, message: '配置远程仓库...' });
+ try {
+ // 尝试移除旧的 origin 远程，以避免冲突
+ await GitService.removeRemote(fullPath!);
+ } catch(e) { /* ignore if no remote */ }
+ await GitService.addRemote(fullPath!, repo.url, repo.username, repo.token);
+
+ // 4. 提交并推送
+ progress.report({ increment: 40, message: '提交并推送到远程仓库...' });
+ // commitAndPushToBranch 内部会 add, commit, checkout -B, push
+ await GitService.commitAndPushToBranch(fullPath!, branchName, repo.url, repo.username, repo.token);
+
+ progress.report({ increment: 100, message: '完成' });
+
+ vscode.window.showInformationMessage(`✅ ${type} ${name} 已成功上传到 ${repo.name} 的分支 ${branchName}`);
+ this.updateWebview();
+ } catch (error: any) {
+ console.error(`❌ ${type} 上传失败:`, error);
+ vscode.window.showErrorMessage(`推送失败: ${error.message || error}`);
+ }
+ });
+ }
private async uploadGitModuleFolder(folderId: string, username?: string, password?: string): Promise {
const folder = this.projectService.getModuleFolder(folderId);
@@ -1845,4 +1970,4 @@ export class ConfigPanel {
});
}
}
-}
+}
\ No newline at end of file
diff --git a/src/panels/services/GitService.ts b/src/panels/services/GitService.ts
index 1e6774a..f7385e5 100755
--- a/src/panels/services/GitService.ts
+++ b/src/panels/services/GitService.ts
@@ -171,9 +171,27 @@ export class GitService {
* 初始化Git仓库
*/
static async initRepository(localPath: string, branchName: string): Promise {
+ // 使用 -b 参数初始化时直接设置分支名
await execAsync(`git init && git checkout -b "${branchName}"`, { cwd: localPath });
}
+ /**
+ * 移除远程仓库
+ */
+ static async removeRemote(localPath: string): Promise {
+ try {
+ await execAsync('git remote remove origin', { cwd: localPath });
+ } catch (error: any) {
+ // 忽略“没有该远程仓库”的错误
+ if (error.stderr && !error.stderr.includes("No such remote")) {
+ throw error;
+ }
+ if (error.stdout && !error.stdout.includes("No such remote")) {
+ throw error;
+ }
+ }
+ }
+
/**
* 添加远程仓库
*/
@@ -185,10 +203,13 @@ export class GitService {
): Promise {
let finalUrl = repoUrl;
- if (username && token) {
- const u = encodeURIComponent(username);
- const t = encodeURIComponent(token);
- finalUrl = repoUrl.replace('://', `://${u}:${t}@`);
+ if (username || token) {
+ const u = encodeURIComponent(username || '');
+ const t = encodeURIComponent(token || '');
+ // 注意: 仅在 URL 是 http/https 时添加 auth
+ if (repoUrl.startsWith('http')) {
+ finalUrl = repoUrl.replace('://', `://${u}:${t}@`);
+ }
}
await execAsync(`git remote add origin "${finalUrl}"`, { cwd: localPath });
@@ -221,7 +242,7 @@ export class GitService {
}
/**
- * 使用Git命令提交并推送
+ * 使用Git命令提交并推送 (用于原有的 Git 模块更新)
*/
static async commitAndPush(localPath: string): Promise {
await execAsync('git add .', { cwd: localPath });
@@ -270,6 +291,38 @@ export class GitService {
await execAsync(commands.join(' && '), { cwd: localPath });
}
+
+ /**
+ * 提交并推送到指定分支和远程 (用于 Project/Aircraft/Container 上传)
+ */
+ static async commitAndPushToBranch(
+ localPath: string,
+ branchName: string,
+ repoUrl?: string, // 这里的 repoUrl 是为了构造带 auth 的 finalUrl
+ username?: string,
+ token?: string
+ ): Promise {
+ 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}@`);
+ }
+ }
+
+ const commands = [
+ 'git add .',
+ // 允许没有更改时 commit 失败 (Exit code 1)，所以使用 || true
+ `git commit -m "Auto commit from DCSP - ${new Date().toLocaleString()}" || true`,
+ `git checkout -B "${branchName}"`, // 切换到指定分支
+ `git push -u "${finalUrl}" "${branchName}" --force` // 强制推送
+ ];
+
+ await execAsync(commands.join(' && '), { cwd: localPath });
+ }
/**
* 生成模块文件夹名称
@@ -292,9 +345,9 @@ export class GitService {
/**
* 构建文件树
* 这里显式忽略:
- * - .git 目录
- * - .dcsp-data.json
- * - 其它以 . 开头的隐藏文件/目录
+ * - .git 目录
+ * - .dcsp-data.json
+ * - 其它以 . 开头的隐藏文件/目录
*/
static async buildFileTree(dir: string, relativePath: string = ''): Promise {
try {
@@ -338,4 +391,4 @@ export class GitService {
return [];
}
}
-}
+}
\ No newline at end of file
diff --git a/src/panels/views/AircraftView.ts b/src/panels/views/AircraftView.ts
index 1780373..62d0b5b 100755
--- a/src/panels/views/AircraftView.ts
+++ b/src/panels/views/AircraftView.ts
@@ -14,6 +14,7 @@ export class AircraftView extends BaseView {
配置容器
+
|
@@ -179,7 +180,6 @@ export class AircraftView extends BaseView {
-
🛫 飞行器云仓库
@@ -242,6 +242,20 @@ export class AircraftView extends BaseView {
}
);
}
+
+ // 新增上传功能
+ function uploadAircraft(aircraftId, aircraftName) {
+ showConfirmDialog(
+ '上传飞行器仓库',
+ '确定将此飞行器目录（包括所有子文件夹和文件）上传到一个新的 Git 仓库分支吗？',
+ function() {
+ vscode.postMessage({
+ type: 'openRepoSelectForAircraftUpload',
+ aircraftId: aircraftId
+ });
+ }
+ );
+ }
// 飞行器名称编辑功能
document.addEventListener('DOMContentLoaded', function() {
@@ -436,4 +450,4 @@ export class AircraftView extends BaseView {