Commit 566a678b by zhaochengxiang

切换系统 任务没刷新

parent f5c667b5
...@@ -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, refresh, refreshSuccess } = props; const { data, onStartTask, onEditTask, onDeleteTask, expanded, refresh, refreshSuccess, scope } = props;
const [ tasks, setTasks ] = useState(null); const [ tasks, setTasks ] = useState(null);
const [ loading, setLoading ] = useState(false); const [ loading, setLoading ] = useState(false);
...@@ -27,6 +27,11 @@ const DatasourceItem = (props) => { ...@@ -27,6 +27,11 @@ const DatasourceItem = (props) => {
//eslint-disable-next-line react-hooks/exhaustive-deps //eslint-disable-next-line react-hooks/exhaustive-deps
}, [refresh]) }, [refresh])
useEffect(() => {
setTasks(null);
//eslint-disable-next-line react-hooks/exhaustive-deps
}, [scope])
const getTasks = () => { const getTasks = () => {
setLoading(true); setLoading(true);
dispatch({ dispatch({
......
import React, { useState } from 'react'; import React, { useState, useEffect } from 'react';
import { List, Space, Button, Tooltip } from "antd"; import { List, Space, Button, Tooltip } from "antd";
import { EditOutlined, DiffOutlined, DeleteOutlined, ArrowDownOutlined, ArrowUpOutlined } from '@ant-design/icons'; import { EditOutlined, DiffOutlined, DeleteOutlined, ArrowDownOutlined, ArrowUpOutlined } from '@ant-design/icons';
...@@ -6,10 +6,16 @@ import DatasourceItem from './DatasourceItem'; ...@@ -6,10 +6,16 @@ import DatasourceItem from './DatasourceItem';
const DatasourceList = (props) => { const DatasourceList = (props) => {
const { loading, data, onEdit, onAddTask, onDelete, onStartTask, onEditTask, onDeleteTask, idBindTasksNeedRefresh, refreshTasksSuccess } = props; const { loading, data, onEdit, onAddTask, onDelete, onStartTask, onEditTask, onDeleteTask, idBindTasksNeedRefresh, refreshTasksSuccess, scope } = props;
const [ expandedBindId, setExpandedBindId ] = useState({}); const [ expandedBindId, setExpandedBindId ] = useState({});
useEffect(() => {
setExpandedBindId({});
//eslint-disable-next-line react-hooks/exhaustive-deps
}, [scope])
const onExpanded = (item) => { const onExpanded = (item) => {
if (expandedBindId.hasOwnProperty(item.id)) { if (expandedBindId.hasOwnProperty(item.id)) {
expandedBindId[item.id] = !expandedBindId[item.id]; expandedBindId[item.id] = !expandedBindId[item.id];
...@@ -63,7 +69,7 @@ const DatasourceList = (props) => { ...@@ -63,7 +69,7 @@ const DatasourceList = (props) => {
</Space> </Space>
</div> </div>
} }
description={ <DatasourceItem data={item} expanded={expanded} refresh={idBindTasksNeedRefresh===item.id} onStartTask={onStartTask} onEditTask={onEditTask} onDeleteTask={onDeleteTask} refreshSuccess={refreshTasksSuccess} /> } description={ <DatasourceItem data={item} scope={scope} expanded={expanded} refresh={idBindTasksNeedRefresh===item.id} onStartTask={onStartTask} onEditTask={onEditTask} onDeleteTask={onDeleteTask} refreshSuccess={refreshTasksSuccess} /> }
/> />
</List.Item> </List.Item>
); );
......
...@@ -274,6 +274,7 @@ const DatasourceManage = () => { ...@@ -274,6 +274,7 @@ const DatasourceManage = () => {
<DatasourceList <DatasourceList
loading={loadingDatasources} loading={loadingDatasources}
data={filterDatasources||[]} data={filterDatasources||[]}
scope={selectedScope}
idBindTasksNeedRefresh={currentDatasourceIdBindTasksNeedRefresh} idBindTasksNeedRefresh={currentDatasourceIdBindTasksNeedRefresh}
onEdit={editDatasource} onEdit={editDatasource}
onAddTask={addTask} onAddTask={addTask}
......
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