Commit c16cfe06 by fanyj

修改neo4j类型细节显示

parent 2abd7859
...@@ -35,7 +35,6 @@ const UpdateDatasourceModal = (props) => { ...@@ -35,7 +35,6 @@ const UpdateDatasourceModal = (props) => {
dispatch({ dispatch({
type: 'datasource.getAllSupportedDatasourceTypies', type: 'datasource.getAllSupportedDatasourceTypies',
callback: data => { callback: data => {
function compare(val1, val2) { function compare(val1, val2) {
var a = val1.seq; var a = val1.seq;
var b = val2.seq; var b = val2.seq;
...@@ -77,13 +76,12 @@ const UpdateDatasourceModal = (props) => { ...@@ -77,13 +76,12 @@ const UpdateDatasourceModal = (props) => {
const getCurrentSupportedDatasourceTypies = (allTypies, type) => { const getCurrentSupportedDatasourceTypies = (allTypies, type) => {
let _currentTypies = null; let _currentTypies = null;
(allTypies||[]).forEach(typies => { (allTypies||[]).forEach(typies => {
if (typies.type === type) { if (typies.type === type) {
_currentTypies = {...typies}; _currentTypies = {...typies};
} }
}) })
console.log(_currentTypies)
setCurrentSupportedDatasourceTypies(_currentTypies); setCurrentSupportedDatasourceTypies(_currentTypies);
} }
......
...@@ -4,7 +4,7 @@ import { Modal, Checkbox, Row, Col, Divider, Input, Typography, Form, Switch } f ...@@ -4,7 +4,7 @@ import { Modal, Checkbox, Row, Col, Divider, Input, Typography, Form, Switch } f
import { dispatch } from '../../../../model'; import { dispatch } from '../../../../model';
const UpdateTaskModal = (props) => { const UpdateTaskModal = (props) => {
const { visible, onCancel, action, id, datasourceId } = props; const { visible, onCancel, action, id, datasourceId,currentDatabase } = props;
const [ schemas, setSchemas ] = useState([]); const [ schemas, setSchemas ] = useState([]);
const [ filterSchemas, setFilterSchemas ] = useState([]); const [ filterSchemas, setFilterSchemas ] = useState([]);
const [ selectedSchemas, setSelectedSchemas ] = useState([]); const [ selectedSchemas, setSelectedSchemas ] = useState([]);
...@@ -57,6 +57,7 @@ const UpdateTaskModal = (props) => { ...@@ -57,6 +57,7 @@ const UpdateTaskModal = (props) => {
}, },
callback: data => { callback: data => {
setTaskSettings(data); setTaskSettings(data);
data && (data.targetConfParameters||[]).forEach(item => { data && (data.targetConfParameters||[]).forEach(item => {
if (item.name === 'schema') { if (item.name === 'schema') {
setSchemas(item.selectItem||[]); setSchemas(item.selectItem||[]);
...@@ -164,6 +165,8 @@ const UpdateTaskModal = (props) => { ...@@ -164,6 +165,8 @@ const UpdateTaskModal = (props) => {
}, },
}; };
console.log(currentDatabase)
return ( return (
<Modal <Modal
className='update-task-modal' className='update-task-modal'
...@@ -175,11 +178,11 @@ const UpdateTaskModal = (props) => { ...@@ -175,11 +178,11 @@ const UpdateTaskModal = (props) => {
onOk={onOk} onOk={onOk}
confirmLoading={confirmLoading} confirmLoading={confirmLoading}
> >
<Divider>schema信息</Divider> <Divider>{(currentDatabase?.type==="Neo4jTarget")?'neo4j数据库信息':'schema信息'}</Divider>
<div className='d-flex mb-3' style={{ alignItems: 'center' }}> <div className='d-flex mb-3' style={{ alignItems: 'center' }}>
<span className='mr-3'>schema搜索:</span> <span className='mr-3'>{(currentDatabase?.type==="Neo4jTarget")?'neo4j数据库搜索':'schema搜索'}:</span>
<Input <Input
placeholder="请输入schema名称" placeholder={`请输入${(currentDatabase?.type==="Neo4jTarget")?'neo4j数据库':'schema'}名称`}
allowClear allowClear
value={keyword} value={keyword}
onChange={onSearchInputChange} onChange={onSearchInputChange}
......
...@@ -47,6 +47,7 @@ const DatasourceManage = (props) => { ...@@ -47,6 +47,7 @@ const DatasourceManage = (props) => {
const [ currentDatasourceIdBindTasksNeedRefresh, setCurrentDatasourceIdBindTasksNeedRefresh ] = useState(''); const [ currentDatasourceIdBindTasksNeedRefresh, setCurrentDatasourceIdBindTasksNeedRefresh ] = useState('');
const [ currentTaskId, setCurrentTaskId ] = useState(''); const [ currentTaskId, setCurrentTaskId ] = useState('');
const [ tasksProgress, setTasksProgress ] = useState({}); const [ tasksProgress, setTasksProgress ] = useState({});
const [ currentDatabase,setCurrentDatabase] = useState({})
const [modal, contextHolder] = Modal.useModal(); const [modal, contextHolder] = Modal.useModal();
...@@ -234,6 +235,7 @@ const DatasourceManage = (props) => { ...@@ -234,6 +235,7 @@ const DatasourceManage = (props) => {
setCurrentDatasourceId(datasource.id||''); setCurrentDatasourceId(datasource.id||'');
setUpdateTaskModalAction('add'); setUpdateTaskModalAction('add');
setUpdateTaskModalVisible(true); setUpdateTaskModalVisible(true);
setCurrentDatabase(datasource)
} }
const scheduleShow = (task) => { const scheduleShow = (task) => {
...@@ -400,6 +402,7 @@ const DatasourceManage = (props) => { ...@@ -400,6 +402,7 @@ const DatasourceManage = (props) => {
id={currentTaskId} id={currentTaskId}
datasourceId={currentDatasourceId} datasourceId={currentDatasourceId}
action={updateTaskModalAction} action={updateTaskModalAction}
currentDatabase={currentDatabase}
onCancel={onUpdateTaskModalVisibleCancel} onCancel={onUpdateTaskModalVisibleCancel}
/> />
......
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