Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Zzm0809 committed Dec 11, 2023
2 parents 7fb5588 + cba9258 commit a5b1451
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 13 deletions.
10 changes: 6 additions & 4 deletions dinky-web/src/components/LineageGraph/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import { Badge, Tooltip, Typography } from 'antd';

import LineageDagExt from '@/components/LineageGraph/lineage-dag-ext';
import {
LineageDetailInfo,
LineageRelations,
Expand All @@ -28,14 +29,15 @@ import {
import { l } from '@/utils/intl';
import { SuccessNotification, WarningNotification } from '@/utils/messages';
import {
ArrowsAltOutlined, ColumnHeightOutlined,
ArrowsAltOutlined,
ColumnHeightOutlined,
CompassOutlined,
InsertRowAboveOutlined,
ReloadOutlined, ShrinkOutlined
ReloadOutlined,
ShrinkOutlined
} from '@ant-design/icons';
import React, { useEffect } from 'react';
import 'react-lineage-dag/dist/index.css';
import LineageDagExt from '@/components/LineageGraph/lineage-dag-ext';

interface LineageState {
lineageData: LineageDetailInfo;
Expand Down Expand Up @@ -324,7 +326,7 @@ const LineageGraph: React.FC<JobLineageProps> = (props) => {
shapeType: 'line',
gap: 30,
lineWidth: 0.2,
circleRadiu: 5,
circleRadiu: 5
}
}
}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ const CheckpointTable = (props: JobProps) => {
return (
<ProTable<CheckPointsDetailInfo>
columns={columns}
style={{ width: '100%' ,height: 'calc(100vh - 450px)'}}
style={{ width: '100%', height: 'calc(100vh - 450px)' }}
dataSource={checkpoints?.history}
onDataSourceChange={() => actionRef.current?.reload()}
actionRef={actionRef}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ const SavepointTable = (props: JobProps) => {
return (
<ProTable<SavePoint>
columns={columns}
style={{ width: '100%' ,height: 'calc(100vh - 450px)'}}
style={{ width: '100%', height: 'calc(100vh - 450px)' }}
request={(params, sorter, filter) =>
queryList(API_CONSTANTS.GET_SAVEPOINTS, {
...params,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,7 @@ const ExceptionTab = (props: JobProps) => {
);
};

return (
<ProCard bodyStyle={{ height: '100%', overflow: 'auto' }}>
{renderLogTab()}
</ProCard>
);
return <ProCard bodyStyle={{ height: '100%', overflow: 'auto' }}>{renderLogTab()}</ProCard>;
};

export default ExceptionTab;
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ const JobChart = (props: JobChartProps) => {
);
});
}
return <Empty className={"code-content-empty"} />;
return <Empty className={'code-content-empty'} />;
};
return (
<Spin spinning={loading} delay={500}>
Expand Down
2 changes: 1 addition & 1 deletion dinky-web/src/pages/DevOps/JobList/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ const JobList = () => {
}, []);

return (
<ProCard boxShadow={true} style={{ height: 'calc(100vh - 250px)' }} >
<ProCard boxShadow={true} style={{ height: 'calc(100vh - 250px)' }}>
<ProTable<Jobs.JobInstance>
{...PROTABLE_OPTIONS_PUBLIC}
search={false}
Expand Down

0 comments on commit a5b1451

Please sign in to comment.