Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
import { useSize } from 'ahooks';
import VirtualList, { type ListRef } from 'rc-virtual-list';
import { useStyles } from './style';
import { Spin } from 'antd';
import { Progress, Spin } from 'antd';
import importExportServices from '@/service/importExport';
import { ImportExportTaskDetails, ImportExportTaskEvent } from '@/typings/importExport';
import { ACTIVE_TASK_STATUSES, ImportExportTaskStatus } from '@/constants/importExport';
Expand Down Expand Up @@ -274,7 +274,18 @@ const Log = (props: IProps) => {
]
: [];
const visibleEvents = events.length ? events : fallbackErrorEvent;

const progress =
taskDetails.status === ImportExportTaskStatus.SUCCESS
? 100
: Math.min(100, Math.max(0, Number(taskDetails.progress) || 0));
const progressStatus =
taskDetails.status === ImportExportTaskStatus.SUCCESS
? 'success'
: taskDetails.status === ImportExportTaskStatus.FAILED
? 'exception'
: taskDetails.status === ImportExportTaskStatus.RUNNING
? 'active'
: 'normal';
return (
<div className={styles.log}>
{loadingOlder && (
Expand Down Expand Up @@ -317,6 +328,20 @@ const Log = (props: IProps) => {
<div className={styles.loadFailed}>{i18n('workspace.task.events.loadFailed')}</div>
)}
</div>
<div className={styles.progressPanel}>
<div className={styles.progressHeader}>
<Progress
className={styles.progressBar}
percent={progress}
showInfo={false}
size="small"
status={progressStatus}
/>
<span className={styles.progressValue} data-status={taskDetails.status}>
{progress}%
</span>
</div>
</div>
</div>
);
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,48 @@ export const useStyles = createStyles(({ css, token }) => {
font-size: 12px;
transform: translateX(-50%);
`,
progressPanel: css`
flex: none;
padding: 8px 16px;
border-top: 1px solid ${token.colorBorderSecondary};
background: ${token.colorBgElevated};
`,
progressHeader: css`
display: flex;
width: 100%;
gap: 12px;
align-items: center;
min-width: 0;
`,
progressValue: css`
flex: none;
color: ${token.colorPrimary};
font-size: 14px;
font-variant-numeric: tabular-nums;
font-weight: 600;

&[data-status='SUCCESS'] {
color: ${token.colorSuccess};
}

&[data-status='FAILED'] {
color: ${token.colorError};
}

&[data-status='CANCELLED'] {
color: ${token.colorTextSecondary};
}
`,
progressBar: css`
min-width: 80px;
flex: 1;
line-height: 1;

:global(.ant-progress-inner),
:global(.ant-progress-bg) {
border-radius: 999px;
}
`,
eventConsole: css`
display: flex;
min-height: 0;
Expand Down
Loading