From 1bedad903b19a70c99d1ae49a87925859a9ea38e Mon Sep 17 00:00:00 2001 From: maggieyyy <61950669+maggieyyy@users.noreply.github.com> Date: Mon, 2 Sep 2024 17:09:44 +0800 Subject: [PATCH] fix:change route & permission btn & datasource access --- .../components/aoplatform/RenderRoutes.tsx | 2 +- .../src/components/aoplatform/BasicLayout.tsx | 4 ++-- .../components/aoplatform/WithPermission.tsx | 4 ++-- .../packages/common/src/const/permissions.ts | 4 ++-- .../components/aoplatform/RenderRoutes.tsx | 2 +- .../packages/core/src/pages/guide/Guide.tsx | 2 +- .../core/src/pages/system/SystemConfig.tsx | 20 +++++++++---------- .../system/api/SystemInsideRouterList.tsx | 1 - .../dashboard/src/pages/DashboardTabPage.tsx | 2 +- .../dashboard/src/pages/DashboardTotal.tsx | 2 +- 10 files changed, 21 insertions(+), 22 deletions(-) diff --git a/frontend/packages/businessEntry/src/components/aoplatform/RenderRoutes.tsx b/frontend/packages/businessEntry/src/components/aoplatform/RenderRoutes.tsx index d86daa4d..f59db307 100644 --- a/frontend/packages/businessEntry/src/components/aoplatform/RenderRoutes.tsx +++ b/frontend/packages/businessEntry/src/components/aoplatform/RenderRoutes.tsx @@ -357,7 +357,7 @@ const PUBLIC_ROUTES:RouteConfig[] = [ key:uuidv4() }, APP_MODE === 'pro' &&{ - path:'dashboard', + path:'analytics', lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@dashboard/pages/Dashboard.tsx')), key:uuidv4(), children:[ diff --git a/frontend/packages/common/src/components/aoplatform/BasicLayout.tsx b/frontend/packages/common/src/components/aoplatform/BasicLayout.tsx index e93d221c..a9ad6a1c 100644 --- a/frontend/packages/common/src/components/aoplatform/BasicLayout.tsx +++ b/frontend/packages/common/src/components/aoplatform/BasicLayout.tsx @@ -56,8 +56,8 @@ const themeToken = { ]), getNavItem({$t('API 市场')}, 'serviceHub','/serviceHub',,undefined,undefined,'system.workspace.api_market.view'), - getNavItem($t('仪表盘'), 'mainPage', APP_MODE === 'pro' ? '/dashboard' : '/dashboard/total',,[ - getNavItem({$t('运行视图')}, 'dashboard',APP_MODE === 'pro' ? '/dashboard' : '/dashboard/total' ,,undefined,undefined,'system.dashboard.run_view.view'), + getNavItem($t('仪表盘'), 'mainPage', APP_MODE === 'pro' ? '/analytics' : '/analytics/total',,[ + getNavItem({$t('运行视图')}, 'analytics',APP_MODE === 'pro' ? '/analytics' : '/analytics/total' ,,undefined,undefined,'system.dashboard.run_view.view'), APP_MODE === 'pro' ? getNavItem({$t('系统拓扑图')}, 'systemrunning','/systemrunning',,undefined,undefined,'system.dashboard.systemrunning.view') : null, ],undefined,'system.dashboard.run_view.view'), diff --git a/frontend/packages/common/src/components/aoplatform/WithPermission.tsx b/frontend/packages/common/src/components/aoplatform/WithPermission.tsx index ecc14aac..72ab3525 100644 --- a/frontend/packages/common/src/components/aoplatform/WithPermission.tsx +++ b/frontend/packages/common/src/components/aoplatform/WithPermission.tsx @@ -1,5 +1,5 @@ -import { Tooltip } from "antd"; +import { Button, Tooltip, Upload } from "antd"; import { ReactElement, cloneElement, useEffect, useMemo, useState } from "react"; import { useGlobalContext } from "../../contexts/GlobalStateContext"; import { PERMISSION_DEFINITION } from "@common/const/permissions"; @@ -37,7 +37,7 @@ const WithPermission = ({access, tooltip, children,disabled, showDisabled = true {editAccess && disabled && { cloneElement(children, {disabled:true})} } - {!editAccess && (children?.type?.displayName !== 'Button' && children?.type?.displayName !== 'Upload' && showDisabled ) && + {!editAccess && (children?.type !== Button && children?.type !== Upload && showDisabled ) && { cloneElement(children, {disabled:true})} } diff --git a/frontend/packages/common/src/const/permissions.ts b/frontend/packages/common/src/const/permissions.ts index f5ea9d72..d7739302 100644 --- a/frontend/packages/common/src/const/permissions.ts +++ b/frontend/packages/common/src/const/permissions.ts @@ -145,12 +145,12 @@ export const PERMISSION_DEFINITION = [ } }, "system.devops.data_source.view":{ - "grented":{ + "granted":{ "anyOf":[{"backend":['system.devops.data_source.view']}] } }, "system.devops.data_source.edit":{ - "grented":{ + "granted":{ "anyOf":[{"backend":['system.devops.data_source.manager']}] } }, diff --git a/frontend/packages/core/src/components/aoplatform/RenderRoutes.tsx b/frontend/packages/core/src/components/aoplatform/RenderRoutes.tsx index b507f828..e7800d1d 100644 --- a/frontend/packages/core/src/components/aoplatform/RenderRoutes.tsx +++ b/frontend/packages/core/src/components/aoplatform/RenderRoutes.tsx @@ -358,7 +358,7 @@ const PUBLIC_ROUTES:RouteConfig[] = [ key:uuidv4() }, { - path:'dashboard', + path:'analytics', lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@dashboard/pages/Dashboard.tsx')), key:uuidv4(), children:[ diff --git a/frontend/packages/core/src/pages/guide/Guide.tsx b/frontend/packages/core/src/pages/guide/Guide.tsx index d05b623f..30fcdf58 100644 --- a/frontend/packages/core/src/pages/guide/Guide.tsx +++ b/frontend/packages/core/src/pages/guide/Guide.tsx @@ -90,7 +90,7 @@ const QuickGuideContent = ({changeGuideShow}:{changeGuideShow:Dispatch - {window.open('https://docs.apipark.com/docs/quick/','_blank')}}> + {window.open('https://docs.apipark.com/docs/quick/pre-work/monitor','_blank')}}> {$t('仪表盘中提供了多种统计图表，帮助我们了解 API 的运行情况。')} diff --git a/frontend/packages/core/src/pages/system/SystemConfig.tsx b/frontend/packages/core/src/pages/system/SystemConfig.tsx index fc900edb..310dd004 100644 --- a/frontend/packages/core/src/pages/system/SystemConfig.tsx +++ b/frontend/packages/core/src/pages/system/SystemConfig.tsx @@ -52,22 +52,22 @@ const SystemConfig = forwardRef((_,ref) => { return false; } - if (file.size > MAX_SIZE) { - try { - const compressedBase64 = await compressImage(file, MAX_SIZE); - setImageBase64(`data:${file.type};base64,${compressedBase64}`); - form.setFieldValue('logo', `data:${file.type};base64,${compressedBase64}`); - } catch (error) { - console.error('压缩图片时出错', error); - } - } else { + // if (file.size > MAX_SIZE) { + // try { + // const compressedBase64 = await compressImage(file, MAX_SIZE); + // setImageBase64(`data:${file.type};base64,${compressedBase64}`); + // form.setFieldValue('logo', `data:${file.type};base64,${compressedBase64}`); + // } catch (error) { + // console.error('压缩图片时出错', error); + // } + // } else { const reader = new FileReader(); reader.onload = (e: ProgressEvent) => { setImageBase64(e.target?.result as string); form.setFieldValue('logo', e.target?.result); }; reader.readAsDataURL(file); - } + // } return false; }; diff --git a/frontend/packages/core/src/pages/system/api/SystemInsideRouterList.tsx b/frontend/packages/core/src/pages/system/api/SystemInsideRouterList.tsx index f5cc32ca..6704d51e 100644 --- a/frontend/packages/core/src/pages/system/api/SystemInsideRouterList.tsx +++ b/frontend/packages/core/src/pages/system/api/SystemInsideRouterList.tsx @@ -37,7 +37,6 @@ const SystemInsideRouterList:FC = ()=>{ const [curApi, setCurApi] = useState() const getRoutesList = (): Promise<{ data: SystemApiTableListItem[], success: boolean }>=> { - //console.log(sorter, filter) if(!tableHttpReload){ setTableHttpReload(true) return Promise.resolve({ diff --git a/frontend/packages/dashboard/src/pages/DashboardTabPage.tsx b/frontend/packages/dashboard/src/pages/DashboardTabPage.tsx index d6d5ccf3..c42cc3a9 100644 --- a/frontend/packages/dashboard/src/pages/DashboardTabPage.tsx +++ b/frontend/packages/dashboard/src/pages/DashboardTabPage.tsx @@ -43,7 +43,7 @@ export default function DashboardTabPage(){ return (<> {APP_MODE === 'pro' ? { setActiveKey(val); - navigateTo(`/dashboard/${val === 'total' ? val :`${val}/list`}`) + navigateTo(`/analytics/${val === 'total' ? val :`${val}/list`}`) }} items={monitorTabItems} className="h-auto mt-[6px]" size="small" tabBarStyle={{paddingLeft:'10px',marginTop:'0px',marginBottom:'0px'}} /> : } ) diff --git a/frontend/packages/dashboard/src/pages/DashboardTotal.tsx b/frontend/packages/dashboard/src/pages/DashboardTotal.tsx index a62d0307..721d52e4 100644 --- a/frontend/packages/dashboard/src/pages/DashboardTotal.tsx +++ b/frontend/packages/dashboard/src/pages/DashboardTotal.tsx @@ -28,7 +28,7 @@ export default function DashboardTotal() { // ...跳转到详情页... const { start:startTime, end:endTime, clusters} = body navigateTo( - `/dashboard/${type}/list?${objectToSearchParameters({id:val.id,clusters:clusters || undefined, start: startTime?.toString(), end: endTime?.toString(), name:val.name}).toString()}`) + `/analytics/${type}/list?${objectToSearchParameters({id:val.id,clusters:clusters || undefined, start: startTime?.toString(), end: endTime?.toString(), name:val.name}).toString()}`) }; return