@@ -214,7 +212,7 @@ const RoleConfig = ()=>{
>
@@ -222,7 +220,7 @@ const RoleConfig = ()=>{
diff --git a/frontend/packages/core/src/pages/role/RoleList.tsx b/frontend/packages/core/src/pages/role/RoleList.tsx
index 1af89ffc..9bf88d3d 100644
--- a/frontend/packages/core/src/pages/role/RoleList.tsx
+++ b/frontend/packages/core/src/pages/role/RoleList.tsx
@@ -1,4 +1,4 @@
-import { App, Divider} from "antd";
+import { App} from "antd";
import PageList from "@common/components/aoplatform/PageList.tsx";
import { useEffect, useRef,} from "react";
import {ActionType, ProColumns} from "@ant-design/pro-components";
@@ -12,6 +12,7 @@ import { useGlobalContext } from "@common/contexts/GlobalStateContext.tsx";
import { checkAccess } from "@common/utils/permission.ts";
import { useNavigate } from "react-router-dom";
import { RoleTableListItem } from "@core/const/role/type.ts";
+import InsidePage from "@common/components/aoplatform/InsidePage.tsx";
const RoleList = ()=>{
@@ -116,46 +117,50 @@ const RoleList = ()=>{
}, []);
return (<>
-
-
-
系统级别角色
-
[], ...operation('system')]}
- request={()=>getRoleList('system')}
- addNewBtnTitle="添加角色"
- showPagination={false}
- onAddNewBtnClick={() => {
- navigateTo(`/role/system/config`)
- }}
- noScroll={true}
- addNewBtnAccess="system.organization.role.system.add"
- onRowClick={(row:RoleTableListItem)=> navigateTo(`/role/system/config/${row.id}`)}
- tableClickAccess="system.organization.role.system.edit"
- />
- 团队级别角色
- [], ...operation('team')]}
- request={()=>getRoleList('team')}
- showPagination={false}
- addNewBtnTitle="添加角色"
- onAddNewBtnClick={() => {
- navigateTo(`/role/team/config`)
- }}
- noScroll={true}
- addNewBtnAccess="system.organization.role.team.add"
- onRowClick={(row:RoleTableListItem)=> navigateTo(`/role/team/config/${row.id}`)}
- tableClickAccess="system.organization.role.team.edit"
- />
-
+
+
+
系统级别角色
+
[], ...operation('system')]}
+ request={()=>getRoleList('system')}
+ addNewBtnTitle="添加角色"
+ showPagination={false}
+ onAddNewBtnClick={() => {
+ navigateTo(`/role/system/config`)
+ }}
+ noScroll={true}
+ addNewBtnAccess="system.organization.role.system.add"
+ onRowClick={(row:RoleTableListItem)=> navigateTo(`/role/system/config/${row.id}`)}
+ tableClickAccess="system.organization.role.system.edit"
+ />
+ 团队级别角色
+ [], ...operation('team')]}
+ request={()=>getRoleList('team')}
+ showPagination={false}
+ addNewBtnTitle="添加角色"
+ onAddNewBtnClick={() => {
+ navigateTo(`/role/team/config`)
+ }}
+ noScroll={true}
+ addNewBtnAccess="system.organization.role.team.add"
+ onRowClick={(row:RoleTableListItem)=> navigateTo(`/role/team/config/${row.id}`)}
+ tableClickAccess="system.organization.role.team.edit"
+ />
+
)
}
export default RoleList;
\ No newline at end of file
diff --git a/frontend/packages/core/src/pages/serviceCategory/ServiceCategory.tsx b/frontend/packages/core/src/pages/serviceCategory/ServiceCategory.tsx
index 60449f2a..8834d662 100644
--- a/frontend/packages/core/src/pages/serviceCategory/ServiceCategory.tsx
+++ b/frontend/packages/core/src/pages/serviceCategory/ServiceCategory.tsx
@@ -5,7 +5,7 @@ import { PERMISSION_DEFINITION } from "@common/const/permissions";
import { useFetch } from "@common/hooks/http";
import { checkAccess } from "@common/utils/permission";
import { CategorizesType, ServiceHubCategoryConfigHandle } from "@market/const/serviceHub/type";
-import { App, Button, Spin, TagType, Tree, TreeDataNode, TreeProps } from "antd";
+import { App, Button, Spin, Tree, TreeDataNode, TreeProps } from "antd";
import { DataNode } from "antd/es/tree";
import { Key, useEffect, useMemo, useRef, useState } from "react";
import { ServiceHubCategoryConfig } from "./ServiceHubCategoryConfig";
@@ -14,6 +14,8 @@ import { useBreadcrumb } from "@common/contexts/BreadcrumbContext";
import { LoadingOutlined } from "@ant-design/icons";
import { cloneDeep } from "lodash-es";
import { Icon } from "@iconify/react/dist/iconify.js";
+import InsidePage from "@common/components/aoplatform/InsidePage";
+import { EntityItem } from "@common/const/type";
export default function ServiceCategory(){
const [gData, setGData] = useState
([]);
@@ -227,7 +229,7 @@ export default function ServiceCategory(){
const getCategoryList = ()=>{
setLoading(true)
- fetchData>('catalogues',{method:'GET'}).then(response=>{
+ fetchData>('catalogues',{method:'GET'}).then(response=>{
const {code,data,msg} = response
if(code === STATUS_CODE.SUCCESS){
setGData(data.catalogues)
@@ -246,12 +248,14 @@ export default function ServiceCategory(){
},[])
return (
-
-
-
服务分类管理
-
设置服务可选择的分类，方便团队成员快速找到API。
-
-
+
+
} spinning={loading} className=''>
-
+
)
}
\ No newline at end of file
diff --git a/frontend/packages/core/src/pages/system/SystemConfig.tsx b/frontend/packages/core/src/pages/system/SystemConfig.tsx
index af588182..21c6bd34 100644
--- a/frontend/packages/core/src/pages/system/SystemConfig.tsx
+++ b/frontend/packages/core/src/pages/system/SystemConfig.tsx
@@ -1,6 +1,6 @@
import {forwardRef, useEffect, useImperativeHandle, useState} from "react";
-import {App, Button, Divider, Form, Input, Radio, Row, Select, TagType, TreeSelect, Upload} from "antd";
+import {App, Button, Form, Input, Radio, Row, Select, TreeSelect, Upload} from "antd";
import { Link, useNavigate, useParams} from "react-router-dom";
import {RouterParams} from "@core/components/aoplatform/RenderRoutes.tsx";
import {BasicResponse, STATUS_CODE} from "@common/const/const.ts";
@@ -20,6 +20,7 @@ import { getImgBase64 } from "@common/utils/dataTransfer.ts";
import { CategorizesType } from "@market/const/serviceHub/type.ts";
import WithPermission from "@common/components/aoplatform/WithPermission.tsx";
import { Icon } from "@iconify/react/dist/iconify.js";
+import { useGlobalContext } from "@common/contexts/GlobalStateContext.tsx";
const MAX_SIZE = 2 * 1024; // 1KB
@@ -38,6 +39,7 @@ const SystemConfig = forwardRef
((_,ref) => {
const [tagOptionList, setTagOptionList] = useState([])
const [serviceClassifyOptionList, setServiceClassifyOptionList] = useState()
const [uploadLoading, setUploadLoading] = useState(false)
+ const {checkPermission} = useGlobalContext()
useImperativeHandle(ref, () => ({
save:onFinish
@@ -93,11 +95,11 @@ const SystemConfig = forwardRef((_,ref) => {
const getTagAndServiceClassifyList = ()=>{
setTagOptionList([])
setServiceClassifyOptionList([])
- fetchData>('catalogues',{method:'GET'}).then(response=>{
+ fetchData>('catalogues',{method:'GET'}).then(response=>{
const {code,data,msg} = response
if(code === STATUS_CODE.SUCCESS){
- setTagOptionList(data.tags?.map((x:TagType)=>{return {
- label:x.name, value:x.name
+ setTagOptionList(data.tags?.map((x:EntityItem)=>{return {
+ label:x.name, value:x.id
}})||[])
setServiceClassifyOptionList(data.catalogues)
@@ -127,19 +129,6 @@ const SystemConfig = forwardRef((_,ref) => {
}
]
})
- console.log({
- ...data.service,
- team:data.service.team.id,
- catalogue:data.service.catalogue?.id,
- logoFile:[
- {
- uid: '-1', // 文件唯一标识
- name: 'image.png', // 文件名
- status: 'done', // 状态有：uploading, done, error, removed
- url: data.service?.logo || '', // 图片 Base64 数据
- }
- ]
- })
setImageBase64(data.service.logo)
setShowClassify(data.service.serviceType === 'public')
},0)
@@ -170,7 +159,8 @@ const SystemConfig = forwardRef((_,ref) => {
const getTeamOptionList = ()=>{
setTeamOptionList([])
- fetchData>('simple/teams/mine',{method:'GET',eoTransformKeys:['available_partitions']}).then(response=>{
+
+ fetchData>(!checkPermission('system.workspace.team.view_all') ?'simple/teams/mine' :'simple/teams',{method:'GET',eoTransformKeys:[]}).then(response=>{
const {code,data,msg} = response
if(code === STATUS_CODE.SUCCESS){
setTeamOptionList(data.teams?.map((x:MemberItem)=>{return {...x,
@@ -202,7 +192,7 @@ const SystemConfig = forwardRef((_,ref) => {
getSystemInfo();
setBreadcrumb([
{
- title: 内部数据服务
+ title: 服务
},
{
title: '设置'
@@ -238,14 +228,13 @@ const SystemConfig = forwardRef((_,ref) => {
return (
<>
-
{onEdit && <>
-
-
删除服务：删除操作不可恢复，请谨慎操作！
-
-
-
-
+
+
+
删除服务：删除操作不可恢复，请谨慎操作！
+
+
+
+
+
+
}
-
+
{
};
useEffect(() => {
- console.log(apiId, serviceId, currentUrl)
if(apiId !== undefined){
setActiveMenu('api')
}else if(serviceId !== currentUrl.split('/')[currentUrl.split('/').length - 1]){
@@ -84,7 +83,6 @@ const SystemInsidePage:FC = ()=> {
}else{
setActiveMenu('api')
}
- console.log(activeMenu)
}, [currentUrl]);
useEffect(()=>{
@@ -119,7 +117,7 @@ const SystemInsidePage:FC = ()=> {
mode="inline"
items={menuData as unknown as ItemType[] }
/>
-
diff --git a/frontend/packages/core/src/pages/system/SystemInsideSubscriber.tsx b/frontend/packages/core/src/pages/system/SystemInsideSubscriber.tsx
index d04123df..f7e7a631 100644
--- a/frontend/packages/core/src/pages/system/SystemInsideSubscriber.tsx
+++ b/frontend/packages/core/src/pages/system/SystemInsideSubscriber.tsx
@@ -126,7 +126,7 @@ const SystemInsideSubscriber:FC = ()=>{
useEffect(() => {
setBreadcrumb([
{
- title:内部数据服务
+ title:服务
},
{
title:'订阅方管理'
@@ -151,6 +151,7 @@ const SystemInsideSubscriber:FC = ()=>{
addNewBtnTitle="新增订阅方"
onAddNewBtnClick={()=>{openModal('add')}}
addNewBtnAccess="team.service.subscription.add"
+ tableClass="pr-PAGE_INSIDE_X"
/>
)
}
@@ -164,12 +165,10 @@ export const SystemSubscriberConfig = forwardRef()
- const [memberOptionList, setMemberOptionList] = useState()
- const [subscriberTeamId, setSubscriberTeamId] = useState()
const save:()=>Promise = ()=>{
return new Promise((resolve, reject)=>{
form.validateFields().then((value)=>{
- fetchData>('service/subscriber',{method:'POST',eoBody:({...value,service:serviceId}), eoParams:{service:serviceId,team:teamId}}).then(response=>{
+ fetchData>('service/subscriber',{method:'POST',eoBody:({...value}), eoParams:{service:serviceId,team:teamId}}).then(response=>{
const {code,msg} = response
if(code === STATUS_CODE.SUCCESS){
message.success(msg || '操作成功！')
@@ -195,7 +194,6 @@ export const SystemSubscriberConfig = forwardRef();
-
data.apps
.filter((x:SimpleSystemItem)=>x.id !== serviceId)
.forEach((item:SimpleSystemItem) => {
@@ -225,24 +223,6 @@ export const SystemSubscriberConfig = forwardRef{
- subscriberTeamId && getMemberList()
- form.setFieldValue('applier',null)
- },[subscriberTeamId])
-
- const getMemberList = ()=>{
- setMemberOptionList([])
- fetchData>('team/members/simple',{method:'GET',eoParams:{team:subscriberTeamId}}).then(response=>{
- const {code,data,msg} = response
- if(code === STATUS_CODE.SUCCESS){
- setMemberOptionList(data.members?.map((x:NewSimpleMemberItem)=>{return {
- label:x.user.name, value:x.user.id
- }}))
- }else{
- message.error(msg || '操作失败')
- }
- })
- }
useEffect(() => {
getSystemList()
@@ -262,7 +242,7 @@ export const SystemSubscriberConfig = forwardRef
label="订阅方"
- name="subscriber"
+ name="application"
rules={[{ required: true, message: '必填项' }]}
>
{setSubscriberTeamId(_)}}
/>
-
-
-
-
)
})
\ No newline at end of file
diff --git a/frontend/packages/core/src/pages/system/SystemList.tsx b/frontend/packages/core/src/pages/system/SystemList.tsx
index 52c62fc8..d119387f 100644
--- a/frontend/packages/core/src/pages/system/SystemList.tsx
+++ b/frontend/packages/core/src/pages/system/SystemList.tsx
@@ -11,6 +11,7 @@ import { SystemConfigHandle, SystemTableListItem } from "../../const/system/type
import { SYSTEM_TABLE_COLUMNS } from "../../const/system/const.tsx";
import { DrawerWithFooter } from "@common/components/aoplatform/DrawerWithFooter.tsx";
import SystemConfig from "./SystemConfig.tsx";
+import { useGlobalContext } from "@common/contexts/GlobalStateContext.tsx";
const SystemList:FC = ()=>{
const navigate = useNavigate();
@@ -27,6 +28,7 @@ const SystemList:FC = ()=>{
const [memberValueEnum, setMemberValueEnum] = useState<{[k:string]:{text:string}}>({})
const [open, setOpen] = useState(false);
const drawerFormRef = useRef(null)
+ const {checkPermission} = useGlobalContext()
const getSystemList = ()=>{
if(!tableHttpReload){
@@ -36,7 +38,7 @@ const SystemList:FC = ()=>{
success: true,
});
}
- return fetchData>('my_services',{method:'GET',eoParams:{keyword:tableSearchWord},eoTransformKeys:['api_num','service_num','create_time']}).then(response=>{
+ return fetchData>(!checkPermission('system.workspace.service.view_all') ? 'my_services':'services',{method:'GET',eoParams:{keyword:tableSearchWord},eoTransformKeys:['api_num','service_num','create_time']}).then(response=>{
const {code,data,msg} = response
if(code === STATUS_CODE.SUCCESS){
setTableListDataSource(data.services)
@@ -53,7 +55,7 @@ const SystemList:FC = ()=>{
}
const getTeamsList = ()=>{
- fetchData>('simple/teams/mine',{method:'GET'}).then(response=>{
+ fetchData>(!checkPermission('system.workspace.team.view_all') ?'simple/teams/mine' :'simple/teams',{method:'GET',eoTransformKeys:[]}).then(response=>{
const {code,data,msg} = response
setTeamList(data.teams)
if(code === STATUS_CODE.SUCCESS){
@@ -94,7 +96,7 @@ const SystemList:FC = ()=>{
getMemberList()
setBreadcrumb([
{
- title: '内部数据服务'
+ title: '服务'
}])
}, []);
@@ -123,7 +125,7 @@ const SystemList:FC = ()=>{
return (
//
-
+
内部数据服务
+ title: 服务
},
{
title: '调用拓扑图'
diff --git a/frontend/packages/core/src/pages/system/api/SystemInsideApiList.tsx b/frontend/packages/core/src/pages/system/api/SystemInsideApiList.tsx
index ef21f228..68e74bbf 100644
--- a/frontend/packages/core/src/pages/system/api/SystemInsideApiList.tsx
+++ b/frontend/packages/core/src/pages/system/api/SystemInsideApiList.tsx
@@ -176,7 +176,7 @@ const SystemInsideApiList:FC = ()=>{
useEffect(() => {
setBreadcrumb([
{
- title:内部数据服务
+ title:服务
},
{
title:'API'
@@ -226,6 +226,7 @@ const SystemInsideApiList:FC = ()=>{
setTableHttpReload(false)
}}
onRowClick={(row:SystemApiTableListItem)=>openDrawer('view',row)}
+ tableClass="mr-PAGE_INSIDE_X "
/>
{
useEffect(() => {
setBreadcrumb([
{
- title:内部数据服务
+ title:服务
},
{
title:'订阅审批'
@@ -182,6 +182,7 @@ const SystemInsideApprovalList:FC = ()=>{
}}
onRowClick={(row:SubscribeApprovalTableListItem)=>openModal(pageStatus === 0 ? 'approval': 'view',row)}
tableClickAccess={pageStatus === 0 ?'team.service.subscription.approval':'team.service.subscription.view'}
+ tableClass="pr-PAGE_INSIDE_X"
/>
)
diff --git a/frontend/packages/core/src/pages/system/publish/SystemInsidePublish.tsx b/frontend/packages/core/src/pages/system/publish/SystemInsidePublish.tsx
index 0fc84fac..f921259e 100644
--- a/frontend/packages/core/src/pages/system/publish/SystemInsidePublish.tsx
+++ b/frontend/packages/core/src/pages/system/publish/SystemInsidePublish.tsx
@@ -27,7 +27,7 @@ const SystemInsidePublic:FC = ()=>{
useEffect(() => {
setBreadcrumb([
{
- title:
内部数据服务
+ title:
服务
},
{
title:'发布'
diff --git a/frontend/packages/core/src/pages/system/publish/SystemInsidePublishList.tsx b/frontend/packages/core/src/pages/system/publish/SystemInsidePublishList.tsx
index 178c47bf..6ed6c58f 100644
--- a/frontend/packages/core/src/pages/system/publish/SystemInsidePublishList.tsx
+++ b/frontend/packages/core/src/pages/system/publish/SystemInsidePublishList.tsx
@@ -354,7 +354,7 @@ const SystemInsidePublicList:FC = ()=>{
useEffect(() => {
setBreadcrumb([
{
- title:
内部数据服务
+ title:
服务
},
{
title:'发布'
@@ -444,9 +444,9 @@ const SystemInsidePublicList:FC = ()=>{
onChange={() => {
setTableHttpReload(false)
}}
- besidesTableHeight={58}
onRowClick={(row:PublishTableListItem|PublishVersionTableListItem)=>openDrawer('view',row)}
tableClickAccess="team.service.release.view"
+ tableClass="pr-PAGE_INSIDE_X"
/>
((props,ref) => {
@@ -107,7 +107,7 @@ const globalConfigNodesRule: FormItemProps['rules'] = [
useEffect(() => {
setBreadcrumb([
{
- title: 内部数据服务
+ title: 服务
},
{
title: '上游'
@@ -118,14 +118,14 @@ const globalConfigNodesRule: FormItemProps['rules'] = [
return (
} spinning={loading}>
-