浏览代码

Fix prepress p.1,3,14

master
cyril.tsui 1年前
父节点
当前提交
4175b3d3d3
共有 3 个文件被更改,包括 13 次插入8 次删除
  1. +0
    -2
      src/pages/authentication/auth-forms/BusCustomFormWizard.js
  2. +4
    -6
      src/pages/authentication/auth-forms/CustomFormWizard.js
  3. +9
    -0
      src/utils/FieldUtils.js

+ 0
- 2
src/pages/authentication/auth-forms/BusCustomFormWizard.js 查看文件

@@ -665,7 +665,6 @@ const BusCustomFormWizard = (props) => {
fullWidth fullWidth
error={Boolean(formik.touched.enCompanyName && formik.errors.enCompanyName && selectedAddress5 !== "內地")} error={Boolean(formik.touched.enCompanyName && formik.errors.enCompanyName && selectedAddress5 !== "內地")}
onBlur={formik.handleBlur} onBlur={formik.handleBlur}
disabled={selectedAddress5 === "內地"}
inputProps={{ inputProps={{
onKeyDown: (e) => { onKeyDown: (e) => {
if (e.key === 'Enter') { if (e.key === 'Enter') {
@@ -850,7 +849,6 @@ const BusCustomFormWizard = (props) => {
if(newValue=='香港'){ if(newValue=='香港'){
setCheckCountry(false) setCheckCountry(false)
}else{ }else{
if (newValue === "內地") formik.values.enCompanyName = ""
setSelectedAddress4(""); setSelectedAddress4("");
setCheckCountry(true) setCheckCountry(true)
} }


+ 4
- 6
src/pages/authentication/auth-forms/CustomFormWizard.js 查看文件

@@ -132,7 +132,7 @@ const CustomFormWizard = (props) => {
data.password == data.confirmPassword&& data.password == data.confirmPassword&&
selectedIdDocType.type !==""&& selectedIdDocType.type !==""&&
data.idNo !==""&& data.idNo !==""&&
(data.enName !=="" || selectedAddress5 === "內地")&&
(data.enName !=="" || selectedIdDocType.type === "CNID")&&
data.chName !==""&& data.chName !==""&&
data.address1 !==""&& data.address1 !==""&&
data.email !==""&& data.email !==""&&
@@ -821,7 +821,7 @@ const CustomFormWizard = (props) => {
<Grid item xs={12} md={6}> <Grid item xs={12} md={6}>
<Stack spacing={1}> <Stack spacing={1}>
<InputLabel htmlFor="enName-signup">英文姓名 <InputLabel htmlFor="enName-signup">英文姓名
{selectedAddress5 === "內地" ? "" : <span style={{color: '#f10000'}}>*</span>}
{selectedIdDocType.type === "CNID" ? "" : <span style={{color: '#f10000'}}>*</span>}
</InputLabel> </InputLabel>
<OutlinedInput <OutlinedInput
id="enName-login" id="enName-login"
@@ -831,9 +831,8 @@ const CustomFormWizard = (props) => {
onChange={formik.handleChange} onChange={formik.handleChange}
placeholder="與你的身份證明文件相同" placeholder="與你的身份證明文件相同"
fullWidth fullWidth
error={Boolean(formik.touched.enName && formik.errors.enName && selectedAddress5 !== "內地")}
error={Boolean(formik.touched.enName && formik.errors.enName && selectedIdDocType.type !== "CNID")}
onBlur={formik.handleBlur} onBlur={formik.handleBlur}
disabled={selectedAddress5 === "內地"}
inputProps={{ inputProps={{
onKeyDown: (e) => { onKeyDown: (e) => {
if (e.key === 'Enter') { 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" && (
<FormHelperText error id="helper-text-enName-signup"> <FormHelperText error id="helper-text-enName-signup">
{formik.errors.enName} {formik.errors.enName}
</FormHelperText> </FormHelperText>
@@ -958,7 +957,6 @@ const CustomFormWizard = (props) => {
if(newValue=='香港'){ if(newValue=='香港'){
setCheckCountry(false) setCheckCountry(false)
}else{ }else{
if (newValue === "內地") formik.values.enName = ""
setSelectedAddress4(""); setSelectedAddress4("");
setCheckCountry(true) setCheckCountry(true)
} }


+ 9
- 0
src/utils/FieldUtils.js 查看文件

@@ -67,6 +67,15 @@ export const getTextArea = ({ label, valueName, form, disabled, inputProps, ...p
} }


export const getPhoneField = ({ label, valueName, form, disabled }) => { 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 <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' }}>


正在加载...
取消
保存