From f83dad80f6e196b800bbde4cbf2025eb838bf7f4 Mon Sep 17 00:00:00 2001
From: jin-sir <942725119@qq.com>
Date: Fri, 13 Oct 2023 11:41:28 +0800
Subject: [PATCH 1/2] fix: dropdown button wrap
---
taier-ui/src/pages/operation/schedule.scss | 5 +++++
taier-ui/src/pages/operation/schedule.tsx | 2 ++
2 files changed, 7 insertions(+)
diff --git a/taier-ui/src/pages/operation/schedule.scss b/taier-ui/src/pages/operation/schedule.scss
index 2c43c4206d..b61f25390f 100644
--- a/taier-ui/src/pages/operation/schedule.scss
+++ b/taier-ui/src/pages/operation/schedule.scss
@@ -1,3 +1,8 @@
.c-taskOperation__wrap {
height: 100%;
+
+ &__dropdown-btn {
+ display: inline-flex;
+ width: unset;
+ }
}
diff --git a/taier-ui/src/pages/operation/schedule.tsx b/taier-ui/src/pages/operation/schedule.tsx
index 1dd171af08..41ee08058e 100644
--- a/taier-ui/src/pages/operation/schedule.tsx
+++ b/taier-ui/src/pages/operation/schedule.tsx
@@ -626,6 +626,7 @@ export default () => {
}
trigger={['click']}
+ className="c-taskOperation__wrap__dropdown-btn"
style={{ marginRight: 10 }}
icon={}
>
@@ -641,6 +642,7 @@ export default () => {
}
trigger={['click']}
+ className="c-taskOperation__wrap__dropdown-btn"
icon={}
>
重跑当前任务
From f28f87e1e4ccd10928464029a70708d9e9802533 Mon Sep 17 00:00:00 2001
From: jin-sir <942725119@qq.com>
Date: Tue, 17 Oct 2023 15:07:57 +0800
Subject: [PATCH 2/2] fix: use space
---
taier-ui/src/pages/operation/schedule.scss | 5 --
taier-ui/src/pages/operation/schedule.tsx | 65 +++++++++++-----------
2 files changed, 31 insertions(+), 39 deletions(-)
diff --git a/taier-ui/src/pages/operation/schedule.scss b/taier-ui/src/pages/operation/schedule.scss
index b61f25390f..2c43c4206d 100644
--- a/taier-ui/src/pages/operation/schedule.scss
+++ b/taier-ui/src/pages/operation/schedule.scss
@@ -1,8 +1,3 @@
.c-taskOperation__wrap {
height: 100%;
-
- &__dropdown-btn {
- display: inline-flex;
- width: unset;
- }
}
diff --git a/taier-ui/src/pages/operation/schedule.tsx b/taier-ui/src/pages/operation/schedule.tsx
index 41ee08058e..a42cde44f2 100644
--- a/taier-ui/src/pages/operation/schedule.tsx
+++ b/taier-ui/src/pages/operation/schedule.tsx
@@ -17,7 +17,7 @@
*/
import { useState, useMemo, useContext } from 'react';
-import { Tooltip, Dropdown, Menu, Modal, message, Button } from 'antd';
+import { Tooltip, Dropdown, Menu, Modal, message, Button, Space } from 'antd';
import type moment from 'moment';
import { history } from 'umi';
import type { ColumnsType } from 'antd/lib/table';
@@ -615,39 +615,36 @@ export default () => {
return '';
},
}}
- tableFooter={[
- showKillJobsByDate(true)} style={{ width: 114 }}>
- 按业务日期杀
-
- }
- trigger={['click']}
- className="c-taskOperation__wrap__dropdown-btn"
- style={{ marginRight: 10 }}
- icon={}
- >
- 批量杀任务
- ,
- batchReloadJobs()}>
- 重跑当前及全部下游任务
-
- }
- trigger={['click']}
- className="c-taskOperation__wrap__dropdown-btn"
- icon={}
- >
- 重跑当前任务
- ,
- ]}
+ tableFooter={
+
+ showKillJobsByDate(true)} style={{ width: 114 }}>
+ 按业务日期杀
+
+ }
+ trigger={['click']}
+ icon={}
+ >
+ 批量杀任务
+
+ batchReloadJobs()}>
+ 重跑当前及全部下游任务
+
+ }
+ trigger={['click']}
+ icon={}
+ >
+ 重跑当前任务
+
+
+ }
/>