diff --git a/src/vs/code/electron-sandbox/deploy/deployWindowMain.ts b/src/vs/code/electron-sandbox/deploy/deployWindowMain.ts index fb895c88..47a3fb0f 100644 --- a/src/vs/code/electron-sandbox/deploy/deployWindowMain.ts +++ b/src/vs/code/electron-sandbox/deploy/deployWindowMain.ts @@ -356,7 +356,7 @@ class deployWindow { this.prevBtn!.style.display = 'inline'; } if (n === (x.length - 1)) { - this.nextBtn!.innerHTML = '确定'; + this.nextBtn!.innerHTML = '结束'; } else { this.nextBtn!.innerHTML = "下一步"; } @@ -660,7 +660,7 @@ class deployWindow { console.log("onlineInstallTab4 last"); this.prevBtn!.disabled = true; this.nextBtn!.disabled = true; - this.nextBtn!.innerHTML = "确定"; + this.nextBtn!.innerHTML = "结束"; this.cancelBtn!.innerText = "取消"; // this.cancelBtn!.style.display = "inline"; } @@ -718,7 +718,7 @@ class deployWindow { this.prevBtn.style.display = 'inline'; } if (Index === (tabArray.length - 1)) { - if (this.nextBtn) { this.nextBtn.innerHTML = "确定" } + if (this.nextBtn) { this.nextBtn.innerHTML = "结束" } } else { if (this.nextBtn) { this.nextBtn.innerHTML = "下一步" } } @@ -997,9 +997,9 @@ class deployWindow { var allUnchecked = true; for (var item of checks) { var checkbox = item as HTMLInputElement; - if (checkbox.checked) { + if (checkbox.value !== "JavaScript_key" && checkbox.checked) { allUnchecked = false; - } else { + } else if (checkbox.value !== "JavaScript_key" && checkbox.checked == false) { allChecked = false; } } @@ -1120,15 +1120,16 @@ class deployWindow { console.log("deplist SelectedDatas:", SelectedDatas); if (this.depList.length > 0) { formattedDoc = '

软件列表:

'; + formattedDoc += Object.values(this.depList).map(element => `

${element}

`).join(''); } else - formattedDoc = '

软件列表:

'; - - formattedDoc += Object.values(this.depList).map(element => `

${element}

`).join(''); - - formattedDoc += '

插件列表:

'; - formattedDoc += this.extList.map(element => `

${element}

`).join(''); - + formattedDoc = ''; + if (this.extList.length > 0) { + formattedDoc += '

插件列表:

'; + formattedDoc += this.extList.map(element => `

${element}

`).join(''); + } else { + formattedDoc += ''; + } document.getElementById("outputPre")!.innerHTML = formattedDoc; }); }