From 8641da60e11966dae0e005c3a1cbde1f6daee25e Mon Sep 17 00:00:00 2001 From: HOANGLAOTA Date: Fri, 19 Jul 2024 09:04:11 +0700 Subject: [PATCH] fix bug 1907 --- src/_components/Auth/InputDate/index.js | 7 +++++-- src/_containers/ListCustomer/index.js | 2 ++ src/_containers/ListGrantPage/index.js | 6 +++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/_components/Auth/InputDate/index.js b/src/_components/Auth/InputDate/index.js index 903a7f3..3ffc3b2 100644 --- a/src/_components/Auth/InputDate/index.js +++ b/src/_components/Auth/InputDate/index.js @@ -69,7 +69,6 @@ const InputDate = (props) => { }, }, ]} - disabledKeyboardNavigation onKeyDown={(e) => { e.preventDefault(); return false; @@ -78,7 +77,11 @@ const InputDate = (props) => { e.preventDefault(); return false }} - onFocus={e => e.target.blur()} + onFocus={e => e.target.blur()} + onChangeRaw={(e) => { + e.preventDefault() + }} + withPortal={props?.withPortal} /> {/* Err Text Under */} diff --git a/src/_containers/ListCustomer/index.js b/src/_containers/ListCustomer/index.js index 1cacd80..aa64b92 100644 --- a/src/_containers/ListCustomer/index.js +++ b/src/_containers/ListCustomer/index.js @@ -161,6 +161,7 @@ export default function ListCustomer() { errorText={errFilter.start_date} typeErrText='underAbsolute' errorAbsolute={true} + withPortal />
@@ -176,6 +177,7 @@ export default function ListCustomer() { errorText={errFilter.end_date} typeErrText='underAbsolute' errorAbsolute={true} + withPortal />
diff --git a/src/_containers/ListGrantPage/index.js b/src/_containers/ListGrantPage/index.js index 84e5894..dfe6fea 100644 --- a/src/_containers/ListGrantPage/index.js +++ b/src/_containers/ListGrantPage/index.js @@ -13,9 +13,7 @@ export default function ListGrantPage() { const authentication = useSelector((state) => state.authentication); const [listLevel] = useState(Array(authentication?.role === 'agents' ? 2 : 9).fill(0).map((_, i) => ({ title: `Cấp ${i + 1}`, - value: authentication?.role === 'agents' && Number(authentication?.grant) >= 0 - ? (Number(authentication?.grant) + (i + 1)).toString() - : (i + 1).toString(), + value: (Number(authentication?.grant) + (i + 1)).toString() }))) const [filter, setFilter] = useState({ keyword: '', @@ -267,6 +265,7 @@ export default function ListGrantPage() { errorText={errFilter.start_date} typeErrText='underAbsolute' errorAbsolute={true} + withPortal />
@@ -282,6 +281,7 @@ export default function ListGrantPage() { errorText={errFilter.end_date} typeErrText='underAbsolute' errorAbsolute={true} + withPortal />