修改了镜像时的刷新,代码评审的返回

This commit is contained in:
何童崇 2023-02-21 20:50:49 +08:00
parent 717a9520b0
commit 77012fe65a
3 changed files with 10 additions and 26 deletions

View File

@ -346,9 +346,9 @@ class Detail extends Component {
}); });
// 如果是火狐由于部分版本ws不能连接成功故增加刷新 // 如果是火狐由于部分版本ws不能连接成功故增加刷新
if(navigator.userAgent.indexOf("Firefox")>-1){ // if(navigator.userAgent.indexOf("Firefox")>-1){
this.timerChannel = setTimeout(this.reloadDetail, 5000); this.timerChannel = setTimeout(this.reloadDetail, 10000);
} // }
} }
reloadDetail = () => { reloadDetail = () => {

View File

@ -218,6 +218,9 @@ const CodeReview = (props) => {
handleFullscreenChange={setFullscreen} handleFullscreenChange={setFullscreen}
toggleViewerType={toggleViewerType} toggleViewerType={toggleViewerType}
logFullScreen={(bool) => console.log('>>>logFullScreen', bool)} logFullScreen={(bool) => console.log('>>>logFullScreen', bool)}
projectsId={projectsId}
owner={owner}
mergeId={mergeId}
/> />
), ),
user, user,
@ -257,27 +260,6 @@ const CodeReview = (props) => {
return ( return (
<div style={{ height: '100%', lineHeight: '1.4' }}> <div style={{ height: '100%', lineHeight: '1.4' }}>
{/* <EditorEmpty></EditorEmpty> */}
{/* <div className="controller">
{!IDEMode && (
<>
IDE 模式: <Switch checked={IDEMode} onChange={toggleViewerType} />
</>
)}
</div> */}
{/* <div className="pr-head">
<div>{pr.description}</div>
<div>
评审人
{pr.review && pr.review.reviewers && pr.review.reviewers.map((r) => (
<span style={{ marginRight: 4 }} key={r.id}>
{r.name}
</span>
))}
<span style={{ marginRight: 24 }}></span>
合并人{pr.assignee && pr.assignee.name}
</div>
</div> */}
{IDEMode && ( {IDEMode && (
<div style={IDEContainerStyle}> <div style={IDEContainerStyle}>
{visible && <ACR {...propsIDE} key={count} />} {visible && <ACR {...propsIDE} key={count} />}

View File

@ -274,6 +274,7 @@ export const DiscussionItem = memo((props) => {
}); });
export const Menubar = memo((props) => { export const Menubar = memo((props) => {
const {projectsId,owner,mergeId}=props;
const [isFullscreen, setFullscreen] = React.useState( const [isFullscreen, setFullscreen] = React.useState(
props.initialFullscreen || false props.initialFullscreen || false
); );
@ -373,9 +374,10 @@ export const Menubar = memo((props) => {
<div className="arc-menubar"> <div className="arc-menubar">
<div className={'group'}> <div className={'group'}>
{versions.length !== 0 && ( {versions.length !== 0 && (
<div className={'versionContainer'}> <div className='versionContainer'>
<Link to={`/${owner}/${projectsId}/pulls/${mergeId}`} className="font-14 color-grey-9">返回</Link>
<Dropdown overlay={menuFrom} trigger={["click"]} overlayStyle={MenuStyle}> <Dropdown overlay={menuFrom} trigger={["click"]} overlayStyle={MenuStyle}>
<div className={'versionItem'}> <div className='versionItem'>
<span>{idToVerbose.get(fromId)}</span> <span>{idToVerbose.get(fromId)}</span>
<Icon type="down" /> <Icon type="down" />
</div> </div>