15308555518/ frontend
1
0
Fork 0
mirror of https://github.com/cloudreve/frontend.git synced 2026-01-01 02:42:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: newly finished upload task cannot be hide

This commit is contained in:
HFO4 2022-04-20 18:46:13 +08:00
parent 9a46182901
commit bfa965a01d
2 changed files with 53 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/component/Uploader/Popup/TaskList.js
View File

@ -215,6 +215,7 @@ export default function TaskList({
key={uploader.id}
useAvgSpeed={useAvgSpeed}
uploader={uploader}
filter={filters[filter]}
/>
)}
/>

88
src/component/Uploader/Popup/UploadTask.js
View File

@ -154,6 +154,7 @@ export default function UploadTask({
onCancel,
onClose,
selectFile,
filter,
}) {
const classes = useStyles();
const theme = useTheme();
@ -308,6 +309,8 @@ export default function UploadTask({
e.stopPropagation();
};
const show = useMemo(() => filter(uploader), [filter, status, uploader]);
const secondaryAction = useMemo(() => {
if (!taskHover && !fullScreen) {
return <></>;
@ -373,44 +376,57 @@ export default function UploadTask({
}, [uploader, fullScreen]);
return (
<>
<ExpansionPanel square expanded={expanded} onChange={toggleDetail}>
<ExpansionPanelSummary
aria-controls="panel1d-content"
id="panel1d-header"
show && (
<>
<ExpansionPanel
square
expanded={expanded}
onChange={toggleDetail}
>
<div
className={classes.progressContainer}
onMouseLeave={() => setTaskHover(false)}
onMouseOver={() => setTaskHover(true)}
<ExpansionPanelSummary
aria-controls="panel1d-content"
id="panel1d-header"
>
{progressBar}
<ListItem className={classes.progressContent} button>
{fileIcon}
<ListItemText
className={classes.listAction}
primary={
<div className={classes.fileNameContainer}>
<div className={classes.wordBreak}>
{uploader.task.name}
<div
className={classes.progressContainer}
onMouseLeave={() => setTaskHover(false)}
onMouseOver={() => setTaskHover(true)}
>
{progressBar}
<ListItem
className={classes.progressContent}
button
>
{fileIcon}
<ListItemText
className={classes.listAction}
primary={
<div
className={
classes.fileNameContainer
}
>
<div className={classes.wordBreak}>
{uploader.task.name}
</div>
<div>{resumeLabel}</div>
<div>{continueLabel}</div>
</div>
<div>{resumeLabel}</div>
<div>{continueLabel}</div>
</div>
}
secondary={
<div className={classes.wordBreak}>
{statusText}
</div>
}
/>
{secondaryAction}
</ListItem>
</div>
</ExpansionPanelSummary>
<ExpansionPanelDetails>{taskDetail}</ExpansionPanelDetails>
</ExpansionPanel>
<Divider />
</>
}
secondary={
<div className={classes.wordBreak}>
{statusText}
</div>
}
/>
{secondaryAction}
</ListItem>
</div>
</ExpansionPanelSummary>
<ExpansionPanelDetails>{taskDetail}</ExpansionPanelDetails>
</ExpansionPanel>
<Divider />
</>
)
);
}