Browse Source

fix bug

master
Anna Ho 1 year ago
parent
commit
8fafcc63d0
2 changed files with 6 additions and 4 deletions
  1. +4
    -3
      src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
  2. +2
    -1
      src/utils/FieldUtils.js

+ 4
- 3
src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js View File

@@ -43,12 +43,12 @@ const PublicNoticeApplyForm = ({loadedData, selections}) => {
enableReinitialize:true, enableReinitialize:true,
initialValues:loadedData, initialValues:loadedData,
validationSchema:yup.object().shape({ validationSchema:yup.object().shape({
contactPerson: yup.string().max(40).required('請輸入聯絡人'),
contactPerson: yup.string().max(40, "不得超過 40 個字符").required('請輸入聯絡人'),
tel_countryCode: yup.string().min(3,'請輸入3位數字').required('請輸入國際區號'), tel_countryCode: yup.string().min(3,'請輸入3位數字').required('請輸入國際區號'),
fax_countryCode: yup.string().min(3,'請輸入3位數字'), fax_countryCode: yup.string().min(3,'請輸入3位數字'),
phoneNumber: yup.string().min(8,'請輸入8位數字').required('請輸入聯絡電話'), phoneNumber: yup.string().min(8,'請輸入8位數字').required('請輸入聯絡電話'),
faxNumber: yup.string().min(8,'請輸入8位數字'), faxNumber: yup.string().min(8,'請輸入8位數字'),
remarks: yup.string().max(255).nullable(),
remarks: yup.string().max(255, "不得超過 255 個字符").nullable(),
}), }),
onSubmit:values=>{ onSubmit:values=>{
if(!values.issueId){ if(!values.issueId){
@@ -212,7 +212,8 @@ const PublicNoticeApplyForm = ({loadedData, selections}) => {
{FieldUtils.getTextArea({ {FieldUtils.getTextArea({
label:"備註:", label:"備註:",
valueName:"remarks", valueName:"remarks",
form: formik
form: formik,
inputProps:{maxLength: 255}
})} })}
</Grid> </Grid>
<Grid item xs={12}> <Grid item xs={12}>


+ 2
- 1
src/utils/FieldUtils.js View File

@@ -43,7 +43,7 @@ export const getTextField = ({ label, valueName, form, disabled }) => {
</Grid>; </Grid>;
} }


export const getTextArea = ({ label, valueName, form, disabled, ...props }) => {
export const getTextArea = ({ label, valueName, form, disabled, inputProps, ...props }) => {
return <Grid container alignItems={"center"}> return <Grid container alignItems={"center"}>
<Grid item xs={12} md={3} lg={3} <Grid item xs={12} md={3} lg={3}
sx={{ display: 'flex', alignItems: 'center' }}> sx={{ display: 'flex', alignItems: 'center' }}>
@@ -59,6 +59,7 @@ export const getTextArea = ({ label, valueName, form, disabled, ...props }) => {
row: 10, row: 10,
minRows: 4, minRows: 4,
maxRows: 4, maxRows: 4,
inputProps: inputProps,
props props
})} })}
</Grid> </Grid>


Loading…
Cancel
Save