From 45ee308544c0726ef1a587c5d0b6623b7d9bc7c5 Mon Sep 17 00:00:00 2001
From: dinglili <dinglili@kylinos.cn>
Date: Fri, 12 Jul 2024 15:27:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=8F=96=E6=B6=88=E5=89=8D?=
 =?UTF-8?q?=E5=90=8E=E6=98=BE=E7=A4=BA=E4=B8=8D=E4=B8=80=E8=87=B4=EF=BC=9B?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=8F=96=E6=B6=88=E9=80=89=E6=8B=A9=EF=BC=8C?=
 =?UTF-8?q?=E5=85=A8=E9=80=89=E7=8A=B6=E6=80=81=E4=B8=8D=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deploy/deployWindowMain.ts                | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

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 = '<h2>软件列表：</h2>';
+					formattedDoc += Object.values(this.depList).map(element => `<h4>${element}</h4>`).join('');
 				}
 				else
-					formattedDoc = '<h2>软件列表：</h2>';
-
-				formattedDoc += Object.values(this.depList).map(element => `<h4>${element}</h4>`).join('');
-
-				formattedDoc += '<h2>插件列表：</h2>';
-				formattedDoc += this.extList.map(element => `<h4>${element}</h4>`).join('');
-
+					formattedDoc = '';
+				if (this.extList.length > 0) {
+					formattedDoc += '<h2>插件列表：</h2>';
+					formattedDoc += this.extList.map(element => `<h4>${element}</h4>`).join('');
+				} else {
+					formattedDoc += '';
+				}
 				document.getElementById("outputPre")!.innerHTML = formattedDoc;
 			});
 		}