diff --git a/src/components/FileList.js b/src/components/FileList.js index 045f3fe..202ecc2 100644 --- a/src/components/FileList.js +++ b/src/components/FileList.js @@ -8,11 +8,15 @@ import * as HttpUtils from "../utils/HttpUtils" import * as UrlUtils from "../utils/ApiPathConst" import * as DateUtils from "../utils/DateUtils" import { FiDataGrid } from './FiDataGrid'; +import {useTheme} from "@emotion/react"; +import {useMediaQuery} from "@mui/material"; // ==============================|| EVENT TABLE ||============================== // export default function FileList({ refType, refId, allowDelete, sx, dateHideable,lang, ...props }) { const [rows, setRows] = React.useState([]); const [rowModesModel] = React.useState({}); + const theme = useTheme(); + const isMdOrLg = useMediaQuery(theme.breakpoints.up('md')); React.useEffect(() => { loadData(); @@ -92,13 +96,15 @@ export default function FileList({ refType, refId, allowDelete, sx, dateHideable id: 'filename', field: 'filename', headerName: lang=="ch"?"檔案名稱":'File Name', - flex: 3, + width: isMdOrLg ? 'auto' : 400, + flex: isMdOrLg ? 3 : undefined, }, { id: 'filesize', field: 'filesize', headerName: lang=="ch"?"檔案大小":'File Size', - flex: 1, + width: isMdOrLg ? 'auto' : 160, + flex: isMdOrLg ? 1 : undefined, valueGetter: (params) => { return convertToStr(params.value); } @@ -110,7 +116,8 @@ export default function FileList({ refType, refId, allowDelete, sx, dateHideable id: 'created', field: 'created', headerName: lang=="ch"?"日期":'Created', - flex: 1, + width: isMdOrLg ? 'auto' : 160, + flex: isMdOrLg ? 1 : undefined, valueGetter: (params) => { return DateUtils.datetimeStr(params.value); } @@ -137,13 +144,15 @@ export default function FileList({ refType, refId, allowDelete, sx, dateHideable id: 'filename', field: 'filename', headerName: lang=="ch"?"檔案名稱":'File Name', - flex: 3, + width: isMdOrLg ? 'auto' : 400, + flex: isMdOrLg ? 3 : undefined, }, { id: 'filesize', field: 'filesize', headerName: lang=="ch"?"檔案大小":'File Size', - flex: 1, + width: isMdOrLg ? 'auto' : 160, + flex: isMdOrLg ? 1 : undefined, valueGetter: (params) => { return convertToStr(params.value); } @@ -175,7 +184,6 @@ export default function FileList({ refType, refId, allowDelete, sx, dateHideable } return ( - //
- //
); } diff --git a/src/pages/PublicNotice/Details_GLD/index.js b/src/pages/PublicNotice/Details_GLD/index.js index abdd7c7..a92c56e 100644 --- a/src/pages/PublicNotice/Details_GLD/index.js +++ b/src/pages/PublicNotice/Details_GLD/index.js @@ -380,10 +380,10 @@ const PublicNoticeDetail_GLD = () => { - + - + { :
{/*top button*/} - + - {editMode ? <> @@ -195,319 +194,319 @@ const UserInformationCard_Individual = ({ formData, loadDataFun }) => { } - {/*end top button*/} Individual User Details - - - {FieldUtils.getTextField({ - label: "Username:", - valueName: "username", - disabled: true, - form: formik - })} - + + + + {FieldUtils.getTextField({ + label: "Username:", + valueName: "username", + disabled: true, + form: formik + })} + - - {FieldUtils.getTextField({ - label: "English Name:", - valueName: "enName", - disabled: (!editMode), - form: formik - })} - + + {FieldUtils.getTextField({ + label: "English Name:", + valueName: "enName", + disabled: (!editMode), + form: formik + })} + - - {FieldUtils.getTextField({ - label: "Created Date:", - valueName: "createDate", - disabled: true, - form: formik - })} - - - {FieldUtils.getTextField({ - label: "Prefix:", - valueName: "prefix", - disabled: (!editMode), - form: formik - })} - + + {FieldUtils.getTextField({ + label: "Created Date:", + valueName: "createDate", + disabled: true, + form: formik + })} + + + {FieldUtils.getTextField({ + label: "Prefix:", + valueName: "prefix", + disabled: (!editMode), + form: formik + })} + - - {FieldUtils.getTextField({ - label: "Chinese Name:", - valueName: "chName", - disabled: (!editMode), - form: formik - })} - + + {FieldUtils.getTextField({ + label: "Chinese Name:", + valueName: "chName", + disabled: (!editMode), + form: formik + })} + - - {FieldUtils.getTextField({ - label: "Last Updated:", - valueName: "modifieDate", - disabled: true, - form: formik - })} - + + {FieldUtils.getTextField({ + label: "Last Updated:", + valueName: "modifieDate", + disabled: true, + form: formik + })} + - - {FieldUtils.getComboField({ - label: "ID Type:", - valueName: "idDocType", - disabled: (!editMode), - dataList: ComboData.idDocType, - filterOptions: (options) => options, - getOptionLabel: (item) => item ? typeof item === 'string' ? item : (item["type"] ? item["type"] + "-" + item["label"] : "") : "", - onInputChange: (event, newValue, setInputValue) => { - if (newValue == null) { - setInputValue(""); - } - let _val = newValue.split("-"); - if (_val[0]) { - setInputValue(_val[0]); - } - }, - onChange: (event, newValue) => { - if (newValue == null) { - formik.setFieldValue("idDocType", ""); - return; - } - formik.setFieldValue("idDocType", newValue.type); - }, - form: formik - })} - + + {FieldUtils.getComboField({ + label: "ID Type:", + valueName: "idDocType", + disabled: (!editMode), + dataList: ComboData.idDocType, + filterOptions: (options) => options, + getOptionLabel: (item) => item ? typeof item === 'string' ? item : (item["type"] ? item["type"] + "-" + item["label"] : "") : "", + onInputChange: (event, newValue, setInputValue) => { + if (newValue == null) { + setInputValue(""); + } + let _val = newValue.split("-"); + if (_val[0]) { + setInputValue(_val[0]); + } + }, + onChange: (event, newValue) => { + if (newValue == null) { + formik.setFieldValue("idDocType", ""); + return; + } + formik.setFieldValue("idDocType", newValue.type); + }, + form: formik + })} + - - {FieldUtils.getPhoneField({ - label: "Contact Tel:", - valueName: { - code: "tel_countryCode", - num: "phoneNumber" - }, - disabled: (!editMode), - form: formik - })} - + + {FieldUtils.getPhoneField({ + label: "Contact Tel:", + valueName: { + code: "tel_countryCode", + num: "phoneNumber" + }, + disabled: (!editMode), + form: formik + })} + - - - - Verified: - + + + + Verified: + - { - currentUserData.verifiedBy || editMode ? - - {FieldUtils.initField({ - valueName: "verifiedStatus", - disabled: true, - form: formik, - })} - - : - <> - + { + currentUserData.verifiedBy || editMode ? + {FieldUtils.initField({ valueName: "verifiedStatus", disabled: true, form: formik, })} - - - - - } - - - - - - - - ID No.: - - - - - {formik.values.idDocType == "HKID" ? + : <> - + {FieldUtils.initField({ - valueName: "identification", - disabled: (!editMode), + valueName: "verifiedStatus", + disabled: true, form: formik, - placeholder: "證件號碼", - inputProps: { - maxLength: 7, - onKeyDown: (e) => { - if (e.key === 'Enter') { - e.preventDefault(); - } - }, - } })} - - + + + + + } + + + + + + + + ID No.: + + + + + {formik.values.idDocType == "HKID" ? + <> + + {FieldUtils.initField({ + valueName: "identification", + disabled: (!editMode), + form: formik, + placeholder: "證件號碼", + inputProps: { + maxLength: 7, + onKeyDown: (e) => { + if (e.key === 'Enter') { + e.preventDefault(); + } + }, + } + })} + + + + {FieldUtils.initField({ + valueName: "checkDigit", + disabled: (!editMode), + form: formik + })} + + : + {FieldUtils.initField({ - valueName: "checkDigit", + valueName: "identification", disabled: (!editMode), form: formik })} - : - - {FieldUtils.initField({ - valueName: "identification", - disabled: (!editMode), - form: formik - })} - - } + } + - - - {FieldUtils.getPhoneField({ - label: "Fax No.:", - valueName: { - code: "fax_countryCode", - num: "faxNumber" - }, - disabled: (!editMode), - form: formik - })} - + + {FieldUtils.getPhoneField({ + label: "Fax No.:", + valueName: { + code: "fax_countryCode", + num: "faxNumber" + }, + disabled: (!editMode), + form: formik + })} + - - {FieldUtils.getTextField({ - label: "Last Login:", - valueName: "lastLoginDate", - disabled: true, - form: formik - })} - + + {FieldUtils.getTextField({ + label: "Last Login:", + valueName: "lastLoginDate", + disabled: true, + form: formik + })} + - - {FieldUtils.getComboField({ - label: "Country:", - valueName: "country", - dataList: ComboData.country, - disabled: (!editMode), - form: formik - })} - + + {FieldUtils.getComboField({ + label: "Country:", + valueName: "country", + dataList: ComboData.country, + disabled: (!editMode), + form: formik + })} + - - {FieldUtils.getTextField({ - label: "Email:", - valueName: "emailAddress", - disabled: (!editMode), - form: formik - })} - + + {FieldUtils.getTextField({ + label: "Email:", + valueName: "emailAddress", + disabled: (!editMode), + form: formik + })} + - - - - Status: - + + + + Status: + - { - editMode ? - - {FieldUtils.initField({ - valueName: "status", - disabled: true, - form: formik, - })} - - : - <> - + { + editMode ? + {FieldUtils.initField({ valueName: "status", disabled: true, form: formik, })} - {locked ? - - - - : - - + : + <> + + {FieldUtils.initField({ + valueName: "status", + disabled: true, + form: formik, + })} - } - - } + {locked ? + + + + : + + + + } + + } + - - - {FieldUtils.getAddressField({ - label: "Address:", - valueName: ["addressLine1", "addressLine2", "addressLine3"], - disabled: (!editMode), - form: formik - })} - + + {FieldUtils.getAddressField({ + label: "Address:", + valueName: ["addressLine1", "addressLine2", "addressLine3"], + disabled: (!editMode), + form: formik + })} + - - {FieldUtils.getComboField({ - label: "District:", - valueName: "district", - dataList: ComboData.district, - disabled: (!editMode), - form: formik - })} + + {FieldUtils.getComboField({ + label: "District:", + valueName: "district", + dataList: ComboData.district, + disabled: (!editMode), + form: formik + })} + - } diff --git a/src/pages/User/DetailsPage_Individual/index.js b/src/pages/User/DetailsPage_Individual/index.js index de2a01f..3dbece4 100644 --- a/src/pages/User/DetailsPage_Individual/index.js +++ b/src/pages/User/DetailsPage_Individual/index.js @@ -1,7 +1,7 @@ // material-ui import * as React from "react"; -import { Grid, Typography, Button, Stack, Box } from '@mui/material'; +import { Grid, Typography, Button, Stack } from '@mui/material'; import FileList from "../../../components/FileList" import MainCard from "../../../components/MainCard"; import * as HttpUtils from "../../../utils/HttpUtils"; @@ -35,26 +35,6 @@ const UserMaintainPage_Individual = () => { const [formData, setFormData] = React.useState({}) const [isLoading, setLoding] = React.useState(true); - const _sx = { - ml: 6, - mr: 6, - mb: 3, - mt: 3, - padding: "4 2 4 2", - boxShadow: 1, - border: 1, - borderColor: '#DDD', - '& .MuiDataGrid-cell': { - borderTop: 1, - borderBottom: 1, - borderColor: "#EEE" - }, - '& .MuiDataGrid-footerContainer': { - border: 1, - borderColor: "#EEE" - } - } - React.useEffect(() => { loadData(); }, []); @@ -102,7 +82,7 @@ const UserMaintainPage_Individual = () => { isLoading ? : - +
@@ -116,29 +96,26 @@ const UserMaintainPage_Individual = () => { {/*col 1*/} - + - - - - + + - - - - Files - + + + Files + + - - + +
diff --git a/src/utils/FieldUtils.js b/src/utils/FieldUtils.js index 1577fc5..457f3f4 100644 --- a/src/utils/FieldUtils.js +++ b/src/utils/FieldUtils.js @@ -27,8 +27,8 @@ export const getDateField = ({ label, valueName, form, disabled }) => { } export const getTextField = ({ label, valueName, form, disabled }) => { - return - + {label}