From 7afb73f994ba13607ba36c356e3363dee5a7e497 Mon Sep 17 00:00:00 2001 From: Liujian <[email protected]> Date: Wed, 3 Jul 2024 14:21:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A5=E5=BF=97=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=88=86=E5=8C=BA=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../intelligent-plugin/IntelligentPluginConfig.tsx | 2 +- .../src/pages/system/approval/SystemInsideApprovalList.tsx | 6 +++--- .../pages/system/upstream/SystemInsideUpstreamContent.tsx | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/packages/common/src/components/aoplatform/intelligent-plugin/IntelligentPluginConfig.tsx b/frontend/packages/common/src/components/aoplatform/intelligent-plugin/IntelligentPluginConfig.tsx index 3033d3d..c09181f 100644 --- a/frontend/packages/common/src/components/aoplatform/intelligent-plugin/IntelligentPluginConfig.tsx +++ b/frontend/packages/common/src/components/aoplatform/intelligent-plugin/IntelligentPluginConfig.tsx @@ -840,7 +840,7 @@ export const IntelligentPluginConfig = forwardRef diff --git a/frontend/packages/core/src/pages/system/approval/SystemInsideApprovalList.tsx b/frontend/packages/core/src/pages/system/approval/SystemInsideApprovalList.tsx index 04bb9d4..6d67b9f 100644 --- a/frontend/packages/core/src/pages/system/approval/SystemInsideApprovalList.tsx +++ b/frontend/packages/core/src/pages/system/approval/SystemInsideApprovalList.tsx @@ -1,8 +1,8 @@ /* * @Date: 2024-01-31 15:00:11 * @LastEditors: maggieyyy - * @LastEditTime: 2024-06-07 17:36:19 - * @FilePath: \frontend\packages\core\src\pages\system\approval\SystemInsideApprovalList.tsx + * @LastEditTime: 2024-07-02 17:13:12 + * @FilePath: \frontend\node_modules\.pnpm\node_modules\core\src\pages\system\approval\SystemInsideApprovalList.tsx */ import {ActionType, ProColumns} from "@ant-design/pro-components"; import {FC, useEffect, useMemo, useRef, useState} from "react"; @@ -60,7 +60,7 @@ const SystemInsideApprovalList:FC = ()=>{ return subscribeRef.current?.save('pass').then((res)=>res === true && manualReloadTable()) }, width:600, - okText:'确认', + okText:type === 'approval' ? '通过' : '确认', cancelText:type === 'approval' ?'取消':'关闭', okButtonProps:{ disabled : type === 'approval' ? !checkAccess('project.mySystem.publish.approval', accessData): false diff --git a/frontend/packages/core/src/pages/system/upstream/SystemInsideUpstreamContent.tsx b/frontend/packages/core/src/pages/system/upstream/SystemInsideUpstreamContent.tsx index b6168e6..97a66d1 100644 --- a/frontend/packages/core/src/pages/system/upstream/SystemInsideUpstreamContent.tsx +++ b/frontend/packages/core/src/pages/system/upstream/SystemInsideUpstreamContent.tsx @@ -1,7 +1,7 @@ /* * @Date: 2024-01-31 15:00:11 * @LastEditors: maggieyyy - * @LastEditTime: 2024-06-07 17:36:28 + * @LastEditTime: 2024-07-02 17:06:19 * @FilePath: \frontend\packages\core\src\pages\system\upstream\SystemInsideUpstreamContent.tsx */ import { App, Badge, Button, Col, Divider, Form, Input, InputNumber, Radio, Row, Select, Spin, Switch, Tabs} from "antd"; @@ -107,7 +107,7 @@ const SystemInsideUpstreamContent= forwardRef if(data.upstream?.[p.id]){ setFormStatus(pre=>({...pre, [p.id]:true})) } - data.upstream = {...data.upstream, [p.id] : (data.upstream?.[p.id] ? {...data.upstream[p.id], nodes:data.upstream[p.id].nodes ?? [{_id:uuidv4()}]} : {driver:'static', scheme:'HTTP', balance: 'round-robin',limitPeerSecond:5,timeout: 10000,proxyHeaders: [],retry:3})} + data.upstream = {...data.upstream, [p.id] : (data.upstream?.[p.id] ? {...data.upstream[p.id], nodes: (data.upstream[p.id].nodes ? [...data.upstream[p.id].nodes,{_id:uuidv4()}] : [{_id:uuidv4()}])} : {driver:'static', scheme:'HTTP', balance: 'round-robin',limitPeerSecond:5,timeout: 10000,proxyHeaders: [],retry:3})} } setFormDataFromApi(data.upstream) }else{