From e77a13fe841aa6a23224d8f609e96713bb42cf2d Mon Sep 17 00:00:00 2001 From: anna Date: Mon, 13 Nov 2023 11:31:10 +0800 Subject: [PATCH] Squashed commit of the following: commit 605c115d48807f6ae460fd2df16827e9dab686c6 Author: cyril.tsui Date: Fri Nov 10 16:33:40 2023 +0800 update commit 4ac2c961276ca1aff05853188c0de9203c60a0a4 Merge: d89d1be 3dbd0b3 Author: Jason Date: Fri Nov 10 16:16:27 2023 +0800 Merge branch 'master' of https://git.2fi-solutions.com/alex/PNSPS-frontend-MaterialUI commit d89d1be964dedda24cf88c1a41f6a0513442661b Author: Jason Date: Fri Nov 10 16:16:25 2023 +0800 update commit 3dbd0b30dcac6f93d5b37dfb1d3a396d0fc80ecd Author: cyril.tsui Date: Fri Nov 10 16:15:39 2023 +0800 update commit d6fca0218ae5ef224918be613fedfdaf14d1a1a9 Author: cyril.tsui Date: Fri Nov 10 15:42:38 2023 +0800 update --- src/pages/Proof/Create_FromApp/ProofForm.js | 22 +++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/pages/Proof/Create_FromApp/ProofForm.js b/src/pages/Proof/Create_FromApp/ProofForm.js index fb40ee1..c89d34e 100644 --- a/src/pages/Proof/Create_FromApp/ProofForm.js +++ b/src/pages/Proof/Create_FromApp/ProofForm.js @@ -10,6 +10,7 @@ import { FormLabel, Button } from '@mui/material'; + import * as UrlUtils from "utils/ApiPathConst"; import * as HttpUtils from "utils/HttpUtils"; import MainCard from "components/MainCard"; @@ -20,8 +21,6 @@ import { useNavigate } from "react-router-dom"; import Loadable from 'components/Loadable'; import { notifySaveSuccess } from 'utils/CommonFunction'; const UploadFileTable = Loadable(React.lazy(() => import('./UploadFileTable'))); -// ==============================|| DASHBOARD - DEFAULT ||============================== // - const FormPanel = ({ formData }) => { @@ -239,9 +238,12 @@ const FormPanel = ({ formData }) => { size="small" type="text" onChange={(event) => { - const value = event.target.value; - formik.setFieldValue("length", value); - formik.setFieldValue("fee", 6552 * value); + const re = /^[0-9\b]+$/; + if (event.target.value === '' || re.test(event.target.value)) { + const value = event.target.value; + formik.setFieldValue("length", value); + formik.setFieldValue("fee", 6552 * value); + } }} name="noOfPages" value={formik.values["noOfPages"]} @@ -275,9 +277,13 @@ const FormPanel = ({ formData }) => { size="small" type="text" onChange={(event) => { - const value = event.target.value; - formik.setFieldValue("length", value); - formik.setFieldValue("fee", columnPrice.value * value); + const re = /^[0-9\b]+$/; + if (event.target.value === '' || re.test(event.target.value)) { + const value = event.target.value; + formik.setFieldValue("length", value); + formik.setFieldValue("fee", columnPrice.value * value); + } + }} name="length" value={formik.values["length"]}