diff --git a/renderer/src/pages/Dashboard/index.tsx b/renderer/src/pages/Dashboard/index.tsx index 2fd9827..f9933e1 100644 --- a/renderer/src/pages/Dashboard/index.tsx +++ b/renderer/src/pages/Dashboard/index.tsx @@ -40,7 +40,9 @@ const Dashboard = () => { ) => { const { chunk, ln } = data; const xterm = xtermManager.getTerm(TERM_ID); - xterm.writeChunk(chunk, ln); + if (xterm) { + xterm.writeChunk(chunk, ln); + } }; function onDialogConfirm(packageNames: string[]) { @@ -51,7 +53,10 @@ const Dashboard = () => { const selectedInstallPackagesList = installPackagesList.filter((item) => { return packageNames.includes(item.name); }); - + const xterm = xtermManager.getTerm(TERM_ID); + if (xterm) { + xterm.clear(TERM_ID); + } dispatchers.updateInstallStatus(true); dispatchers.initStep(selectedInstallPackagesList); ipcRenderer @@ -126,6 +131,27 @@ const Dashboard = () => { ); + const installStepItem = ( +
+ + {installPackagesList.map((item: IBasePackage, index: number) => { + const { status } = pkgInstallStatuses[index] || {}; + return ( + + ); + })} + +
+ ); + return ( { - - {installPackagesList.map((item: IBasePackage, index: number) => { - const { status } = pkgInstallStatuses[index]; - return ( - - ); - })} - - - } + content={installStepItem} /> diff --git a/renderer/src/pages/Node/components/InstallStep/index.tsx b/renderer/src/pages/Node/components/InstallStep/index.tsx index cf01cf3..322b3ba 100644 --- a/renderer/src/pages/Node/components/InstallStep/index.tsx +++ b/renderer/src/pages/Node/components/InstallStep/index.tsx @@ -58,7 +58,9 @@ const InstallStep: FC = ({ managerName, INSTALL_NODE_CHANNEL, goBa ) => { const { chunk, ln } = data; const xterm = xtermManager.getTerm(TERM_ID); - xterm.writeChunk(chunk, ln); + if (xterm) { + xterm.writeChunk(chunk, ln); + } }; const goNext = () => { @@ -72,6 +74,10 @@ const InstallStep: FC = ({ managerName, INSTALL_NODE_CHANNEL, goBa return; } const values = field.getValues() as object; + const xterm = xtermManager.getTerm(TERM_ID); + if (xterm) { + xterm.clear(TERM_ID); + } dispatchers.updateInstallNodeFormValue(values); await ipcRenderer.invoke( 'install-node',