Merge branch 'develop' into feature/tool_yjp

web/src/views/ToolManagement/components/CustomToolModal.tsx

@@ -6,6 +6,7 @@ import type { CustomToolItem, CustomToolModalRef, ToolItem } from '../types'
 import RbModal from '@/components/RbModal';
 import { parseSchema, addTool, updateTool } from '@/api/tools';
 import Table from '@/components/Table';
+import { stringRegExp } from '@/utils/validator';
 const FormItem = Form.Item;
 
 interface CustomToolModalProps {
@@ -134,7 +135,11 @@ const CustomToolModal = forwardRef<CustomToolModalRef, CustomToolModalProps>(({
         <Form.Item
           name="name"
           label={t('tool.name')}
-          rules={[{ required: true, message: t('common.enterNamePlaceholder') }]}
+          rules={[
+            { required: true, message: t('tool.enterNamePlaceholder') },
+            { max: 50 },
+            { pattern: stringRegExp, message: t('common.nameInvalid') },
+          ]}
         >
           <Input placeholder={t('tool.enterNamePlaceholder')} />
         </Form.Item>

web/src/views/ToolManagement/components/McpServiceModal.tsx

@@ -9,6 +9,7 @@ import RequestHeaderModal from './RequestHeaderModal';
 import Table from '@/components/Table';
 import { addTool, updateTool, testConnection } from '@/api/tools'
 import type { McpServiceModalRef } from '../types'
+import { stringRegExp } from '@/utils/validator';
 
 const FormItem = Form.Item;
 
@@ -174,14 +175,22 @@ const McpServiceModal = forwardRef<McpServiceModalRef, McpServiceModalProps>(({
           name={['config', "server_url"]}
           label={t('tool.serviceEndpoint')}
           extra={t('tool.serviceEndpointExtra')}
-          rules={[{ required: true, message: t('common.pleaseEnter') }]}
+          rules={[
+            { required: true, message: t('common.pleaseEnter') },
+            { max: 500 },
+            { pattern: /^https?:\/\/\S+$/, message: t('tool.serverUrlInvalid') },
+          ]}
         >
           <Input placeholder={t('tool.serviceEndpointPlaceholder')} />
         </FormItem>
         <Form.Item
           name="name"
           label={t('tool.name')}
-          rules={[{ required: true, message: t('common.pleaseEnter') }]}
+          rules={[
+            { required: true, message: t('common.pleaseEnter') },
+            { max: 50 },
+            { pattern: stringRegExp, message: t('common.nameInvalid') },
+          ]}
         >
           <Input placeholder={t('tool.namePlaceholder')} />
         </Form.Item>
@@ -207,6 +216,7 @@ const McpServiceModal = forwardRef<McpServiceModalRef, McpServiceModalProps>(({
         <FormItem
           name="description"
           label={t('tool.description')}
+          rules={[{ max: 500 }]}
         >
           <Input.TextArea rows={3} placeholder={t('common.inputPlaceholder', { title: t('tool.description') })}/>
         </FormItem>

web/src/views/ToolManagement/components/RequestHeaderModal.tsx

@@ -4,6 +4,7 @@ import { useTranslation } from 'react-i18next';
 
 import type { RequestHeader, RequestHeaderModalRef } from './McpServiceModal'
 import RbModal from '@/components/RbModal'
+import { stringRegExp } from '@/utils/validator';
 
 const FormItem = Form.Item;
 
@@ -82,7 +83,11 @@ const RequestHeaderModal = forwardRef<RequestHeaderModalRef, RequestHeaderModalP
         <FormItem
           name="key"
           label={t('tool.requestHeaderName')}
-          rules={[{ required: true, message: t('common.pleaseEnter') }]}
+          rules={[
+            { required: true, message: t('common.pleaseEnter') },
+            { pattern: /^[a-zA-Z0-9][a-zA-Z0-9\-_]*[a-zA-Z0-9]$|^[a-zA-Z0-9]$/, message: t('tool.requestHeaderKeyInvalid') },
+            { max: 100 }
+          ]}
         >
           <Input placeholder={t('common.enter')} />
         </FormItem>
@@ -90,7 +95,11 @@ const RequestHeaderModal = forwardRef<RequestHeaderModalRef, RequestHeaderModalP
         <FormItem
           name="value"
           label={t('tool.requestHeaderValue')}
-          rules={[{ required: true, message: t('common.pleaseEnter') }]}
+          rules={[
+            { required: true, message: t('common.pleaseEnter') },
+            { pattern: stringRegExp, message: t('common.nameInvalid') },
+            { max: 2000 }
+          ]}
         >
           <Input placeholder={t('common.enter',)} />
         </FormItem>