diff --git a/src/pages/authentication/auth-forms/BusCustomFormWizard.js b/src/pages/authentication/auth-forms/BusCustomFormWizard.js index 6eddf8a..4066aeb 100644 --- a/src/pages/authentication/auth-forms/BusCustomFormWizard.js +++ b/src/pages/authentication/auth-forms/BusCustomFormWizard.js @@ -665,7 +665,6 @@ const BusCustomFormWizard = (props) => { fullWidth error={Boolean(formik.touched.enCompanyName && formik.errors.enCompanyName && selectedAddress5 !== "內地")} onBlur={formik.handleBlur} - disabled={selectedAddress5 === "內地"} inputProps={{ onKeyDown: (e) => { if (e.key === 'Enter') { @@ -850,7 +849,6 @@ const BusCustomFormWizard = (props) => { if(newValue=='香港'){ setCheckCountry(false) }else{ - if (newValue === "內地") formik.values.enCompanyName = "" setSelectedAddress4(""); setCheckCountry(true) } diff --git a/src/pages/authentication/auth-forms/CustomFormWizard.js b/src/pages/authentication/auth-forms/CustomFormWizard.js index c60da33..c3b93be 100644 --- a/src/pages/authentication/auth-forms/CustomFormWizard.js +++ b/src/pages/authentication/auth-forms/CustomFormWizard.js @@ -132,7 +132,7 @@ const CustomFormWizard = (props) => { data.password == data.confirmPassword&& selectedIdDocType.type !==""&& data.idNo !==""&& - (data.enName !=="" || selectedAddress5 === "內地")&& + (data.enName !=="" || selectedIdDocType.type === "CNID")&& data.chName !==""&& data.address1 !==""&& data.email !==""&& @@ -821,7 +821,7 @@ const CustomFormWizard = (props) => { 英文姓名 - {selectedAddress5 === "內地" ? "" : *} + {selectedIdDocType.type === "CNID" ? "" : *} { onChange={formik.handleChange} placeholder="與你的身份證明文件相同" fullWidth - error={Boolean(formik.touched.enName && formik.errors.enName && selectedAddress5 !== "內地")} + error={Boolean(formik.touched.enName && formik.errors.enName && selectedIdDocType.type !== "CNID")} onBlur={formik.handleBlur} - disabled={selectedAddress5 === "內地"} inputProps={{ onKeyDown: (e) => { if (e.key === 'Enter') { @@ -842,7 +841,7 @@ const CustomFormWizard = (props) => { }, }} /> - {formik.touched.enName && formik.errors.enName && selectedAddress5 !== "內地" && ( + {formik.touched.enName && formik.errors.enName && selectedIdDocType.type !== "CNID" && ( {formik.errors.enName} @@ -958,7 +957,6 @@ const CustomFormWizard = (props) => { if(newValue=='香港'){ setCheckCountry(false) }else{ - if (newValue === "內地") formik.values.enName = "" setSelectedAddress4(""); setCheckCountry(true) } diff --git a/src/utils/FieldUtils.js b/src/utils/FieldUtils.js index 68c60a2..f48ed13 100644 --- a/src/utils/FieldUtils.js +++ b/src/utils/FieldUtils.js @@ -67,6 +67,15 @@ export const getTextArea = ({ label, valueName, form, disabled, inputProps, ...p } export const getPhoneField = ({ label, valueName, form, disabled }) => { + form.handleChange = (event) => { + const value = event.target.value; + const name = event.target.name; + if (value.match(/[^0-9]/)) { + return event.preventDefault(); + } + if (valueName.code === name) form.setFieldValue(valueName.code, value) + if (valueName.num === name) form.setFieldValue(valueName.num, value) + } return