openkylin
/
kylin-code
9
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

安装显示提示

This commit is contained in:
dinglili 2024-07-22 14:12:55 +08:00 committed by wangpenglong
parent c8629845bd
commit dfb44325c7
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/code/electron-sandbox/deploy/deployWindow-dev.html
View File

@ -153,7 +153,7 @@
</div> </div>
<div class="detailInstallOutputTextbox"> <div class="detailInstallOutputTextbox">
<label for="detailInstallOutputTextbox">安装详情</label> <label for="detailInstallOutputTextbox" id="labelprocessdetail">安装列表详情</label>
<button class="switchInstallOutput" id="switchInstallOutput"> <button class="switchInstallOutput" id="switchInstallOutput">
<img src="./media/switch.png" style="display: inline-block;" alt="切换" width="10px" height="8px"/> <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> <div style="display: inline; margin-left: 4px; margin-right: 0px; padding: 0px;">切换输出</div>

2
src/vs/code/electron-sandbox/deploy/deployWindow.html
View File

@ -153,7 +153,7 @@
</div> </div>
<div class="detailInstallOutputTextbox"> <div class="detailInstallOutputTextbox">
<label for="detailInstallOutputTextbox">安装详情</label> <label for="detailInstallOutputTextbox" id="labelprocessdetail">安装列表详情</label>
<button class="switchInstallOutput" id="switchInstallOutput"> <button class="switchInstallOutput" id="switchInstallOutput">
<img src="./media/switch.png" style="display: inline-block;" alt="切换" width="10px" height="8px"/> <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> <div style="display: inline; margin-left: 4px; margin-right: 0px; padding: 0px;">切换输出</div>

16
src/vs/code/electron-sandbox/deploy/deployWindowMain.ts
View File

@ -415,6 +415,7 @@ class deployWindow {
document.getElementById("detailInstallPre")!.style.display = 'none'; document.getElementById("detailInstallPre")!.style.display = 'none';
document.getElementById("extInstallLogPre")!.style.display = 'none'; document.getElementById("extInstallLogPre")!.style.display = 'none';
document.getElementById("progressInfoCancel")!.style.display = 'none'; document.getElementById("progressInfoCancel")!.style.display = 'none';
document.getElementById("labelprocessdetail")!.innerHTML = "安装结果";
if (success) { if (success) {
document.getElementById("progressInfoFinish")!.style.display = 'inline-block'; document.getElementById("progressInfoFinish")!.style.display = 'inline-block';
@ -432,7 +433,7 @@ class deployWindow {
this.nextBtn!.innerText = "结束"; this.nextBtn!.innerText = "结束";
this.nextBtn!.disabled = false; this.nextBtn!.disabled = false;
this.logShow = 0; this.logShow = 3;
ipcRenderer.send("kylinide.installWizard.removeFileLister", { type: "extFile" }); ipcRenderer.send("kylinide.installWizard.removeFileLister", { type: "extFile" });
ipcRenderer.send("kylinide.installWizard.removeFileLister", { type: "pkgFile" }); ipcRenderer.send("kylinide.installWizard.removeFileLister", { type: "pkgFile" });
ipcRenderer.send("kylinide.installWizard.removeFileLister", { type: "installFile" }); ipcRenderer.send("kylinide.installWizard.removeFileLister", { type: "installFile" });
@ -796,9 +797,10 @@ class deployWindow {
const installPreElement = document.getElementById("detailInstallPre"); const installPreElement = document.getElementById("detailInstallPre");
const extLogPreElement = document.getElementById("extInstallLogPre"); const extLogPreElement = document.getElementById("extInstallLogPre");
const finishPage = document.getElementById("finishPage"); const finishPage = document.getElementById("finishPage");
let logView = [logPreElement, extLogPreElement, installPreElement, finishPage]; let logView = [installPreElement, logPreElement, extLogPreElement, finishPage];
this.logShow++; this.logShow++;
if (this.logShow % (logView.length + this.finishFlag) == 0) { if (this.logShow % (logView.length + this.finishFlag) == 0) {
document.getElementById("labelprocessdetail")!.innerHTML = "安装列表详情";
installPreElement!.style.display = "block"; installPreElement!.style.display = "block";
logPreElement!.style.display = "none"; logPreElement!.style.display = "none";
extLogPreElement!.style.display = "none"; extLogPreElement!.style.display = "none";
@ -806,19 +808,27 @@ class deployWindow {
finishPage!.style.display = "none"; finishPage!.style.display = "none";
} }
else if (this.logShow % (logView.length + this.finishFlag) == 1) { else if (this.logShow % (logView.length + this.finishFlag) == 1) {
if (this.depList.length > 0) {
document.getElementById("labelprocessdetail")!.innerHTML = "系统软件安装详情";
installPreElement!.style.display = "none"; installPreElement!.style.display = "none";
logPreElement!.style.display = "block"; logPreElement!.style.display = "block";
extLogPreElement!.style.display = "none"; extLogPreElement!.style.display = "none";
if (this.finishFlag > -1) if (this.finishFlag > -1)
finishPage!.style.display = "none"; 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"; installPreElement!.style.display = "none";
logPreElement!.style.display = "none"; logPreElement!.style.display = "none";
extLogPreElement!.style.display = "block"; extLogPreElement!.style.display = "block";
if (this.finishFlag > -1) if (this.finishFlag > -1)
finishPage!.style.display = "none"; finishPage!.style.display = "none";
} else if (this.logShow % (logView.length + this.finishFlag) == 3) { } else if (this.logShow % (logView.length + this.finishFlag) == 3) {
document.getElementById("labelprocessdetail")!.innerHTML = "安装结果";
finishPage!.style.display = "block"; finishPage!.style.display = "block";
installPreElement!.style.display = "none"; installPreElement!.style.display = "none";
logPreElement!.style.display = "none"; logPreElement!.style.display = "none";