Merge remote-tracking branch 'github-pro/main' into feature/1.7-liujian

Author: Dot-Liu

frontend/packages/common/src/components/aoplatform/Breadcrumb.tsx

@@ -1,11 +1,25 @@
 import { Breadcrumb } from 'antd'
 import { useBreadcrumb } from '@common/contexts/BreadcrumbContext.tsx'
 import { FC, useEffect } from 'react'
+import { LeftOutlined } from '@ant-design/icons'
 
-const TopBreadcrumb: FC = () => {
+const TopBreadcrumb: FC<{ handleBackCallback?: () => void }> = ({ handleBackCallback }) => {
   const { breadcrumb } = useBreadcrumb()
   useEffect(() => {}, [breadcrumb])
-  return <Breadcrumb items={breadcrumb} />
+  const handleBack = () => {
+    handleBackCallback?.()
+  }
+  return (
+    <div className="flex text-[18px] leading-[25px] pb-[12px]">
+      <div
+        onClick={handleBack}
+        className="hover:bg-gray-100 items-center mt-[1px] mr-[12px] flex justify-center rounded-lg border cursor-pointer border-gray-300 w-[30px] h-[30px] border border-solid "
+      >
+        <LeftOutlined className="text-xs" />
+      </div>
+      <Breadcrumb items={breadcrumb} className="flex-1" />
+    </div>
+  )
 }
 
 export default TopBreadcrumb

frontend/packages/common/src/components/aoplatform/InsidePage.tsx

@@ -4,6 +4,7 @@ import { $t } from '@common/locales'
 import { Button, Tag } from 'antd'
 import { FC, ReactNode } from 'react'
 import { useNavigate } from 'react-router-dom'
+import TopBreadcrumb from './Breadcrumb'
 
 class InsidePageProps {
   showBanner?: boolean = true
@@ -64,14 +65,7 @@ const InsidePage: FC<InsidePageProps> = ({
             <></>
           ) : (
             <div className={customPadding ? '' : 'mb-[30px]'}>
-              {backUrl && (
-                <div className="text-[18px] leading-[25px] mb-[12px]">
-                  <Button type="text" onClick={goBack}>
-                    <ArrowLeftOutlined className="max-h-[14px]" />
-                    {$t('返回')}
-                  </Button>
-                </div>
-              )}
+              {backUrl && <TopBreadcrumb handleBackCallback={() => goBack()} />}
               <div className="flex justify-between mb-[20px] items-center ">
                 <div className="flex items-center gap-TAG_LEFT">
                   <div className="text-theme text-[26px] ">{pageTitle}</div>

frontend/packages/common/src/components/aoplatform/UnUsedWordForTranslate.tsx

@@ -56,6 +56,7 @@ export const TranslateWord = () => {
       {$t('无需审核：允许任何消费者调用该服务')}
       {$t('人工审核：仅允许通过人工审核的消费者调用该服务')}
       {$t('开启：AI Agent 等产品能够通过 MCP 方式调用服务')}
+      {$t('总览')}
       {$t('永久')}
       {$t('否')}
       {$t('是')}

frontend/packages/common/src/components/postcat/ApiEdit.tsx

@@ -234,12 +234,16 @@ export default function ApiEdit({
       <>
         <Space.Compact className="w-full mb-btnybase">
           <Select
+            showSearch
+            optionFilterProp="label"
             className="w-[15%] min-w-[100px]"
             value={apiInfo?.protocol || 'HTTP'}
             disabled={true}
             options={protocolOptionList}
           />
           <Select
+            showSearch
+            optionFilterProp="label"
             className="w-[15%] min-w-[100px]"
             value={apiInfo?.method}
             disabled={true}

frontend/packages/common/src/const/permissions.ts

@@ -254,6 +254,21 @@ export const PERMISSION_DEFINITION = [
         anyOf: [{ backend: ['system.settings.ai_balance.manager'] }]
       }
     },
+    'system.settings.mcp.manager': {
+      granted: {
+        anyOf: [{ backend: ['system.settings.mcp.manager'] }]
+      }
+    },
+    'system.settings.mcp.view': {
+      granted: {
+        anyOf: [{ backend: ['system.settings.mcp.view'] }]
+      }
+    },
+    'system.settings.apikey.view': {
+      granted: {
+        anyOf: [{ backend: ['system.settings.apikey.view'] }]
+      }
+    },
     'system.devops.policy.view': {
       granted: {
         anyOf: [{ backend: ['system.settings.strategy.view'] }]

frontend/packages/common/src/const/type.ts

@@ -81,6 +81,7 @@ export type MatchItem = {
 export type EntityItem = {
   id: string
   name: string
+  isSubscribed: boolean
 }
 
 export type DynamicMenuItem = {

frontend/packages/common/src/contexts/BreadcrumbContext.tsx

@@ -18,5 +18,19 @@ export const useBreadcrumb = () => {
 export const BreadcrumbProvider = ({ children }: unknown) => {
   const [breadcrumb, setBreadcrumb] = useState<BreadcrumbItemType[]>([])
 
-  return <BreadcrumbContext.Provider value={{ setBreadcrumb, breadcrumb }}>{children}</BreadcrumbContext.Provider>
+  return (
+    <BreadcrumbContext.Provider
+      value={{
+        setBreadcrumb: (newItems) => {
+          newItems.slice(0, newItems.length - 1).forEach((item) => {
+            item.title = <span className="cursor-pointer hover:text-theme">{item.title}</span>
+          })
+          setBreadcrumb(newItems)
+        },
+        breadcrumb
+      }}
+    >
+      {children}
+    </BreadcrumbContext.Provider>
+  )
 }

frontend/packages/common/src/contexts/GlobalStateContext.tsx

@@ -99,10 +99,31 @@ const mockData = [
     icon: 'ic:baseline-bar-chart',
     children: [
       {
-        name: '运行视图',
-        key: 'analytics',
-        path: '/analytics',
-        icon: 'ic:baseline-bar-chart',
+        name: '总览',
+        key: 'analyticsTotal',
+        path: '/analytics/total',
+        icon: 'material-symbols:bar-chart',
+        access: 'system.analysis.run_view.view'
+      },
+      {
+        name: '服务',
+        key: 'analyticsSubscriber',
+        path: '/analytics/subscriber/list',
+        icon: 'ic:baseline-blinds-closed',
+        access: 'system.analysis.run_view.view'
+      },
+      {
+        name: '消费者',
+        key: 'analyticsProvider',
+        path: '/analytics/provider/list',
+        icon: 'ic:baseline-apps',
+        access: 'system.analysis.run_view.view'
+      },
+      {
+        name: 'API',
+        key: 'analyticsApi',
+        path: '/analytics/api/list',
+        icon: 'gravity-ui:plug-connection',
         access: 'system.analysis.run_view.view'
       }
     ],
@@ -201,14 +222,14 @@ const mockData = [
             key: 'mcpService',
             path: '/mcpService',
             icon: 'ph:network-x',
-            access: ''
+            access: 'system.settings.mcp.view'
           },
           {
             name: 'API Key',
             key: 'mcpKey',
             path: '/mcpKey',
             icon: 'material-symbols:key',
-            access: ''
+            access: 'system.settings.apikey.view'
           },
           {
             name: '数据源',

frontend/packages/common/src/locales/keyHashMap.json

@@ -16,7 +16,6 @@
   "添加(0)": "Ka7aaaeb",
   "请输入Key": "Kaff78ecf",
   "请输入Value": "K65d46535",
-  "返回": "Kc14b2ea3",
   "ID": "K11d3633a",
   "名称": "Kbff43de3",
   "Driver": "K16ca79ef",
@@ -114,6 +113,7 @@
   "打开 OpenAPI YAML 编辑器": "Kdac8ce7e",
   "无需审核：允许任何消费者调用该服务": "K1fc2cc28",
   "人工审核：仅允许通过人工审核的消费者调用该服务": "K8dabb98e",
+  "开启：AI Agent 等产品能够通过 MCP 方式调用服务": "Ke959f135",
   "永久": "Kbfe02d7f",
   "否": "K1e9c479e",
   "是": "Kaddfcb6b",
@@ -345,10 +345,11 @@
   "重置": "K50d471b2",
   "查询": "Kee8ae330",
   "请输入 APIURL 搜索": "Kf8187c33",
+  "服务": "Kb58e0c3f",
+  "说明文档": "K6cd677b",
   "最近一次更新者": "K617f34f1",
   "最近一次更新时间": "K6ebca204",
   "保存": "Kabfe9512",
-  "服务": "Kb58e0c3f",
   "API 路由": "K51d1eb5d",
   "API 文档": "Ka2b6d281",
   "使用说明": "Kdefa9caa",
@@ -365,6 +366,9 @@
   "手动添加": "K18307d56",
   "订阅申请": "K705fe9f5",
   "订阅方": "K3a67ea90",
+  "API": "K3ba29a85",
+  "编辑 API": "Ke93388fd",
+  "添加 API": "K84aabfd4",
   "AI 路由设置": "Kefa2a4cf",
   "路由名称": "K66060758",
   "请求路径": "K5582ac8",
@@ -414,17 +418,16 @@
   "启用": "K52c8a730",
   "Ollama 地址": "K6b99dce8",
   "输入例如：https://www.apipark.com": "K8d4f5b44",
-  "自定义": "K8929cbb1",
+  "自定义（空模板）": "K24f6a5b4",
   "模型名称": "K1fd51aaa",
   "访问配置": "Kd6285399",
-  "模型参数模板": "K7eb03edd",
   "模型参数": "K49b434e9",
+  "载入预置模板": "Kea608112",
   "供应商名称": "K16ef56b1",
   "注意：": "K484de451",
   "仅支持使用 OpenAI 输入输出格式和认证方法（APIKey）的供应商。如果不满足此条件，创建后自定义供应商将不可用。": "Kbd80dde0",
   "从 (0) 获取 API KEY": "Kb3e34847",
   "该模型为官方模型，不可编辑": "Kcb6a1c57",
-  "存在使用当前模型的接口，需要先解绑后才能编辑": "Kf9300eb4",
   "该模型为官方模型，不可删除": "K8af71816",
   "存在使用当前模型的接口，需要先解绑后才能删除": "Kb8ad0af5",
   "模型值": "K73cb9ff1",
@@ -450,14 +453,15 @@
   "Models": "Ke37a353f",
   "Keys": "K14bcebd2",
   "添加供应商": "Kd87397b0",
+  "编辑供应商( (0) )": "Kee7de862",
   "编辑供应商": "K5bcf8c48",
   "(0) 模型": "Kf7a916be",
   "待审核": "K35612f29",
   "已审核": "K47eaafde",
   "发布申请": "K56b4254f",
   "API 调用地址": "Kea2f9279",
   "API base URL 一般设置为API 网关的外部网络访问地址，或者是API网关绑定的域名。": "K7fc496a1",
-  "集成地址": "K508d8bf4",
+  "OpenAPI & MCP 调用地址": "Ka7ca8fde",
   "与外部平台集成时，获取 API 市场中文档信息的域名": "K67f4e9bb",
   "常规设置": "K8ab0fc95",
   "API 请求设置": "Kb66fec9d",
@@ -469,6 +473,7 @@
   "分类名称": "Ke595a20a",
   "父分类 ID": "K9679728f",
   "子分类名称": "K9b2d08fd",
+  "暂无权限": "Kce2fcdbf",
   "添加 Rest 服务": "K2c93168c",
   "导入OpenAPI文档，将现有系统的API发布到APIPark。": "K39a8d392",
   "添加在线 AI API": "K68932d54",
@@ -551,6 +556,13 @@
   "Version (0)-(1)": "K480045ce",
   "日志配置": "Kadee8e49",
   "提供详尽的 API 调用日志，帮助企业监控、分析和审计 API 的运行状况。": "K2724314b",
+  "MCP 配置": "K6e9c928f",
+  "Open API 文档": "Kb6d0eb39",
+  "AI 代理集成": "Ke6908f16",
+  "新增 API Key": "Kb0e0aeda",
+  "API 密钥可用于调用系统级 Open API 和 MCP。": "K9d81999c",
+  "MCP 服务": "Kf106bc62",
+  "MCP Service 充当 AI 模型与 API 之间的桥梁，允许智能助手（如 Claude）动态发现和调用 Gateway 上的 API，无需繁琐的手动配置或自定义集成。": "K7c2bfeff",
   "部门名称": "K33c76dbc",
   "父部门 ID": "K84829ca9",
   "子部门名称": "K4d7fc74b",
@@ -615,6 +627,8 @@
   "处理日志": "Ke429194e",
   "脱敏前": "K8c34c02f",
   "脱敏后": "K8e3d388d",
+  "编辑服务策略": "Kf06f6737",
+  "添加服务策略": "K205971e1",
   "编辑策略": "Kc82b8374",
   "策略类型": "K4b34a5e5",
   "匹配条件": "K57f0fee8",
@@ -641,6 +655,7 @@
   "支持对系统全局进行统一的策略配置，从而简化管理并确保一致性。全局策略的优先级比服务策略略低。": "Kc975cd5a",
   "资源配置": "K8e7a0f80",
   "角色": "Kf644225f",
+  "角色配置": "Kc9f2249c",
   "设置角色的权限范围。": "K95c3fd8b",
   "系统级别角色": "K138facd3",
   "添加角色": "K6eac768d",
@@ -662,9 +677,13 @@
   "停止": "K24540de",
   "继续等待": "Kd85b3f64",
   "只允许上传PNG、JPG或SVG格式的图片": "Ka9c08390",
+  "关闭 MCP": "K30595880",
+  "关闭后将无法通过MCP方式调用服务": "Kc081047c",
+  "了解": "Ka73a5801",
   "服务名称": "K413b9869",
   "服务类型": "K9919285b",
   "REST 服务": "K62840d62",
+  "MCP": "K373c8ab3",
   "默认 AI 供应商": "Kcef64f4d",
   "创建 API 时会默认选择该供应商，修改默认供应商不会影响现有 API": "K300c89d4",
   "未配置任何 AI 模型供应商，": "Kcab588a9",
@@ -811,6 +830,7 @@
   "添加授权": "Kd23d1716",
   "到期时间": "Kfa920c0",
   "订阅的服务": "Kcce1af60",
+  "返回": "Kc14b2ea3",
   "审核详情": "Kfefa9b58",
   "取消订阅": "K3118fdb0",
   "请确认是否取消订阅？": "Ked811bb1",
@@ -823,22 +843,21 @@
   "创建并管理自己的消费者实体，每个消费者可以订阅多个API服务，确保在调用之前已获得相应权限。你可以为消费者生成 API 密钥等鉴权方式，用于安全地调用 API 服务": "K5c4e2865",
   "订阅的服务数量：已通过 (0) 个，申请中 (1) 个": "K3c7b175f",
   "输入名称、ID 查找消费者": "K3a6f905d",
-  "服务市场": "K370a3eb2",
+  "API 门户": "Kc84dbd1a",
   "服务详情": "Kf7ec36d",
   "申请服务": "K58ca9485",
-  "介绍": "K59cdbec3",
-  "Base URL": "Kc29dabf2",
-  "申请": "K4aa9ed2c",
-  "服务信息": "K6c060779",
-  "接入消费者": "Kba74f26d",
   "供应方": "Kb97544cb",
-  "分类": "Kb32f0afe",
   "版本": "K81634069",
   "更新时间": "Keefda53d",
-  "无标签": "K96a2f1c8",
+  "介绍": "K59cdbec3",
   "暂无服务描述": "Ka4b45550",
+  "申请": "K4aa9ed2c",
+  "无标签": "K96a2f1c8",
+  "分类": "Kb32f0afe",
+  "服务市场": "K370a3eb2",
   "API 数量": "K72b0c0b3",
   "接入消费者数量": "K70b79760",
+  "30天内调用次数": "K3d52b756",
   "关联标签": "K96059c69",
   "更新者": "K8b7c2592",
   "添加 Open Api": "K32263abd",

frontend/packages/common/src/locales/scan/en-US.json

@@ -913,5 +913,19 @@
   "K3ba29a85": "API",
   "K3d52b756": "Number of invocations within 30 days",
   "Ke959f135": "Enable: AI Agent and other products can invoke services through MCP.",
-  "Ka73a5801": "I Understand"
+  "Ka73a5801": "I Understand",
+  "K6cd677b": "Documentation",
+  "Kec68fe24": "Edit API Settings",
+  "Kc9aeee51": "Add API Settings",
+  "Kf06f6737": "Edit Service Policy",
+  "K205971e1": "Add Service Policy",
+  "Kc9f2249c": "Role Configuration",
+  "Kba68dfc1": "Add API Settings",
+  "Kc84dbd1a": "API Portal",
+  "Ke93388fd": "Edit API",
+  "K84aabfd4": "Add API",
+  "K71ed51fa": "Please subscribe to the service first",
+  "K1bec8cbe": "Select API Key",
+  "K5611e01e": "This consumer is already subscribed",
+  "Kaf9e8011": "Overview"
 }