github
/
spug
mirror of https://github.com/openspug/spug
1
0
Fork 0
Code Issues Releases Wiki Activity

fix issues

pull/410/head
vapao 2021-09-20 01:58:22 +08:00
parent c67f7c2207
commit c5838f1287
2 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
spug_web/src/pages/exec/task/ExecConsole.js
View File

@ -24,6 +24,7 @@ import store from './store';
class ExecConsole extends React.Component { class ExecConsole extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
this.lastOutputs = {};
this.socket = null; this.socket = null;
this.terms = {}; this.terms = {};
this.outputs = {}; this.outputs = {};
@ -49,6 +50,7 @@ class ExecConsole extends React.Component {
const {key, data, status} = JSON.parse(e.data); const {key, data, status} = JSON.parse(e.data);
if (status !== undefined) store.outputs[key].status = status; if (status !== undefined) store.outputs[key].status = status;
if (data) { if (data) {
if (data.replace(/\r\n/g, '')) this.lastOutputs[key] = data.trim()
this.handleWrite(key, data) this.handleWrite(key, data)
} }
} }
@ -80,16 +82,24 @@ class ExecConsole extends React.Component {
} }
} }
genExtra = (status) => { genExtra = (status, key) => {
if (status === -2) { if (status === -2) {
return <LoadingOutlined style={{fontSize: 20, color: '#108ee9'}}/>; return <LoadingOutlined style={{fontSize: 20, color: '#108ee9'}}/>;
} else if (status === 0) { } else if (status === 0) {
return <CheckCircleTwoTone style={{fontSize: 20}} twoToneColor="#52c41a"/> return (
<div style={{display: 'flex', alignItems: 'center'}}>
<pre className={styles.header2}>{this.lastOutputs[key]}</pre>
<CheckCircleTwoTone style={{fontSize: 20}} twoToneColor="#52c41a"/>
</div>
)
} else { } else {
return ( return (
<Tooltip title={`退出状态码：${status}`}> <div style={{display: 'flex', alignItems: 'center'}}>
<WarningTwoTone style={{fontSize: 20}} twoToneColor="red"/> <pre className={styles.header2}>{this.lastOutputs[key]}</pre>
</Tooltip> <Tooltip title={`退出状态码：${status}`}>
<WarningTwoTone style={{fontSize: 20}} twoToneColor="red"/>
</Tooltip>
</div>
) )
} }
}; };
@ -124,7 +134,10 @@ class ExecConsole extends React.Component {
onChange={key => this.handleUpdate({activeKey: key})} onChange={key => this.handleUpdate({activeKey: key})}
expandIcon={({isActive}) => <CaretRightOutlined style={{fontSize: 16}} rotate={isActive ? 90 : 0}/>}> expandIcon={({isActive}) => <CaretRightOutlined style={{fontSize: 16}} rotate={isActive ? 90 : 0}/>}>
{Object.entries(store.outputs).map(([key, item], index) => ( {Object.entries(store.outputs).map(([key, item], index) => (
<Collapse.Panel key={key} header={<b>{item['title']}</b>} extra={this.genExtra(item.status)}> <Collapse.Panel
key={key}
header={<div className={styles.header1}>{item['title']}</div>}
extra={this.genExtra(item.status, key)}>
<OutView <OutView
isFullscreen={isFullscreen} isFullscreen={isFullscreen}
getOutput={() => this.outputs[key]} getOutput={() => this.outputs[key]}

15
spug_web/src/pages/exec/task/index.module.less
View File

@ -20,12 +20,23 @@
color: #000; color: #000;
} }
.header { .header1 {
display: inline-block;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap;
max-width: 400px; max-width: 400px;
font-weight: bold;
margin: 0;
}
.header2 {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
max-width: 450px;
padding-right: 20px; padding-right: 20px;
margin: 0 margin: 0;
} }
pre { pre {