From 0dd40bad266951b78bfb22a41277362fe8d94c92 Mon Sep 17 00:00:00 2001 From: "peng.peng" Date: Tue, 21 Mar 2023 16:46:29 +0800 Subject: [PATCH] =?UTF-8?q?(*)=E9=80=82=E9=85=8D=E5=99=A8=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=20=E5=A2=9E=E5=8A=A0=20=E4=BB=BB=E5=8A=A1=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../metadataAcquisition/actions/dataSource.js | 2 +- .../components/adapterStep.js | 5 ++-- .../containers/acquisitionTask.js | 1 + .../metadataAcquisition/containers/adapter.js | 26 ++++++++++++++++--- .../containers/dataSourceManagement.js | 2 +- 5 files changed, 28 insertions(+), 8 deletions(-) diff --git a/web/client/src/sections/metadataAcquisition/actions/dataSource.js b/web/client/src/sections/metadataAcquisition/actions/dataSource.js index 6467ef4..91f8963 100644 --- a/web/client/src/sections/metadataAcquisition/actions/dataSource.js +++ b/web/client/src/sections/metadataAcquisition/actions/dataSource.js @@ -11,7 +11,7 @@ export function addDataSource(params, msg) { actionType: 'ADD_DATSOURCE', url: ApiTable.addDataSource, msg: { - option: msg || '新增数据源', + option: msg == '' ? '' : '新增数据源', }, }); } diff --git a/web/client/src/sections/metadataAcquisition/components/adapterStep.js b/web/client/src/sections/metadataAcquisition/components/adapterStep.js index 8ad34ab..39e511e 100644 --- a/web/client/src/sections/metadataAcquisition/components/adapterStep.js +++ b/web/client/src/sections/metadataAcquisition/components/adapterStep.js @@ -31,7 +31,8 @@ const AdapterStep = (props) => { const onFinish = (values) => { props.onFinish({ stepOneValues, - stepTwoValues: values || stepTwoValues + stepTwoValues: current == 2 ? values || stepTwoValues : stepTwoValues, + stepThreeValue: values }) } @@ -65,7 +66,7 @@ const AdapterStep = (props) => { })); return <> - {stepProps == 3 && } + {stepProps == 3 && }
{steps[current].content}
} diff --git a/web/client/src/sections/metadataAcquisition/containers/acquisitionTask.js b/web/client/src/sections/metadataAcquisition/containers/acquisitionTask.js index dc33010..723b4d0 100644 --- a/web/client/src/sections/metadataAcquisition/containers/acquisitionTask.js +++ b/web/client/src/sections/metadataAcquisition/containers/acquisitionTask.js @@ -116,6 +116,7 @@ function AcquisitionTask(props) { dataSourceId: values?.dataSourceId, cron: values?.cron, } + if (editData) { dispatch(actions.metadataAcquisition.modifyTask(editData?.id, dataToSave)).then(res => { if (res.success) { diff --git a/web/client/src/sections/metadataAcquisition/containers/adapter.js b/web/client/src/sections/metadataAcquisition/containers/adapter.js index c422fd2..5f5d0b1 100644 --- a/web/client/src/sections/metadataAcquisition/containers/adapter.js +++ b/web/client/src/sections/metadataAcquisition/containers/adapter.js @@ -34,19 +34,37 @@ const LatestMetadata = (props) => { ]; const onFinish = (values) => { - const { stepOneValues, stepTwoValues } = values; + const { stepOneValues, stepTwoValues, stepThreeValue } = values; const adapterInfo = adapters?.find(x => x.adapterName == stepOneValues?.adapterName) if (adapterInfo) { dispatch(actions.metadataAcquisition.addDataSource({ name: stepOneValues?.name, audited: true, - adapter: adapterInfo?.id, + adapterId: adapterInfo?.id, mountPath: 1, description: stepOneValues?.description, config: stepTwoValues, time: moment() - })).then(res => { - setIsModalOpen(false) + }, '')).then(res => { + if (res.success) { + const dataToSave = { + taskName: stepThreeValue?.taskName, + retryCount: stepThreeValue?.retryCount, + retryTime: stepThreeValue?.retryTime, + retried: stepThreeValue?.retried ? true : false, + dataSourceId: res?.payload?.data?.id, + cron: stepThreeValue?.cron, + } + dataToSave.enabled = true; + dataToSave.autoReleased = true; + dataToSave.storageStrategy = "增量"; + dispatch(actions.metadataAcquisition.addTask(dataToSave, '适配器配置')).then(res => { + if (res.success) { + setIsModalOpen(false) + } + }) + + } }) } } diff --git a/web/client/src/sections/metadataAcquisition/containers/dataSourceManagement.js b/web/client/src/sections/metadataAcquisition/containers/dataSourceManagement.js index b1d549b..dc67061 100644 --- a/web/client/src/sections/metadataAcquisition/containers/dataSourceManagement.js +++ b/web/client/src/sections/metadataAcquisition/containers/dataSourceManagement.js @@ -108,7 +108,7 @@ function DataSourceManagement(props) { ]; const onFinish = (values) => { - const { stepOneValues, stepTwoValues } = values; + const { stepOneValues, stepTwoValues, } = values; const adapterInfo = adapters?.find(x => x.adapterName == stepOneValues?.adapterName) if (adapterInfo) { const dataToSave = {