Commit 90e063d3 by zhaochengxiang

服务资产

parent 70af3bcf
...@@ -30,6 +30,7 @@ const AssetTree = loadable(()=> import('./view/Manage/AssetManage/Component/Asse ...@@ -30,6 +30,7 @@ const AssetTree = loadable(()=> import('./view/Manage/AssetManage/Component/Asse
const DataMasterDefine = loadable(()=> import('./view/Manage/DataMaster/Define')); const DataMasterDefine = loadable(()=> import('./view/Manage/DataMaster/Define'));
const DataMasterManage = loadable(()=> import('./view/Manage/DataMaster/Manage')); const DataMasterManage = loadable(()=> import('./view/Manage/DataMaster/Manage'));
const DataServiceDetail = loadable(()=> import('./view/Manage/Model/Component/ServiceDetail')); const DataServiceDetail = loadable(()=> import('./view/Manage/Model/Component/ServiceDetail'));
const GrantedDataServiceList = loadable(()=> import('./view/Manage/Model/Component/GrantedList'));
export class App extends React.Component { export class App extends React.Component {
constructor() { constructor() {
...@@ -154,6 +155,22 @@ export class App extends React.Component { ...@@ -154,6 +155,22 @@ export class App extends React.Component {
); );
} }
if (message === 'showGrantedDataService') {
return (
<AppContext.Provider value={{
env: hostParams?.env,
user: hostParams?.user,
openAdmit: hostParams?.openAdmit,
openDetail: hostParams?.openDetail,
editServer: hostParams?.editServer,
setGlobalState,
onGlobalStateChange
}}>
<GrantedDataServiceList/>
</AppContext.Provider>
);
}
return ( return (
<AppContext.Provider value={{ <AppContext.Provider value={{
env: hostParams?.env, env: hostParams?.env,
......
...@@ -29,6 +29,10 @@ export function* getServices(payload) { ...@@ -29,6 +29,10 @@ export function* getServices(payload) {
return yield call(pds.getServices, payload); return yield call(pds.getServices, payload);
} }
export function* getGrantedServices(payload) {
return yield call(pds.getGrantedServices, payload)
}
export function* getStateServices(payload) { export function* getStateServices(payload) {
return yield call(pds.getStateServices, payload) return yield call(pds.getStateServices, payload)
} }
......
...@@ -28,6 +28,10 @@ export function getServices(payload) { ...@@ -28,6 +28,10 @@ export function getServices(payload) {
return GetJSON("/pdataservice/pdsCURD/getCurrentDataServiceCatalog", payload) return GetJSON("/pdataservice/pdsCURD/getCurrentDataServiceCatalog", payload)
} }
export function getGrantedServices(payload) {
return GetJSON("/pdataservice/pdsCURD/getGrantedDataService", payload)
}
export function getStateServices(payload) { export function getStateServices(payload) {
return GetJSON("/pdataservice/pdsCURD/getCurrentDataServiceStateCatalog", payload) return GetJSON("/pdataservice/pdsCURD/getCurrentDataServiceStateCatalog", payload)
} }
......
import React, { useEffect, useState, useContext } from 'react';
import { Spin } from 'antd';
import { AppContext } from '../../../../App';
import { dispatch } from '../../../../model';
import ModelTable from "./ModelTable";
import HistoryAndVersionDrawer from './HistoryAndVersionDrawer';
import '../index.less';
const FC = (props) => {
const app = useContext(AppContext);
const [loading, setLoading] = useState(false);
const [data, setData] = useState([]);
const [historyParams, setHistoryParams] = useState({historyVisible: false, id: undefined })
useEffect(() => {
getServices();
}, [])
const getServices = () => {
setLoading(true);
dispatch({
type: 'pds.getGrantedServices',
payload: {
namespace: `${app?.env?.domainId}`
},
callback: data => {
setLoading(false);
setData(data);
},
error: () => {
setLoading(false);
}
});
}
const onHistory = (id) => {
setHistoryParams({historyVisible: true, id});
}
const onHistoryCancel = () => {
setHistoryParams({historyVisible: false, id: undefined});
}
return (
<div>
<Spin spinning={loading}>
<ModelTable
user={app?.user}
view='grant'
data={data}
onHistory={onHistory}
{...props} />
</Spin>
<HistoryAndVersionDrawer
id={historyParams?.id}
visible={historyParams?.visible}
onCancel={onHistoryCancel}
/>
</div>
)
}
export default FC
\ No newline at end of file
...@@ -629,7 +629,8 @@ const ModelTable = (props) => { ...@@ -629,7 +629,8 @@ const ModelTable = (props) => {
if (needExpand) { if (needExpand) {
expandable = { expandable = {
expandedRowRender: record => <ModelTable expandedRowRender: record => <ModelTable
view={view}
modelId={record?.checkedOutId} modelId={record?.checkedOutId}
modelPid={record?.id} modelPid={record?.id}
onSubSelect={onSubSelectChange} onSubSelect={onSubSelectChange}
...@@ -738,7 +739,7 @@ const ModelTable = (props) => { ...@@ -738,7 +739,7 @@ const ModelTable = (props) => {
}} }}
> >
<Table <Table
rowSelection={rowSelection} rowSelection={view!=='grant'?rowSelection:undefined}
components={{ components={{
header: { header: {
cell: ResizeableHeaderCell, cell: ResizeableHeaderCell,
...@@ -785,14 +786,14 @@ const ModelTable = (props) => { ...@@ -785,14 +786,14 @@ const ModelTable = (props) => {
} }
<RcMenu id={MENU_ID}> <RcMenu id={MENU_ID}>
{ {
(getDataModelerRole(user)!==DataModelerRoleReader) && <RcItem id="edit" disabled={disableEdit} onClick={handleItemClick}> (getDataModelerRole(user)!==DataModelerRoleReader) && view!=='grant' && <RcItem id="edit" disabled={disableEdit} onClick={handleItemClick}>
<Tooltip title={editTip}> <Tooltip title={editTip}>
{ editMenuTitle } { editMenuTitle }
</Tooltip> </Tooltip>
</RcItem> </RcItem>
} }
{ {
(getDataModelerRole(user)!==DataModelerRoleReader) && <RcItem id="delete" disabled={disableDelete} onClick={handleItemClick}> (getDataModelerRole(user)!==DataModelerRoleReader) && view!=='grant' && <RcItem id="delete" disabled={disableDelete} onClick={handleItemClick}>
<Tooltip title={deleteTip}> <Tooltip title={deleteTip}>
删除 删除
</Tooltip> </Tooltip>
...@@ -807,7 +808,7 @@ const ModelTable = (props) => { ...@@ -807,7 +808,7 @@ const ModelTable = (props) => {
</RcItem> </RcItem>
} */} } */}
{ {
getDataModelerRole(user)!==DataModelerRoleReader && (currentItem?.state?.supportedActions||[]).length>0 && currentItem?.state?.supportedActions.map((item, index) => { getDataModelerRole(user)!==DataModelerRoleReader && view!=='grant' && (currentItem?.state?.supportedActions||[]).length>0 && currentItem?.state?.supportedActions.map((item, index) => {
return ( return (
<RcItem id={`action-${index}`} onClick={handleItemClick}> <RcItem id={`action-${index}`} onClick={handleItemClick}>
{item.cnName||''} {item.cnName||''}
...@@ -816,7 +817,7 @@ const ModelTable = (props) => { ...@@ -816,7 +817,7 @@ const ModelTable = (props) => {
}) })
} }
{ {
currentItem?.state?.id?.indexOf('4')!==-1 && <RcItem id="admit" onClick={handleItemClick}> currentItem?.state?.id?.indexOf('4')!==-1 && view!=='grant' && <RcItem id="admit" onClick={handleItemClick}>
授权 授权
</RcItem> </RcItem>
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment