0
0

修复大小写bug

This commit is contained in:
xubing
2026-01-30 11:06:42 +08:00
parent 9374414de4
commit ad34dca525
28 changed files with 87 additions and 74 deletions

6
dcsp-repos.json Normal file → Executable file
View File

@@ -4,19 +4,19 @@
"name": "卫星模型", "name": "卫星模型",
"url": "http://117.72.162.127:3000/xb/test.git", "url": "http://117.72.162.127:3000/xb/test.git",
"username": "xb", "username": "xb",
"token": "582e19830c58bdbfa8962f881ec873cce208ead0" "token": "6f5aa254217295569dc5ec8aeb15de6641ca63c7"
}, },
{ {
"name": "动力学模型", "name": "动力学模型",
"url": "http://117.72.162.127:3000/xb/build.git", "url": "http://117.72.162.127:3000/xb/build.git",
"username": "xb", "username": "xb",
"token": "582e19830c58bdbfa8962f881ec873cce208ead0" "token": "6f5aa254217295569dc5ec8aeb15de6641ca63c7"
}, },
{ {
"name": "项目模型", "name": "项目模型",
"url": "http://117.72.162.127:3000/xb/----.git", "url": "http://117.72.162.127:3000/xb/----.git",
"username": "xb", "username": "xb",
"token": "582e19830c58bdbfa8962f881ec873cce208ead0" "token": "6f5aa254217295569dc5ec8aeb15de6641ca63c7"
} }
] ]
} }

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -287,7 +287,7 @@ class ConfigPanel {
'updateContainerName': (data) => this.updateContainerName(data.containerId, data.name), 'updateContainerName': (data) => this.updateContainerName(data.containerId, data.name),
'createContainer': (data) => this.createContainer(data.name), 'createContainer': (data) => this.createContainer(data.name),
'deleteContainer': (data) => this.deleteContainer(data.containerId), 'deleteContainer': (data) => this.deleteContainer(data.containerId),
// 配置管理 // 模块管理
// [修改] 接收新的文件名 // [修改] 接收新的文件名
'updateConfigName': (data) => this.updateConfigName(data.configId, data.name, data.fileName), 'updateConfigName': (data) => this.updateConfigName(data.configId, data.name, data.fileName),
'createConfig': (data) => this.createConfig(data.name), 'createConfig': (data) => this.createConfig(data.name),
@@ -598,7 +598,7 @@ class ConfigPanel {
} }
} }
// ============================================= // =============================================
// 配置管理方法 // 模块管理方法
// ============================================= // =============================================
/** /**
* [修改] 同时更新配置显示名称和文件名,并处理磁盘文件重命名 * [修改] 同时更新配置显示名称和文件名,并处理磁盘文件重命名

View File

@@ -317,7 +317,7 @@ class GitService {
if (file === '.git') if (file === '.git')
continue; continue;
// 2. 不要解析项目数据文件 // 2. 不要解析项目数据文件
if (file === '.dcsp-data.json') if (file === 'dcsp-data.json')
continue; continue;
// 3. 其它所有隐藏文件/目录统统忽略 // 3. 其它所有隐藏文件/目录统统忽略
if (file.startsWith('.')) if (file.startsWith('.'))

File diff suppressed because one or more lines are too long

View File

@@ -49,15 +49,15 @@ class ProjectService {
return `${prefix}${randomPart}`; return `${prefix}${randomPart}`;
} }
/** /**
* [新增] 文件名/文件夹名净化:允许中文、字母、数字、-、_ * 文件名/文件夹名净化:保留大小写,允许中文、字母、数字、-、_、.
*/ */
sanitizeFileName(name) { sanitizeFileName(name) {
// 允许中文、字母、数字、-、_ let fileName = name.trim(); // 移除 .toLowerCase() 以保留大小写
let fileName = name.trim().toLowerCase();
// 1. 替换所有空格为下划线 // 1. 替换所有空格为下划线
fileName = fileName.replace(/\s+/g, '_'); fileName = fileName.replace(/\s+/g, '_');
// 2. 移除所有不被允许的特殊字符(只保留中文、字母、数字、-、_ // 2. 移除特殊字符
fileName = fileName.replace(/[^\u4e00-\u9fa5a-z0-9_-]/g, ''); // 在正则中增加了 A-Z 以及 \. (注意:\u4e00-\u9fa5 匹配中文)
fileName = fileName.replace(/[^\u4e00-\u9fa5a-zA-Z0-9_\-\.]/g, '');
// 3. 确保不为空 // 3. 确保不为空
if (fileName.length === 0) { if (fileName.length === 0) {
return 'config_file'; return 'config_file';
@@ -308,9 +308,10 @@ class ProjectService {
getConfig(configId) { getConfig(configId) {
return this.configs.find(c => c.id === configId); return this.configs.find(c => c.id === configId);
} }
// src/panels/services/ProjectService.ts
async createConfig(name, containerId) { async createConfig(name, containerId) {
const newId = this.generateUniqueId('cfg', this.configs); const newId = this.generateUniqueId('cfg', this.configs);
// 使用新增的 sanitizeFileName 方法来处理文件名 // 使用净化后的文件名
const newFileName = this.sanitizeFileName(name); const newFileName = this.sanitizeFileName(name);
const newConfig = { const newConfig = {
id: newId, id: newId,
@@ -319,7 +320,22 @@ class ProjectService {
containerId: containerId containerId: containerId
}; };
this.configs.push(newConfig); this.configs.push(newConfig);
// 1. 首先确保父级容器目录存在
await this.ensureContainerDirectoryExists(containerId); await this.ensureContainerDirectoryExists(containerId);
// 2. 获取文件的完整磁盘路径
const filePath = this.getConfigFilePath(newId);
if (filePath) {
try {
const fileUri = vscode.Uri.file(filePath);
// 3. 真实创建文件:写入一个空的 Uint8Array 即可创建一个空文件
// 如果你希望有默认内容,可以在这里自定义 TextEncoder().encode("...")
await vscode.workspace.fs.writeFile(fileUri, new Uint8Array());
console.log(`✅ 磁盘文件已真实创建: ${filePath}`);
}
catch (error) {
console.error(`❌ 磁盘文件创建失败: ${error}`);
}
}
return newId; return newId;
} }
/** /**
@@ -399,17 +415,6 @@ class ProjectService {
this.moduleFolders = this.moduleFolders.filter(f => f.id !== folderId); this.moduleFolders = this.moduleFolders.filter(f => f.id !== folderId);
return true; return true;
} }
/**
* [删除] 此方法已被 ConfigPanel 中的 updateModuleFolder 替换,以支持同步磁盘操作。
*/
// renameModuleFolder(folderId: string, newName: string): boolean {
// const folder = this.moduleFolders.find(f => f.id === folderId);
// if (!folder) return false;
//
// const oldName = folder.localPath.split('/').pop() || '';
// folder.localPath = folder.localPath.replace(/\/[^/]+$/, '/' + newName);
// return true;
// }
// =============== 文件系统操作 (新增/修改) =============== // =============== 文件系统操作 (新增/修改) ===============
/** /**
* 获取项目目录重命名所需的旧路径和新路径(新增) * 获取项目目录重命名所需的旧路径和新路径(新增)

File diff suppressed because one or more lines are too long

View File

@@ -38,7 +38,7 @@ class StorageService {
*/ */
static async loadProjectData(projectPath) { static async loadProjectData(projectPath) {
try { try {
const dataUri = vscode.Uri.joinPath(vscode.Uri.file(projectPath), '.dcsp-data.json'); const dataUri = vscode.Uri.joinPath(vscode.Uri.file(projectPath), 'dcsp-data.json');
try { try {
await vscode.workspace.fs.stat(dataUri); await vscode.workspace.fs.stat(dataUri);
} }
@@ -61,7 +61,7 @@ class StorageService {
*/ */
static async saveProjectData(projectPath, data) { static async saveProjectData(projectPath, data) {
try { try {
const dataUri = vscode.Uri.joinPath(vscode.Uri.file(projectPath), '.dcsp-data.json'); const dataUri = vscode.Uri.joinPath(vscode.Uri.file(projectPath), 'dcsp-data.json');
const uint8Array = new TextEncoder().encode(JSON.stringify(data, null, 2)); const uint8Array = new TextEncoder().encode(JSON.stringify(data, null, 2));
await vscode.workspace.fs.writeFile(dataUri, uint8Array); await vscode.workspace.fs.writeFile(dataUri, uint8Array);
console.log('✅ 项目数据已保存'); console.log('✅ 项目数据已保存');
@@ -77,7 +77,7 @@ class StorageService {
*/ */
static async checkProjectPathHasData(projectPath) { static async checkProjectPathHasData(projectPath) {
try { try {
const dataUri = vscode.Uri.joinPath(vscode.Uri.file(projectPath), '.dcsp-data.json'); const dataUri = vscode.Uri.joinPath(vscode.Uri.file(projectPath), 'dcsp-data.json');
await vscode.workspace.fs.stat(dataUri); await vscode.workspace.fs.stat(dataUri);
return true; return true;
} }

View File

@@ -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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"}

View File

@@ -11,7 +11,7 @@ class AircraftView extends BaseView_1.BaseView {
<span class="aircraft-name" data-aircraft-id="${aircraft.id}">🛸 ${aircraft.name}</span> <span class="aircraft-name" data-aircraft-id="${aircraft.id}">🛸 ${aircraft.name}</span>
</td> </td>
<td> <td>
<span class="clickable" onclick="openAircraftConfig('${aircraft.id}', '${aircraft.projectId}')">配置容器</span> <span class="clickable" onclick="openAircraftConfig('${aircraft.id}', '${aircraft.projectId}')">打开</span>
</td> </td>
<td> <td>
<button class="btn-upload" onclick="uploadAircraft('${aircraft.id}', '${aircraft.name}')" style="margin-right: 5px;">上传</button> <button class="btn-upload" onclick="uploadAircraft('${aircraft.id}', '${aircraft.name}')" style="margin-right: 5px;">上传</button>

View File

@@ -69,7 +69,7 @@ class ConfigView extends BaseView_1.BaseView {
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>配置管理</title> <title>模块管理</title>
${this.getBaseStylesAndScripts()} ${this.getBaseStylesAndScripts()}
${this.getRepoSelectScript()} ${this.getRepoSelectScript()}
<style> <style>
@@ -261,7 +261,7 @@ class ConfigView extends BaseView_1.BaseView {
</head> </head>
<body> <body>
<div class="header"> <div class="header">
<h2>⚙️ 配置管理 - <span style="color: var(--vscode-textLink-foreground);">${container?.name || '未知容器'}</span></h2> <h2>⚙️ 模块管理 - <span style="color: var(--vscode-textLink-foreground);">${container?.name || '未知容器'}</span></h2>
<button class="back-btn" onclick="goBackToContainers()">← 返回容器管理</button> <button class="back-btn" onclick="goBackToContainers()">← 返回容器管理</button>
</div> </div>
@@ -276,7 +276,7 @@ class ConfigView extends BaseView_1.BaseView {
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>
<th width="25%">配置</th> <th width="25%">模块</th>
<th width="15%">类别</th> <th width="15%">类别</th>
<th width="35%">文件/文件夹</th> <th width="35%">文件/文件夹</th>
<th width="25%">操作</th> <th width="25%">操作</th>
@@ -534,7 +534,7 @@ class ConfigView extends BaseView_1.BaseView {
showModuleFolderRenameDialog(folderId, currentName, currentFolderName); showModuleFolderRenameDialog(folderId, currentName, currentFolderName);
} }
// 配置管理功能 // 模块管理功能
// 原始的 editConfigName 已被修改为接受三个参数 // 原始的 editConfigName 已被修改为接受三个参数
// 在 VSCode 中打开配置文件 // 在 VSCode 中打开配置文件

View File

@@ -13,7 +13,7 @@ class ContainerView extends BaseView_1.BaseView {
<span class="editable" onclick="editContainerName('${container.id}', '${container.name}')">📦 ${container.name}</span> <span class="editable" onclick="editContainerName('${container.id}', '${container.name}')">📦 ${container.name}</span>
</td> </td>
<td> <td>
<span class="clickable" onclick="openContainerConfig('${container.id}')">配置文件</span> <span class="clickable" onclick="openContainerConfig('${container.id}')">打开</span>
</td> </td>
<td> <td>
<button class="btn-upload" onclick="uploadContainer('${container.id}', '${container.name}')" style="margin-right: 5px;">上传</button> <button class="btn-upload" onclick="uploadContainer('${container.id}', '${container.name}')" style="margin-right: 5px;">上传</button>
@@ -149,7 +149,7 @@ class ContainerView extends BaseView_1.BaseView {
<thead> <thead>
<tr> <tr>
<th width="40%">容器</th> <th width="40%">容器</th>
<th width="40%">配置文件</th> <th width="40%">打开</th>
<th width="20%">操作</th> <th width="20%">操作</th>
</tr> </tr>
</thead> </thead>

View File

@@ -220,7 +220,7 @@ class ProjectView extends BaseView_1.BaseView {
<div style="display: flex; gap: 10px; margin-top: 10px; align-items: center;"> <div style="display: flex; gap: 10px; margin-top: 10px; align-items: center;">
<button class="btn-new" onclick="openRepoSelectForProject()">获取仓库</button> <button class="btn-new" onclick="openRepoSelectForProject()">获取仓库</button>
<span style="font-size: 12px; color: var(--vscode-descriptionForeground);"> <span style="font-size: 12px; color: var(--vscode-descriptionForeground);">
从仓库配置中选择 Git 仓库,选择分支后可将完整项目克隆到本地(包含 dscp-data.json 从仓库配置中选择 Git 仓库,选择分支后可将完整项目克隆到本地
</span> </span>
</div> </div>
<div id="branchSelectionContainer"></div> <div id="branchSelectionContainer"></div>

View File

@@ -1,7 +1,7 @@
{ {
"name": "dsc-platform", "name": "dsc-platform",
"displayName": "数字卫星构建平台", "displayName": "数字卫星构建平台",
"version": "1.6.9", "version": "1.6.10",
"publisher": "njust-micro-nano-lab", "publisher": "njust-micro-nano-lab",
"description": "一个用于快速构建数字卫星的平台", "description": "一个用于快速构建数字卫星的平台",
"repository": { "repository": {

View File

@@ -368,7 +368,7 @@ export class ConfigPanel {
'createContainer': (data) => this.createContainer(data.name), 'createContainer': (data) => this.createContainer(data.name),
'deleteContainer': (data) => this.deleteContainer(data.containerId), 'deleteContainer': (data) => this.deleteContainer(data.containerId),
// 配置管理 // 模块管理
// [修改] 接收新的文件名 // [修改] 接收新的文件名
'updateConfigName': (data) => this.updateConfigName(data.configId, data.name, data.fileName), 'updateConfigName': (data) => this.updateConfigName(data.configId, data.name, data.fileName),
'createConfig': (data) => this.createConfig(data.name), 'createConfig': (data) => this.createConfig(data.name),
@@ -749,7 +749,7 @@ export class ConfigPanel {
} }
// ============================================= // =============================================
// 配置管理方法 // 模块管理方法
// ============================================= // =============================================
/** /**

View File

@@ -345,7 +345,6 @@ export class GitService {
}; };
} }
/** /**
* 构建文件树 * 构建文件树
* 这里显式忽略: * 这里显式忽略:
@@ -363,7 +362,7 @@ export class GitService {
if (file === '.git') continue; if (file === '.git') continue;
// 2. 不要解析项目数据文件 // 2. 不要解析项目数据文件
if (file === '.dcsp-data.json') continue; if (file === 'dcsp-data.json') continue;
// 3. 其它所有隐藏文件/目录统统忽略 // 3. 其它所有隐藏文件/目录统统忽略
if (file.startsWith('.')) continue; if (file.startsWith('.')) continue;

View File

@@ -31,15 +31,18 @@ export class ProjectService {
} }
/** /**
* [新增] 文件名/文件夹名净化:允许中文、字母、数字、-、_ * 文件名/文件夹名净化:保留大小写,允许中文、字母、数字、-、_、.
*/ */
public sanitizeFileName(name: string): string { public sanitizeFileName(name: string): string {
// 允许中文、字母、数字、-、_ let fileName = name.trim(); // 移除 .toLowerCase() 以保留大小写
let fileName = name.trim().toLowerCase();
// 1. 替换所有空格为下划线 // 1. 替换所有空格为下划线
fileName = fileName.replace(/\s+/g, '_'); fileName = fileName.replace(/\s+/g, '_');
// 2. 移除所有不被允许的特殊字符(只保留中文、字母、数字、-、_
fileName = fileName.replace(/[^\u4e00-\u9fa5a-z0-9_-]/g, ''); // 2. 移除特殊字符
// 在正则中增加了 A-Z 以及 \. (注意:\u4e00-\u9fa5 匹配中文)
fileName = fileName.replace(/[^\u4e00-\u9fa5a-zA-Z0-9_\-\.]/g, '');
// 3. 确保不为空 // 3. 确保不为空
if (fileName.length === 0) { if (fileName.length === 0) {
return 'config_file'; return 'config_file';
@@ -340,9 +343,11 @@ export class ProjectService {
return this.configs.find(c => c.id === configId); return this.configs.find(c => c.id === configId);
} }
// src/panels/services/ProjectService.ts
async createConfig(name: string, containerId: string): Promise<string> { async createConfig(name: string, containerId: string): Promise<string> {
const newId = this.generateUniqueId('cfg', this.configs); const newId = this.generateUniqueId('cfg', this.configs);
// 使用新增的 sanitizeFileName 方法来处理文件名 // 使用净化后的文件名
const newFileName = this.sanitizeFileName(name); const newFileName = this.sanitizeFileName(name);
const newConfig: Config = { const newConfig: Config = {
@@ -353,7 +358,23 @@ export class ProjectService {
}; };
this.configs.push(newConfig); this.configs.push(newConfig);
// 1. 首先确保父级容器目录存在
await this.ensureContainerDirectoryExists(containerId); await this.ensureContainerDirectoryExists(containerId);
// 2. 获取文件的完整磁盘路径
const filePath = this.getConfigFilePath(newId);
if (filePath) {
try {
const fileUri = vscode.Uri.file(filePath);
// 3. 真实创建文件:写入一个空的 Uint8Array 即可创建一个空文件
// 如果你希望有默认内容,可以在这里自定义 TextEncoder().encode("...")
await vscode.workspace.fs.writeFile(fileUri, new Uint8Array());
console.log(`✅ 磁盘文件已真实创建: ${filePath}`);
} catch (error) {
console.error(`❌ 磁盘文件创建失败: ${error}`);
}
}
return newId; return newId;
} }
@@ -446,18 +467,6 @@ export class ProjectService {
return true; return true;
} }
/**
* [删除] 此方法已被 ConfigPanel 中的 updateModuleFolder 替换,以支持同步磁盘操作。
*/
// renameModuleFolder(folderId: string, newName: string): boolean {
// const folder = this.moduleFolders.find(f => f.id === folderId);
// if (!folder) return false;
//
// const oldName = folder.localPath.split('/').pop() || '';
// folder.localPath = folder.localPath.replace(/\/[^/]+$/, '/' + newName);
// return true;
// }
// =============== 文件系统操作 (新增/修改) =============== // =============== 文件系统操作 (新增/修改) ===============
/** /**

View File

@@ -14,7 +14,7 @@ export class StorageService {
*/ */
static async loadProjectData(projectPath: string): Promise<ProjectData | null> { static async loadProjectData(projectPath: string): Promise<ProjectData | null> {
try { try {
const dataUri = vscode.Uri.joinPath(vscode.Uri.file(projectPath), '.dcsp-data.json'); const dataUri = vscode.Uri.joinPath(vscode.Uri.file(projectPath), 'dcsp-data.json');
try { try {
await vscode.workspace.fs.stat(dataUri); await vscode.workspace.fs.stat(dataUri);
@@ -39,7 +39,7 @@ export class StorageService {
*/ */
static async saveProjectData(projectPath: string, data: ProjectData): Promise<boolean> { static async saveProjectData(projectPath: string, data: ProjectData): Promise<boolean> {
try { try {
const dataUri = vscode.Uri.joinPath(vscode.Uri.file(projectPath), '.dcsp-data.json'); const dataUri = vscode.Uri.joinPath(vscode.Uri.file(projectPath), 'dcsp-data.json');
const uint8Array = new TextEncoder().encode(JSON.stringify(data, null, 2)); const uint8Array = new TextEncoder().encode(JSON.stringify(data, null, 2));
await vscode.workspace.fs.writeFile(dataUri, uint8Array); await vscode.workspace.fs.writeFile(dataUri, uint8Array);
@@ -57,7 +57,7 @@ export class StorageService {
*/ */
static async checkProjectPathHasData(projectPath: string): Promise<boolean> { static async checkProjectPathHasData(projectPath: string): Promise<boolean> {
try { try {
const dataUri = vscode.Uri.joinPath(vscode.Uri.file(projectPath), '.dcsp-data.json'); const dataUri = vscode.Uri.joinPath(vscode.Uri.file(projectPath), 'dcsp-data.json');
await vscode.workspace.fs.stat(dataUri); await vscode.workspace.fs.stat(dataUri);
return true; return true;
} catch { } catch {

View File

@@ -11,7 +11,7 @@ export class AircraftView extends BaseView {
<span class="aircraft-name" data-aircraft-id="${aircraft.id}">🛸 ${aircraft.name}</span> <span class="aircraft-name" data-aircraft-id="${aircraft.id}">🛸 ${aircraft.name}</span>
</td> </td>
<td> <td>
<span class="clickable" onclick="openAircraftConfig('${aircraft.id}', '${aircraft.projectId}')">配置容器</span> <span class="clickable" onclick="openAircraftConfig('${aircraft.id}', '${aircraft.projectId}')">打开</span>
</td> </td>
<td> <td>
<button class="btn-upload" onclick="uploadAircraft('${aircraft.id}', '${aircraft.name}')" style="margin-right: 5px;">上传</button> <button class="btn-upload" onclick="uploadAircraft('${aircraft.id}', '${aircraft.name}')" style="margin-right: 5px;">上传</button>

View File

@@ -97,7 +97,7 @@ export class ConfigView extends BaseView {
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>配置管理</title> <title>模块管理</title>
${this.getBaseStylesAndScripts()} ${this.getBaseStylesAndScripts()}
${this.getRepoSelectScript()} ${this.getRepoSelectScript()}
<style> <style>
@@ -289,7 +289,7 @@ export class ConfigView extends BaseView {
</head> </head>
<body> <body>
<div class="header"> <div class="header">
<h2>⚙️ 配置管理 - <span style="color: var(--vscode-textLink-foreground);">${container?.name || '未知容器'}</span></h2> <h2>⚙️ 模块管理 - <span style="color: var(--vscode-textLink-foreground);">${container?.name || '未知容器'}</span></h2>
<button class="back-btn" onclick="goBackToContainers()">← 返回容器管理</button> <button class="back-btn" onclick="goBackToContainers()">← 返回容器管理</button>
</div> </div>
@@ -304,7 +304,7 @@ export class ConfigView extends BaseView {
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>
<th width="25%">配置</th> <th width="25%">模块</th>
<th width="15%">类别</th> <th width="15%">类别</th>
<th width="35%">文件/文件夹</th> <th width="35%">文件/文件夹</th>
<th width="25%">操作</th> <th width="25%">操作</th>
@@ -562,7 +562,7 @@ export class ConfigView extends BaseView {
showModuleFolderRenameDialog(folderId, currentName, currentFolderName); showModuleFolderRenameDialog(folderId, currentName, currentFolderName);
} }
// 配置管理功能 // 模块管理功能
// 原始的 editConfigName 已被修改为接受三个参数 // 原始的 editConfigName 已被修改为接受三个参数
// 在 VSCode 中打开配置文件 // 在 VSCode 中打开配置文件

View File

@@ -13,7 +13,7 @@ export class ContainerView extends BaseView {
<span class="editable" onclick="editContainerName('${container.id}', '${container.name}')">📦 ${container.name}</span> <span class="editable" onclick="editContainerName('${container.id}', '${container.name}')">📦 ${container.name}</span>
</td> </td>
<td> <td>
<span class="clickable" onclick="openContainerConfig('${container.id}')">配置文件</span> <span class="clickable" onclick="openContainerConfig('${container.id}')">打开</span>
</td> </td>
<td> <td>
<button class="btn-upload" onclick="uploadContainer('${container.id}', '${container.name}')" style="margin-right: 5px;">上传</button> <button class="btn-upload" onclick="uploadContainer('${container.id}', '${container.name}')" style="margin-right: 5px;">上传</button>
@@ -150,7 +150,7 @@ export class ContainerView extends BaseView {
<thead> <thead>
<tr> <tr>
<th width="40%">容器</th> <th width="40%">容器</th>
<th width="40%">配置文件</th> <th width="40%">打开</th>
<th width="20%">操作</th> <th width="20%">操作</th>
</tr> </tr>
</thead> </thead>

View File

@@ -221,7 +221,7 @@ export class ProjectView extends BaseView {
<div style="display: flex; gap: 10px; margin-top: 10px; align-items: center;"> <div style="display: flex; gap: 10px; margin-top: 10px; align-items: center;">
<button class="btn-new" onclick="openRepoSelectForProject()">获取仓库</button> <button class="btn-new" onclick="openRepoSelectForProject()">获取仓库</button>
<span style="font-size: 12px; color: var(--vscode-descriptionForeground);"> <span style="font-size: 12px; color: var(--vscode-descriptionForeground);">
从仓库配置中选择 Git 仓库,选择分支后可将完整项目克隆到本地(包含 dscp-data.json 从仓库配置中选择 Git 仓库,选择分支后可将完整项目克隆到本地
</span> </span>
</div> </div>
<div id="branchSelectionContainer"></div> <div id="branchSelectionContainer"></div>