diff --git a/src/pages/DemandNote/Details/ApplicationDetailCard.js b/src/pages/DemandNote/Details/ApplicationDetailCard.js
index 27ada79..8845d44 100644
--- a/src/pages/DemandNote/Details/ApplicationDetailCard.js
+++ b/src/pages/DemandNote/Details/ApplicationDetailCard.js
@@ -159,6 +159,7 @@ const ApplicationDetailCard = ({ data }) => {
// fullWidth
id='fileName'
variant="h5"
+ sx={{ wordBreak: 'break-word' }}
>
{appDetail.appFilename}
diff --git a/src/pages/Proof/Reply_GLD/ProofForm.js b/src/pages/Proof/Reply_GLD/ProofForm.js
index 1121019..56f5b3f 100644
--- a/src/pages/Proof/Reply_GLD/ProofForm.js
+++ b/src/pages/Proof/Reply_GLD/ProofForm.js
@@ -50,7 +50,7 @@ const FormPanel = ({ formData, isOverTime }) => {
Reply Date: {DateUtils.datetimeStr(formik.values.replyDate)}
- Reply: {formik.values.action ? (Ready for printing (correct manuscript).) : (Not ready for printing (requires modification).)}
+ Reply: {formik.values.action ? (Ready for printing (correct manuscript).) : (Not ready for printing (requires modification).)}
{
formik.values.action ?
diff --git a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
index f6f5441..4ec3444 100644
--- a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
+++ b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
@@ -21,6 +21,8 @@ import {
import { useNavigate } from "react-router-dom";
import { notifyActionSuccess } from 'utils/CommonFunction';
+import {PNSPS_LONG_BUTTON_THEME} from "../../../themes/buttonConst";
+import {ThemeProvider} from "@emotion/react";
// ==============================|| DASHBOARD - DEFAULT ||============================== //
@@ -132,7 +134,7 @@ const PublicNoticeApplyForm = ({ loadedData, selections }) => {
-
+
@@ -180,7 +182,7 @@ const PublicNoticeApplyForm = ({ loadedData, selections }) => {
sx={{ display: 'flex', alignItems: 'center' }}>
目標期數:
-
+
{
sx={{ display: 'flex', alignItems: 'center' }}>
稿件檔案 ({"檔案大小應<10MB"}):
-
+
{
+
+
diff --git a/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js b/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js
index 608f344..96eb5b5 100644
--- a/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js
+++ b/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js
@@ -475,7 +475,7 @@ const ApplicationDetailCard = (
- Manuscript File:
+ Manuscript File:
@@ -485,6 +485,7 @@ const ApplicationDetailCard = (
// fullWidth
id='fileName'
variant="h5"
+ sx={{ wordBreak: 'break-word' }}
>
{fileDetail.filename}
diff --git a/src/pages/PublicNotice/Details_GLD/index.js b/src/pages/PublicNotice/Details_GLD/index.js
index c812e32..ddf39df 100644
--- a/src/pages/PublicNotice/Details_GLD/index.js
+++ b/src/pages/PublicNotice/Details_GLD/index.js
@@ -301,7 +301,7 @@ const PublicNoticeDetail_GLD = () => {
}, [getUploadStatus]);
return (
-
+
{
selectedGazetteGroupInputType={selectedGazetteGroupInputType}
setSelectedGazetteGroupInputType={setSelectedGazetteGroupInputType}
/>
-
+
Application
@@ -338,10 +338,10 @@ const PublicNoticeDetail_GLD = () => {
*/}
-
+
-
-
+
+
{isLoading && editMode ?
:
{
}
-
-
+
+
{
/>
-
-
+
+
{
-
+
-
+
() => {
navigate('/paymentPage/details/' + params.row.id);
@@ -23,7 +26,8 @@ export default function SubmittedTab({ rows }) {
{
field: 'actions',
headerName: 'Trans. No.',
- flex: 1,
+ width: isMdOrLg ? 'auto' : 160,
+ flex: isMdOrLg ? 1 : undefined,
cellClassName: 'actions',
renderCell: (params) => {
return ;
@@ -33,7 +37,8 @@ export default function SubmittedTab({ rows }) {
id: 'transDateTime',
field: 'transDateTime',
headerName: 'Trans. Date',
- flex: 1,
+ width: isMdOrLg ? 'auto' : 160,
+ flex: isMdOrLg ? 1 : undefined,
valueGetter: (params) => {
return DateUtils.datetimeStr(params.value);
}
@@ -42,7 +47,8 @@ export default function SubmittedTab({ rows }) {
id: 'status',
field: 'status',
headerName: 'Status',
- flex: 1,
+ width: isMdOrLg ? 'auto' : 160,
+ flex: isMdOrLg ? 1 : undefined,
renderCell: (params) => {
return PaymentStatus.getStatus_Eng(params);
}
diff --git a/src/pages/PublicNotice/Details_GLD/tabTableDetail/ProofTab.js b/src/pages/PublicNotice/Details_GLD/tabTableDetail/ProofTab.js
index 4679084..3567d96 100644
--- a/src/pages/PublicNotice/Details_GLD/tabTableDetail/ProofTab.js
+++ b/src/pages/PublicNotice/Details_GLD/tabTableDetail/ProofTab.js
@@ -1,7 +1,7 @@
// material-ui
import * as React from 'react';
import {
- Button,
+ Button, useMediaQuery,
} from '@mui/material';
import {
GridActionsCellItem,
@@ -14,11 +14,14 @@ import {FiDataGrid} from "components/FiDataGrid";
import * as FormatUtils from "utils/FormatUtils"
import * as HttpUtils from "utils/HttpUtils"
import * as UrlUtils from "utils/ApiPathConst"
+import {useTheme} from "@emotion/react";
// ==============================|| EVENT TABLE ||============================== //
export default function ProofTab({rows}) {
const navigate = useNavigate()
+ const theme = useTheme();
+ const isMdOrLg = useMediaQuery(theme.breakpoints.up('md'));
const handleEditClick = (params) => () => {
navigate('/proof/reply/' + params.row.id);
@@ -35,7 +38,8 @@ export default function ProofTab({rows}) {
field: 'refNo',
headerName: 'Proof No.',
- width: 200,
+ width: isMdOrLg ? 'auto' : 200,
+ flex: isMdOrLg ? 1 : undefined,
cellClassName: 'actions',
renderCell: (params) => {
return ;
@@ -44,7 +48,8 @@ export default function ProofTab({rows}) {
{
field: 'status',
headerName: 'Status',
- flex: 1,
+ width: isMdOrLg ? 'auto' : 160,
+ flex: isMdOrLg ? 1 : undefined,
renderCell: (params) => {
return ProofStatus.getStatus_Eng(params);
},
@@ -52,7 +57,9 @@ export default function ProofTab({rows}) {
{
field: 'created',
headerName: 'Proof Date',
- flex: 1,
+ width: isMdOrLg ? 'auto' : 160,
+ flex: isMdOrLg ? 1 : undefined,
+
valueGetter: (params) => {
return DateUtils.datetimeStr(params?.value);
}
@@ -60,7 +67,8 @@ export default function ProofTab({rows}) {
{
field: 'replyDate',
headerName: 'Confirmed/Return Date',
- flex: 1,
+ width: isMdOrLg ? 'auto' : 160,
+ flex: isMdOrLg ? 1 : undefined,
valueGetter: (params) => {
return params?.value?DateUtils.datetimeStr(params?.value):"";
}
@@ -68,7 +76,9 @@ export default function ProofTab({rows}) {
{
field: 'fee',
headerName: 'Fee',
- flex: 1,
+ width: isMdOrLg ? 'auto' : 160,
+ flex: isMdOrLg ? 1 : undefined,
+
valueGetter: (params) => {
return (params?.value)?"$ "+FormatUtils.currencyFormat(params?.value):"";
}
diff --git a/src/pages/PublicNotice/Details_GLD/tabTableDetail/StatusHistoryTab.js b/src/pages/PublicNotice/Details_GLD/tabTableDetail/StatusHistoryTab.js
index 43ed2cc..2f9322f 100644
--- a/src/pages/PublicNotice/Details_GLD/tabTableDetail/StatusHistoryTab.js
+++ b/src/pages/PublicNotice/Details_GLD/tabTableDetail/StatusHistoryTab.js
@@ -7,16 +7,22 @@ import {FiDataGrid} from "components/FiDataGrid";
// } from '@mui/material';
import * as DateUtils from "utils/DateUtils"
import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils";
+import {useTheme} from "@emotion/react";
+import {useMediaQuery} from "@mui/material";
// ==============================|| EVENT TABLE ||============================== //
export default function StatusHistoryTab({rows}) {
+ const theme = useTheme();
+ const isMdOrLg = useMediaQuery(theme.breakpoints.up('md'));
+
const columns = [
{
id: 'created',
field: 'created',
headerName: 'Date',
- flex: 1,
+ width: isMdOrLg ? 'auto' : 160,
+ flex: isMdOrLg ? 1 : undefined,
valueGetter: (params) => {
return DateUtils.datetimeStr(params?.value);
}
@@ -26,13 +32,15 @@ export default function StatusHistoryTab({rows}) {
id: 'createdBy',
field: 'createdBy',
headerName: 'Changed By',
- flex: 1,
+ width: isMdOrLg ? 'auto' : 160,
+ flex: isMdOrLg ? 1 : undefined,
},
{
id: 'status',
field: 'status',
headerName: 'Status',
- flex: 1,
+ width: isMdOrLg ? 'auto' : 160,
+ flex: isMdOrLg ? 1 : undefined,
renderCell: (params) => {
return [StatusUtils.getStatusEng(params)]
},
diff --git a/src/pages/PublicNotice/Details_GLD/tabTableDetail/TabTable.js b/src/pages/PublicNotice/Details_GLD/tabTableDetail/TabTable.js
index 82b4e40..6e241be 100644
--- a/src/pages/PublicNotice/Details_GLD/tabTableDetail/TabTable.js
+++ b/src/pages/PublicNotice/Details_GLD/tabTableDetail/TabTable.js
@@ -74,7 +74,7 @@ const PublicNotice = ({ applicationDetailData, proofList, paymentList }) => {
{/*col 2*/}
-
+
diff --git a/src/utils/FieldUtils.js b/src/utils/FieldUtils.js
index a8440b3..1577fc5 100644
--- a/src/utils/FieldUtils.js
+++ b/src/utils/FieldUtils.js
@@ -60,6 +60,9 @@ export const getTextArea = ({ label, valueName, form, disabled, inputProps, ...p
minRows: 4,
maxRows: 4,
inputProps: inputProps,
+ InputProps: {
+ style: { minHeight:'42.5px', maxHeight: '50vh',height: 'auto' },
+ },
props
})}
@@ -170,7 +173,7 @@ export const getComboField = ({ label, dataList, valueName, form, disabled, getO
;
}
-export const initField = ({ type, valueName, form, disabled, multiline, handleChange, placeholder, inputProps, width, ...props }) => {
+export const initField = ({ type, valueName, form, disabled, multiline, handleChange, placeholder, inputProps, InputProps, width, ...props }) => {
let err = Boolean(form.errors[valueName]);
return