diff --git a/src/vs/code/electron-sandbox/deploy/deployWindow-dev.html b/src/vs/code/electron-sandbox/deploy/deployWindow-dev.html index 5fb44ef0..cbd67938 100644 --- a/src/vs/code/electron-sandbox/deploy/deployWindow-dev.html +++ b/src/vs/code/electron-sandbox/deploy/deployWindow-dev.html @@ -164,6 +164,7 @@ +

diff --git a/src/vs/code/electron-sandbox/deploy/deployWindow.html b/src/vs/code/electron-sandbox/deploy/deployWindow.html index 2bce1a88..2dce1f3a 100644 --- a/src/vs/code/electron-sandbox/deploy/deployWindow.html +++ b/src/vs/code/electron-sandbox/deploy/deployWindow.html @@ -164,6 +164,7 @@ +

diff --git a/src/vs/code/electron-sandbox/deploy/deployWindowMain.ts b/src/vs/code/electron-sandbox/deploy/deployWindowMain.ts index aa61b25d..27acb0cf 100644 --- a/src/vs/code/electron-sandbox/deploy/deployWindowMain.ts +++ b/src/vs/code/electron-sandbox/deploy/deployWindowMain.ts @@ -29,6 +29,7 @@ class deployWindow { firstClassList: any = {}; currentTab = 0; finishFlag = -1; + logPath = ""; //用来标识程序结束完成 gExtDownNum = 0; @@ -343,6 +344,7 @@ class deployWindow { document.getElementById('lablenotNow')!.style.display = 'none'; } this.reset(); + this.logPath = msg.logPath; }; // private nativeHostService: INativeHostService; @@ -559,11 +561,19 @@ class deployWindow { console.log("nextPrev onlineInstallTab3"); // 获取所有选中的复选框 let selectedCheckboxes = checkboxForm!.querySelectorAll('input[type="checkbox"]:checked'); - // let checkSelectedValues = []; + let checkSelectedValues = []; this.extInstallState.clear(); this.extDownloadDoneCounter = 0; this.extInstallDoneCounter = 0; this.progressNum = 0; + + for (var item of selectedCheckboxes) { + var checkbox = item as HTMLInputElement; + if (checkbox.value !== "JavaScript_key" && checkbox.value !== "selectAll") { + checkSelectedValues.push(checkbox.value); + } + } + //去重 console.log("selectedCheckboxes.length:" + selectedCheckboxes.length); @@ -588,6 +598,7 @@ class deployWindow { document.getElementById("progressInfoCancel")!.style.display = 'inline-block'; document.getElementById("progressInfoFinish")!.style.display = 'none'; document.getElementById("progressInfoFinishFail")!.style.display = 'none'; + document.getElementById("detailInstallOutputLogInfo")!.innerHTML = "log目录:" + this.logPath; let extPreElement = document.getElementById("extInstallLogPre"); extPreElement!.innerHTML = ""; @@ -597,7 +608,8 @@ class deployWindow { configList: this.configList, extList: this.extList, depList: this.depList, - scriptList: this.scriptList + scriptList: this.scriptList, + checkSelectedValues: checkSelectedValues } ipcRenderer.send('kylinide.installWizard.msg.process', installPkgMsg); diff --git a/src/vs/code/electron-sandbox/deploy/media/deploy.css b/src/vs/code/electron-sandbox/deploy/media/deploy.css index 6ee714bd..20a85f76 100644 --- a/src/vs/code/electron-sandbox/deploy/media/deploy.css +++ b/src/vs/code/electron-sandbox/deploy/media/deploy.css @@ -366,7 +366,7 @@ button#prevStep:disabled { display: flex; justify-content: center; align-items: start; - margin-top: -11px; + margin-top: -5px; } .indicator-item { diff --git a/src/vs/platform/issue/electron-main/deployMainService.ts b/src/vs/platform/issue/electron-main/deployMainService.ts index ef1bd012..a1bcbe4c 100644 --- a/src/vs/platform/issue/electron-main/deployMainService.ts +++ b/src/vs/platform/issue/electron-main/deployMainService.ts @@ -301,6 +301,7 @@ export class DeployMainService implements IDeployMainService { else if (msg.type === 'installPkg') { this.phase = DeployMainPhase.InstallPage; this.logger.info("开始安装操作InstallPage"); + this.logger.info("选中的开发场景为:", msg.checkSelectedValues); // const extlogFile = this.installConfig + '/log/extInstall.log'; // this.backupLogFile(extlogFile) const extlogFile0 = this.installConfig + '/log/extInstall.1.log'; @@ -1287,11 +1288,12 @@ export class DeployMainService implements IDeployMainService { let initData = { isFirstLoad: flag, + logPath: path.join(this.installConfig, 'log') } this.DeployWindow.webContents.on('did-finish-load', () => { if (this.DeployWindow) { this.logger.info("窗口加载完成,显示首页HomePage", "send kylinide.installWizard.initdata"); - this.DeployWindow.webContents.send('kylinide.installWizard.initdata', initData);; + this.DeployWindow.webContents.send('kylinide.installWizard.initdata', initData); this.DeployWindow.show(); this.phase = DeployMainPhase.HomePage; }