From ab6f6838343036c304f4da7bd09946096cc38646 Mon Sep 17 00:00:00 2001
From: Alex Cheung <alex.cheung@2fi-solutions.com.hk>
Date: Mon, 29 Jan 2024 11:21:21 +0800
Subject: [PATCH] fix window bug

---
 src/assets/style/styles.css                   |  4 +++-
 .../ApplyForm/PublicNoticeApplyForm.js        | 22 +++++++++++++++++--
 src/utils/FieldUtils.js                       |  5 +++--
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/assets/style/styles.css b/src/assets/style/styles.css
index e5738cb..07d26ce 100644
--- a/src/assets/style/styles.css
+++ b/src/assets/style/styles.css
@@ -46,4 +46,6 @@ img
 .huerotate {-webkit-filter: hue-rotate(180deg);}
 .rss.opacity {-webkit-filter: opacity(50%);}
 
-img:hover{-webkit-filter:none;}
\ No newline at end of file
+img:hover{-webkit-filter:none;}
+
+/* iframe#webpack-dev-server-client-overlay{display:none!important} */
\ No newline at end of file
diff --git a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
index d9d9da9..09b1d72 100644
--- a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
+++ b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
@@ -209,7 +209,6 @@ const PublicNoticeApplyForm = ({ loadedData, selections }) => {
                                     </Grid>
                                 </Grid>
                             </Grid>
-
                             <Grid item xs={12} md={12} lg={12}>
                                 <Grid container direction="row" justifyContent="flex-start" alignItems="center">
                                     <Grid item xs={12} md={3} lg={3}
@@ -231,7 +230,7 @@ const PublicNoticeApplyForm = ({ loadedData, selections }) => {
                                         />
                                         {attachment.name}
                                     </Grid>
-                                    <Grid item xs={12} md={3} lg={3}>
+                                    {/* <Grid item xs={12} md={3} lg={3}>
                                         <label htmlFor="uploadFileBtn">
                                             <Button
                                                 aria-label={intl.formatMessage({id: 'uploadFileBtn'})}
@@ -240,6 +239,25 @@ const PublicNoticeApplyForm = ({ loadedData, selections }) => {
                                                 size="large"
                                             >{attachment ? intl.formatMessage({id: 'uploadFileBtn'}) : intl.formatMessage({id: 'reUpload'})}</Button>
                                         </label>
+                                    </Grid> */}
+                                </Grid>
+                            </Grid>
+                            <Grid item xs={12} md={12} lg={12}>
+                                <Grid container direction="row" justifyContent="flex-start" alignItems="center">
+                                    <Grid item xs={12} md={3} lg={3}
+                                        sx={{ display: 'flex', alignItems: 'center' }}>
+                                    </Grid>
+                                    <Grid item xs={12} md={6} lg={6} >
+                                        <label htmlFor="uploadFileBtn">
+                                            <Button
+                                                aria-label={intl.formatMessage({id: 'uploadFileBtn'})}
+                                                component="span"
+                                                variant="outlined"
+                                                size="large"
+                                            >{attachment ? intl.formatMessage({id: 'uploadFileBtn'}) : intl.formatMessage({id: 'reUpload'})}</Button>
+                                        </label>
+                                    </Grid>
+                                    <Grid item xs={12} md={3} lg={3}>
                                     </Grid>
                                 </Grid>
                             </Grid>
diff --git a/src/utils/FieldUtils.js b/src/utils/FieldUtils.js
index 462cf1f..5e08b63 100644
--- a/src/utils/FieldUtils.js
+++ b/src/utils/FieldUtils.js
@@ -55,12 +55,13 @@ export const getTextArea = ({ label, valueName, form, disabled, inputProps, ...p
                 valueName: valueName,
                 form: form,
                 disabled: disabled,
-                multiline: true,
-                row: 10,
                 minRows: 4,
                 maxRows: 4,
                 inputProps: inputProps,
                 InputProps: {
+                    row: 10,
+                    multiline: true,
+                    inputComponent: 'textarea',
                     style: { minHeight:'42.5px', maxHeight: '50vh',height: 'auto'  },
                 },
                 props