From 2135205f40f1c22f07b936d0891cbe836ac3c6ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A2=A6=E6=B4=81?= Date: Thu, 28 Nov 2024 18:14:02 +0800 Subject: [PATCH] fix: service data-masking layout --- frontend/packages/common/src/locales/scan/en-US.json | 2 +- .../core/src/pages/aiService/AiServiceInsidePage.tsx | 6 ++++-- .../packages/core/src/pages/common/ApiRequestSetting.tsx | 2 +- .../core/src/pages/policy/dataMasking/DataMasking.tsx | 2 +- .../src/pages/policy/dataMasking/DataMaskingConfig.tsx | 1 + .../packages/core/src/pages/system/SystemInsidePage.tsx | 9 +++++---- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/frontend/packages/common/src/locales/scan/en-US.json b/frontend/packages/common/src/locales/scan/en-US.json index 4fe97074..50c3af57 100644 --- a/frontend/packages/common/src/locales/scan/en-US.json +++ b/frontend/packages/common/src/locales/scan/en-US.json @@ -684,7 +684,7 @@ "K35f23b64": "Follow these steps for integration:", "Kf5cd608b": "Step 1: Create a custom plugin on the Agent platform", "K4c81c7b6": "For details on the operations of different Agent platforms, refer to", - "K275f7ffa": "the 'Agent Integration Manual'", + "K275f7ffa": "the Agent Integration Manual", "K49b81d06": "Step 2: Import API documentation data", "K4a3b62be": "You can import API documentation data to the Agent platform via the following URL or by downloading the JSON file.", "K42697e11": "Copy URL", diff --git a/frontend/packages/core/src/pages/aiService/AiServiceInsidePage.tsx b/frontend/packages/core/src/pages/aiService/AiServiceInsidePage.tsx index a99eef7b..3459f146 100644 --- a/frontend/packages/core/src/pages/aiService/AiServiceInsidePage.tsx +++ b/frontend/packages/core/src/pages/aiService/AiServiceInsidePage.tsx @@ -19,7 +19,7 @@ const APP_MODE = import.meta.env.VITE_APP_MODE; const AiServiceInsidePage:FC = ()=> { const { message } = App.useApp() - const { teamId,serviceId,apiId, routeId } = useParams(); + const { teamId,serviceId,apiId, routeId,policyId } = useParams(); const location = useLocation() const currentUrl = location.pathname const {fetchData} = useFetch() @@ -109,7 +109,9 @@ const AiServiceInsidePage:FC = ()=> { }; useEffect(() => { - setShowMenu(!routeId && !currentUrl.includes('route/create')) + // route edit and policy edit page don't need to show menu + setShowMenu(!routeId && !currentUrl.includes('route/create') && !policyId &&!currentUrl.includes('servicepolicy/datamasking/create')) + if(apiId !== undefined){ setActiveMenu('api') } else if(currentUrl.includes('servicepolicy')){ diff --git a/frontend/packages/core/src/pages/common/ApiRequestSetting.tsx b/frontend/packages/core/src/pages/common/ApiRequestSetting.tsx index a5be297a..02c688c8 100644 --- a/frontend/packages/core/src/pages/common/ApiRequestSetting.tsx +++ b/frontend/packages/core/src/pages/common/ApiRequestSetting.tsx @@ -78,7 +78,7 @@ export default function ApiRequestSetting(){ label={$t("集成地址")} name="sitePrefix" - rules={[{ required: true,whitespace:true }]} + rules={[{ whitespace:true }]} extra={$t("与外部平台集成时，获取 API 市场中文档信息的域名")} > diff --git a/frontend/packages/core/src/pages/policy/dataMasking/DataMasking.tsx b/frontend/packages/core/src/pages/policy/dataMasking/DataMasking.tsx index 5973b939..a42d2e37 100644 --- a/frontend/packages/core/src/pages/policy/dataMasking/DataMasking.tsx +++ b/frontend/packages/core/src/pages/policy/dataMasking/DataMasking.tsx @@ -76,7 +76,7 @@ const DataMasking = (props: any) => { { title: '', key: 'option', - btnNums: rowOperation.length, + btnNums: rowOperation.length -1, fixed: 'right', valueType: 'option', render: (_: React.ReactNode, entity: any) => [ diff --git a/frontend/packages/core/src/pages/policy/dataMasking/DataMaskingConfig.tsx b/frontend/packages/core/src/pages/policy/dataMasking/DataMaskingConfig.tsx index a6953e0c..b0349fd9 100644 --- a/frontend/packages/core/src/pages/policy/dataMasking/DataMaskingConfig.tsx +++ b/frontend/packages/core/src/pages/policy/dataMasking/DataMaskingConfig.tsx @@ -96,6 +96,7 @@ const DataMaskingConfig = forwardRef((_,ref) => { showBorder={false} scrollPage={false} className="overflow-y-auto" + backUrl={serviceId ? '../list' : undefined} > } spinning={loading} wrapperClassName=' pb-PAGE_INSIDE_B pr-PAGE_INSIDE_X'> diff --git a/frontend/packages/core/src/pages/system/SystemInsidePage.tsx b/frontend/packages/core/src/pages/system/SystemInsidePage.tsx index 89ac2c36..b7a3082d 100644 --- a/frontend/packages/core/src/pages/system/SystemInsidePage.tsx +++ b/frontend/packages/core/src/pages/system/SystemInsidePage.tsx @@ -1,7 +1,6 @@ import { FC, useEffect, useMemo, useState } from "react"; import { Link, Outlet, useLocation, useNavigate, useParams } from "react-router-dom"; -import { RouterParams } from "@core/components/aoplatform/RenderRoutes.tsx"; import { App, Menu, MenuProps } from "antd"; import { BasicResponse, RESPONSE_TIPS, STATUS_CODE } from "@common/const/const.tsx"; import { useFetch } from "@common/hooks/http.ts"; @@ -15,11 +14,12 @@ import { ItemType, MenuItemGroupType, MenuItemType } from "antd/es/menu/hooks/us import { cloneDeep } from "lodash-es"; import { $t } from "@common/locales/index.ts"; import { getItem } from "@common/utils/navigation.tsx"; +import { RouterParams } from "@common/const/type.ts"; const APP_MODE = import.meta.env.VITE_APP_MODE; const SystemInsidePage: FC = () => { const { message } = App.useApp() - const { teamId, serviceId, apiId, routeId } = useParams(); + const { teamId, serviceId, apiId, routeId,policyId } = useParams(); const location = useLocation() const currentUrl = location.pathname const { fetchData } = useFetch() @@ -107,8 +107,9 @@ const SystemInsidePage: FC = () => { setActiveMenu(key) }; - useEffect(() => { - setShowMenu(!routeId && !currentUrl.includes('route/create')) + useEffect(() => { + // route edit and policy edit page don't need to show menu + setShowMenu(!routeId && !currentUrl.includes('route/create') && !policyId && !currentUrl.includes('servicepolicy/datamasking/create')) if (apiId !== undefined) { setActiveMenu('api') } else if(currentUrl.includes('servicepolicy')){