diff --git a/src/components/FileUpload/FileUpload.less b/src/components/FileUpload/FileUpload.less index 413983a..8cbfbc4 100644 --- a/src/components/FileUpload/FileUpload.less +++ b/src/components/FileUpload/FileUpload.less @@ -9,12 +9,8 @@ text-overflow: ellipsis; } - .ant-upload-select { - margin-bottom: 8px; - } .file-upload-tip { - margin-top: 8px; color: rgba(0, 0, 0, 0.45); font-size: 12px; line-height: 1.5; diff --git a/src/components/FileUpload/FileUpload.tsx b/src/components/FileUpload/FileUpload.tsx index 2cf13ec..02b34a0 100644 --- a/src/components/FileUpload/FileUpload.tsx +++ b/src/components/FileUpload/FileUpload.tsx @@ -203,7 +203,7 @@ const FileUpload: React.FC = ({ } return ( - ); diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index 8d9e243..36b0f16 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -13,6 +13,7 @@ import supplierAnnualTemplateManage from './en-US/supplierAnnualTemplateManage'; import supplierAnnualReview from './en-US/supplierAnnualReview'; import supplierAnnualResult from './en-US/supplierAnnualResult'; import supplierAnnualTaskManage from './en-US/supplierAnnualTaskManage'; +import components from './en-US/component'; export default { 'navBar.lang': 'Languages', @@ -39,4 +40,5 @@ export default { ...supplierAnnualReview, ...supplierAnnualResult, ...supplierAnnualTaskManage, + ...components, }; diff --git a/src/locales/en-US/component.ts b/src/locales/en-US/component.ts new file mode 100644 index 0000000..00c19e0 --- /dev/null +++ b/src/locales/en-US/component.ts @@ -0,0 +1,3 @@ +export default { + 'component.fileUpload.buttonText': 'Upload File', +}; diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index d8c824b..ed575e1 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -13,6 +13,7 @@ import supplierAnnualTemplateManage from './zh-CN/supplierAnnualTemplateManage'; import supplierAnnualReview from './zh-CN/supplierAnnualReview'; import supplierAnnualResult from './zh-CN/supplierAnnualResult'; import supplierAnnualTaskManage from './zh-CN/supplierAnnualTaskManage'; +import components from './zh-CN/component'; export default { 'navBar.lang': '语言', @@ -39,4 +40,5 @@ export default { ...supplierAnnualReview, ...supplierAnnualResult, ...supplierAnnualTaskManage, + ...components, }; diff --git a/src/locales/zh-CN/component.ts b/src/locales/zh-CN/component.ts new file mode 100644 index 0000000..ac630a0 --- /dev/null +++ b/src/locales/zh-CN/component.ts @@ -0,0 +1,3 @@ +export default { + 'component.fileUpload.buttonText': '上传文件', +}; diff --git a/src/pages/register/supplier/CommonFormSections.tsx b/src/pages/register/supplier/CommonFormSections.tsx index 3aa2afd..bade76e 100644 --- a/src/pages/register/supplier/CommonFormSections.tsx +++ b/src/pages/register/supplier/CommonFormSections.tsx @@ -138,7 +138,7 @@ export const QualificationSection: React.FC = ({ form } @@ -177,7 +177,11 @@ export const QualificationSection: React.FC = ({ form } title: createRequiredTitle('资质类别和等级'), dataIndex: 'certLevel', render: (_, record) => ( - + ), @@ -241,11 +245,21 @@ export const QualificationSection: React.FC = ({ form } rules={[createConditionalRule('certFile', '请上传资质证书附件')]} style={{ margin: 0 }} wrapperCol={{ span: 24 }} + getValueProps={(value) => { + return { + value: value?.length > 0 ? value[0]?.url : undefined, + }; + }} + getValueFromEvent={(value) => { + return value.length > 0 && value[0].url; + }} > ), @@ -350,16 +364,25 @@ export const InvoiceSection: React.FC = ({ form }) => { - - { + return { + value: value?.length > 0 ? value[0]?.url : undefined, + }; + }} + getValueFromEvent={(value) => { + return value.length > 0 && value[0].url; + }} + > + validateFileSize(file, 10, ['pdf', 'jpg', 'jpeg', 'png'])} - > - - + allowedTypes={['pdf', 'jpg', 'jpeg', 'png']} + maxSize={10} + tip="pdf,jpg,jpeg,png类型的文件,大小不超过10MB" + /> @@ -796,43 +819,22 @@ export const AttachmentSection: React.FC = ({ form }) = { + return value.length > 0 && value[0].url; + }} + getValueProps={(value) => { + return { + value: value?.length > 0 ? value[0]?.url : undefined, + }; + }} > - - validateFileSize(file, 10, ['pdf', 'doc', 'docx']) - } - onChange={(info) => { - if (info.file.status === 'done') { - const response = info.file.response; - if (response && response.success) { - // 填充文件信息 - form.setFieldsValue({ - coscoSupplierSurveyAttachments: [ - { - ...form.getFieldValue([ - 'coscoSupplierSurveyAttachments', - field.name, - ]), - fileName: info.file.name, - fileType: info.file.type, - fileSize: info.file.size?.toString() || '0', - filePath: response.filePath || response.url, - }, - ], - }); - message.success(`${info.file.name} 上传成功`); - } else { - message.error(`${info.file.name} 上传失败`); - } - } - }} - > - - + allowedTypes={['pdf', 'doc', 'docx', 'jpg', 'jpeg', 'png']} + maxSize={10} + tip="pdf,doc,docx,jpg,jpeg,png类型的文件,大小不超过10MB" + /> ))} @@ -869,42 +871,23 @@ export const AttachmentSection: React.FC = ({ form }) = )} {index > 0 && ( - - { + return value.length > 0 && value[0].url; + }} + getValueProps={(value) => { + return { + value: value?.length > 0 ? value[0]?.url : undefined, + }; + }} + > + validateFileSize(file, 20, ['*'])} - onChange={(info) => { - if (info.file.status === 'done') { - const response = info.file.response; - if (response && response.success) { - // 填充文件信息 - const fieldValue = form.getFieldValue([ - 'coscoSupplierSurveyAttachments', - field.name, - ]); - form.setFieldsValue({ - coscoSupplierSurveyAttachments: [ - { - ...fieldValue, - fileName: info.file.name, - fileType: info.file.type, - fileSize: info.file.size?.toString() || '0', - filePath: response.filePath || response.url, - }, - ], - }); - message.success(`${info.file.name} 上传成功`); - } else { - message.error(`${info.file.name} 上传失败`); - } - } - }} - > - - + maxSize={10} + tip="大小不超过10MB" + /> )} diff --git a/src/pages/register/supplier/DomesticForm.tsx b/src/pages/register/supplier/DomesticForm.tsx index b6a74a4..f13ce4b 100644 --- a/src/pages/register/supplier/DomesticForm.tsx +++ b/src/pages/register/supplier/DomesticForm.tsx @@ -72,13 +72,12 @@ const DomesticForm: React.FC = ({ { - // return { - // value: value?.length > 0 ? value[0]?.url : undefined, - // }; - // }} + getValueProps={(value) => { + return { + value: value?.length > 0 ? value[0]?.url : undefined, + }; + }} getValueFromEvent={(value) => { return value?.length > 0 ? value[0]?.url : undefined; }} @@ -88,6 +87,7 @@ const DomesticForm: React.FC = ({ maxCount={1} maxSize={10} allowedTypes={['pdf', 'jpg', 'jpeg', 'png']} + tip="pdf,jpg,jpeg,png类型的文件,大小不超过10MB" > @@ -220,7 +220,11 @@ const DomesticForm: React.FC = ({ - + } placeholder="请具体注明省、市、区、路、门牌号"