Merge branch 'feature/v1.2' into 'main'

Feature/v1.2 See merge request apipark/APIPark!49
2026-06-14 20:41:15 +08:00 · 2024-10-25 15:23:51 +08:00
parent 307faed57b 62d47077b1
commit b9cc53b694
11 changed files with 103 additions and 24 deletions
@@ -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',<Icon icon="ic:baseline-space-dashboard" width="18" height="18"/>, [
@@ -126,7 +122,6 @@ const themeToken = {

     
    const { message } = App.useApp()
-    const { dispatch,resetAccess,getGlobalAccessData} = useGlobalContext()
    const [userInfo,setUserInfo] = useState<UserInfoType>()
    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: (
                <Button key="changePsw" type="text" className="flex items-center p-0 bg-transparent border-none " onClick={()=>navigator('/userProfile/changepsw')}>
@@ -178,7 +173,7 @@ const themeToken = {
                {$t('退出登录')}
                </Button>)
        },
-    ];
+    ].filter(Boolean), [userInfo]);



@@ -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('取消申请')}
            
        </>
    )
@@ -7,6 +7,8 @@ export type UserInfoType = {
    email: string
    phone: string
    avatar: string
+    type:string
+
 }

 export type UserProfileProps = {
@@ -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",
@@ -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",
@@ -1,2 +1,16 @@
 {
+  "K76036e25": "HTTP 请求头",
+  "K44607e3f": "全等匹配",
+  "Kc287500a": "前缀匹配",
+  "Kfc0b1147": "后缀匹配",
+  "Ka4a92043": "子串匹配",
+  "K30b2e44f": "非等匹配",
+  "Kb1587991": "空值匹配",
+  "K1e97dbd8": "存在匹配",
+  "K87c5a801": "区分大小写的正则匹配",
+  "K95f062f1": "不区分大小写的正则匹配",
+  "Kfbd230a5": "任意匹配",
+  "Kd85208a3": "驳回",
+  "Kad6aa439": "已订阅",
+  "K9a68443b": "取消申请"
 }
@@ -1,2 +1,16 @@
 {
+  "K76036e25": "HTTP 请求头",
+  "K44607e3f": "全等匹配",
+  "Kc287500a": "前缀匹配",
+  "Kfc0b1147": "后缀匹配",
+  "Ka4a92043": "子串匹配",
+  "K30b2e44f": "非等匹配",
+  "Kb1587991": "空值匹配",
+  "K1e97dbd8": "存在匹配",
+  "K87c5a801": "区分大小写的正则匹配",
+  "K95f062f1": "不区分大小写的正则匹配",
+  "Kfbd230a5": "任意匹配",
+  "Kd85208a3": "驳回",
+  "Kad6aa439": "已订阅",
+  "K9a68443b": "取消申请"
 }
@@ -1,4 +1,18 @@
 {
+  "K76036e25": "HTTP 请求头",
+  "K44607e3f": "全等匹配",
+  "Kc287500a": "前缀匹配",
+  "Kfc0b1147": "后缀匹配",
+  "Ka4a92043": "子串匹配",
+  "K30b2e44f": "非等匹配",
+  "Kb1587991": "空值匹配",
+  "K1e97dbd8": "存在匹配",
+  "K87c5a801": "区分大小写的正则匹配",
+  "K95f062f1": "不区分大小写的正则匹配",
+  "Kfbd230a5": "任意匹配",
+  "Kd85208a3": "驳回",
+  "Kad6aa439": "已订阅",
+  "K9a68443b": "取消申请",
  "Kc3b7bfa8": "暂无消费者描述",
  "K3a6f905d": "输入名称、ID 查找消费者"
 }
@@ -1,4 +1,16 @@
 {
-  "Kc3b7bfa8": "暂无消费者描述",
-  "K3a6f905d": "输入名称、ID 查找消费者"
+  "K76036e25": "HTTP 请求头",
+  "K44607e3f": "全等匹配",
+  "Kc287500a": "前缀匹配",
+  "Kfc0b1147": "后缀匹配",
+  "Ka4a92043": "子串匹配",
+  "K30b2e44f": "非等匹配",
+  "Kb1587991": "空值匹配",
+  "K1e97dbd8": "存在匹配",
+  "K87c5a801": "区分大小写的正则匹配",
+  "K95f062f1": "不区分大小写的正则匹配",
+  "Kfbd230a5": "任意匹配",
+  "Kd85208a3": "驳回",
+  "Kad6aa439": "已订阅",
+  "K9a68443b": "取消申请"
 }
@@ -256,7 +256,7 @@ const AiServiceInsideRouterCreate = () => {
                            </Form.Item>
                            
                            
-                        <Form.Item label={$t("请求路径")}>
+                        <Form.Item  className="flex-1" label={$t("请求路径")}>
                            <Space.Compact block>
                                <Form.Item
                                        name="pathMatch"
@@ -276,7 +276,7 @@ const AiServiceInsideRouterCreate = () => {
                                        }]}
                                        noStyle
                                    >
-                                    <Input  prefix={(prefixForce ? `${apiPrefix}/` :"/")} className="w-INPUT_NORMAL" 
+                                    <Input  prefix={(prefixForce ? `${apiPrefix}/` :"/")} 
                                        placeholder={$t(PLACEHOLDER.input)} onChange={(e)=>{
                                            if((e.target.value as string).endsWith('/*')){
                                                form.setFieldValue('path',e.target.value.slice(0,-2))
@@ -153,7 +153,7 @@ const SystemList:FC = ()=>{
                
            <InsidePage 
                pageTitle={$t('服务')} 
-                description={'APIPark '+$t("服务提供了高性能 API 网关，并且可以无缝接入多种大型 AI 模型，并将这些 AI 能力打包成 API 进行调用，从而大幅简化了 AI 模型的使用门槛。同时，我们的平台提供了完善的 API 管理功能，支持 API 的创建、监控、访问控制等，保障开发者可以高效、安全地开发和管理 API 服务。")}
+                description={$t("服务提供了高性能 API 网关，并且可以无缝接入多种大型 AI 模型，并将这些 AI 能力打包成 API 进行调用，从而大幅简化了 AI 模型的使用门槛。同时，我们的平台提供了完善的 API 管理功能，支持 API 的创建、监控、访问控制等，保障开发者可以高效、安全地开发和管理 API 服务。")}
                showBorder={false}
                contentClassName=" pr-PAGE_INSIDE_X pb-PAGE_INSIDE_B"
                >