Commit 9452d8af by zhaochengxiang

同步任务

parent 07835ae0
...@@ -7,7 +7,7 @@ import { dispatch } from '../../../../model'; ...@@ -7,7 +7,7 @@ import { dispatch } from '../../../../model';
import './DatasourceItem.less'; import './DatasourceItem.less';
const DatasourceItem = (props) => { const DatasourceItem = (props) => {
const { data, onStartTask, onEditTask, onDeleteTask, expanded } = props; const { data, onStartTask, onEditTask, onDeleteTask, expanded, refresh, refreshSuccess } = props;
const [ tasks, setTasks ] = useState(null); const [ tasks, setTasks ] = useState(null);
useEffect(() => { useEffect(() => {
...@@ -18,6 +18,14 @@ const DatasourceItem = (props) => { ...@@ -18,6 +18,14 @@ const DatasourceItem = (props) => {
//eslint-disable-next-line react-hooks/exhaustive-deps //eslint-disable-next-line react-hooks/exhaustive-deps
}, [expanded]) }, [expanded])
useEffect(() => {
if (refresh && expanded) {
getTasks();
}
//eslint-disable-next-line react-hooks/exhaustive-deps
}, [refresh])
const getTasks = () => { const getTasks = () => {
dispatch({ dispatch({
type: 'datasource.getTasksByDatasourceId', type: 'datasource.getTasksByDatasourceId',
...@@ -26,6 +34,7 @@ const DatasourceItem = (props) => { ...@@ -26,6 +34,7 @@ const DatasourceItem = (props) => {
}, },
callback: data => { callback: data => {
setTasks(data); setTasks(data);
refresh && refreshSuccess && refreshSuccess();
} }
}) })
} }
......
...@@ -6,7 +6,7 @@ import DatasourceItem from './DatasourceItem'; ...@@ -6,7 +6,7 @@ import DatasourceItem from './DatasourceItem';
const DatasourceList = (props) => { const DatasourceList = (props) => {
const { loading, data, onEdit, onAddTask, onDelete, onStartTask, onEditTask, onDeleteTask } = props; const { loading, data, onEdit, onAddTask, onDelete, onStartTask, onEditTask, onDeleteTask, idBindTasksNeedRefresh, refreshTasksSuccess } = props;
const [ expandedBindId, setExpandedBindId ] = useState({}); const [ expandedBindId, setExpandedBindId ] = useState({});
...@@ -63,7 +63,7 @@ const DatasourceList = (props) => { ...@@ -63,7 +63,7 @@ const DatasourceList = (props) => {
</Space> </Space>
</div> </div>
} }
description={ <DatasourceItem data={item} expanded={expanded} onStartTask={onStartTask} onEditTask={onEditTask} onDeleteTask={onDeleteTask} /> } description={ <DatasourceItem data={item} expanded={expanded} refresh={idBindTasksNeedRefresh===item.id} onStartTask={onStartTask} onEditTask={onEditTask} onDeleteTask={onDeleteTask} refreshSuccess={refreshTasksSuccess} /> }
/> />
</List.Item> </List.Item>
); );
......
...@@ -107,7 +107,7 @@ const UpdateTaskModal = (props) => { ...@@ -107,7 +107,7 @@ const UpdateTaskModal = (props) => {
}, },
callback: data => { callback: data => {
setConfirmLoading(false); setConfirmLoading(false);
onCancel && onCancel(); onCancel && onCancel(true);
}, },
error: () => { error: () => {
setConfirmLoading(false); setConfirmLoading(false);
......
...@@ -25,6 +25,7 @@ const DatasourceManage = () => { ...@@ -25,6 +25,7 @@ const DatasourceManage = () => {
const [ updateTaskModalVisible, setUpdateTaskModalVisible ] = useState(false); const [ updateTaskModalVisible, setUpdateTaskModalVisible ] = useState(false);
const [ updateTaskModalAction, setUpdateTaskModalAction ] = useState(''); const [ updateTaskModalAction, setUpdateTaskModalAction ] = useState('');
const [ currentDatasourceId, setCurrentDatasourceId ] = useState(''); const [ currentDatasourceId, setCurrentDatasourceId ] = useState('');
const [ currentDatasourceIdBindTasksNeedRefresh, setCurrentDatasourceIdBindTasksNeedRefresh ] = useState('');
const [ currentTaskId, setCurrentTaskId ] = useState(''); const [ currentTaskId, setCurrentTaskId ] = useState('');
const [modal, contextHolder] = Modal.useModal(); const [modal, contextHolder] = Modal.useModal();
...@@ -138,6 +139,7 @@ const DatasourceManage = () => { ...@@ -138,6 +139,7 @@ const DatasourceManage = () => {
const editTask = (task) => { const editTask = (task) => {
setCurrentTaskId(task.id); setCurrentTaskId(task.id);
setCurrentDatasourceId(task.target.id||'');
setUpdateTaskModalAction('edit'); setUpdateTaskModalAction('edit');
setUpdateTaskModalVisible(true); setUpdateTaskModalVisible(true);
} }
...@@ -153,6 +155,8 @@ const DatasourceManage = () => { ...@@ -153,6 +155,8 @@ const DatasourceManage = () => {
harvestingTaskId: task.id harvestingTaskId: task.id
}, },
callback: () => { callback: () => {
setCurrentDatasourceIdBindTasksNeedRefresh(task.target.id||'');
setCurrentDatasourceId(task.target.id||'');
showMessage('success', '删除任务成功'); showMessage('success', '删除任务成功');
} }
}); });
...@@ -160,8 +164,13 @@ const DatasourceManage = () => { ...@@ -160,8 +164,13 @@ const DatasourceManage = () => {
}); });
} }
const onUpdateTaskModalVisibleCancel = () => { const onUpdateTaskModalVisibleCancel = (refresh = false) => {
setUpdateTaskModalVisible(false); setUpdateTaskModalVisible(false);
refresh && setCurrentDatasourceIdBindTasksNeedRefresh(currentDatasourceId);
}
const refreshTasksSuccess = () => {
setCurrentDatasourceIdBindTasksNeedRefresh('');
} }
return ( return (
...@@ -199,12 +208,14 @@ const DatasourceManage = () => { ...@@ -199,12 +208,14 @@ const DatasourceManage = () => {
<DatasourceList <DatasourceList
loading={loadingDatasources} loading={loadingDatasources}
data={filterDatasources||[]} data={filterDatasources||[]}
idBindTasksNeedRefresh={currentDatasourceIdBindTasksNeedRefresh}
onEdit={editDatasource} onEdit={editDatasource}
onAddTask={addTask} onAddTask={addTask}
onDelete={deleteDatasource} onDelete={deleteDatasource}
onStartTask={startTask} onStartTask={startTask}
onEditTask={editTask} onEditTask={editTask}
onDeleteTask={deleteTask} onDeleteTask={deleteTask}
refreshTasksSuccess={refreshTasksSuccess}
/> />
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment