From dfb44325c7a6cf52aacbc4af915c5c6dddfecf6c Mon Sep 17 00:00:00 2001
From: dinglili <dinglili@kylinos.cn>
Date: Mon, 22 Jul 2024 14:12:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E8=A3=85=E6=98=BE=E7=A4=BA=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deploy/deployWindow-dev.html              |  2 +-
 .../electron-sandbox/deploy/deployWindow.html |  2 +-
 .../deploy/deployWindowMain.ts                | 26 +++++++++++++------
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/vs/code/electron-sandbox/deploy/deployWindow-dev.html b/src/vs/code/electron-sandbox/deploy/deployWindow-dev.html
index 93b0fd10..5fb44ef0 100644
--- a/src/vs/code/electron-sandbox/deploy/deployWindow-dev.html
+++ b/src/vs/code/electron-sandbox/deploy/deployWindow-dev.html
@@ -153,7 +153,7 @@
 							</div>
 
 							<div class="detailInstallOutputTextbox">
-								<label for="detailInstallOutputTextbox">安装详情</label>
+								<label for="detailInstallOutputTextbox" id="labelprocessdetail">安装列表详情</label>
 								<button class="switchInstallOutput" id="switchInstallOutput">
 									<img src="./media/switch.png" style="display: inline-block;" alt="切换" width="10px" height="8px"/>
 									<div style="display: inline; margin-left: 4px; margin-right: 0px; padding: 0px;">切换输出</div>
diff --git a/src/vs/code/electron-sandbox/deploy/deployWindow.html b/src/vs/code/electron-sandbox/deploy/deployWindow.html
index e075e180..2bce1a88 100644
--- a/src/vs/code/electron-sandbox/deploy/deployWindow.html
+++ b/src/vs/code/electron-sandbox/deploy/deployWindow.html
@@ -153,7 +153,7 @@
 							</div>
 
 							<div class="detailInstallOutputTextbox">
-								<label for="detailInstallOutputTextbox">安装详情</label>
+								<label for="detailInstallOutputTextbox" id="labelprocessdetail">安装列表详情</label>
 								<button class="switchInstallOutput" id="switchInstallOutput">
 									<img src="./media/switch.png" style="display: inline-block;" alt="切换" width="10px" height="8px"/>
 									<div style="display: inline; margin-left: 4px; margin-right: 0px; padding: 0px;">切换输出</div>
diff --git a/src/vs/code/electron-sandbox/deploy/deployWindowMain.ts b/src/vs/code/electron-sandbox/deploy/deployWindowMain.ts
index cf6b5a03..5c33f9c0 100644
--- a/src/vs/code/electron-sandbox/deploy/deployWindowMain.ts
+++ b/src/vs/code/electron-sandbox/deploy/deployWindowMain.ts
@@ -415,6 +415,7 @@ class deployWindow {
 		document.getElementById("detailInstallPre")!.style.display = 'none';
 		document.getElementById("extInstallLogPre")!.style.display = 'none';
 		document.getElementById("progressInfoCancel")!.style.display = 'none';
+		document.getElementById("labelprocessdetail")!.innerHTML = "安装结果";
 
 		if (success) {
 			document.getElementById("progressInfoFinish")!.style.display = 'inline-block';
@@ -432,7 +433,7 @@ class deployWindow {
 
 		this.nextBtn!.innerText = "结束";
 		this.nextBtn!.disabled = false;
-		this.logShow = 0;
+		this.logShow = 3;
 		ipcRenderer.send("kylinide.installWizard.removeFileLister", { type: "extFile" });
 		ipcRenderer.send("kylinide.installWizard.removeFileLister", { type: "pkgFile" });
 		ipcRenderer.send("kylinide.installWizard.removeFileLister", { type: "installFile" });
@@ -796,9 +797,10 @@ class deployWindow {
 			const installPreElement = document.getElementById("detailInstallPre");
 			const extLogPreElement = document.getElementById("extInstallLogPre");
 			const finishPage = document.getElementById("finishPage");
-			let logView = [logPreElement, extLogPreElement, installPreElement, finishPage];
+			let logView = [installPreElement, logPreElement, extLogPreElement, finishPage];
 			this.logShow++;
 			if (this.logShow % (logView.length + this.finishFlag) == 0) {
+				document.getElementById("labelprocessdetail")!.innerHTML = "安装列表详情";
 				installPreElement!.style.display = "block";
 				logPreElement!.style.display = "none";
 				extLogPreElement!.style.display = "none";
@@ -806,19 +808,27 @@ class deployWindow {
 					finishPage!.style.display = "none";
 			}
 			else if (this.logShow % (logView.length + this.finishFlag) == 1) {
-				installPreElement!.style.display = "none";
-				logPreElement!.style.display = "block";
-				extLogPreElement!.style.display = "none";
-				if (this.finishFlag > -1)
-					finishPage!.style.display = "none";
+				if (this.depList.length > 0) {
+					document.getElementById("labelprocessdetail")!.innerHTML = "系统软件安装详情";
+					installPreElement!.style.display = "none";
+					logPreElement!.style.display = "block";
+					extLogPreElement!.style.display = "none";
+					if (this.finishFlag > -1)
+						finishPage!.style.display = "none";
+				} else {
+					this.logShow++;
+				}
+
 			}
-			else if (this.logShow % (logView.length + this.finishFlag) == 2) {
+			if (this.logShow % (logView.length + this.finishFlag) == 2) {
+				document.getElementById("labelprocessdetail")!.innerHTML = "插件安装详情";
 				installPreElement!.style.display = "none";
 				logPreElement!.style.display = "none";
 				extLogPreElement!.style.display = "block";
 				if (this.finishFlag > -1)
 					finishPage!.style.display = "none";
 			} else if (this.logShow % (logView.length + this.finishFlag) == 3) {
+				document.getElementById("labelprocessdetail")!.innerHTML = "安装结果";
 				finishPage!.style.display = "block";
 				installPreElement!.style.display = "none";
 				logPreElement!.style.display = "none";