Compare commits

...

1 Commits

Author SHA1 Message Date
ningyv b7bb409e96 fix: consumer permission 2024-12-13 20:00:38 +08:00
5 changed files with 22 additions and 30 deletions
@@ -146,20 +146,11 @@ export const PublishApprovalModalContent = forwardRef<PublishApprovalModalHandle
...x, ...x,
title: typeof x.title === 'string' ? $t(x.title) : x.title, title: typeof x.title === 'string' ? $t(x.title) : x.title,
...(x.dataIndex === 'status' ? { ...(x.dataIndex === 'status' ? {
render:(_,entity)=> { render:(_,entity)=> (
switch(entity.change){ <span className={`${ApprovalStatusColorClass[entity.change as keyof typeof ApprovalStatusColorClass]} truncate block`}>
case 'none': {$t(ChangeTypeEnum[entity.change as (keyof typeof ChangeTypeEnum)] || '-')}
return '-' </span>
case 'new': )
return $t('新建')
case 'update':
return $t('更新')
case 'delete':
return $t('删除')
default:
return '-'
}
}
}:{}) }:{})
} }
}),[state.language]) }),[state.language])
@@ -486,17 +486,17 @@ export const PERMISSION_DEFINITION = [
}, },
"team.application.subscription.add": { "team.application.subscription.add": {
"granted": { "granted": {
"anyOf": [{ "backend": ["system.workspace.application.manager_al","team.consumer.subscription.subscribe"] }] "anyOf": [{ "backend": ["system.workspace.application.manager_all","team.consumer.subscription.subscribe"] }]
} }
}, },
"team.application.subscription.edit": { "team.application.subscription.edit": {
"granted": { "granted": {
"anyOf": [{ "backend": ["system.workspace.application.manager_al","team.consumer.subscription.manager_subscribed_services"] }] "anyOf": [{ "backend": ["system.workspace.application.manager_all","team.consumer.subscription.manager_subscribed_services"] }]
} }
}, },
"team.application.subscription.delete": { "team.application.subscription.delete": {
"granted": { "granted": {
"anyOf": [{ "backend": ["system.workspace.application.manager_al","team.team.consumer.subscription.manager_subscribed_services"] }] "anyOf": [{ "backend": ["system.workspace.application.manager_all","team.team.consumer.subscription.manager_subscribed_services"] }]
} }
}, },
"team.application.application.view": { "team.application.application.view": {
@@ -506,47 +506,47 @@ export const PERMISSION_DEFINITION = [
}, },
"team.application.application.add": { "team.application.application.add": {
"granted": { "granted": {
"anyOf": [{ "backend": ["system.workspace.application.manager_al",'team.team.consumer.manager',"team.consumer.application.manager"] }] "anyOf": [{ "backend": ["system.workspace.application.manager_all",'team.team.consumer.manager',"team.consumer.application.manager"] }]
} }
}, },
"team.application.application.edit": { "team.application.application.edit": {
"granted": { "granted": {
"anyOf": [{ "backend": ["system.workspace.application.manager_al",'team.team.consumer.manager',"team.consumer.application.manager"] }] "anyOf": [{ "backend": ["system.workspace.application.manager_all",'team.team.consumer.manager',"team.consumer.application.manager"] }]
} }
}, },
"team.application.application.delete": { "team.application.application.delete": {
"granted": { "granted": {
"anyOf": [{ "backend": ["system.workspace.application.manager_al",'team.team.consumer.manager',"team.consumer.application.manager"] }] "anyOf": [{ "backend": ["system.workspace.application.manager_all",'team.team.consumer.manager',"team.consumer.application.manager"] }]
} }
}, },
"team.consumer.authorization.view": { "team.consumer.authorization.view": {
"granted": { "granted": {
"anyOf": [{ "backend": ["system.workspace.application.manager_al","system.workspace.application.view_all","team.consumer.authorization.view"] }] "anyOf": [{ "backend": ["system.workspace.application.manager_all","system.workspace.application.view_all","team.consumer.authorization.view"] }]
} }
}, },
"team.application.authorization.add": { "team.application.authorization.add": {
"granted": { "granted": {
"anyOf": [{ "backend": ["system.workspace.application.manager_al","team.consumer.authorization.manager"] }] "anyOf": [{ "backend": ["system.workspace.application.manager_all","team.consumer.authorization.manager"] }]
} }
}, },
"team.application.authorization.edit": { "team.application.authorization.edit": {
"granted": { "granted": {
"anyOf": [{ "backend": ["system.workspace.application.manager_al","team.consumer.authorization.manager"] }] "anyOf": [{ "backend": ["system.workspace.application.manager_all","team.consumer.authorization.manager"] }]
} }
}, },
"team.application.authorization.delete": { "team.application.authorization.delete": {
"granted": { "granted": {
"anyOf": [{ "backend": ["system.workspace.application.manager_al","team.consumer.authorization.manager"] }] "anyOf": [{ "backend": ["system.workspace.application.manager_all","team.consumer.authorization.manager"] }]
} }
}, },
"team.application.authorization.cancelSubApply": { "team.application.authorization.cancelSubApply": {
"granted": { "granted": {
"anyOf": [{ "backend": ["system.workspace.application.manager_al","team.consumer.authorization.manager"] }] "anyOf": [{ "backend": ["system.workspace.application.manager_all","team.consumer.authorization.manager"] }]
} }
}, },
"team.application.authorization.cancelSub": { "team.application.authorization.cancelSub": {
"granted": { "granted": {
"anyOf": [{ "backend": ["system.workspace.application.manager_al","team.consumer.authorization.manager"] }] "anyOf": [{ "backend": ["system.workspace.application.manager_all","team.consumer.authorization.manager"] }]
} }
}, },
"team.team.team.view": { "team.team.team.view": {
@@ -88,7 +88,7 @@ const PartitionInsideDashboardSetting: FC = () => {
pageTitle={$t('数据源')} pageTitle={$t('数据源')}
description={$t("设置监控报表的数据来源,设置完成之后即可获得详细的API调用统计图表。")} description={$t("设置监控报表的数据来源,设置完成之后即可获得详细的API调用统计图表。")}
showBorder={false} showBorder={false}
scrollPage={true} scrollPage={false}
> >
<div className="flex flex-col overflow-auto pb-PAGE_INSIDE_B pr-PAGE_INSIDE_X"> <div className="flex flex-col overflow-auto pb-PAGE_INSIDE_B pr-PAGE_INSIDE_X">
<Spin wrapperClassName="flex-1" indicator={<LoadingOutlined style={{ fontSize: 24 }} spin />} spinning={loading}> <Spin wrapperClassName="flex-1" indicator={<LoadingOutlined style={{ fontSize: 24 }} spin />} spinning={loading}>
+2 -1
View File
@@ -77,7 +77,8 @@ export default defineConfig({
target: 'http://172.18.166.219:8288/', target: 'http://172.18.166.219:8288/',
changeOrigin: true, changeOrigin: true,
} }
} },
open: true
}, },
logLevel:'info' logLevel:'info'
}) })
@@ -11,7 +11,7 @@ import { RouterParams } from "@core/components/aoplatform/RenderRoutes";
import { SimpleTeamItem } from "@common/const/type"; import { SimpleTeamItem } from "@common/const/type";
import { useTenantManagementContext } from "../../../contexts/TenantManagementContext"; import { useTenantManagementContext } from "../../../contexts/TenantManagementContext";
import { Icon } from "@iconify/react/dist/iconify.js"; import { Icon } from "@iconify/react/dist/iconify.js";
import { useGlobalContext } from "@common/contexts/GlobalStateContext"; import { GlobalProvider, useGlobalContext } from "@common/contexts/GlobalStateContext";
import { $t } from "@common/locales"; import { $t } from "@common/locales";
import WithPermission from "@common/components/aoplatform/WithPermission"; import WithPermission from "@common/components/aoplatform/WithPermission";
import InsidePage from "@common/components/aoplatform/InsidePage"; import InsidePage from "@common/components/aoplatform/InsidePage";
@@ -149,7 +149,7 @@ export default function ServiceHubManagement() {
switch (type){ switch (type){
case 'add': case 'add':
title=$t('添加消费者') title=$t('添加消费者')
content=<ManagementConfig ref={addManagementRef} dataShowType={dataShowType} type={type} teamId={teamId!} /> content=<GlobalProvider><ManagementConfig ref={addManagementRef} dataShowType={dataShowType} type={type} teamId={teamId!} /></GlobalProvider>
break; break;
// case 'edit':{ // case 'edit':{
// title='配置 Open Api' // title='配置 Open Api'