Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added frontend/packages/common/src/assets/feishu.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ function BasicLayout({ project = 'core' }: { project: string }) {
const items: MenuProps['items'] = useMemo(
() =>
[
userInfo?.type !== 'guest' && {
!['guest', 'third-user'].includes(userInfo?.type as string) && {
key: '2',
label: (
<Button
Expand Down
14 changes: 14 additions & 0 deletions frontend/packages/common/src/const/permissions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,11 @@ export const PERMISSION_DEFINITION = [
anyOf: [{ backend: ['system.organization.role.manager_team_role'] }]
}
},
'system.organization.auth.view': {
granted: {
anyOf: [{ backend: ['system.settings.login.manager', 'system.settings.login.view'] }]
}
},
'system.api_market.service_classification.view': {
granted: {
anyOf: [{ backend: ['system.settings.general.view'] }]
Expand Down Expand Up @@ -634,6 +639,15 @@ export const PERMISSION_DEFINITION = [
]
}
},
'team.consumer.mcp.view': {
granted: {
anyOf: [
{
backend: ['team.consumer.mcp.manager', 'team.consumer.mcp.view']
}
]
}
},
'team.application.authorization.add': {
granted: {
anyOf: [{ backend: ['system.workspace.application.manager_all', 'team.consumer.authorization.manager'] }]
Expand Down
9 changes: 8 additions & 1 deletion frontend/packages/common/src/contexts/GlobalStateContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,15 @@ const mockData = [
name: '角色',
key: 'role',
path: '/role',
icon: 'ic:baseline-verified-user',
icon: 'ph:user-circle-gear-fill',
access: 'system.organization.role.view'
},
{
name: '鉴权',
key: 'auth',
path: '/auth',
icon: 'ic:baseline-verified-user',
access: 'system.organization.auth.view'
}
]
},
Expand Down
10 changes: 10 additions & 0 deletions frontend/packages/common/src/hooks/pluginLoader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,16 @@ const mockData = {
}
]
},
{
driver: 'apipark.builtIn.component',
name: 'auth',
router: [
{
path: 'auth',
type: 'normal'
}
]
},
{
driver: 'apipark.builtIn.component',
name: 'cluster',
Expand Down
12 changes: 12 additions & 0 deletions frontend/packages/common/src/locales/keyHashMap.json
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,17 @@
"待审核": "K35612f29",
"已审核": "K47eaafde",
"发布申请": "K56b4254f",
"鉴权": "Kb35e6a18",
"系统用户账号登录授权配置": "K679bd7e4",
"授权类型": "K9e7bb257",
"请选择授权类型": "Kc499fc1d",
"APP ID": "Kee9f8f26",
"请输入APP ID": "K9e4c19bb",
"APP ID 参数位于飞书开发人员控制台中的应用程序凭证和基础信息页面上": "K45c99f97",
"APP Secret": "K90f7c3b4",
"请输入APP Secret": "Kdc53d96f",
"APP Secret 参数位于飞书开发人员控制台中的应用程序凭证和基础信息页面上": "K56e77c4",
"启用授权": "K50693bd8",
"API 调用地址": "Kea2f9279",
"API base URL 一般设置为API 网关的外部网络访问地址,或者是API网关绑定的域名。": "K7fc496a1",
"OpenAPI & MCP 调用地址": "Ka7ca8fde",
Expand Down Expand Up @@ -553,6 +564,7 @@
"请输入密码": "K25c895d5",
"密码": "K551b0348",
"登录": "Kd2c1a316",
"飞书授权登录": "K682b11cb",
"访客模式": "K192b3e38",
"您可通过访客模式查看所有页面和功能,但是无法编辑数据。访客模式仅用于了解产品功能,您可以在正式产品中关闭该功能。": "K91aa4801",
"Version (0)-(1)": "K480045ce",
Expand Down
14 changes: 13 additions & 1 deletion frontend/packages/common/src/locales/scan/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -972,5 +972,17 @@
"K6c267c7b": "Avg Requests per Subscriber",
"K133d4291": "Avg Traffic per Subscriber",
"K37c5f1d0": "Token",
"Kb98264d4": "Avg Token per Subscriber"
"Kb98264d4": "Avg Token per Subscriber",
"Kb35e6a18": "Auth",
"K679bd7e4": "System User Account Login Authorization Settings",
"K9e7bb257": "Authorization Type",
"Kc499fc1d": "Please select an authorization type",
"Kee9f8f26": "APP ID",
"K9e4c19bb": "Please enter APP ID",
"K90f7c3b4": "APP Secret",
"Kdc53d96f": "Please enter APP Secret",
"K50693bd8": "Enable Authorization",
"K682b11cb": "Feishu Authorization Login",
"K45c99f97": "The APP ID parameter can be found on the App Credentials and Basic Information page in the Feishu Developer Console",
"K56e77c4": "The APP Secret parameter can be found on the App Credentials and Basic Information page in the Feishu Developer Console"
}
14 changes: 13 additions & 1 deletion frontend/packages/common/src/locales/scan/ja-JP.json
Original file line number Diff line number Diff line change
Expand Up @@ -994,5 +994,17 @@
"K6c267c7b": "消費者あたりの平均リクエスト数",
"K133d4291": "消費者あたりの平均ネットワークトラフィック",
"K37c5f1d0": "トークン消費量",
"Kb98264d4": "消費者あたりの平均トークン消費量"
"Kb98264d4": "消費者あたりの平均トークン消費量",
"Kb35e6a18": "認証",
"K679bd7e4": "システムユーザーアカウントログイン認可設定",
"K9e7bb257": "認可タイプ",
"Kc499fc1d": "認可タイプを選択してください",
"Kee9f8f26": "APP ID",
"K9e4c19bb": "APP ID を入力してください",
"K90f7c3b4": "APP Secret",
"Kdc53d96f": "APP Secret を入力してください",
"K50693bd8": "認可を有効化",
"K682b11cb": "Feishu 認証ログイン",
"K45c99f97": "APP ID パラメータは Feishu 開発者コンソールのアプリ認証情報と基本情報ページにあります",
"K56e77c4": "APP Secret パラメータは Feishu 開発者コンソールのアプリ認証情報と基本情報ページにあります"
}
14 changes: 13 additions & 1 deletion frontend/packages/common/src/locales/scan/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -923,5 +923,17 @@
"K6c267c7b": "平均每消费者的请求次数",
"K133d4291": "平均每消费者的网络流量",
"K37c5f1d0": "Token 消耗",
"Kb98264d4": "平均每消费者的 Token 消耗"
"Kb98264d4": "平均每消费者的 Token 消耗",
"Kb35e6a18": "鉴权",
"K679bd7e4": "系统用户账号登录授权配置",
"K9e7bb257": "授权类型",
"Kc499fc1d": "请选择授权类型",
"Kee9f8f26": "APP ID",
"K9e4c19bb": "请输入APP ID",
"K90f7c3b4": "APP Secret",
"Kdc53d96f": "请输入APP Secret",
"K50693bd8": "启用授权",
"K682b11cb": "飞书授权登录",
"K45c99f97": "APP ID 参数位于飞书开发人员控制台中的应用程序凭证和基础信息页面上",
"K56e77c4": "APP Secret 参数位于飞书开发人员控制台中的应用程序凭证和基础信息页面上"
}
14 changes: 13 additions & 1 deletion frontend/packages/common/src/locales/scan/zh-TW.json
Original file line number Diff line number Diff line change
Expand Up @@ -994,5 +994,17 @@
"K6c267c7b": "平均每位使用者的請求次數",
"K133d4291": "平均每位使用者的網路流量",
"K37c5f1d0": "Token 消耗",
"Kb98264d4": "平均每位使用者的 Token 消耗"
"Kb98264d4": "平均每位使用者的 Token 消耗",
"Kb35e6a18": "鑑權",
"K679bd7e4": "系統用戶帳號登入授權配置",
"K9e7bb257": "授權類型",
"Kc499fc1d": "請選擇授權類型",
"Kee9f8f26": "APP ID",
"K9e4c19bb": "請輸入 APP ID",
"K90f7c3b4": "APP Secret",
"Kdc53d96f": "請輸入 APP Secret",
"K50693bd8": "啟用授權",
"K682b11cb": "飛書授權登入",
"K45c99f97": "APP ID 參數位於飛書開發人員控制台中的應用程式憑證與基礎資訊頁面",
"K56e77c4": "APP Secret 參數位於飛書開發人員控制台中的應用程式憑證與基礎資訊頁面"
}
18 changes: 18 additions & 0 deletions frontend/packages/core/src/const/const.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -618,6 +618,16 @@ export const routerMap: Map<string, RouterMapConfig> = new Map([
/* webpackChunkName: "[request]" */ '@market/pages/serviceHub/management/ManagementAppSetting.tsx'
)
)
},
{
path: 'mcp',
key: 'consumerMcp',
lazy: lazy(
() =>
import(
/* webpackChunkName: "[request]" */ '@market/pages/serviceHub/management/mcpContent.tsx'
)
)
}
]
},
Expand Down Expand Up @@ -693,6 +703,14 @@ export const routerMap: Map<string, RouterMapConfig> = new Map([
]
}
],
[
'auth',
{
type: 'module',
lazy: lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/auth/Auth.tsx')),
key: 'auth'
}
],
[
'analytics',
{
Expand Down
3 changes: 2 additions & 1 deletion frontend/packages/core/src/const/member/type.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export type MemberTableListItem = {
enable:boolean
departmentId:string
roles:EntityItem[]
form: string
};

export type AddToDepartmentProps = {
Expand All @@ -40,7 +41,7 @@ export type MemberDropdownModalFieldType = {

export type MemberDropdownModalProps = {
type:'addDep'|'addChild'|'addMember'|'editMember'|'rename'
entity?:(MemberTableListItem & {departmentIds:string[]}) | ({id?:string, departmentIds?:string[],name?:string})
entity?:(MemberTableListItem & {departmentIds:string[]}) | ({id?:string, departmentIds?:string[],name?:string,form?:string})
selectedMemberGroupId?:string
}

Expand Down
Loading