free-sun
/
GovernmentDataResourceCenter
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of https://gitea.anxinyun.cn/free-sun/GovernmentDataResourceCenter

master
peng.peng 2 years ago
parent
19d6ddd5c4 a44d9830a3
commit
fc5f4dee3d
8 changed files with 1495 additions and 1182 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      api/.vscode/launch.json
  2. 1498
      api/app/lib/controllers/latestMetadata/index.js
  3. 3
      api/app/lib/routes/latestMetadata/index.js
  4. 6
      web/client/src/sections/dataQuality/containers/ruleLibrary.js
  5. 258
      web/client/src/sections/metadataManagement/actions/businessMetadata.js
  6. 237
      web/client/src/sections/metadataManagement/components/releaseModal.js
  7. 673
      web/client/src/sections/metadataManagement/containers/databasesTable.js
  8. 1
      web/client/src/utils/webapi.js

1
api/.vscode/launch.json
View File

@ -16,6 +16,7 @@
"-p 4400", "-p 4400",
// 研发 // 研发
"-g postgres://FashionAdmin:123456@10.8.30.39:5432/GovernmentDataResourceCenter", "-g postgres://FashionAdmin:123456@10.8.30.39:5432/GovernmentDataResourceCenter",
// "-g postgres://FashionAdmin:123456@10.8.30.156:5432/gdrcenter",
"-b http://10.8.30.161:31420" "-b http://10.8.30.161:31420"
] ]
}, },

1498
api/app/lib/controllers/latestMetadata/index.js
View File

File diff suppressed because it is too large

3
api/app/lib/routes/latestMetadata/index.js
View File

@ -68,4 +68,7 @@ module.exports = function (app, router, opts) {
app.fs.api.logAttr['DEL/metadata/restapis/:id'] = { content: '删除接口元数据', visible: true }; app.fs.api.logAttr['DEL/metadata/restapis/:id'] = { content: '删除接口元数据', visible: true };
router.delete('/metadata/restapis/:id', latestMetadata.delMetadataRestapis); router.delete('/metadata/restapis/:id', latestMetadata.delMetadataRestapis);
app.fs.api.logAttr['GET/listStructuredData'] = { content: '获取对表的库与字段信息', visible: true };
router.get('/listStructuredData', latestMetadata.listStructuredData);
}; };

6
web/client/src/sections/dataQuality/containers/ruleLibrary.js
View File

@ -97,7 +97,7 @@ function RuleLibrary ({ loading, clientHeight, actions, dispatch, }) {
return <> return <>
<div style={{ display: 'flex', justifyContent: 'space-between' }}> <div style={{ display: 'flex', justifyContent: 'space-between', marginBottom: 20 }}>
<Button onClick={() => { <Button onClick={() => {
setRuleModal(true); setRuleModal(true);
}}>新建业务规则</Button> }}>新建业务规则</Button>
@ -123,7 +123,7 @@ function RuleLibrary ({ loading, clientHeight, actions, dispatch, }) {
<Table <Table
columns={columns} columns={columns}
dataSource={tableList?.rows || []} dataSource={tableList?.rows || []}
scroll={{ scrollToFirstRowOnChange: true, y: clientHeight - 260 }} scroll={{ scrollToFirstRowOnChange: true, y: clientHeight - 240 }}
pagination={{ pagination={{
current: query?.page + 1, current: query?.page + 1,
pageSize: query?.limit, pageSize: query?.limit,
@ -146,7 +146,7 @@ function RuleLibrary ({ loading, clientHeight, actions, dispatch, }) {
close={() => { close={() => {
setRuleModal(false); setRuleModal(false);
setEditData({}) setEditData({})
} } }}
success={() => { success={() => {
resourceData({ limit: 10, page: 0, keyword }) resourceData({ limit: 10, page: 0, keyword })
} }

258
web/client/src/sections/metadataManagement/actions/businessMetadata.js
View File

@ -3,151 +3,163 @@
import { basicAction } from '@peace/utils' import { basicAction } from '@peace/utils'
import { ApiTable } from '$utils' import { ApiTable } from '$utils'
export function getBusinessMetadataDatabases(params) { export function getBusinessMetadataDatabases (params) {
return dispatch => basicAction({ return dispatch => basicAction({
type: 'get', type: 'get',
dispatch: dispatch, dispatch: dispatch,
query: params, query: params,
actionType: 'GET_BUSINESS_METADATA_DATABASES_LIST', actionType: 'GET_BUSINESS_METADATA_DATABASES_LIST',
url: ApiTable.getBusinessMetadataDatabases, url: ApiTable.getBusinessMetadataDatabases,
msg: { error: '获取业务元数据列表失败' }, msg: { error: '获取业务元数据列表失败' },
reducer: { name: 'businessMetadataDatabases' } reducer: { name: 'businessMetadataDatabases' }
}); });
} }
export function postBusinessMetadataDatabases(data) { export function postBusinessMetadataDatabases (data) {
return dispatch => basicAction({ return dispatch => basicAction({
type: 'post', type: 'post',
data: data, data: data,
dispatch: dispatch, dispatch: dispatch,
actionType: 'POST_BUSINESS_METADATA_DATABASES', actionType: 'POST_BUSINESS_METADATA_DATABASES',
url: ApiTable.postBusinessMetadataDatabases, url: ApiTable.postBusinessMetadataDatabases,
msg: { option: '新建业务元数据' }, msg: { option: '新建业务元数据' },
reducer: {} reducer: {}
}); });
} }
export function putBusinessMetadataDatabases(id, data) { export function putBusinessMetadataDatabases (id, data) {
return dispatch => basicAction({ return dispatch => basicAction({
type: 'put', type: 'put',
data: data, data: data,
dispatch, dispatch,
actionType: 'PUT_BUSINESS_METADATA_DATABASES', actionType: 'PUT_BUSINESS_METADATA_DATABASES',
url: ApiTable.putBusinessMetadataDatabases.replace('{id}', id), url: ApiTable.putBusinessMetadataDatabases.replace('{id}', id),
msg: { msg: {
option: '修改业务元数据', option: '修改业务元数据',
} }
}); });
} }
export function delBusinessMetadataDatabases(id) { export function delBusinessMetadataDatabases (id) {
return dispatch => basicAction({ return dispatch => basicAction({
type: 'del', type: 'del',
dispatch, dispatch,
actionType: 'DELETE_BUSINESS_METADATA_DATABASES', actionType: 'DELETE_BUSINESS_METADATA_DATABASES',
url: ApiTable.delBusinessMetadataDatabases.replace('{id}', id), url: ApiTable.delBusinessMetadataDatabases.replace('{id}', id),
msg: { msg: {
option: '删除业务元数据', option: '删除业务元数据',
} }
}); });
} }
export function getBusinessMetadataFiles(params) { export function getBusinessMetadataFiles (params) {
return dispatch => basicAction({ return dispatch => basicAction({
type: 'get', type: 'get',
dispatch: dispatch, dispatch: dispatch,
query: params, query: params,
actionType: 'GET_BUSINESS_METADATA_FILES_LIST', actionType: 'GET_BUSINESS_METADATA_FILES_LIST',
url: ApiTable.getBusinessMetadataFiles, url: ApiTable.getBusinessMetadataFiles,
msg: { error: '获取业务元数据列表失败' }, msg: { error: '获取业务元数据列表失败' },
reducer: { name: 'businessMetadataFiles' } reducer: { name: 'businessMetadataFiles' }
}); });
} }
export function postBusinessMetadataFiles(data) { export function postBusinessMetadataFiles (data) {
return dispatch => basicAction({ return dispatch => basicAction({
type: 'post', type: 'post',
data: data, data: data,
dispatch: dispatch, dispatch: dispatch,
actionType: 'POST_BUSINESS_METADATA_FILES', actionType: 'POST_BUSINESS_METADATA_FILES',
url: ApiTable.postBusinessMetadataFiles, url: ApiTable.postBusinessMetadataFiles,
msg: { option: '新建业务元数据' }, msg: { option: '新建业务元数据' },
reducer: {} reducer: {}
}); });
} }
export function putBusinessMetadataFiles(id, data) { export function putBusinessMetadataFiles (id, data) {
return dispatch => basicAction({ return dispatch => basicAction({
type: 'put', type: 'put',
data: data, data: data,
dispatch, dispatch,
actionType: 'PUT_BUSINESS_METADATA_FILES', actionType: 'PUT_BUSINESS_METADATA_FILES',
url: ApiTable.putBusinessMetadataFiles.replace('{id}', id), url: ApiTable.putBusinessMetadataFiles.replace('{id}', id),
msg: { msg: {
option: '修改业务元数据', option: '修改业务元数据',
} }
}); });
} }
export function delBusinessMetadataFiles(id) { export function delBusinessMetadataFiles (id) {
return dispatch => basicAction({ return dispatch => basicAction({
type: 'del', type: 'del',
dispatch, dispatch,
actionType: 'DELETE_BUSINESS_METADATA_FILES', actionType: 'DELETE_BUSINESS_METADATA_FILES',
url: ApiTable.delBusinessMetadataFiles.replace('{id}', id), url: ApiTable.delBusinessMetadataFiles.replace('{id}', id),
msg: { msg: {
option: '删除业务元数据', option: '删除业务元数据',
} }
}); });
} }
export function getBusinessMetadataRestapis(params) { export function getBusinessMetadataRestapis (params) {
return dispatch => basicAction({ return dispatch => basicAction({
type: 'get', type: 'get',
dispatch: dispatch, dispatch: dispatch,
query: params, query: params,
actionType: 'GET_BUSINESS_METADATA_RESTAPIS_LIST', actionType: 'GET_BUSINESS_METADATA_RESTAPIS_LIST',
url: ApiTable.getBusinessMetadataRestapis, url: ApiTable.getBusinessMetadataRestapis,
msg: { error: '获取业务元数据列表失败' }, msg: { error: '获取业务元数据列表失败' },
reducer: { name: 'businessMetadataRestapis' } reducer: { name: 'businessMetadataRestapis' }
}); });
} }
export function postBusinessMetadataRestapis(data) { export function postBusinessMetadataRestapis (data) {
return dispatch => basicAction({ return dispatch => basicAction({
type: 'post', type: 'post',
data: data, data: data,
dispatch: dispatch, dispatch: dispatch,
actionType: 'POST_BUSINESS_METADATA_RESTAPIS', actionType: 'POST_BUSINESS_METADATA_RESTAPIS',
url: ApiTable.postBusinessMetadataRestapis, url: ApiTable.postBusinessMetadataRestapis,
msg: { option: '新建业务元数据' }, msg: { option: '新建业务元数据' },
reducer: {} reducer: {}
}); });
} }
export function putBusinessMetadataRestapis(id, data) { export function putBusinessMetadataRestapis (id, data) {
return dispatch => basicAction({ return dispatch => basicAction({
type: 'put', type: 'put',
data: data, data: data,
dispatch, dispatch,
actionType: 'PUT_BUSINESS_METADATA_RESTAPIS', actionType: 'PUT_BUSINESS_METADATA_RESTAPIS',
url: ApiTable.putBusinessMetadataRestapis.replace('{id}', id), url: ApiTable.putBusinessMetadataRestapis.replace('{id}', id),
msg: { msg: {
option: '修改业务元数据', option: '修改业务元数据',
} }
}); });
} }
export function delBusinessMetadataRestapis(id) { export function delBusinessMetadataRestapis (id) {
return dispatch => basicAction({ return dispatch => basicAction({
type: 'del', type: 'del',
dispatch, dispatch,
actionType: 'DELETE_BUSINESS_METADATA_RESTAPIS', actionType: 'DELETE_BUSINESS_METADATA_RESTAPIS',
url: ApiTable.delBusinessMetadataRestapis.replace('{id}', id), url: ApiTable.delBusinessMetadataRestapis.replace('{id}', id),
msg: { msg: {
option: '删除业务元数据', option: '删除业务元数据',
} }
}); });
}
export function listStructuredData (query = {}) {
return dispatch => basicAction({
type: 'get',
query,
dispatch: dispatch,
actionType: 'GET_LIST_STRUCTURED_DATA',
url: ApiTable.listStructuredData,
msg: { error: '获取对表的库与字段信息失败' },
reducer: {}
});
} }

237
web/client/src/sections/metadataManagement/components/releaseModal.js
View File

@ -0,0 +1,237 @@
import React, { useEffect, useState } from 'react';
import { connect } from 'react-redux';
import { Modal, Input, Form, Tabs, Avatar, Checkbox, Button, Select } from 'antd';
import { PlusCircleOutlined, MinusCircleOutlined } from '@ant-design/icons';
const { TabPane } = Tabs;
const { TextArea } = Input;
const CheckboxGroup = Checkbox.Group;
const ReleaseModal = ({ actions, dispatch, onConfirm, onCancel, editData = {} }) => {
const { metadataManagement } = actions;
const [activeKey, setActiveKeyl] = useState("field")
const [fieldList, setFiedList] = useState([])
const [fieldData, setFiedData] = useState([])
const [database, setDatabase] = useState({})
const [fieldValue, setFiedValue] = useState([])
const [indeterminate, setIndeterminate] = useState(false)
const [fromData, setFromData] = useState([{ value1: '', value2: '', value3: '' }])
const [sql, setSql] = useState()
const [form] = Form.useForm();
useEffect(() => {
dispatch(metadataManagement.listStructuredData({ id: editData?.id, parent: editData?.parent })).then(res => {
if (res.success) {
setFiedData(res.payload.data?.field || [])
setFiedList(res.payload.data?.field?.map(v => v.code) || [])
setDatabase(res.payload.data?.database || {})
}
})
}, []);
let operator = [{ value: '=', label: '=' },
{ value: '!=', label: '!=' },
{ value: '>', label: '>' },
{ value: '<', label: '<' },
{ value: '>=', label: '>=' },
{ value: '<=', label: '<=' },
{ value: 'BETWEEN', label: 'BETWEEN' },
{ value: 'LIKE', label: 'LIKE' },
{ value: 'IN', label: 'IN' }]
return (
<Modal title={'发布REST服务'} open={true} destroyOnClose
width={800}
// onOk={() => handleOk(null)}
onCancel={onCancel}
footer={null}
>
<div style={{ width: '100%', display: 'flex', alignItems: 'center', justifyContent: 'space-around' }}>
{[{ name: '选择字段', key: "field" },
{ name: '配置条件', key: "condition" },
{ name: '预览SQL', key: "SQL" },
{ name: '服务发布', key: "release" }].map((v, index) => {
let title = []
if (index > 0) {
title.push(<div style={{ width: '14%', border: '1px solid #0000004a' }}></div>)
}
title.push(<div style={{ width: '14%', color: activeKey == v.key ? '#1e6ee5' : "", }}>
<Avatar style={{
backgroundColor: activeKey == v.key ? "rgb(30 110 229 / 74%)" : 'rgb(200 192 185)'
}}
size="large" icon={index + 1} />
{v.name}
</div>)
return title
})}
</div>
<Tabs activeKey={activeKey} onChange={v => {
setActiveKeyl(v)
}} >
<TabPane key="field">
<div style={{ fontSize: 20, fontWeight: 600 }}>选择字段</div>
{/* <div style={{ marginLeft: 20 }}> */}
<Checkbox indeterminate={indeterminate} style={{ margin: '20px 40px' }} onChange={e => {
setFiedValue(e.target.checked ? fieldList : []);
setIndeterminate(e.target.checked);
}}>
全选
</Checkbox>
<div style={{ display: 'flex', marginLeft: 40 }}>
<div style={{ marginRight: 8 }}>字段:</div>
<CheckboxGroup options={fieldList} value={fieldValue} onChange={v => {
setFiedValue(v)
if (v?.length == fieldList?.length) {
setIndeterminate(true)
} else {
setIndeterminate(false)
}
}} />
</div>
</TabPane>
<TabPane key="condition">
<div style={{ fontSize: 20, margin: '20px 0', fontWeight: 600 }}>配置条件：</div>
{fromData?.map((f, index) => {
return <div key={'key' + index} style={{ display: 'flex', marginBottom: 16 }}>
<Select
style={{ width: 200, marginRight: 10 }} value={f.value1 || null}
placeholder="请选择字段"
onChange={v => {
fromData?.splice(index, 1, { value1: v, value2: f.value2, value3: f.value3 })
setFromData([...fromData])
}}
options={fieldValue?.map(d => ({ value: d, label: d })) || []}
allowClear
/>
<Select
style={{ width: 200, marginRight: 10 }} value={f.value2 || null}
placeholder="请选择条件"
onChange={v => {
fromData?.splice(index, 1, { value1: f.value1, value2: v, value3: f.value3 })
setFromData([...fromData])
}}
options={operator}
allowClear
/>
<Input
style={{ width: 200, marginRight: 10 }} value={f.value3}
placeholder="请输入值"
onChange={v => {
fromData?.splice(index, 1, { value1: f.value1, value2: f.value2, value3: v?.target?.value })
setFromData([...fromData])
}}
allowClear
/>
{index == 0 ?
<PlusCircleOutlined style={{ fontSize: 20, marginTop: 6 }} onClick={() => {
fromData?.splice(index, 0, { value1: '', value2: '', value3: '' })
setFromData([...fromData])
}} />
: <MinusCircleOutlined style={{ fontSize: 20, marginTop: 6 }} onClick={() => {
fromData?.splice(index, 1)
setFromData([...fromData])
}} />
}
</div>
})}
</TabPane>
<TabPane key="SQL">
<div style={{ fontSize: 20, marginBottom: 20, fontWeight: 600, display: 'flex', justifyContent: 'space-between' }}>预览SQL：<Button onClick={() => {
console.log(editData);
console.log(database);
console.log(fromData);
let whereOption = []
fromData.map(s => {
whereOption.push(`${editData?.code}.${s.value1} ${s.value2} ${s.value3}`);
})
let sqlData = `SELECT * FROM ${editData?.code} ${fromData.length ? 'WHERE ' + whereOption.join(' AND ') : ''}`
setSql(sqlData)
}}>生成SQL</Button></div>
<TextArea value={sql} autoSize={{ minRows: 5 }} disabled={true} />
</TabPane>
<TabPane key="release">
<div style={{ fontSize: 20, marginBottom: 10, fontWeight: 600 }}>服务发布：</div>
<div style={{ display: 'flex' }}>接口名称：<Input style={{ width: 180 }} placeholder='请输入' /></div>
<div style={{ display: 'flex', margin: '10px 0 10px 30px' }}>URL： <Select
style={{ width: 200, marginRight: 10 }}
onChange={v => {
}}
defaultValue={"GET"}
options={[{ value: "GET", label: "GET" },
{ value: "POST", label: "POST" },
{ value: "PUT", label: "PUT" },
{ value: "DEL", label: "DEL" },]}
allowClear
/>
<Input style={{ width: 180, marginLeft: 20 }} placeholder='请输入' />
</div>
<div style={{ display: 'flex', marginLeft: 20 }}>返回值：
<div style={{ display: 'flex', width: 250, flexDirection: 'column', alignItems: 'center' }}>
<div key={'fieldData' + index} style={{ display: 'flex' }}>
<div style={{ width: 80, border: '1px solid #dcc' }}>名称</div>
<div style={{ width: 80, border: '1px solid #dcc' }}>意义</div>
<div style={{ width: 80, border: '1px solid #dcc' }}>说明</div>
</div>
{fieldData?.map((s, index) => {
return <div key={'fieldData' + index} style={{ display: 'flex' }}>
<div style={{ width: 80, border: '1px solid #dcc' }}>{s.code}</div>
<div style={{ width: 80, border: '1px solid #dcc' }}>{s.name}</div>
<div style={{ width: 80, border: '1px solid #dcc' }}>{s.type}</div>
</div>
})}
</div>
</div>
</TabPane>
</Tabs >
<div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: 20 }}>
{activeKey == 'condition' || activeKey == 'SQL' || activeKey == 'release' ? <Button type="primary" onClick={() => {
if (activeKey == 'condition') {
setActiveKeyl('field')
} else if (activeKey == 'SQL') {
setActiveKeyl('condition')
} else if (activeKey == 'release') {
setActiveKeyl('SQL')
}
}}>上一步</Button> : ""}
{activeKey == 'condition' || activeKey == 'SQL' || activeKey == 'field' ? <Button style={{ marginLeft: 10 }} type="primary" onClick={() => {
if (activeKey == 'field') {
setActiveKeyl('condition')
} else if (activeKey == 'condition') {
setActiveKeyl('SQL')
} else if (activeKey == 'SQL') {
setActiveKeyl('release')
}
}}>下一步</Button> : ""}
{activeKey == 'release' ? <Button type="primary" style={{ marginLeft: 10 }} onClick={() => {
}}>完成 </Button> : ""}
<Button style={{ marginLeft: 10 }} onClick={() => onCancel()}>取消</Button>
</div>
</Modal >
)
}
function mapStateToProps (state) {
const { global, auth, } = state;
return {
user: auth.user,
actions: global.actions,
clientHeight: global.clientHeight,
};
}
export default connect(mapStateToProps)(ReleaseModal)

673
web/client/src/sections/metadataManagement/containers/databasesTable.js
View File

@ -8,343 +8,370 @@ import MetadataDatabaseModal from '../components/metadataDatabaseModal';
import { ModelTypes } from '../constants/index'; import { ModelTypes } from '../constants/index';
import MetadataTagModal from '../components/metadataTagModal'; import MetadataTagModal from '../components/metadataTagModal';
import MetadataResourceModal from '../components/metadataResourceModal'; import MetadataResourceModal from '../components/metadataResourceModal';
import ReleaseModal from '../components/releaseModal';
const DatabaseTable = (props) => { const DatabaseTable = (props) => {
const { user, dispatch, actions, clientHeight, resourceCatalogId, resourceCatalogKey, const { user, dispatch, actions, clientHeight, resourceCatalogId, resourceCatalogKey,
resourceCatalogPath, isRequesting, metadataModels, setView, tagList, metadataResourceApplications, params } = props; resourceCatalogPath, isRequesting, metadataModels, setView, tagList, metadataResourceApplications, params } = props;
const { metadataManagement } = actions; const { metadataManagement } = actions;
const SortValues = { 'ascend': 'asc', 'descend': 'desc' }; const SortValues = { 'ascend': 'asc', 'descend': 'desc' };
const [tableData, setTableData] = useState([]); const [tableData, setTableData] = useState([]);
const [tableDataCount, setTableDataCount] = useState(0);//Table数据 const [tableDataCount, setTableDataCount] = useState(0);//Table数据
const [createAtSort, setCreateAtSort] = useState('descend'); const [createAtSort, setCreateAtSort] = useState('descend');
const [keywords, setKeywords] = useState(''); const [keywords, setKeywords] = useState('');
const [limit, setLimit] = useState(10); const [limit, setLimit] = useState(10);
const [currentPage, setCurrentPage] = useState(1); const [currentPage, setCurrentPage] = useState(1);
const [selectedRowKeys, setSelectedRowKeys] = useState([]); const [selectedRowKeys, setSelectedRowKeys] = useState([]);
const [selectedRows, setSelectedRows] = useState([]); const [selectedRows, setSelectedRows] = useState([]);
const [modalVisible, setModalVisible] = useState(false); const [modalVisible, setModalVisible] = useState(false);
const [editData, setEditData] = useState({}); const [editData, setEditData] = useState({});
const [tagModalVisible, setTagModalVisible] = useState(false); const [tagModalVisible, setTagModalVisible] = useState(false);
const [editTagData, setEditTagData] = useState({}); const [editTagData, setEditTagData] = useState({});
const [resourceModalVisible, setResourceModalVisible] = useState(false); const [resourceModalVisible, setResourceModalVisible] = useState(false);
const [editResourceData, setEditResourceData] = useState({}); const [editResourceData, setEditResourceData] = useState({});
const [releaseModal, setReleaseModal] = useState(false);
useEffect(() => { useEffect(() => {
dispatch(metadataManagement.getTagList()); dispatch(metadataManagement.getTagList());
setCreateAtSort('descend'); setCreateAtSort('descend');
onSearch('descend'); onSearch('descend');
}, [resourceCatalogId]); }, [resourceCatalogId]);
const initData = (query = {}) => { const initData = (query = {}) => {
dispatch(metadataManagement.getMetadataDatabases({ resourceId: params?.type == 'databases' ? params?.resourceId : null, catalog: resourceCatalogId, keywords, orderBy: 'createAt', ...query })).then(res => { dispatch(metadataManagement.getMetadataDatabases({ resourceId: params?.type == 'databases' ? params?.resourceId : null, catalog: resourceCatalogId, keywords, orderBy: 'createAt', ...query })).then(res => {
if (res.success) { if (res.success) {
setTableData(res.payload.data.rows); setTableData(res.payload.data.rows);
setTableDataCount(res.payload.data.count); setTableDataCount(res.payload.data.count);
let resourceNames = []; let resourceNames = [];
res.payload.data.rows.map(r => { res.payload.data.rows.map(r => {
if (r.type === '表') { if (r.type === '表') {
resourceNames.push(r.name); resourceNames.push(r.name);
} }
}) })
if (resourceNames.length) if (resourceNames.length)
dispatch(metadataManagement.getMetadataResourceApplications({ resourceNames: resourceNames.join(','), type: '库表' })) dispatch(metadataManagement.getMetadataResourceApplications({ resourceNames: resourceNames.join(','), type: '库表' }))
} }
}) })
} }
const onView = (record) => { const onView = (record) => {
setView({ path: '/' + resourceCatalogPath.join('/'), ...record }); setView({ path: '/' + resourceCatalogPath.join('/'), ...record });
} }
const onEdit = (record) => { const onEdit = (record) => {
dispatch(metadataManagement.getMetadataModels({ modelTypes: ModelTypes.join(',') })).then(res => { dispatch(metadataManagement.getMetadataModels({ modelTypes: ModelTypes.join(',') })).then(res => {
if (res.success) { if (res.success) {
setEditData({ title: '修改库表元数据', record: { path: '/' + resourceCatalogPath.join('/'), ...record, ...record.attributesParam } }); setEditData({ title: '修改库表元数据', record: { path: '/' + resourceCatalogPath.join('/'), ...record, ...record.attributesParam } });
setModalVisible(true); setModalVisible(true);
}
})
}
const confirmDelete = (id) => {
dispatch(metadataManagement.delMetadataDatabases(id)).then(res => {
if (res.success) {
onSearch(); setModalVisible(false);
}
});
}
const marking = (id) => {
dispatch(metadataManagement.getTagMetadata(id, 'database')).then(res => {
if (res.success) {
const obj = { tagSet: [], tags: [], id: id }
if (res.payload.data.length) {
const tagSetIds = res.payload.data.map(d => d.tagSet)
obj.tagSet = [...new Set(tagSetIds)];
obj.tags = res.payload.data.map(d => d.id);
} }
}) setEditTagData({ record: obj });
} setTagModalVisible(true);
const confirmDelete = (id) => { }
dispatch(metadataManagement.delMetadataDatabases(id)).then(res => { })
if (res.success) { }
onSearch(); setModalVisible(false); const onConfirmTag = (values) => {
} dispatch(metadataManagement.postTagMetadata({ database: editTagData.record.id, ...values })).then(res => {
}); if (res.success) {
} onSearch(); setTagModalVisible(false);
const marking = (id) => { }
dispatch(metadataManagement.getTagMetadata(id, 'database')).then(res => { });
if (res.success) { }
const obj = { tagSet: [], tags: [], id: id }; const applyResources = (record) => {
if (res.payload.data.length) { setEditResourceData({ record: { resourceId: record.id, resourceName: record.name, applyBy: user.id, applyByName: user.name, resourceType: '库表' } });
const tagSetIds = res.payload.data.map(d => d.tagSet) setResourceModalVisible(true);
obj.tagSet = [...new Set(tagSetIds)]; }
obj.tags = res.payload.data.map(d => d.id);
}
setEditTagData({ record: obj });
setTagModalVisible(true);
}
})
}
const onConfirmTag = (values) => {
dispatch(metadataManagement.postTagMetadata({ database: editTagData.record.id, ...values })).then(res => {
if (res.success) {
onSearch(); setTagModalVisible(false);
}
});
}
const applyResources = (record) => {
setEditResourceData({ record: { resourceId: record.id, resourceName: record.name, applyBy: user.id, applyByName: user.name, resourceType: '库表' } });
setResourceModalVisible(true);
}
const onConfirmResource = (values) => {
dispatch(metadataManagement.postMetadataResourceApplications(values)).then(res => {
if (res.success) {
onSearch(); setResourceModalVisible(false);
}
});
}
const onTableChange = (pagination, filters, sorter) => {
let limit = Number.parseInt(pagination.pageSize);
let offset = Number.parseInt(pagination.current) - 1;
setCurrentPage(pagination.current);
setLimit(limit);
let query = { offset, limit, orderDirection: SortValues[createAtSort] };
if (sorter.columnKey === 'createAt') {
query.orderDirection = SortValues[sorter.order];
setCreateAtSort(sorter.order);
}
setSelectedRowKeys([]);
setSelectedRows([]);
initData(query);
}
const columns = [
{
title: '名称',
dataIndex: 'name',
key: 'name',
width: '16%',
ellipsis: true
}, {
title: '代码',
dataIndex: 'code',
key: 'code',
width: '16%',
ellipsis: true
}, {
title: '元数据类型',
dataIndex: 'type',
key: 'type',
width: '10%'
}, {
title: '标签',
dataIndex: 'tags',
key: 'tags',
width: '18%',
ellipsis: true,
render: (text, record, index) => {
let tagName = record.tagDatabases.map(tagSet => tagSet.tag.name);
return tagName.join(',');
}
}, {
title: '创建者',
dataIndex: 'createBy',
key: 'createBy',
width: '14%',
render: (text, record, index) => {
return record.user.username
}
}, {
title: '创建时间',
dataIndex: 'createAt',
key: 'createAt',
width: '18%',
sortOrder: createAtSort,
sorter: (a, b) => moment(a.createAt).valueOf() - moment(b.createAt).valueOf(),
sortDirections: ['descend', 'ascend', 'descend'],
render: (text, record, index) => {
return moment(text).format('YYYY-MM-DD HH:mm:ss')
}
}, {
title: '操作',
dataIndex: 'action',
width: '8%',
render: (text, record) => {
let resourceApplicationsRecords = metadataResourceApplications.filter(ra =>
ra.applyBy == user.id && ra.resourceName === record.name && ra.resourceId == record.id && !!record.token);
return <ButtonGroup>
<a onClick={() => onView(record)}>查看</a>
{user.role == '数据消费者' ? null :
<>
<a style={{ marginLeft: 10 }} onClick={() => onEdit(record)}>编辑</a>
<Popconfirm
title="是否确认删除该元数据？"
onConfirm={() => confirmDelete(record.id)}
> <a style={{ marginLeft: 10 }}>删除</a></Popconfirm>
{record.type === '表' ? <a style={{ marginLeft: 10 }} onClick={() => marking(record.id)}>打标</a> : null}
</>
}
{user.role !== '数据消费者' ? null : record.type === '表' ? resourceApplicationsRecords.length === 0 ? const servicePublication = (record) => {
<a style={{ marginLeft: 10 }} onClick={() => applyResources(record)}>申请资源</a> : console.log(record);
<span style={{ marginLeft: 10, color: "#c0c0c0" }} title='已存在资源申请'>申请资源</span> : null} setEditData(record)
</ButtonGroup> setReleaseModal(true)
} }
}];
const onSearch = (sort) => { const onConfirmResource = (values) => {
setSelectedRowKeys([]); dispatch(metadataManagement.postMetadataResourceApplications(values)).then(res => {
setSelectedRows([]); if (res.success) {
setCurrentPage(1); onSearch(); setResourceModalVisible(false);
initData({ limit, offset: 0, orderDirection: SortValues[sort || createAtSort] }); }
} });
const handleExport = (isAll = false) => { }
let tableHeader = `<tr>`; const onTableChange = (pagination, filters, sorter) => {
columns.filter(c => c.dataIndex != 'action').map(c => { tableHeader += `<th><div>${c.title}</div></th>`; }); let limit = Number.parseInt(pagination.pageSize);
tableHeader += '</tr>'; let offset = Number.parseInt(pagination.current) - 1;
if (isAll) { setCurrentPage(pagination.current);
dispatch(metadataManagement.getMetadataDatabases({ catalog: resourceCatalogId })).then(res => { setLimit(limit);
if (res.success) { let query = { offset, limit, orderDirection: SortValues[createAtSort] };
handleExportTable(tableHeader, res.payload.data.rows); if (sorter.columnKey === 'createAt') {
} query.orderDirection = SortValues[sorter.order];
}) setCreateAtSort(sorter.order);
} else { }
let data = [] setSelectedRowKeys([]);
if (createAtSort === 'descend') { setSelectedRows([]);
data = selectedRows.sort((a, b) => moment(b.createAt).valueOf() - moment(a.createAt).valueOf()); initData(query);
} else { }
data = selectedRows.sort((a, b) => moment(a.createAt).valueOf() - moment(b.createAt).valueOf()); const columns = [
{
title: '名称',
dataIndex: 'name',
key: 'name',
width: '16%',
ellipsis: true
}, {
title: '代码',
dataIndex: 'code',
key: 'code',
width: '16%',
ellipsis: true
}, {
title: '元数据类型',
dataIndex: 'type',
key: 'type',
width: '10%'
}, {
title: '标签',
dataIndex: 'tags',
key: 'tags',
width: '18%',
ellipsis: true,
render: (text, record, index) => {
let tagName = record.tagDatabases.map(tagSet => tagSet.tag.name);
return tagName.join(',');
}
}, {
title: '创建者',
dataIndex: 'createBy',
key: 'createBy',
width: '14%',
render: (text, record, index) => {
return record.user.username
}
}, {
title: '创建时间',
dataIndex: 'createAt',
key: 'createAt',
width: '18%',
sortOrder: createAtSort,
sorter: (a, b) => moment(a.createAt).valueOf() - moment(b.createAt).valueOf(),
sortDirections: ['descend', 'ascend', 'descend'],
render: (text, record, index) => {
return moment(text).format('YYYY-MM-DD HH:mm:ss')
}
}, {
title: '操作',
dataIndex: 'action',
width: '8%',
render: (text, record) => {
let resourceApplicationsRecords = metadataResourceApplications.filter(ra =>
ra.applyBy == user.id && ra.resourceName === record.name && ra.resourceId == record.id);
return <ButtonGroup>
<a onClick={() => onView(record)}>查看</a>
{user.role == '数据消费者' ? null :
<>
<a style={{ marginLeft: 10 }} onClick={() => onEdit(record)}>编辑</a>
<Popconfirm
title="是否确认删除该元数据？"
onConfirm={() => confirmDelete(record.id)}
> <a style={{ marginLeft: 10 }}>删除</a></Popconfirm>
{record.type === '表' ? <a style={{ marginLeft: 10 }} onClick={() => marking(record.id)}>打标</a> : null}
</>
}
{user.role !== '数据消费者' ? null : record.type === '表' ? resourceApplicationsRecords.length === 0 ?
<a style={{ marginLeft: 10 }} onClick={() => applyResources(record)}>申请资源</a> :
<span style={{ marginLeft: 10, color: "#c0c0c0" }} title='已存在资源申请'>申请资源</span> : null}
{user.role == '数据消费者' ? null :
record.type === '表' ?
<a style={{ marginLeft: 10 }} onClick={() => servicePublication(record)}>REST服务发布</a> : null
}
</ButtonGroup>
}
}];
const onSearch = (sort) => {
setSelectedRowKeys([]);
setSelectedRows([]);
setCurrentPage(1);
initData({ limit, offset: 0, orderDirection: SortValues[sort || createAtSort] });
}
const handleExport = (isAll = false) => {
let tableHeader = `<tr>`;
columns.filter(c => c.dataIndex != 'action').map(c => { tableHeader += `<th><div>${c.title}</div></th>`; });
tableHeader += '</tr>';
if (isAll) {
dispatch(metadataManagement.getMetadataDatabases({ catalog: resourceCatalogId })).then(res => {
if (res.success) {
handleExportTable(tableHeader, res.payload.data.rows);
} }
handleExportTable(tableHeader, data); })
} } else {
} let data = []
const handleExportTable = (tableHeader, contentData) => { if (createAtSort === 'descend') {
let tableContent = ''; data = selectedRows.sort((a, b) => moment(b.createAt).valueOf() - moment(a.createAt).valueOf());
contentData.map(cd => { } else {
tableContent += `<tr>`; data = selectedRows.sort((a, b) => moment(a.createAt).valueOf() - moment(b.createAt).valueOf());
tableContent += `<th style="font-weight:600"><div>${cd.name}</div></th>`; }
tableContent += `<th style="font-weight:600"><div>${cd.code}</div></th>`; handleExportTable(tableHeader, data);
tableContent += `<th style="font-weight:600"><div>${cd.type}</div></th>`; }
let tagName = cd.tagDatabases.map(tagSet => tagSet.tag.name); }
tableContent += `<th style="font-weight:600"><div>${tagName.join(',')}</div></th>`; const handleExportTable = (tableHeader, contentData) => {
tableContent += `<th style="font-weight:600"><div>${cd.user.username}</div></th>`; let tableContent = '';
tableContent += `<th style="font-weight:600"><div>${moment(cd.createAt).format('YYYY-MM-DD HH:mm:ss')}</div></th>`; contentData.map(cd => {
tableContent += `</tr>`; tableContent += `<tr>`;
}) tableContent += `<th style="font-weight:600"><div>${cd.name}</div></th>`;
let exportTable = `\uFEFF<table border="1"> tableContent += `<th style="font-weight:600"><div>${cd.code}</div></th>`;
tableContent += `<th style="font-weight:600"><div>${cd.type}</div></th>`;
let tagName = cd.tagDatabases.map(tagSet => tagSet.tag.name);
tableContent += `<th style="font-weight:600"><div>${tagName.join(',')}</div></th>`;
tableContent += `<th style="font-weight:600"><div>${cd.user.username}</div></th>`;
tableContent += `<th style="font-weight:600"><div>${moment(cd.createAt).format('YYYY-MM-DD HH:mm:ss')}</div></th>`;
tableContent += `</tr>`;
})
let exportTable = `\uFEFF<table border="1">
${tableHeader} ${tableHeader}
${tableContent} ${tableContent}
</table>`; </table>`;
let tempStr = new Blob([exportTable], { type: 'text/plain;charset=utf-8' }); let tempStr = new Blob([exportTable], { type: 'text/plain;charset=utf-8' });
FileSaver.saveAs(tempStr, `库表元数据导出.xls`); FileSaver.saveAs(tempStr, `库表元数据导出.xls`);
} }
//新建、修改 //新建、修改
const onConfirm = (values) => { const onConfirm = (values) => {
let obj = {} let obj = {}
if (editData.add) { if (editData.add) {
obj = { createBy: user.id, catalog: resourceCatalogId, catalogKey: resourceCatalogKey, ...values } obj = { createBy: user.id, catalog: resourceCatalogId, catalogKey: resourceCatalogKey, ...values }
dispatch(metadataManagement.postMetadataDatabases(obj)).then(res => { dispatch(metadataManagement.postMetadataDatabases(obj)).then(res => {
if (res.success) { if (res.success) {
onSearch(); setModalVisible(false); onSearch(); setModalVisible(false);
} }
}); });
} else { } else {
obj = { catalog: resourceCatalogId, catalogKey: resourceCatalogKey, ...values } obj = { catalog: resourceCatalogId, catalogKey: resourceCatalogKey, ...values }
dispatch(metadataManagement.putMetadataDatabases(editData.record.id, obj)).then(res => { dispatch(metadataManagement.putMetadataDatabases(editData.record.id, obj)).then(res => {
if (res.success) { if (res.success) {
onSearch(); setModalVisible(false); onSearch(); setModalVisible(false);
} }
}); });
} }
} }
return <Spin spinning={isRequesting}> return <Spin spinning={isRequesting}>
<Row style={{ marginBottom: 16 }}> <Row style={{ marginBottom: 16 }}>
<Col span={12}> <Col span={12}>
{user.role == '数据消费者' ? null : <> {user.role == '数据消费者' ? null : <>
<Button type='primary' onClick={() => { <Button type='primary' onClick={() => {
dispatch(metadataManagement.getMetadataModels({ modelTypes: ModelTypes.join(',') })).then(res => { dispatch(metadataManagement.getMetadataModels({ modelTypes: ModelTypes.join(',') })).then(res => {
if (res.success) { if (res.success) {
setEditData({ add: true, title: '新建库表元数据', record: { path: '/' + resourceCatalogPath.join('/'), type: '目录' } }); setEditData({ add: true, title: '新建库表元数据', record: { path: '/' + resourceCatalogPath.join('/'), type: '目录' } });
setModalVisible(true); setModalVisible(true);
} }
}) })
}}>新建</Button> }}>新建</Button>
{ {
tableDataCount == 0 ? <Button disabled={tableDataCount == 0} style={{ marginLeft: 16 }} onClick={() => handleExport()}>导出</Button> : tableDataCount == 0 ? <Button disabled={tableDataCount == 0} style={{ marginLeft: 16 }} onClick={() => handleExport()}>导出</Button> :
selectedRowKeys && selectedRowKeys.length ? selectedRowKeys && selectedRowKeys.length ?
<Button disabled={tableDataCount == 0} style={{ marginLeft: 16 }} onClick={() => handleExport()}>导出</Button> <Button disabled={tableDataCount == 0} style={{ marginLeft: 16 }} onClick={() => handleExport()}>导出</Button>
: <Popconfirm title={'是否导出全部？'} onConfirm={() => handleExport(true)} okText="确定" cancelText="取消"> : <Popconfirm title={'是否导出全部？'} onConfirm={() => handleExport(true)} okText="确定" cancelText="取消">
<Button disabled={tableDataCount == 0} style={{ marginLeft: 16 }}> 导出</Button> <Button disabled={tableDataCount == 0} style={{ marginLeft: 16 }}> 导出</Button>
</Popconfirm> </Popconfirm>
} }
</>} </>}
</Col> </Col>
<Col span={12} style={{ display: 'flex', justifyContent: 'flex-end' }}> <Col span={12} style={{ display: 'flex', justifyContent: 'flex-end' }}>
<Input style={{ width: 220 }} placeholder="名称/代码/类型" <Input style={{ width: 220 }} placeholder="名称/代码/类型"
allowClear onPressEnter={onSearch} onChange={e => setKeywords(e.target.value || '')} /> allowClear onPressEnter={onSearch} onChange={e => setKeywords(e.target.value || '')} />
<Button type='primary' style={{ marginLeft: 16 }} onClick={onSearch}>查询</Button> <Button type='primary' style={{ marginLeft: 16 }} onClick={onSearch}>查询</Button>
</Col> </Col>
</Row > </Row >
<Table <Table
scroll={{ y: clientHeight - 320 }} scroll={{ y: clientHeight - 320 }}
rowKey='id' rowKey='id'
columns={columns} columns={columns}
dataSource={tableData} dataSource={tableData}
onChange={onTableChange} onChange={onTableChange}
pagination={{ pagination={{
current: currentPage, current: currentPage,
pageSize: limit, pageSize: limit,
total: tableDataCount, total: tableDataCount,
showSizeChanger: true, showSizeChanger: true,
// showQuickJumper: true, // showQuickJumper: true,
showTotal: (total) => { return <span style={{ fontSize: 15 }}>{`共${Math.ceil(total / limit)}页，${total}项`}</span> }, showTotal: (total) => { return <span style={{ fontSize: 15 }}>{`共${Math.ceil(total / limit)}页，${total}项`}</span> },
}}
rowSelection={{
onChange: (selectedRowKeys, selectedRows) => {
setSelectedRowKeys(selectedRowKeys)
setSelectedRows(selectedRows);
},
selectedRowKeys: selectedRowKeys
}}
>
</Table>
{
modalVisible ?
<MetadataDatabaseModal
modelTypes={ModelTypes.filter(m => m === '目录')}
metadataModels={metadataModels}
editData={editData}
onCancel={() => setModalVisible(false)}
onConfirm={onConfirm} /> : ''
}
{
tagModalVisible ?
<MetadataTagModal
tagList={tagList}
editData={editTagData}
onCancel={() => setTagModalVisible(false)}
onConfirm={onConfirmTag} /> : ''
}
{
resourceModalVisible ?
<MetadataResourceModal
editData={editResourceData}
onCancel={() => setResourceModalVisible(false)}
onConfirm={onConfirmResource} /> : ''
}
{
releaseModal ?
<ReleaseModal
editData={editData}
onCancel={() => {
setReleaseModal(false)
setEditData({})
}}
onConfirm={() => {
}} }}
rowSelection={{ />
onChange: (selectedRowKeys, selectedRows) => { : ''
setSelectedRowKeys(selectedRowKeys) }
setSelectedRows(selectedRows); </Spin >
},
selectedRowKeys: selectedRowKeys
}}
>
</Table>
{
modalVisible ?
<MetadataDatabaseModal
modelTypes={ModelTypes.filter(m => m === '目录')}
metadataModels={metadataModels}
editData={editData}
onCancel={() => setModalVisible(false)}
onConfirm={onConfirm} /> : ''
}
{
tagModalVisible ?
<MetadataTagModal
tagList={tagList}
editData={editTagData}
onCancel={() => setTagModalVisible(false)}
onConfirm={onConfirmTag} /> : ''
}
{
resourceModalVisible ?
<MetadataResourceModal
editData={editResourceData}
onCancel={() => setResourceModalVisible(false)}
onConfirm={onConfirmResource} /> : ''
}
</Spin >
} }
function mapStateToProps(state) { function mapStateToProps (state) {
const { global, auth, metadataDatabases, metadataModels, tagList, tagMetadata, metadataResourceApplications } = state; const { global, auth, metadataDatabases, metadataModels, tagList, tagMetadata, metadataResourceApplications } = state;
return { return {
user: auth.user, user: auth.user,
actions: global.actions, actions: global.actions,
clientHeight: global.clientHeight, clientHeight: global.clientHeight,
isRequesting: metadataDatabases.isRequesting || metadataModels.isRequesting || tagList.isRequesting isRequesting: metadataDatabases.isRequesting || metadataModels.isRequesting || tagList.isRequesting
|| tagMetadata.isRequesting || metadataResourceApplications.isRequesting, || tagMetadata.isRequesting || metadataResourceApplications.isRequesting,
metadataModels: metadataModels.data, metadataModels: metadataModels.data,
tagList: tagList.data || [], tagList: tagList.data || [],
metadataResourceApplications: metadataResourceApplications.data || [] metadataResourceApplications: metadataResourceApplications.data || []
}; };
} }
export default connect(mapStateToProps)(DatabaseTable) export default connect(mapStateToProps)(DatabaseTable)

1
web/client/src/utils/webapi.js
View File

@ -22,6 +22,7 @@ export const ApiTable = {
postResourceCatalog: 'resource-catalog', postResourceCatalog: 'resource-catalog',
putResourceCatalog: 'resource-catalog/{id}', putResourceCatalog: 'resource-catalog/{id}',
delResourceCatalog: 'resource-catalog/{id}', delResourceCatalog: 'resource-catalog/{id}',
listStructuredData: 'listStructuredData',
//最新元数据-元数据列表查询 //最新元数据-元数据列表查询
getMetadataDatabases: 'metadata/databases', getMetadataDatabases: 'metadata/databases',
getMetadataFiles: 'metadata/files', getMetadataFiles: 'metadata/files',

Write Preview
Loading…
Cancel
Save