feature/1.7-MCP

Author: NINGyv179

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/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'
       }
     ],

frontend/packages/dashboard/src/pages/DashboardTabPage.tsx

@@ -7,49 +7,16 @@ import { RouterParams } from '@common/const/type'
 
 export default function DashboardTabPage() {
   const { dashboardType } = useParams<RouterParams>()
-  const [activeKey, setActiveKey] = useState<string>('total')
   const navigateTo = useNavigate()
 
   useEffect(() => {
-    setActiveKey(dashboardType || 'total')
+    const activeKey = dashboardType || 'total'
+    navigateTo(`/analytics/${activeKey === 'total' ? activeKey : `${activeKey}/list`}`)
   }, [dashboardType])
 
-  const monitorTabItems: TabsProps['items'] = [
-    {
-      label: $t('监控总览'),
-      key: 'total',
-      children: <DashboardTotal />
-    },
-    {
-      label: $t('服务被调用统计'),
-      key: 'subscriber',
-      children: <Outlet />
-    },
-    {
-      label: $t('消费者调用统计'),
-      key: 'provider',
-      children: <Outlet />
-    },
-    {
-      label: $t('API 调用统计'),
-      key: 'api',
-      children: <Outlet />
-    }
-  ]
-
   return (
     <>
-      <Tabs
-        activeKey={activeKey}
-        onChange={(val) => {
-          setActiveKey(val)
-          navigateTo(`/analytics/${val === 'total' ? val : `${val}/list`}`)
-        }}
-        items={monitorTabItems}
-        className="h-full overflow-hidden mt-[6px] [&>.ant-tabs-content-holder]:overflow-auto  [&>.ant-tabs-content-holder]:pr-PAGE_INSIDE_X  [&>.ant-tabs-content-holder>.ant-tabs-content]:h-full [&>.ant-tabs-content-holder>.ant-tabs-content>.ant-tabs-tabpane]:h-full"
-        size="small"
-        tabBarStyle={{ paddingLeft: '10px', marginTop: '0px', marginBottom: '0px' }}
-      />
+      <Outlet />
     </>
   )
 }

frontend/packages/market/src/pages/serviceHub/ApplyServiceModal.tsx

@@ -2,7 +2,7 @@ import WithPermission from '@common/components/aoplatform/WithPermission'
 import { BasicResponse, RESPONSE_TIPS, STATUS_CODE } from '@common/const/const'
 import { useFetch } from '@common/hooks/http'
 import { $t } from '@common/locales'
-import { App, Col, Form, Input, Row, Select } from 'antd'
+import { App, Col, Form, Input, Row, Select, Tooltip } from 'antd'
 import { forwardRef, useEffect, useImperativeHandle } from 'react'
 import { ApplyServiceHandle, ApplyServiceProps } from '../../const/serviceHub/type'
 
@@ -77,6 +77,16 @@ export const ApplyServiceModal = forwardRef<ApplyServiceHandle, ApplyServiceProp
             placeholder={$t('搜索或选择消费者')}
             mode="multiple"
             options={mySystemOptionList?.filter((x) => x.value !== entity.id)}
+            optionRender={(option) => {
+              if (option.data.disabled) {
+                return (
+                  <Tooltip title={$t('该消费者已订阅')}>
+                    <div>{option.data.label}</div>
+                  </Tooltip>
+                )
+              }
+              return <div>{option.data.label}</div>
+            }}
           />
         </Form.Item>
         {entity.approvalType === 'manual' && (

frontend/packages/market/src/pages/serviceHub/ServiceHubDetail.tsx

@@ -235,16 +235,28 @@ servers:
 
   const getMySelectList = () => {
     setMySystemOptionList([])
-    fetchData<BasicResponse<{ app: EntityItem[] }>>('apps/can_subscribe', { method: 'GET' }).then((response) => {
+    fetchData<BasicResponse<{ app: EntityItem[] }>>('apps/can_subscribe', {
+      method: 'GET',
+      eoParams: { service: serviceId },
+      eoTransformKeys: ['is_subscribed']
+    }).then((response) => {
       const { code, data, msg } = response
       if (code === STATUS_CODE.SUCCESS) {
         setMySystemOptionList(
-          data.app?.map((x: EntityItem) => {
-            return {
-              label: x.name,
-              value: x.id
-            }
-          })
+          data.app
+            ?.sort((a: EntityItem, b: EntityItem) => {
+              // 已订阅的排在后面
+              if (a.isSubscribed && !b.isSubscribed) return 1
+              if (!a.isSubscribed && b.isSubscribed) return -1
+              return 0
+            })
+            .map((x: EntityItem) => {
+              return {
+                label: x.name,
+                value: x.id,
+                disabled: x.isSubscribed // 已订阅的设为禁用
+              }
+            })
         )
       } else {
         message.error(msg || $t(RESPONSE_TIPS.error))