diff --git a/frontend/packages/dashboard/src/component/MonitorApiPage.tsx b/frontend/packages/dashboard/src/component/MonitorApiPage.tsx index 89b8465d..67d157b8 100644 --- a/frontend/packages/dashboard/src/component/MonitorApiPage.tsx +++ b/frontend/packages/dashboard/src/component/MonitorApiPage.tsx @@ -28,7 +28,7 @@ export type MonitorApiPageProps = { detailEntityName:string } -export type MonitorApiQueryData = SearchBody & { path?:string, apis?:string[], projects?:string[] } +export type MonitorApiQueryData = SearchBody & { path?:string, apis?:string[], services?:string[] } export default function MonitorApiPage(props:MonitorApiPageProps){ const {fetchTableData,detailDrawerContent,fullScreen,setFullScreen,setDetailId,timeButton,setTimeButton,detailEntityName,setDetailEntityName} = props @@ -51,7 +51,7 @@ export default function MonitorApiPage(props:MonitorApiPageProps){ }, []); const getApiList = (projectIds?:string[])=>{ - return fetchData<{apis:EntityItem[]}>('simple/project/apis',{method:'POST',eoBody:({projects:projectIds || queryData?.projects})}).then((resp) => { + return fetchData<{apis:EntityItem[]}>('simple/service/apis',{method:'POST',eoBody:({services:projectIds || queryData?.services})}).then((resp) => { const {code,data,msg} = resp if(code === STATUS_CODE.SUCCESS){ setApiOptionList(data.apis?.map((x:EntityItem)=>({label:x.name, value:x.id}))) @@ -65,10 +65,10 @@ export default function MonitorApiPage(props:MonitorApiPageProps){ } const getProjectList = ()=>{ - return fetchData<{projects:EntityItem[]}>('simple/projects',{method:'GET'}).then((resp) => { + return fetchData<{services:EntityItem[]}>('simple/services',{method:'GET'}).then((resp) => { const {code,data,msg} = resp if(code === STATUS_CODE.SUCCESS){ - setProjectOptionList(data.projects?.map((x:EntityItem)=>({label:x.name, value:x.id}))) + setProjectOptionList(data.services?.map((x:EntityItem)=>({label:x.name, value:x.id}))) }else{ message.error(msg || $t(RESPONSE_TIPS.dataError)) return setProjectOptionList([]) @@ -164,13 +164,13 @@ export default function MonitorApiPage(props:MonitorApiPageProps){ {$t('服务')}: {setQueryData(prevData=>({...prevData || {}, projects:value}));getApiList(value)}} + onChange={(value)=>{setQueryData(prevData=>({...prevData || {}, services:value}));getApiList(value)}} /> diff --git a/frontend/packages/dashboard/src/component/MonitorAppPage.tsx b/frontend/packages/dashboard/src/component/MonitorAppPage.tsx index 1d3e45aa..a618e75a 100644 --- a/frontend/packages/dashboard/src/component/MonitorAppPage.tsx +++ b/frontend/packages/dashboard/src/component/MonitorAppPage.tsx @@ -56,10 +56,10 @@ export default function MonitorAppPage(props:MonitorAppPageProps){ }; const getAppList = ()=>{ - return fetchData<{projects:EntityItem[]}>('simple/apps/mine',{method:'GET'}).then((resp) => { + return fetchData<{apps:EntityItem[]}>('simple/apps/mine',{method:'GET'}).then((resp) => { const {code,data,msg} = resp if(code === STATUS_CODE.SUCCESS){ - setListOfApps(data.projects?.map((x:EntityItem)=>({label:x.name, value:x.id}))) + setListOfApps(data.apps?.map((x:EntityItem)=>({label:x.name, value:x.id}))) }else{ message.error(msg || $t(RESPONSE_TIPS.dataError)) return setListOfApps([]) @@ -151,9 +151,9 @@ export default function MonitorAppPage(props:MonitorAppPageProps){ maxTagCount={1} // maxTagPlaceholder={(selectedList) => `and ${selectedList.length} more selected`} placeholder={$t("请选择消费者")} - value={queryData?.projects} + value={queryData?.apps} options={listOfApps} - onChange={(value)=>{setQueryData(prevData=>({...prevData || {}, projects:value}))}} + onChange={(value)=>{setQueryData(prevData=>({...prevData || {},apps :value}))}} /> diff --git a/frontend/packages/dashboard/src/component/MonitorSubPage.tsx b/frontend/packages/dashboard/src/component/MonitorSubPage.tsx index fcd7340c..44f51390 100644 --- a/frontend/packages/dashboard/src/component/MonitorSubPage.tsx +++ b/frontend/packages/dashboard/src/component/MonitorSubPage.tsx @@ -15,7 +15,7 @@ import { CloseOutlined, ExpandOutlined } from "@ant-design/icons"; import { useFetch } from "@common/hooks/http"; import { $t } from "@common/locales"; -export type MonitorSubQueryData = SearchBody & { projects?:string[] ,type?:'subscriber'|'provider'} +export type MonitorSubQueryData = SearchBody & { services?:string[] , apps?:string[],type?:'subscriber'|'provider'} export type MonitorSubPageProps = { @@ -60,10 +60,10 @@ export default function MonitorSubPage(props:MonitorSubPageProps){ }; const getProjectList = ()=>{ - return fetchData<{projects:EntityItem[]}>('simple/projects',{method:'GET'}).then((resp) => { + return fetchData<{services:EntityItem[]}>('simple/services',{method:'GET'}).then((resp) => { const {code,data,msg} = resp if(code === STATUS_CODE.SUCCESS){ - setListOfProjects(data.projects?.map((x:EntityItem)=>({label:x.name, value:x.id}))) + setListOfProjects(data.services?.map((x:EntityItem)=>({label:x.name, value:x.id}))) }else{ message.error(msg || $t(RESPONSE_TIPS.dataError)) return setListOfProjects([]) @@ -154,9 +154,9 @@ export default function MonitorSubPage(props:MonitorSubPageProps){ mode="multiple" maxTagCount={1} placeholder={$t("请选择服务")} - value={queryData?.projects} + value={queryData?.services} options={listOfProjects} - onChange={(value)=>{setQueryData(prevData=>({...prevData || {}, projects:value}))}} + onChange={(value)=>{setQueryData(prevData=>({...prevData || {}, services:value}))}} />