diff --git a/frontend/packages/common/src/components/aoplatform/BasicLayout.tsx b/frontend/packages/common/src/components/aoplatform/BasicLayout.tsx index 207996b8..7843ef1f 100644 --- a/frontend/packages/common/src/components/aoplatform/BasicLayout.tsx +++ b/frontend/packages/common/src/components/aoplatform/BasicLayout.tsx @@ -1,19 +1,15 @@ import { - ConfigProvider, - Dropdown, MenuProps, App, - Button} from 'antd'; + Button, + ConfigProvider, + Dropdown} from 'antd'; +import { Outlet, useLocation, useNavigate} from "react-router-dom"; import Logo from '@common/assets/layout-logo.png'; import AvatarPic from '@common/assets/default-avatar.png' -import {Outlet, useLocation, useNavigate} from "react-router-dom"; -import { useEffect, useMemo, useState} from "react"; +import { useEffect, useMemo, useState} from "react"; import { useGlobalContext } from '@common/contexts/GlobalStateContext.tsx'; import { PERMISSION_DEFINITION } from '@common/const/permissions.ts'; - import { - ProConfigProvider, - ProLayout, - } from '@ant-design/pro-components'; import { BasicResponse, RESPONSE_TIPS, routerKeyMap, STATUS_CODE } from '@common/const/const.tsx'; import { UserInfoType } from '@common/const/type.ts'; import { useFetch } from '@common/hooks/http.ts'; @@ -21,6 +17,7 @@ import { ProjectFilled } from '@ant-design/icons'; import { getNavItem } from '@common/utils/navigation'; import { Icon } from '@iconify/react'; import { $t } from '@common/locales'; +import { ProConfigProvider, ProLayout } from '@ant-design/pro-components'; import LanguageSetting from './LanguageSetting'; const APP_MODE = import.meta.env.VITE_APP_MODE; @@ -41,9 +38,8 @@ const themeToken = { const navigator = useNavigate() const location = useLocation() const currentUrl = location.pathname - const { state,accessData,checkPermission,accessInit} = useGlobalContext() - const [pathname, setPathname] = useState(currentUrl); - const mainPage = project === 'core' ?'/service/list':'/serviceHub/list' + const { state,accessData,checkPermission,accessInit,dispatch,resetAccess,getGlobalAccessData} = useGlobalContext() + const [pathname, setPathname] = useState(currentUrl); const mainPage = project === 'core' ?'/service/list':'/serviceHub/list' const TOTAL_MENU_ITEMS:MenuProps['items'] = useMemo(() => [ getNavItem($t('工作空间'), 'workspace','/guide/page',, [ @@ -126,7 +122,6 @@ const themeToken = { const { message } = App.useApp() - const { dispatch,resetAccess,getGlobalAccessData} = useGlobalContext() const [userInfo,setUserInfo] = useState() const {fetchData} = useFetch() const navigate = useNavigate(); @@ -163,8 +158,8 @@ const themeToken = { }) } - const items: MenuProps['items'] = [ - { + const items: MenuProps['items'] = useMemo(() => [ + userInfo?.type !== 'guest' && { key: '2', label: ( ) }, - ]; + ].filter(Boolean), [userInfo]); diff --git a/frontend/packages/common/src/components/aoplatform/UnUsedWordForTranslate.tsx b/frontend/packages/common/src/components/aoplatform/UnUsedWordForTranslate.tsx index 981fd393..d2d76808 100644 --- a/frontend/packages/common/src/components/aoplatform/UnUsedWordForTranslate.tsx +++ b/frontend/packages/common/src/components/aoplatform/UnUsedWordForTranslate.tsx @@ -137,6 +137,20 @@ export const TranslateWord = ()=>{ {$t('鉴权数量')} {$t('列表')} {$t('块')} + {$t('HTTP 请求头')} + {$t('全等匹配')} + {$t('前缀匹配')} + {$t('后缀匹配')} + {$t('子串匹配')} + {$t('非等匹配')} + {$t('空值匹配')} + {$t('存在匹配')} + {$t('区分大小写的正则匹配')} + {$t('不区分大小写的正则匹配')} + {$t('任意匹配')} + {$t('驳回')} + {$t('已订阅')} + {$t('取消申请')} ) diff --git a/frontend/packages/common/src/const/type.ts b/frontend/packages/common/src/const/type.ts index 1ea206cc..094d858e 100644 --- a/frontend/packages/common/src/const/type.ts +++ b/frontend/packages/common/src/const/type.ts @@ -7,6 +7,8 @@ export type UserInfoType = { email: string phone: string avatar: string + type:string + } export type UserProfileProps = { diff --git a/frontend/packages/common/src/locales/keyHashMap.json b/frontend/packages/common/src/locales/keyHashMap.json index 534968c4..0731b7e7 100644 --- a/frontend/packages/common/src/locales/keyHashMap.json +++ b/frontend/packages/common/src/locales/keyHashMap.json @@ -212,6 +212,20 @@ "鉴权数量": "Ka701316", "列表": "K9eaa2eb6", "块": "Kfaec39e9", + "HTTP 请求头": "K76036e25", + "全等匹配": "K44607e3f", + "前缀匹配": "Kc287500a", + "后缀匹配": "Kfc0b1147", + "子串匹配": "Ka4a92043", + "非等匹配": "K30b2e44f", + "空值匹配": "Kb1587991", + "存在匹配": "K1e97dbd8", + "区分大小写的正则匹配": "K87c5a801", + "不区分大小写的正则匹配": "K95f062f1", + "任意匹配": "Kfbd230a5", + "驳回": "Kd85208a3", + "已订阅": "Kad6aa439", + "取消申请": "K9a68443b", "暂无操作权限,请联系管理员分配。": "K23fda291", "微信小程序": "K4618cb0a", "获取文件,需填路径": "Ka854f511", diff --git a/frontend/packages/common/src/locales/scan/en-US.json b/frontend/packages/common/src/locales/scan/en-US.json index 2811dec3..7f32cdda 100644 --- a/frontend/packages/common/src/locales/scan/en-US.json +++ b/frontend/packages/common/src/locales/scan/en-US.json @@ -580,8 +580,8 @@ "Kd7d84192": "Name", "Kc88e03b6": "Team Roles", "Ke08ff808": "Addition Date", - "K19a3ebe0": "Successful Requests", - "Kcaa8259": "Successful Forwards", + "K19a3ebe0": "Success", + "Kcaa8259": "Success", "K17f93984": "API", "K888f038f": "Failed Status Code Count", "Ke792d01c": "Service Association", @@ -607,7 +607,7 @@ "Ke108c369": "Success", "K9168d3e": "Redirecting to Login Page", "K2f8a7ab7": "Review Comments Not Provided", - "Kb858d78a": "Copy Successful", + "Kb858d78a": "Copied", "K26e85d15": "Copy Failed, Please Copy Manually", "Kd60d204": "Service Team", "K823bfe63": "Online", diff --git a/frontend/packages/common/src/locales/scan/newJson/en-US.json b/frontend/packages/common/src/locales/scan/newJson/en-US.json index 7a73a41b..522f3e8d 100644 --- a/frontend/packages/common/src/locales/scan/newJson/en-US.json +++ b/frontend/packages/common/src/locales/scan/newJson/en-US.json @@ -1,2 +1,16 @@ { + "K76036e25": "HTTP 请求头", + "K44607e3f": "全等匹配", + "Kc287500a": "前缀匹配", + "Kfc0b1147": "后缀匹配", + "Ka4a92043": "子串匹配", + "K30b2e44f": "非等匹配", + "Kb1587991": "空值匹配", + "K1e97dbd8": "存在匹配", + "K87c5a801": "区分大小写的正则匹配", + "K95f062f1": "不区分大小写的正则匹配", + "Kfbd230a5": "任意匹配", + "Kd85208a3": "驳回", + "Kad6aa439": "已订阅", + "K9a68443b": "取消申请" } \ No newline at end of file diff --git a/frontend/packages/common/src/locales/scan/newJson/ja-JP.json b/frontend/packages/common/src/locales/scan/newJson/ja-JP.json index 7a73a41b..522f3e8d 100644 --- a/frontend/packages/common/src/locales/scan/newJson/ja-JP.json +++ b/frontend/packages/common/src/locales/scan/newJson/ja-JP.json @@ -1,2 +1,16 @@ { + "K76036e25": "HTTP 请求头", + "K44607e3f": "全等匹配", + "Kc287500a": "前缀匹配", + "Kfc0b1147": "后缀匹配", + "Ka4a92043": "子串匹配", + "K30b2e44f": "非等匹配", + "Kb1587991": "空值匹配", + "K1e97dbd8": "存在匹配", + "K87c5a801": "区分大小写的正则匹配", + "K95f062f1": "不区分大小写的正则匹配", + "Kfbd230a5": "任意匹配", + "Kd85208a3": "驳回", + "Kad6aa439": "已订阅", + "K9a68443b": "取消申请" } \ No newline at end of file diff --git a/frontend/packages/common/src/locales/scan/newJson/zh-CN.json b/frontend/packages/common/src/locales/scan/newJson/zh-CN.json index 0e647920..1ac9637f 100644 --- a/frontend/packages/common/src/locales/scan/newJson/zh-CN.json +++ b/frontend/packages/common/src/locales/scan/newJson/zh-CN.json @@ -1,4 +1,18 @@ { + "K76036e25": "HTTP 请求头", + "K44607e3f": "全等匹配", + "Kc287500a": "前缀匹配", + "Kfc0b1147": "后缀匹配", + "Ka4a92043": "子串匹配", + "K30b2e44f": "非等匹配", + "Kb1587991": "空值匹配", + "K1e97dbd8": "存在匹配", + "K87c5a801": "区分大小写的正则匹配", + "K95f062f1": "不区分大小写的正则匹配", + "Kfbd230a5": "任意匹配", + "Kd85208a3": "驳回", + "Kad6aa439": "已订阅", + "K9a68443b": "取消申请", "Kc3b7bfa8": "暂无消费者描述", "K3a6f905d": "输入名称、ID 查找消费者" } \ No newline at end of file diff --git a/frontend/packages/common/src/locales/scan/newJson/zh-TW.json b/frontend/packages/common/src/locales/scan/newJson/zh-TW.json index 0e647920..522f3e8d 100644 --- a/frontend/packages/common/src/locales/scan/newJson/zh-TW.json +++ b/frontend/packages/common/src/locales/scan/newJson/zh-TW.json @@ -1,4 +1,16 @@ { - "Kc3b7bfa8": "暂无消费者描述", - "K3a6f905d": "输入名称、ID 查找消费者" + "K76036e25": "HTTP 请求头", + "K44607e3f": "全等匹配", + "Kc287500a": "前缀匹配", + "Kfc0b1147": "后缀匹配", + "Ka4a92043": "子串匹配", + "K30b2e44f": "非等匹配", + "Kb1587991": "空值匹配", + "K1e97dbd8": "存在匹配", + "K87c5a801": "区分大小写的正则匹配", + "K95f062f1": "不区分大小写的正则匹配", + "Kfbd230a5": "任意匹配", + "Kd85208a3": "驳回", + "Kad6aa439": "已订阅", + "K9a68443b": "取消申请" } \ No newline at end of file diff --git a/frontend/packages/core/src/pages/aiService/api/AiServiceInsideRouterCreate.tsx b/frontend/packages/core/src/pages/aiService/api/AiServiceInsideRouterCreate.tsx index 0377e05e..e983f90d 100644 --- a/frontend/packages/core/src/pages/aiService/api/AiServiceInsideRouterCreate.tsx +++ b/frontend/packages/core/src/pages/aiService/api/AiServiceInsideRouterCreate.tsx @@ -256,7 +256,7 @@ const AiServiceInsideRouterCreate = () => { - + { }]} noStyle > - { if((e.target.value as string).endsWith('/*')){ form.setFieldValue('path',e.target.value.slice(0,-2)) diff --git a/frontend/packages/core/src/pages/system/SystemList.tsx b/frontend/packages/core/src/pages/system/SystemList.tsx index 8f53ae96..fa906a19 100644 --- a/frontend/packages/core/src/pages/system/SystemList.tsx +++ b/frontend/packages/core/src/pages/system/SystemList.tsx @@ -153,7 +153,7 @@ const SystemList:FC = ()=>{