alex
/
PNSPS-frontend-MaterialUI
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

update combo layout

New_Enhancement
Alex Cheung 4 weeks ago
parent
1c1db00bce
commit
e26e45395f
27 changed files with 221 additions and 47 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +5
    -0
      src/pages/DemandNote/Create/SearchForm.js
  2. +5
    -0
      src/pages/DemandNote/Export/SearchForm.js
  3. +15
    -0
      src/pages/DemandNote/Search/SearchForm.js
  4. +10
    -0
      src/pages/DemandNote/Search_Public/SearchForm.js
  5. +3
    -3
      src/pages/GazetteIssue/ExportForm.js
  6. +3
    -3
      src/pages/GazetteIssue/SearchForm.js
  7. +3
    -3
      src/pages/Holiday/SearchForm.js
  8. +5
    -0
      src/pages/Organization/SearchPage/OrganizationSearchForm.js
  9. +5
    -0
      src/pages/Payment/Search_GLD/SearchForm.js
  10. +5
    -0
      src/pages/Payment/Search_Public/SearchForm.js
  11. +5
    -1
      src/pages/Proof/Create_FromApp/ProofForm.js
  12. +20
    -0
      src/pages/Proof/Search_GLD/SearchForm.js
  13. +10
    -0
      src/pages/Proof/Search_Public/SearchForm.js
  14. +5
    -1
      src/pages/PublicNotice/Details_GLD/StatusChangeDialog.js
  15. +5
    -0
      src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
  16. +5
    -0
      src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js
  17. +20
    -0
      src/pages/PublicNotice/Search_GLD/SearchForm.js
  18. +15
    -0
      src/pages/PublicNotice/Search_Mark_As_Paid_GLD/SearchForm.js
  19. +10
    -0
      src/pages/Recon/SearchForm.js
  20. +5
    -0
      src/pages/User/SearchPage_Individual/UserSearchForm_Individual.js
  21. +16
    -6
      src/pages/User/SearchPage_Organization/UserSearchForm_Organization.js
  22. +10
    -5
      src/pages/authentication/auth-forms/BusCustomFormWizard.js
  23. +13
    -6
      src/pages/authentication/auth-forms/CustomFormWizard.js
  24. +12
    -5
      src/pages/authentication/auth-forms/IAmSmartFormWizard.js
  25. +5
    -0
      src/pages/pnspsUserGroupDetailPage/UserAddCard.js
  26. +3
    -7
      src/utils/Combo.js
  27. +3
    -7
      src/utils/SelectBase.js

+ 5
- 0
src/pages/DemandNote/Create/SearchForm.js View File

@@ -173,6 +173,11 @@ const SearchPublicNoticeForm = ({ applySearch, issueComboData, _paymentCount, _p
setIssueSelected(newValue); setIssueSelected(newValue);
} }
}} }}
sx={{
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}}
renderInput={(params) => ( renderInput={(params) => (
<TextField {...params} <TextField {...params}
label="Gazette Issue" label="Gazette Issue"


+ 5
- 0
src/pages/DemandNote/Export/SearchForm.js View File

@@ -174,6 +174,11 @@ const SearchPublicNoticeForm = ({ applySearch, issueComboData }) => {
setIssueSelected(newValue); setIssueSelected(newValue);
} }
}} }}
sx={{
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}}
renderInput={(params) => ( renderInput={(params) => (
<TextField {...params} <TextField {...params}
label="Gazette Issue" label="Gazette Issue"


+ 15
- 0
src/pages/DemandNote/Search/SearchForm.js View File

@@ -211,6 +211,11 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
onChange={(event, newValue) => { onChange={(event, newValue) => {
setIssueSelected(newValue); setIssueSelected(newValue);
}} }}
sx={{
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}}
renderInput={(params) => ( renderInput={(params) => (
<TextField {...params} <TextField {...params}
label="Gazette Issue No." label="Gazette Issue No."
@@ -256,6 +261,11 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
setOrgSelected({}); setOrgSelected({});
} }
}} }}
sx={{
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}}
renderInput={(params) => ( renderInput={(params) => (
<TextField {...params} <TextField {...params}
label="Organisation" label="Organisation"
@@ -421,6 +431,11 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
} }
}} }}
getOptionLabel={(option) => option.label} getOptionLabel={(option) => option.label}
sx={{
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}}
renderInput={(params) => ( renderInput={(params) => (
<TextField <TextField
{...params} {...params}


+ 10
- 0
src/pages/DemandNote/Search_Public/SearchForm.js View File

@@ -167,6 +167,11 @@ const SearchDemandNoteForm = ({ applySearch, searchCriteria, issueComboData, onG
setIssueSelected(newValue); setIssueSelected(newValue);
} }
}} }}
sx={{
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}}
renderInput={(params) => ( renderInput={(params) => (
<TextField {...params} <TextField {...params}
label={intl.formatMessage({ id: 'gazetteCount' })} label={intl.formatMessage({ id: 'gazetteCount' })}
@@ -274,6 +279,11 @@ const SearchDemandNoteForm = ({ applySearch, searchCriteria, issueComboData, onG
setSelectedStatus(newValue); setSelectedStatus(newValue);
} }
}} }}
sx={{
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}}
renderInput={(params) => ( renderInput={(params) => (
<TextField <TextField
{...params} {...params}


+ 3
- 3
src/pages/GazetteIssue/ExportForm.js View File

@@ -81,9 +81,9 @@ const SearchGazetteIssueForm = ({ applyExport, comboData, waitDownload}) => {
setSelectedYear(newValue); setSelectedYear(newValue);
}} }}
sx={{ sx={{
"& .MuiInputBase-root": { height: "41px" },
"#year-combo": { padding: "0px 0px 0px 0px" },
"& .MuiAutocomplete-endAdornment": { top: "auto" },
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}} }}
renderInput={(params) => <TextField {...params} placeholder={""}/>} renderInput={(params) => <TextField {...params} placeholder={""}/>}
/> />


+ 3
- 3
src/pages/GazetteIssue/SearchForm.js View File

@@ -79,9 +79,9 @@ const SearchGazetteIssueForm = ({ applySearch, comboData, onGridReady}) => {
setSelectedYear(newValue); setSelectedYear(newValue);
}} }}
sx={{ sx={{
"& .MuiInputBase-root": { height: "41px" },
"#year-combo": { padding: "0px 0px 0px 0px" },
"& .MuiAutocomplete-endAdornment": { top: "auto" },
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}} }}
renderInput={(params) => <TextField {...params} placeholder={""}/>} renderInput={(params) => <TextField {...params} placeholder={""}/>}
/> />


+ 3
- 3
src/pages/Holiday/SearchForm.js View File

@@ -79,9 +79,9 @@ const SearchHolidayForm = ({ applySearch, comboData, onGridReady}) => {
setSelectedYear(newValue); setSelectedYear(newValue);
}} }}
sx={{ sx={{
"& .MuiInputBase-root": { height: "41px" },
"#year-combo": { padding: "0px 0px 0px 0px" },
"& .MuiAutocomplete-endAdornment": { top: "auto" },
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}} }}
renderInput={(params) => <TextField {...params} placeholder={""}/>} renderInput={(params) => <TextField {...params} placeholder={""}/>}
/> />


+ 5
- 0
src/pages/Organization/SearchPage/OrganizationSearchForm.js View File

@@ -150,6 +150,11 @@ const OrganizationSearchForm = ({ applySearch, onGridReady, searchCriteria }) =>
}} }}
getOptionLabel={(option) => option.label} getOptionLabel={(option) => option.label}
sx={{
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}}
renderInput={(params) => ( renderInput={(params) => (
<TextField <TextField
{...params} {...params}


+ 5
- 0
src/pages/Payment/Search_GLD/SearchForm.js View File

@@ -202,6 +202,11 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, onGridReady }) =>
setStatus(newValue); setStatus(newValue);
} }
}} }}
sx={{
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}}
renderInput={(params) => ( renderInput={(params) => (
<TextField {...params} <TextField {...params}
label="Status" label="Status"


+ 5
- 0
src/pages/Payment/Search_Public/SearchForm.js View File

@@ -200,6 +200,11 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, onGridReady }) =>
setStatus(ComboData.paymentStatus[0]); setStatus(ComboData.paymentStatus[0]);
} }
}} }}
sx={{
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}}
renderInput={(params) => ( renderInput={(params) => (
<TextField {...params} <TextField {...params}
label={intl.formatMessage({id: 'status'})} label={intl.formatMessage({id: 'status'})}


+ 5
- 1
src/pages/Proof/Create_FromApp/ProofForm.js View File

@@ -397,7 +397,10 @@ const FormPanel = ({ formData }) => {


<Autocomplete <Autocomplete
sx={{ sx={{
width: "15%"
width: "15%",
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}} }}
disablePortal disablePortal
id="price" id="price"
@@ -409,6 +412,7 @@ const FormPanel = ({ formData }) => {
setColumnPrice(newValue) setColumnPrice(newValue)
formik.values["fee"] = newValue.value * formik.values.length; formik.values["fee"] = newValue.value * formik.values.length;
}} }}
renderInput={(params) => ( renderInput={(params) => (
<TextField {...params} <TextField {...params}
InputLabelProps={{ InputLabelProps={{


+ 20
- 0
src/pages/Proof/Search_GLD/SearchForm.js View File

@@ -232,6 +232,11 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
onChange={(event, newValue) => { onChange={(event, newValue) => {
setIssueSelected(newValue); setIssueSelected(newValue);
}} }}
sx={{
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}}
renderInput={(params) => ( renderInput={(params) => (
<TextField {...params} <TextField {...params}
label="Gazette Issue No." label="Gazette Issue No."
@@ -256,6 +261,11 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
onChange={(event, newValue) => { onChange={(event, newValue) => {
setGroupSelected(newValue); setGroupSelected(newValue);
}} }}
sx={{
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}}
renderInput={(params) => ( renderInput={(params) => (
<TextField {...params} <TextField {...params}
label="Gazette Group" label="Gazette Group"
@@ -355,6 +365,11 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
setStatus(newValue); setStatus(newValue);
} }
}} }}
sx={{
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}}
renderInput={(params) => ( renderInput={(params) => (
<TextField {...params} <TextField {...params}
label="Status" label="Status"
@@ -387,6 +402,11 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
setOrgSelected({}); setOrgSelected({});
} }
}} }}
sx={{
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}}
renderInput={(params) => ( renderInput={(params) => (
<TextField {...params} <TextField {...params}
label="Organisation" label="Organisation"


+ 10
- 0
src/pages/Proof/Search_Public/SearchForm.js View File

@@ -210,6 +210,11 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData, o
onChange={(event, newValue) => { onChange={(event, newValue) => {
setIssueSelected(newValue); setIssueSelected(newValue);
}} }}
sx={{
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}}
renderInput={(params) => ( renderInput={(params) => (
<TextField {...params} <TextField {...params}
label={intl.formatMessage({id: 'gazetteCount'})} label={intl.formatMessage({id: 'gazetteCount'})}
@@ -335,6 +340,11 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData, o
setStatus(ComboData.proofStatus[0]); setStatus(ComboData.proofStatus[0]);
} }
}} }}
sx={{
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}}
renderInput={(params) => ( renderInput={(params) => (
<TextField {...params} <TextField {...params}
label={intl.formatMessage({id: 'status'})} label={intl.formatMessage({id: 'status'})}


+ 5
- 1
src/pages/PublicNotice/Details_GLD/StatusChangeDialog.js View File

@@ -160,7 +160,11 @@ const StatusChangeDialog = (props) => {
props.setSelectedGazetteGroupInputType(""); props.setSelectedGazetteGroupInputType("");
} }
}} }}
// sx={{"& .MuiInputBase-root": { height: "41px" },"#idDocType":{padding: "0px 0px 0px 0px"}, "& .MuiAutocomplete-endAdornment": { top: "auto" },}}
sx={{
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}}
renderInput={(params) => <TextField {...params} placeholder="" />} renderInput={(params) => <TextField {...params} placeholder="" />}
/> />
</Grid> </Grid>


+ 5
- 0
src/pages/PublicNotice/ListPanel/PendingPaymentTab.js View File

@@ -393,6 +393,11 @@ export default function SubmittedTab({ setCount, url }) {
// console.log(newValue) // console.log(newValue)
setSelectedCareOf(newValue); setSelectedCareOf(newValue);
}} }}
sx={{
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}}
renderInput={(params) => <TextField {...params} />} renderInput={(params) => <TextField {...params} />}
/> />
</Grid> </Grid>


+ 5
- 0
src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js View File

@@ -242,6 +242,11 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, onGridReady }) =>
setStatus(newValue); setStatus(newValue);
} }
}} }}
sx={{
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}}
renderInput={(params) => ( renderInput={(params) => (
<TextField {...params} <TextField {...params}
label={intl.formatMessage({id: 'status'})} label={intl.formatMessage({id: 'status'})}


+ 20
- 0
src/pages/PublicNotice/Search_GLD/SearchForm.js View File

@@ -272,6 +272,11 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
} }
}} }}
getOptionLabel={(option) => option.label} getOptionLabel={(option) => option.label}
sx={{
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}}
renderInput={(params) => ( renderInput={(params) => (
<TextField <TextField
{...params} {...params}
@@ -337,6 +342,11 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
setOrgSelected({}); setOrgSelected({});
} }
}} }}
sx={{
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}}
renderInput={(params) => ( renderInput={(params) => (
<TextField {...params} <TextField {...params}
label="Organisation" label="Organisation"
@@ -371,6 +381,11 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
onChange={(event, newValue) => { onChange={(event, newValue) => {
setIssueSelected(newValue); setIssueSelected(newValue);
}} }}
sx={{
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}}
renderInput={(params) => ( renderInput={(params) => (
<TextField {...params} <TextField {...params}
label="Gazette Issue No." label="Gazette Issue No."
@@ -395,6 +410,11 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
onChange={(event, newValue) => { onChange={(event, newValue) => {
setGroupSelected(newValue); setGroupSelected(newValue);
}} }}
sx={{
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}}
renderInput={(params) => ( renderInput={(params) => (
<TextField {...params} <TextField {...params}
label="Gazette Group" label="Gazette Group"


+ 15
- 0
src/pages/PublicNotice/Search_Mark_As_Paid_GLD/SearchForm.js View File

@@ -267,6 +267,11 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
} }
}} }}
getOptionLabel={(option) => option.label} getOptionLabel={(option) => option.label}
sx={{
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}}
renderInput={(params) => ( renderInput={(params) => (
<TextField <TextField
{...params} {...params}
@@ -333,6 +338,11 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
setOrgSelected({}); setOrgSelected({});
} }
}} }}
sx={{
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}}
renderInput={(params) => ( renderInput={(params) => (
<TextField {...params} <TextField {...params}
label="Organisation" label="Organisation"
@@ -367,6 +377,11 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
onChange={(event, newValue) => { onChange={(event, newValue) => {
setIssueSelected(newValue); setIssueSelected(newValue);
}} }}
sx={{
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}}
renderInput={(params) => ( renderInput={(params) => (
<TextField {...params} <TextField {...params}
label="Gazette Issue No." label="Gazette Issue No."


+ 10
- 0
src/pages/Recon/SearchForm.js View File

@@ -192,6 +192,11 @@ const SearchPublicNoticeForm = ({ applySearch, generateReport, onLoad }) => {
setMethod(newValue); setMethod(newValue);
} }
}} }}
sx={{
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}}
renderInput={(params) => ( renderInput={(params) => (
<TextField {...params} <TextField {...params}
label="Payment Method" label="Payment Method"
@@ -219,6 +224,11 @@ const SearchPublicNoticeForm = ({ applySearch, generateReport, onLoad }) => {
setStatus(newValue); setStatus(newValue);
} }
}} }}
sx={{
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}}
renderInput={(params) => ( renderInput={(params) => (
<TextField {...params} <TextField {...params}
label="Payment Status" label="Payment Status"


+ 5
- 0
src/pages/User/SearchPage_Individual/UserSearchForm_Individual.js View File

@@ -146,6 +146,11 @@ const UserSearchForm_Individual = ({ applySearch, onGridReady, searchCriteria })
setAccountFilter("All"); setAccountFilter("All");
} }
}} }}
sx={{
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}}
renderInput={(params) => ( renderInput={(params) => (
<TextField {...params} <TextField {...params}
label="Status" label="Status"


+ 16
- 6
src/pages/User/SearchPage_Organization/UserSearchForm_Organization.js View File

@@ -119,6 +119,11 @@ const UserSearchForm_Organization = ({applySearch, orgComboData, onGridReady, se
setOrgSelected({}); setOrgSelected({});
} }
}} }}
sx={{
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}}
renderInput={(params) => ( renderInput={(params) => (
<TextField {...params} <TextField {...params}
label="Organisation" label="Organisation"
@@ -214,12 +219,17 @@ const UserSearchForm_Organization = ({applySearch, orgComboData, onGridReady, se
options={["All", "Active","Locked","Not Verified"]} options={["All", "Active","Locked","Not Verified"]}
value={accountFilter} value={accountFilter}
onChange={(event, newValue) => { onChange={(event, newValue) => {
if (newValue !== null){
setAccountFilter(newValue);
}else{
setAccountFilter("All");
}
}}
if (newValue !== null){
setAccountFilter(newValue);
}else{
setAccountFilter("All");
}
}}
sx={{
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}}
renderInput={(params) => ( renderInput={(params) => (
<TextField {...params} <TextField {...params}
label="Status" label="Status"


+ 10
- 5
src/pages/authentication/auth-forms/BusCustomFormWizard.js View File

@@ -1035,9 +1035,11 @@ const BusCustomFormWizard = (props) => {
onChange={(event, newValue) => { onChange={(event, newValue) => {
setSelectedAddress4(newValue); setSelectedAddress4(newValue);
}} }}
sx={{ "& .MuiInputBase-root": { height: "41px" },
"#address4-combo": { padding: "0px 0px 0px 3px" },
"& .MuiAutocomplete-endAdornment": { top: "auto" }, }}
sx={{
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}}
renderInput={(params) => <TextField error={checkDistrict} {...params} placeholder={intl.formatMessage({id: 'region'})} renderInput={(params) => <TextField error={checkDistrict} {...params} placeholder={intl.formatMessage({id: 'region'})}
/>} />}
/> />
@@ -1083,8 +1085,11 @@ const BusCustomFormWizard = (props) => {
setCheckCountry(true) setCheckCountry(true)
} }
}} }}

sx={{ "& .MuiInputBase-root": { height: "41px" }, "#address5-combo": { padding: "0px 0px 0px 3px" }, "& .MuiAutocomplete-endAdornment": { top: "auto" }, }}
sx={{
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}}
renderInput={(params) => <TextField {...params} placeholder={intl.formatMessage({id: 'regionOrCountry'})} />} renderInput={(params) => <TextField {...params} placeholder={intl.formatMessage({id: 'regionOrCountry'})} />}
/> />
{formik.touched.address1 && formik.errors.address1 && ( {formik.touched.address1 && formik.errors.address1 && (


+ 13
- 6
src/pages/authentication/auth-forms/CustomFormWizard.js View File

@@ -1101,7 +1101,11 @@ const CustomFormWizard = (props) => {
setSelectedIdDocType({}); setSelectedIdDocType({});
} }
}} }}
sx={{ "#address4-combo": { padding: "0px 0px 0px 0px" }, "& .MuiAutocomplete-endAdornment": { top: "auto" }, }}
sx={{
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}}
renderInput={(params) => <TextField renderInput={(params) => <TextField
{...params} {...params}
error={formik.touched.idDocType && (selectedIdDocType === null || selectedIdDocType?.type == null)} error={formik.touched.idDocType && (selectedIdDocType === null || selectedIdDocType?.type == null)}
@@ -1402,9 +1406,9 @@ const CustomFormWizard = (props) => {
setSelectedAddress4(newValue); setSelectedAddress4(newValue);
}} }}
sx={{ sx={{
"& .MuiInputBase-root": { height: "41px" },
"#address4-combo": { padding: "0px 0px 0px 3px" },
"& .MuiAutocomplete-endAdornment": { top: "auto" },
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}} }}
renderInput={(params) => <TextField error={checkDistrict} {...params} placeholder={intl.formatMessage({ id: 'region' })} renderInput={(params) => <TextField error={checkDistrict} {...params} placeholder={intl.formatMessage({ id: 'region' })}
/>} />}
@@ -1452,8 +1456,11 @@ const CustomFormWizard = (props) => {
setCheckCountry(true) setCheckCountry(true)
} }
}} }}

sx={{ "& .MuiInputBase-root": { height: "41px" }, "#address5-combo": { padding: "0px 0px 0px 3px" }, "& .MuiAutocomplete-endAdornment": { top: "auto" }, }}
sx={{
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}}
renderInput={(params) => <TextField {...params} placeholder={intl.formatMessage({ id: 'regionOrCountry' })} />} renderInput={(params) => <TextField {...params} placeholder={intl.formatMessage({ id: 'regionOrCountry' })} />}
/> />
{formik.touched.address1 && formik.errors.address1 && ( {formik.touched.address1 && formik.errors.address1 && (


+ 12
- 5
src/pages/authentication/auth-forms/IAmSmartFormWizard.js View File

@@ -615,8 +615,12 @@ const CustomFormWizard = (props) => {
onChange={(event, newValue) => { onChange={(event, newValue) => {
setSelectedAddress4(newValue); setSelectedAddress4(newValue);
}} }}
sx={{ "& .MuiInputBase-root": { height: "41px" }, "#address4-combo": { padding: "0px 0px 0px 0px" }, "& .MuiAutocomplete-endAdornment": { top: "auto" }, }}
renderInput={(params) => <TextField error={checkDistrict} {...params} placeholder={intl.formatMessage({ id: 'region' })}
sx={{
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}}
renderInput={(params) => <TextField error={checkDistrict} {...params} placeholder={intl.formatMessage({ id: 'region' })}
/>} />}
/> />
<Autocomplete <Autocomplete
@@ -640,9 +644,12 @@ const CustomFormWizard = (props) => {
setCheckCountry(true) setCheckCountry(true)
} }
}} }}
sx={{ "& .MuiInputBase-root": { height: "41px" }, "#address5-combo": { padding: "0px 0px 0px 0px" }, "& .MuiAutocomplete-endAdornment": { top: "auto" }, }}
renderInput={(params) => <TextField {...params} placeholder={intl.formatMessage({ id: 'regionOrCountry' })} />}
sx={{
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}}
renderInput={(params) => <TextField {...params} placeholder={intl.formatMessage({ id: 'regionOrCountry' })} />}
/> />
{formik.touched.address1 && formik.errors.address1 && ( {formik.touched.address1 && formik.errors.address1 && (
<FormHelperText error id="helper-text-address1-signup"> <FormHelperText error id="helper-text-address1-signup">


+ 5
- 0
src/pages/pnspsUserGroupDetailPage/UserAddCard.js View File

@@ -128,6 +128,11 @@ const UserAddCard = ({ isCollectData, updateGroupMember, userGroupData, isNewRec
// console.log(newValue) // console.log(newValue)
setSelectedUser(newValue); setSelectedUser(newValue);
}} }}
sx={{
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 }
}}
renderInput={(params) => <TextField {...params} />} renderInput={(params) => <TextField {...params} />}
/> />
</Grid> </Grid>


+ 3
- 7
src/utils/Combo.js View File

@@ -41,13 +41,9 @@ export default function Combo ({valueName, disabled, form, dataList, filterOptio
} }
}} }}
sx={{ sx={{
"& .MuiInputBase-root": {
height: "41px",
padding: "0px 0px 0px 8px"
},
"& .MuiAutocomplete-endAdornment": {
top: "auto"
},
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 },
"& .MuiInputBase-input.Mui-disabled": { "& .MuiInputBase-input.Mui-disabled": {
WebkitTextFillColor: "#000000", WebkitTextFillColor: "#000000",
background: "#f8f8f8", background: "#f8f8f8",


+ 3
- 7
src/utils/SelectBase.js View File

@@ -40,13 +40,9 @@ export default function Combo ({valueName, disabled, form, dataList, filterOptio
} }
}} }}
sx={{ sx={{
"& .MuiInputBase-root": {
height: "41px",
padding: "0px 0px 0px 8px"
},
"& .MuiAutocomplete-endAdornment": {
top: "auto"
},
'& .MuiInputBase-root': { alignItems: 'center' },
'& .MuiAutocomplete-endAdornment': { top: '50%', transform: 'translateY(-50%)' },
'& .MuiOutlinedInput-root': { height: 40 },
"& .MuiInputBase-input.Mui-disabled": { "& .MuiInputBase-input.Mui-disabled": {
WebkitTextFillColor: "#000000", WebkitTextFillColor: "#000000",
background: "#f8f8f8", background: "#f8f8f8",


Write Preview
Loading…
Cancel
Save