数据源管理列表展示完善 适配器增加采集模式字段 数据源增加修改时间字段

api/app/lib/models/adapter.js

@@ -60,7 +60,16 @@ module.exports = dc => {
             primaryKey: false,
             field: "config",
             autoIncrement: false
-        }
+        },
+        mode: {
+            type: DataTypes.STRING,
+            allowNull: false,
+            defaultValue: null,
+            comment: "采集模式",
+            primaryKey: false,
+            field: "mode",
+            autoIncrement: false
+        },
     }, {
         tableName: "t_adapter",
         comment: "",

api/app/lib/models/data_source.js

@@ -77,6 +77,15 @@ module.exports = dc => {
             primaryKey: false,
             field: "config",
             autoIncrement: false
+        },
+        time: {
+            type: DataTypes.DATE,
+            allowNull: true,
+            defaultValue: null,
+            comment: "修改时间",
+            primaryKey: false,
+            field: "time",
+            autoIncrement: false
         }
     }, {
         tableName: "t_data_source",

scripts/0.0.3/schema/01_alter_t_data_source.sql

@@ -0,0 +1,2 @@
+alter table t_data_source
+    add time timestamp(6) with time zone;

scripts/0.0.3/schema/02_alter_t_adapter.sql

@@ -0,0 +1,2 @@
+alter table t_adapter
+    add  mode varchar(255);

web/client/src/sections/metadataAcquisition/containers/adapter.js

@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
 import { Tabs, Card, Modal } from 'antd'
 import { DatabaseOutlined } from '@ant-design/icons'
 import AdapterStep from '../components/adapterStep';
-
+import moment from 'moment';
 //关系型数据库卡片配置
 const RELATION_DATABASE_TOOL_CONFIG = [{
     key: 'postgre', // key与详情配置（adapterDetail）中的key需一直否则无法查看详情页
@@ -39,14 +39,21 @@ const LatestMetadata = (props) => {
 
     const onFinish = (values) => {
         const { stepOneValues, stepTwoValues } = values;
-        dispatch(actions.metadataAcquisition.addDataSource({
+        const adapterName = RELATION_DATABASE_TOOL_CONFIG?.find(x => x.key == isModalOpen)?.name;
-            name: stepOneValues?.name,
+        const adapterInfo = adapters?.find(x => x.adapterName == adapterName)
-            audited: true,
+        if (adapterInfo) {
-            adapter: 1,
+            dispatch(actions.metadataAcquisition.addDataSource({
-            mountPath: 1,
+                name: stepOneValues?.name,
-            description: stepOneValues?.description,
+                audited: true,
-            config: stepTwoValues
+                adapter: adapterInfo?.id,
-        }))
+                mountPath: 1,
+                description: stepOneValues?.description,
+                config: stepTwoValues,
+                time: moment()
+            })).then(res => {
+                setIsModalOpen(false)
+            })
+        }
     }
 
     return <>

web/client/src/sections/metadataAcquisition/containers/dataSourceManagement.js

@@ -2,8 +2,8 @@ import React, { useEffect, useState } from 'react'
 import { Spin, Popconfirm, Tree, Row, Col, Button, Input, Table } from 'antd';
 import { connect } from 'react-redux';
 import ProTable from '@ant-design/pro-table';
-
+import moment from 'moment';
-const TreeNode = Tree.TreeNode;
+import './style.less';
 function DataSourceManagement(props) {
     const { loading, clientHeight, actions, dispatch, dataSources, adapters } = props;
     const [pageSize, setPageSize] = useState(10);
@@ -52,7 +52,7 @@ function DataSourceManagement(props) {
             dataIndex: 'control',
             render: (text, record) => {
                 const adapterInfo = adapters?.find(s => s.id == record?.adapter)
-                return adapterInfo?.toolName
+                return adapterInfo?.mode
             }
         },
         {
@@ -65,11 +65,14 @@ function DataSourceManagement(props) {
         },
         {
             title: '修改时间',
-            dataIndex: 'nullable',
+            dataIndex: 'time',
+            render: (text, record) => moment(record?.time).format('YYYY-MM-DD HH:mm:ss')
         },
         {
             title: '描述',
             dataIndex: 'description',
+            ellipsis: true,
+            search: false,
         },
         {
             title: '操作',
@@ -96,14 +99,15 @@ function DataSourceManagement(props) {
             },
         },
     ];
+    
     return <Spin spinning={loading}>
-        <Row style={{ marginBottom: 16 }}>
+        <Row className='protable-title'>
             <Col span={12}><Button type='primary'>新建</Button></Col>
             <Col span={12} style={{ textAlign: 'right' }}><Input
                 value={searchValue} onChange={e => { setSearchValue(e.target.value) }}
                 style={{ width: 220, marginRight: 15 }} placeholder="数据源名称" /><Button onClick={() => { queryData() }} type='primary'>查询</Button></Col>
         </Row>
-        <Table
+        <ProTable
             columns={columns}
             dateFormatter="string"
             search={false}

web/client/src/sections/metadataAcquisition/containers/style.less

@@ -0,0 +1,5 @@
+.protable-title {
+    margin-bottom: 16px;
+    padding-left: 24px;
+    padding-right: 24px;
+}