修改上传逻辑,增加了分支名输入的功能
This commit is contained in:
@@ -255,7 +255,7 @@ class BaseView {
|
||||
`;
|
||||
}
|
||||
/**
|
||||
* 获取仓库选择对话框的脚本(仅ConfigView需要)
|
||||
* 获取仓库选择对话框的脚本(ConfigView 使用)
|
||||
*/
|
||||
getRepoSelectScript() {
|
||||
return `
|
||||
@@ -267,6 +267,7 @@ class BaseView {
|
||||
}
|
||||
window.__dcspRepoDialogInitialized = true;
|
||||
|
||||
// ① 仅用于“获取仓库 -> 拉取分支”的弹窗
|
||||
function showRepoSelectDialog(repos) {
|
||||
// 移除已有弹窗
|
||||
var existing = document.getElementById('repoSelectModal');
|
||||
@@ -350,11 +351,120 @@ class BaseView {
|
||||
}
|
||||
}
|
||||
|
||||
// ② 专门用于“上传代码”的仓库+分支弹窗
|
||||
function showUploadRepoSelectDialog(repos, folderId, folderType) {
|
||||
var existing = document.getElementById('uploadRepoSelectModal');
|
||||
if (existing) {
|
||||
existing.remove();
|
||||
}
|
||||
|
||||
var overlay = document.createElement('div');
|
||||
overlay.className = 'modal-overlay';
|
||||
overlay.id = 'uploadRepoSelectModal';
|
||||
|
||||
var hasRepos = Array.isArray(repos) && repos.length > 0;
|
||||
var optionsHtml = '';
|
||||
if (hasRepos) {
|
||||
for (var i = 0; i < repos.length; i++) {
|
||||
var r = repos[i];
|
||||
if (!r || !r.name) continue;
|
||||
optionsHtml += '<option value="' + r.name + '">' + r.name + '</option>';
|
||||
}
|
||||
}
|
||||
|
||||
var disabledAttr = hasRepos ? '' : 'disabled';
|
||||
|
||||
var noRepoTip = '';
|
||||
if (!hasRepos) {
|
||||
noRepoTip = '<div style="margin-top:8px; font-size:12px; color: var(--vscode-descriptionForeground);">当前配置中没有仓库,请先在"仓库配置"中添加。</div>';
|
||||
}
|
||||
|
||||
overlay.innerHTML =
|
||||
'<div class="modal-dialog">' +
|
||||
'<div class="modal-title">上传到仓库</div>' +
|
||||
'<div style="margin-bottom: 10px;">' +
|
||||
'<label style="display:block; margin-bottom:6px;">请选择仓库:</label>' +
|
||||
'<select id="uploadRepoSelect" style="width:100%; padding:6px; background: var(--vscode-input-background); color: var(--vscode-input-foreground); border:1px solid var(--vscode-input-border); border-radius:4px;">' +
|
||||
optionsHtml +
|
||||
'</select>' +
|
||||
noRepoTip +
|
||||
'</div>' +
|
||||
'<div style="margin-bottom: 10px;">' +
|
||||
'<label style="display:block; margin-bottom:6px;">请输入分支名称:</label>' +
|
||||
'<input type="text" id="uploadBranchInput" style="width:100%; padding:6px; background: var(--vscode-input-background); color: var(--vscode-input-foreground); border:1px solid var(--vscode-input-border); border-radius:4px;" placeholder="如:main、develop、feature/xxx">' +
|
||||
'<div style="font-size:12px; color: var(--vscode-descriptionForeground); margin-top:4px;">将把代码推送到该分支,如不存在则自动创建</div>' +
|
||||
'</div>' +
|
||||
'<div class="modal-buttons">' +
|
||||
'<button class="modal-btn modal-btn-secondary" id="uploadRepoSelectCancelBtn">取消</button>' +
|
||||
'<button class="modal-btn modal-btn-primary" id="uploadRepoSelectOkBtn" ' + disabledAttr + '>确定</button>' +
|
||||
'</div>' +
|
||||
'</div>';
|
||||
|
||||
document.body.appendChild(overlay);
|
||||
|
||||
var cancelBtn = document.getElementById('uploadRepoSelectCancelBtn');
|
||||
var okBtn = document.getElementById('uploadRepoSelectOkBtn');
|
||||
var repoSelect = document.getElementById('uploadRepoSelect');
|
||||
var branchInput = document.getElementById('uploadBranchInput');
|
||||
|
||||
if (cancelBtn) {
|
||||
cancelBtn.addEventListener('click', function () {
|
||||
if (typeof vscode !== 'undefined') {
|
||||
vscode.postMessage({
|
||||
type: 'uploadRepoSelectCanceled',
|
||||
folderId: folderId,
|
||||
folderType: folderType
|
||||
});
|
||||
}
|
||||
overlay.remove();
|
||||
});
|
||||
}
|
||||
|
||||
if (okBtn) {
|
||||
okBtn.addEventListener('click', function () {
|
||||
if (!hasRepos || !repoSelect) {
|
||||
overlay.remove();
|
||||
return;
|
||||
}
|
||||
var repoName = repoSelect.value;
|
||||
var branchName = branchInput ? branchInput.value.trim() : '';
|
||||
if (!repoName) {
|
||||
alert('请选择一个仓库');
|
||||
return;
|
||||
}
|
||||
if (!branchName) {
|
||||
alert('请输入分支名称');
|
||||
return;
|
||||
}
|
||||
if (typeof vscode !== 'undefined') {
|
||||
vscode.postMessage({
|
||||
type: 'uploadRepoSelected',
|
||||
repoName: repoName,
|
||||
branchName: branchName,
|
||||
folderId: folderId,
|
||||
folderType: folderType
|
||||
});
|
||||
}
|
||||
overlay.remove();
|
||||
});
|
||||
}
|
||||
|
||||
setTimeout(function () {
|
||||
if (branchInput) {
|
||||
branchInput.focus();
|
||||
}
|
||||
}, 100);
|
||||
}
|
||||
|
||||
window.addEventListener('message', function (event) {
|
||||
var message = event.data;
|
||||
if (!message || !message.type) return;
|
||||
if (message.type === 'showRepoSelect') {
|
||||
// 旧逻辑:仅用于获取分支
|
||||
showRepoSelectDialog(message.repos || []);
|
||||
} else if (message.type === 'showUploadRepoSelect') {
|
||||
// 新逻辑:上传代码用(仓库 + 分支)
|
||||
showUploadRepoSelectDialog(message.repos || [], message.folderId, message.folderType);
|
||||
}
|
||||
});
|
||||
})();
|
||||
|
||||
Reference in New Issue
Block a user