From 136c938340a328b86c926b5bcb44c0ff892183e0 Mon Sep 17 00:00:00 2001
From: "peng.peng" <peng.peng@free-sun.com.cn>
Date: Thu, 8 Jun 2023 15:21:32 +0800
Subject: [PATCH] =?UTF-8?q?=EF=BC=88*=EF=BC=89=E6=9C=80=E6=96=B0=E5=85=83?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../containers/databasesTable.js              | 67 ++++++++++--------
 .../containers/filesTable.js                  | 68 +++++++++++--------
 .../containers/latestMetadata.js              |  4 +-
 .../containers/restapisTable.js               | 50 ++++++++------
 4 files changed, 111 insertions(+), 78 deletions(-)

diff --git a/web/client/src/sections/metadataManagement/containers/databasesTable.js b/web/client/src/sections/metadataManagement/containers/databasesTable.js
index beac381..db40d2e 100644
--- a/web/client/src/sections/metadataManagement/containers/databasesTable.js
+++ b/web/client/src/sections/metadataManagement/containers/databasesTable.js
@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import { connect } from 'react-redux';
-import { Spin, Table, Popconfirm, Button, Input } from 'antd';
+import { Spin, Table, Popconfirm, Button, Input, Row, Col } from 'antd';
 import { ButtonGroup } from '$components';
 import moment from 'moment';
 import FileSaver from 'file-saver';
@@ -173,13 +173,18 @@ const DatabaseTable = (props) => {
                     ra.applyBy == user.id && ra.resourceName === record.name);
                 return <ButtonGroup>
                     <a onClick={() => onView(record)}>查看</a>
-                    <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 == '系统管理员' ? '' : record.type === '表' ? resourceApplicationsRecords.length === 0 ?
+                    {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}
                 </ButtonGroup>
@@ -252,27 +257,33 @@ const DatabaseTable = (props) => {
         }
     }
     return <Spin spinning={isRequesting}>
-        <div style={{ marginBottom: 16 }}>
-            <Button type='primary' onClick={() => {
-                dispatch(metadataManagement.getMetadataModels({ modelTypes: ModelTypes.join(',') })).then(res => {
-                    if (res.success) {
-                        setEditData({ add: true, title: '新建库表元数据', record: { path: '/' + resourceCatalogPath.join('/'), type: '目录' } });
-                        setModalVisible(true);
+        <Row style={{ marginBottom: 16 }}>
+            <Col span={12}>
+                {user.role == '数据消费者' ? null : <>
+                    <Button type='primary' onClick={() => {
+                        dispatch(metadataManagement.getMetadataModels({ modelTypes: ModelTypes.join(',') })).then(res => {
+                            if (res.success) {
+                                setEditData({ add: true, title: '新建库表元数据', record: { path: '/' + resourceCatalogPath.join('/'), type: '目录' } });
+                                setModalVisible(true);
+                            }
+                        })
+                    }}>新建</Button>
+                    {
+                        tableDataCount == 0 ? <Button disabled={tableDataCount == 0} style={{ marginLeft: 16 }} onClick={() => handleExport()}>导出</Button> :
+                            selectedRowKeys && selectedRowKeys.length ?
+                                <Button disabled={tableDataCount == 0} style={{ marginLeft: 16 }} onClick={() => handleExport()}>导出</Button>
+                                : <Popconfirm title={'是否导出全部？'} onConfirm={() => handleExport(true)} okText="确定" cancelText="取消">
+                                    <Button disabled={tableDataCount == 0} style={{ marginLeft: 16 }}> 导出</Button>
+                                </Popconfirm>
                     }
-                })
-            }}>新建</Button>
-            {
-                tableDataCount == 0 ? <Button disabled={tableDataCount == 0} style={{ marginLeft: 16 }} onClick={() => handleExport()}>导出</Button> :
-                    selectedRowKeys && selectedRowKeys.length ?
-                        <Button disabled={tableDataCount == 0} style={{ marginLeft: 16 }} onClick={() => handleExport()}>导出</Button>
-                        : <Popconfirm title={'是否导出全部？'} onConfirm={() => handleExport(true)} okText="确定" cancelText="取消">
-                            <Button disabled={tableDataCount == 0} style={{ marginLeft: 16 }}> 导出</Button>
-                        </Popconfirm>
-            }
-            <Button type='primary' style={{ marginLeft: 16, float: 'right' }} onClick={onSearch}>查询</Button>
-            <Input style={{ width: 220, float: 'right' }} placeholder="名称/代码/类型"
-                allowClear onPressEnter={onSearch} onChange={e => setKeywords(e.target.value || '')} />
-        </div >
+                </>}
+            </Col>
+            <Col span={12} style={{ display: 'flex', justifyContent: 'flex-end' }}>
+                <Input style={{ width: 220 }} placeholder="名称/代码/类型"
+                    allowClear onPressEnter={onSearch} onChange={e => setKeywords(e.target.value || '')} />
+                <Button type='primary' style={{ marginLeft: 16 }} onClick={onSearch}>查询</Button>
+            </Col>
+        </Row >
         <Table
             scroll={{ y: clientHeight - 320 }}
             rowKey='id'
diff --git a/web/client/src/sections/metadataManagement/containers/filesTable.js b/web/client/src/sections/metadataManagement/containers/filesTable.js
index 04c82d9..ea81c8b 100644
--- a/web/client/src/sections/metadataManagement/containers/filesTable.js
+++ b/web/client/src/sections/metadataManagement/containers/filesTable.js
@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import { connect } from 'react-redux';
-import { Spin, Table, Popconfirm, Button, Input } from 'antd';
+import { Spin, Table, Popconfirm, Button, Input, Row, Col } from 'antd';
 import { ButtonGroup } from '$components';
 import moment from 'moment';
 import FileSaver from 'file-saver';
@@ -207,12 +207,17 @@ const FilesTable = (props) => {
                 let resourceApplicationsRecords = metadataResourceApplications.filter(ra =>
                     ra.applyBy == user.id && ra.resourceName === record.name);
                 return <ButtonGroup>
-                    <a style={{ marginLeft: 10 }} onClick={() => onEdit(record)}>编辑</a>
-                    <Popconfirm
-                        title="是否确认删除该元数据？"
-                        onConfirm={() => confirmDelete(record)}
-                    > <a style={{ marginLeft: 10 }}>删除</a></Popconfirm>
-                    <a style={{ marginLeft: 10 }} onClick={() => marking(record.id)}>打标</a>
+                    {user.role == '数据消费者' ? null :
+                        <>
+                            <a style={{ marginLeft: 10 }} onClick={() => onEdit(record)}>编辑</a>
+                            <Popconfirm
+                                title="是否确认删除该元数据？"
+                                onConfirm={() => confirmDelete(record)}
+                            ><a style={{ marginLeft: 10 }}>删除</a></Popconfirm>
+                            <a style={{ marginLeft: 10 }} onClick={() => marking(record.id)}>打标</a>
+                        </>
+                    }
+
                     {user.role == '系统管理员' ? '' : resourceApplicationsRecords.length === 0 ?
                         <a style={{ marginLeft: 10 }} onClick={() => applyResources(record)}>申请资源</a> :
                         <span style={{ marginLeft: 10, color: "#c0c0c0" }} title='已存在资源申请'>申请资源</span>}
@@ -298,27 +303,34 @@ const FilesTable = (props) => {
         }
     }
     return <Spin spinning={isRequesting}>
-        <div style={{ marginBottom: 16 }}>
-            <Button type='primary' onClick={() => {
-                dispatch(metadataManagement.getMetadataModels({ modelTypes: '文件' })).then(res => {
-                    if (res.success) {
-                        setEditData({ add: true, title: '新建文件元数据', record: {} });
-                        setModalVisible(true);
-                    }
-                })
-            }}>新建</Button>
-            {
-                tableDataCount == 0 ? <Button disabled={tableDataCount == 0} style={{ marginLeft: 16 }} onClick={() => handleExport()}>导出</Button> :
-                    selectedRowKeys && selectedRowKeys.length ?
-                        <Button disabled={tableDataCount == 0} style={{ marginLeft: 16 }} onClick={() => handleExport()}>导出</Button>
-                        : <Popconfirm title={'是否导出全部？'} onConfirm={() => handleExport(true)} okText="确定" cancelText="取消">
-                            <Button disabled={tableDataCount == 0} style={{ marginLeft: 16 }}> 导出</Button>
-                        </Popconfirm>
-            }
-            <Button type='primary' style={{ marginLeft: 16, float: 'right' }} onClick={onSearch}>查询</Button>
-            <Input style={{ width: 220, float: 'right' }} placeholder="名称/类型"
-                allowClear onPressEnter={onSearch} onChange={e => setKeywords(e.target.value || '')} />
-        </div >
+        <Row style={{ marginBottom: 16 }}>
+            <Col span={12}>
+                {user.role == '数据消费者' ? null : <>
+                    <Button type='primary' onClick={() => {
+                        dispatch(metadataManagement.getMetadataModels({ modelTypes: '文件' })).then(res => {
+                            if (res.success) {
+                                setEditData({ add: true, title: '新建文件元数据', record: {} });
+                                setModalVisible(true);
+                            }
+                        })
+                    }}>新建</Button>
+                    {
+                        tableDataCount == 0 ? <Button disabled={tableDataCount == 0} style={{ marginLeft: 16 }} onClick={() => handleExport()}>导出</Button> :
+                            selectedRowKeys && selectedRowKeys.length ?
+                                <Button disabled={tableDataCount == 0} style={{ marginLeft: 16 }} onClick={() => handleExport()}>导出</Button>
+                                : <Popconfirm title={'是否导出全部？'} onConfirm={() => handleExport(true)} okText="确定" cancelText="取消">
+                                    <Button disabled={tableDataCount == 0} style={{ marginLeft: 16 }}> 导出</Button>
+                                </Popconfirm>
+                    }</>}
+            </Col>
+            <Col span={12} style={{ display: 'flex', justifyContent: 'flex-end' }}>
+                <Input style={{ width: 220 }} placeholder="名称/类型"
+                    allowClear onPressEnter={onSearch} onChange={e => setKeywords(e.target.value || '')} />
+                <Button type='primary' style={{ marginLeft: 16 }} onClick={onSearch}>查询</Button>
+            </Col>
+        </Row>
+
+
         <Table
             scroll={{ y: clientHeight - 320 }}
             rowKey='id'
diff --git a/web/client/src/sections/metadataManagement/containers/latestMetadata.js b/web/client/src/sections/metadataManagement/containers/latestMetadata.js
index 75c60ae..1b06efa 100644
--- a/web/client/src/sections/metadataManagement/containers/latestMetadata.js
+++ b/web/client/src/sections/metadataManagement/containers/latestMetadata.js
@@ -183,10 +183,10 @@ const LatestMetadata = (props) => {
                 <Input style={{ width: 220, marginBottom: 8 }} placeholder="输入资源目录关键字搜索"
                     allowClear onChange={onChangeSearch}
                     onKeyPress={onChangeSearch} />
-                <Button type='primary' style={{ marginBottom: 16 }} onClick={() => {
+                {user?.role == '系统管理员' && <Button type='primary' style={{ marginBottom: 16 }} onClick={() => {
                     setEditData({ title: '新建资源目录', add: true });
                     setModalVisible(true);
-                }}>新建资源目录</Button>
+                }}>新建资源目录</Button>}
                 <Tree
                     // showLine
                     height={clientHeight - 180}
diff --git a/web/client/src/sections/metadataManagement/containers/restapisTable.js b/web/client/src/sections/metadataManagement/containers/restapisTable.js
index cd16505..09e08e9 100644
--- a/web/client/src/sections/metadataManagement/containers/restapisTable.js
+++ b/web/client/src/sections/metadataManagement/containers/restapisTable.js
@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import { connect } from 'react-redux';
-import { Spin, Table, Popconfirm, Button, Input } from 'antd';
+import { Spin, Table, Popconfirm, Button, Input, Row, Col } from 'antd';
 import { ButtonGroup } from '$components';
 import MetadataRestapiModal from '../components/metadataRestapiModal';
 import MetadataTagModal from '../components/metadataTagModal';
@@ -143,12 +143,17 @@ const RestapisTable = (props) => {
             let resourceApplicationsRecords = metadataResourceApplications.filter(ra =>
                 ra.applyBy == user.id && ra.resourceName === record.name);
             return <ButtonGroup>
-                <a style={{ marginLeft: 10 }} onClick={() => onEdit(record)}>编辑</a>
-                <Popconfirm
-                    title="是否确认删除该元数据？"
-                    onConfirm={() => confirmDelete(record.id)}
-                > <a style={{ marginLeft: 10 }}>删除</a></Popconfirm>
-                <a style={{ marginLeft: 10 }} onClick={() => marking(record.id)}>打标</a>
+                {user.role == '数据消费者' ? null :
+                    <>
+                        <a style={{ marginLeft: 10 }} onClick={() => onEdit(record)}>编辑</a>
+                        <Popconfirm
+                            title="是否确认删除该元数据？"
+                            onConfirm={() => confirmDelete(record.id)}
+                        > <a style={{ marginLeft: 10 }}>删除</a></Popconfirm>
+                        <a style={{ marginLeft: 10 }} onClick={() => marking(record.id)}>打标</a>
+                    </>
+                }
+
                 {user.role == '系统管理员' ? '' : resourceApplicationsRecords.length === 0 ?
                     <a style={{ marginLeft: 10 }} onClick={() => applyResources(record)}>申请资源</a> :
                     <span style={{ marginLeft: 10, color: "#c0c0c0" }} title='已存在资源申请'>申请资源</span>}
@@ -180,19 +185,24 @@ const RestapisTable = (props) => {
         }
     }
     return <Spin spinning={isRequesting}>
-        <div style={{ marginBottom: 16 }}>
-            <Button type='primary' onClick={() => {
-                dispatch(metadataManagement.getMetadataModels({ modelTypes: '接口' })).then(res => {
-                    if (res.success) {
-                        setEditData({ add: true, title: '新建接口元数据', record: {} });
-                        setModalVisible(true);
-                    }
-                })
-            }}>新建</Button>
-            <Button type='primary' style={{ marginLeft: 16, float: 'right' }} onClick={onSearch}>查询</Button>
-            <Input style={{ width: 220, float: 'right' }} placeholder="名称"
-                allowClear onPressEnter={onSearch} onChange={e => setKeywords(e.target.value || '')} />
-        </div >
+        <Row style={{ marginBottom: 16 }}>
+            <Col span={12}>
+                {user.role == '数据消费者' ? null : <>  <Button type='primary' onClick={() => {
+                    dispatch(metadataManagement.getMetadataModels({ modelTypes: '接口' })).then(res => {
+                        if (res.success) {
+                            setEditData({ add: true, title: '新建接口元数据', record: {} });
+                            setModalVisible(true);
+                        }
+                    })
+                }}>新建</Button></>}
+            </Col>
+            <Col span={12} style={{ display: 'flex', justifyContent: 'flex-end' }}>
+                <Input style={{ width: 220 }} placeholder="名称"
+                    allowClear onPressEnter={onSearch} onChange={e => setKeywords(e.target.value || '')} />
+                <Button type='primary' style={{ marginLeft: 16 }} onClick={onSearch}>查询</Button>
+            </Col>
+        </Row>
+
         <Table
             scroll={{ y: clientHeight - 320 }}
             rowKey='id'