Merge branch 'dev' of http://59.110.10.99:53000/liuc/fe_supplier_frontend into dev

src/components/FileUpload/FileUpload.tsx

@@ -50,7 +50,7 @@ const FileUpload: React.FC<FileUploadProps> = ({
   listType = 'text',
   buttonText,
   disabled = false,
-  accept = allowedTypes.map(type => `.${type}`).join(','),
+  accept = allowedTypes.map((type) => `.${type}`).join(','),
   showUploadList = true,
   isDragger = false,
   tip,
@@ -62,7 +62,6 @@ const FileUpload: React.FC<FileUploadProps> = ({
 
   // 监听value变化
   useEffect(() => {
-
     // 处理字符串URL值（这是关键修复）
     if (typeof value === 'string' && value) {
       const file: Partial<UploadFile> = {
@@ -144,12 +143,12 @@ const FileUpload: React.FC<FileUploadProps> = ({
     const filteredList = newFileList.filter((file) => file.status !== 'error');
 
     // 为每个文件添加正确的url
-    const processedList = filteredList.map(file => {
+    const processedList = filteredList.map((file) => {
       if (file.status === 'done' && file.response && !file.url) {
         return {
           ...file,
           url: getFileUrl(file),
-          filePath: file?.response?.filePath || "filePath not found",
+          filePath: file?.response?.filePath || 'filePath not found',
         };
       }
       return file;
@@ -163,7 +162,7 @@ const FileUpload: React.FC<FileUploadProps> = ({
   };
 
   const beforeUpload = (file: File) => {
-    return validateFileSize(file, maxSize);
+    return validateFileSize(file, maxSize, allowedTypes);
   };
 
   const UploadComponent = isDragger ? Upload.Dragger : Upload;
@@ -204,7 +203,12 @@ const FileUpload: React.FC<FileUploadProps> = ({
     }
 
     return (
-      <Button type="link" style={{ padding: 0, height: 'auto',marginTop: 6 }} icon={<UploadOutlined />} disabled={disabled}>
+      <Button
+        type="link"
+        style={{ padding: 0, height: 'auto', marginTop: 6 }}
+        icon={<UploadOutlined />}
+        disabled={disabled}
+      >
         {buttonText || defaultButtonText}
       </Button>
     );

src/pages/register/supplier/CommonFormSections.tsx

@@ -16,7 +16,7 @@ import {
   Radio,
   Cascader,
   Empty,
-  Descriptions
+  Descriptions,
 } from 'antd';
 import { UploadOutlined, PlusOutlined, DeleteOutlined } from '@ant-design/icons';
 import { message } from 'antd';
@@ -25,7 +25,7 @@ import { getRegionTree, getregionInternational } from '@/servers/api/register';
 import { getDictList } from '@/servers/api/dicts';
 import type { DictItem } from '@/servers/api/dicts';
 import FileUpload from '@/components/FileUpload/FileUpload';
-import DictRegionSelect from '@/components/CommonSelect/DictRegionSelect'
+import DictRegionSelect from '@/components/CommonSelect/DictRegionSelect';
 
 const { Option } = Select;
 
@@ -589,11 +589,10 @@ export const BankAccountSection: React.FC<CommonFormSectionsProps> = ({ form, su
                     </Form.Item>
 
                     {/* 级联选择器用于用户选择 */}
-                    <Form.Item
+                    <Form.Item noStyle rules={[{ required: true, message: '请选择地址' }]}>
-                      noStyle
+                      <DictRegionSelect
-                      rules={[{ required: true, message: '请选择地址' }]}
+                        onChange={(value: any) => handleAddressChange(value as string[], record)}
-                    >
+                      />
-                      <DictRegionSelect onChange={(value:any) => handleAddressChange(value as string[], record)} />
                       {/* <Cascader
                         options={addressOptions}
                         placeholder="请选择地址"
@@ -834,7 +833,6 @@ export const AttachmentSection: React.FC<CommonFormSectionsProps> = ({ form }) =
           >
             下载模版
           </Button>
-
         </Descriptions.Item>
         <Descriptions.Item label="请加盖公司公章后上传">
           <Form.List name="coscoSupplierSurveyAttachments">
@@ -868,7 +866,6 @@ export const AttachmentSection: React.FC<CommonFormSectionsProps> = ({ form }) =
                         <Input />
                       </Form.Item>
 
-
                       <Form.Item
                         name={[field.name, 'fileUrl']}
                         rules={[{ required: true, message: '请上传已盖章的反商业贿赂承诺书' }]}
@@ -884,8 +881,8 @@ export const AttachmentSection: React.FC<CommonFormSectionsProps> = ({ form }) =
                                   fileSize: file.size.toString(),
                                   fileUrl: file.url,
                                   filePath: file.filePath,
-                                }
+                                },
-                              }
+                              },
                             });
                             return file.url;
                           }
@@ -902,6 +899,7 @@ export const AttachmentSection: React.FC<CommonFormSectionsProps> = ({ form }) =
                           maxCount={1}
                           allowedTypes={['pdf', 'doc', 'docx', 'jpg', 'jpeg', 'png']}
                           maxSize={10}
+                          tip="pdf,doc,docx,jpg,jpeg,png类型的文件,大小不超过10MB"
                         />
                       </Form.Item>
                     </div>
@@ -910,9 +908,7 @@ export const AttachmentSection: React.FC<CommonFormSectionsProps> = ({ form }) =
               );
             }}
           </Form.List>
-
         </Descriptions.Item>
-
       </Descriptions>
 
       <div className="form-section-title">其他附件</div>
@@ -970,8 +966,8 @@ export const AttachmentSection: React.FC<CommonFormSectionsProps> = ({ form }) =
                                   fileSize: file.size.toString(),
                                   fileUrl: file.url,
                                   filePath: file.filePath,
-                                }
+                                },
-                              }
+                              },
                             });
                             return file.url;
                           }

src/utils/utils.ts

@@ -4,14 +4,22 @@ import { message,Upload } from 'antd';
 // 参数说明:
 // file: 上传的文件
 // maxSize: 最大文件大小
-export const validateFileSize = (file: File, maxSize: number) => {
+export const validateFileSize = (file: File, maxSize: number, type: string[]) => {
+  // 自己抓取文件的后缀名
+  const dotIndex = file.name.lastIndexOf('.');
+  const fileType = dotIndex !== -1 ? file.name.substring(dotIndex + 1) : '';
   const { LIST_IGNORE } = Upload;
   const isLtMaxSize = file.size / 1024 / 1024 < maxSize;
   if (!isLtMaxSize) {
     message.error(`文件大小不能超过${maxSize}MB!`);
     return LIST_IGNORE;
   }
-  return isLtMaxSize;
+  const isValidFormat = type.includes('*') || (fileType ? type.includes(fileType) : type.includes(''));
+  if (!isValidFormat) {
+    message.error(`只能上传${type.join(',')}格式文件!`);
+    return LIST_IGNORE;
+  }
+  return isValidFormat && isLtMaxSize;
 };