From 040cfc43ab4a159dddb88fac895c408c11b77c23 Mon Sep 17 00:00:00 2001
From: "peng.peng" <peng.peng@free-sun.com.cn>
Date: Fri, 17 Mar 2023 11:24:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lib/routes/metadataAcquisition/adapter.js  |  2 +-
 .../metadataAcquisition/actions/adapter.js     | 14 ++++++++++++++
 .../metadataAcquisition/actions/dataSource.js  | 18 ++++++++++++++++++
 .../metadataAcquisition/actions/index.js       |  2 ++
 .../components/adapterStep.js                  |  8 +++++++-
 .../components/steps/postgre/stepOne.js        |  1 +
 .../components/steps/postgre/stepThree.js      |  5 ++---
 .../metadataAcquisition/containers/adapter.js  |  8 ++++++++
 web/client/src/utils/webapi.js                 |  2 ++
 9 files changed, 55 insertions(+), 5 deletions(-)
 create mode 100644 web/client/src/sections/metadataAcquisition/actions/dataSource.js

diff --git a/api/app/lib/routes/metadataAcquisition/adapter.js b/api/app/lib/routes/metadataAcquisition/adapter.js
index db3184e..c8e6ed1 100644
--- a/api/app/lib/routes/metadataAcquisition/adapter.js
+++ b/api/app/lib/routes/metadataAcquisition/adapter.js
@@ -8,7 +8,7 @@ module.exports = function (app, router, opts, AuthCode) {
     router.post('/adapter/check/connect', adapter.checkConnect(opts))
 
     app.fs.api.logAttr['POST/adapter'] = { content: '增加适配器', visible: true };
-    router.post('/adapter', adapter.addAdapter(opts))
+    router.post('/meta/acq/adapter', adapter.addAdapter(opts))
 
 
 };
diff --git a/web/client/src/sections/metadataAcquisition/actions/adapter.js b/web/client/src/sections/metadataAcquisition/actions/adapter.js
index ed54ad9..7d2a509 100644
--- a/web/client/src/sections/metadataAcquisition/actions/adapter.js
+++ b/web/client/src/sections/metadataAcquisition/actions/adapter.js
@@ -15,3 +15,17 @@ export function checkPostgreConnect(params) {
         },
     });
 }
+
+export function addAdapter(params) {
+    return (dispatch) => basicAction({
+        type: 'post',
+        data: params,
+        dispatch,
+        actionType: 'ADD_ADAPTER',
+        url: ApiTable.addAdapter,
+        msg: {
+            option: '新增适配器',
+        },
+    });
+}
+
diff --git a/web/client/src/sections/metadataAcquisition/actions/dataSource.js b/web/client/src/sections/metadataAcquisition/actions/dataSource.js
new file mode 100644
index 0000000..54a4900
--- /dev/null
+++ b/web/client/src/sections/metadataAcquisition/actions/dataSource.js
@@ -0,0 +1,18 @@
+'use strict';
+
+import { basicAction } from '@peace/utils'
+import { ApiTable } from '$utils'
+
+export function addDataSource(params, msg) {
+    return (dispatch) => basicAction({
+        type: 'post',
+        data: params,
+        dispatch,
+        actionType: 'ADD_ADAPTER',
+        url: ApiTable.addDataSource,
+        msg: {
+            option: msg || '新增数据源',
+        },
+    });
+}
+
diff --git a/web/client/src/sections/metadataAcquisition/actions/index.js b/web/client/src/sections/metadataAcquisition/actions/index.js
index 0df100b..e6377ed 100644
--- a/web/client/src/sections/metadataAcquisition/actions/index.js
+++ b/web/client/src/sections/metadataAcquisition/actions/index.js
@@ -2,8 +2,10 @@
 
 import * as example from './example'
 import * as adapter from './adapter'
+import * as dataSource from './dataSource'
 
 export default {
     ...example,
     ...adapter,
+    ...dataSource
 }
\ No newline at end of file
diff --git a/web/client/src/sections/metadataAcquisition/components/adapterStep.js b/web/client/src/sections/metadataAcquisition/components/adapterStep.js
index 2bf67a5..5f04479 100644
--- a/web/client/src/sections/metadataAcquisition/components/adapterStep.js
+++ b/web/client/src/sections/metadataAcquisition/components/adapterStep.js
@@ -23,6 +23,12 @@ const AdapterStep = (props) => {
     const stepTwoValuesFinish = (values) => {
         setStepTwoValues(values)
     }
+    const onFinish = () => {
+        props.onFinish({
+            stepOneValues,
+            stepTwoValues
+        })
+    }
 
     const steps = [
         {
@@ -35,7 +41,7 @@ const AdapterStep = (props) => {
         },
         {
             title: '配置计划任务',
-            content: <StepThree prev={prev} next={next} />,
+            content: <StepThree prev={prev} next={onFinish} />,
         },
     ];
 
diff --git a/web/client/src/sections/metadataAcquisition/components/steps/postgre/stepOne.js b/web/client/src/sections/metadataAcquisition/components/steps/postgre/stepOne.js
index 659f004..10cb862 100644
--- a/web/client/src/sections/metadataAcquisition/components/steps/postgre/stepOne.js
+++ b/web/client/src/sections/metadataAcquisition/components/steps/postgre/stepOne.js
@@ -41,6 +41,7 @@ function StepOne(props) {
                 },
             }}
         >
+            
             <ProFormText
                 rules={[{ required: true, message: '请输入数据源名称' },
                 { max: 255, message: '数据源名称长度不能大于255个字符' },
diff --git a/web/client/src/sections/metadataAcquisition/components/steps/postgre/stepThree.js b/web/client/src/sections/metadataAcquisition/components/steps/postgre/stepThree.js
index ac9a91f..5ede4ee 100644
--- a/web/client/src/sections/metadataAcquisition/components/steps/postgre/stepThree.js
+++ b/web/client/src/sections/metadataAcquisition/components/steps/postgre/stepThree.js
@@ -10,9 +10,9 @@ import {
 
 import '../../style.less';
 function StepThree(props) {
-    const { prev, next, stepOneValues, stepOneValuesFinish } = props;
+    const { prev, next, } = props;
     const formRef = React.createRef();
-    const initialValues = stepOneValues ? stepOneValues : {
+    const initialValues = {
 
     }
     const formItemLayout = { labelCol: { span: 4 }, wrapperCol: { span: 10 } };
@@ -29,7 +29,6 @@ function StepThree(props) {
             }}
             onFinish={async (values) => {
                 next()
-                stepOneValuesFinish(values)
                 return true;
             }}
             style={{ marginTop: 20 }}
diff --git a/web/client/src/sections/metadataAcquisition/containers/adapter.js b/web/client/src/sections/metadataAcquisition/containers/adapter.js
index 9ebaadb..472f2b9 100644
--- a/web/client/src/sections/metadataAcquisition/containers/adapter.js
+++ b/web/client/src/sections/metadataAcquisition/containers/adapter.js
@@ -33,6 +33,13 @@ const LatestMetadata = (props) => {
         { label: '关系型数据库', key: '关系型数据库', children: renderRelationalDatabase() },
     ];
 
+    const onFinish = (values) => {
+        const { stepOneValues, stepTwoValues } = values;
+        dispatch(actions.metadataAcquisition.addDataSource({
+           
+        }))
+    }
+
     return <>
         <Tabs items={items} />
         <Modal
@@ -45,6 +52,7 @@ const LatestMetadata = (props) => {
         >
             <AdapterStep
                 type={isModalOpen} //当前卡片的key （目前只有postgre,支持后续扩展）
+                onFinish={onFinish}
                 {...props}
             />
         </Modal>
diff --git a/web/client/src/utils/webapi.js b/web/client/src/utils/webapi.js
index 0412bb1..1771317 100644
--- a/web/client/src/utils/webapi.js
+++ b/web/client/src/utils/webapi.js
@@ -20,6 +20,8 @@ export const ApiTable = {
 
     //元数据采集
     pgCheckConnect: 'adapter/check/connect',
+    addDataSource: 'meta/acq/dataSource',
+
 };
 
 export const RouteTable = {