From da5845fcb9a0d3b9f0c477f0a1234ae1780f3b87 Mon Sep 17 00:00:00 2001 From: "jason.lam" Date: Tue, 9 Jan 2024 17:49:04 +0800 Subject: [PATCH] update card --- src/pages/Proof/Reply_Public/ProofForm.js | 38 ++++++++++--------- .../Proof/Reply_Public/UploadFileTable.js | 19 ++++++---- 2 files changed, 32 insertions(+), 25 deletions(-) diff --git a/src/pages/Proof/Reply_Public/ProofForm.js b/src/pages/Proof/Reply_Public/ProofForm.js index 8352580..f9ede05 100644 --- a/src/pages/Proof/Reply_Public/ProofForm.js +++ b/src/pages/Proof/Reply_Public/ProofForm.js @@ -22,6 +22,8 @@ import { useNavigate } from "react-router-dom"; import * as DateUtils from "utils/DateUtils" import Loadable from 'components/Loadable'; import { notifyActionSuccess } from 'utils/CommonFunction'; +import {PNSPS_BUTTON_THEME} from "../../../themes/buttonConst"; +import {ThemeProvider} from "@emotion/react"; const UploadFileTable = Loadable(React.lazy(() => import('./UploadFileTable'))); // ==============================|| DASHBOARD - DEFAULT ||============================== // @@ -147,8 +149,8 @@ const FormPanel = ({ formData }) => { { formik.values.replyDate ? - - + + 校對回覆日期: {DateUtils.datetimeStr_Cht(formik.values.replyDate)} @@ -158,7 +160,7 @@ const FormPanel = ({ formData }) => { formik.values.action ? null : - + { : ( isOverTime() ? - + 回覆逾時,請重新申請。 : - + { type="file" accept=".pdf" style={{ display: 'none' }} - disabled={attachments.length >= (formik.values.groupType == "Private Bill" ? 2 : 1)} + disabled={attachments.length >= (formik.values.groupType === "Private Bill" ? 2 : 1)} onChange={(event) => { readFile(event) }} /> - + } - + 簽署: @@ -261,7 +265,7 @@ const FormPanel = ({ formData }) => { WebkitTextFillColor: "#000000", background: "#f8f8f8", }, - width: '50%' + width: '70%' } } /> @@ -271,17 +275,15 @@ const FormPanel = ({ formData }) => { + + diff --git a/src/pages/Proof/Reply_Public/UploadFileTable.js b/src/pages/Proof/Reply_Public/UploadFileTable.js index 9090721..ca2b6e1 100644 --- a/src/pages/Proof/Reply_Public/UploadFileTable.js +++ b/src/pages/Proof/Reply_Public/UploadFileTable.js @@ -10,15 +10,18 @@ import {useEffect} from "react"; // import {useNavigate} from "react-router-dom"; // import { useTheme } from '@mui/material/styles'; import { - Box, - Stack + Stack, useMediaQuery } from '@mui/material'; +import {useTheme} from "@emotion/react"; // ==============================|| EVENT TABLE ||============================== // export default function UploadFileTable({recordList, setRecordList,}) { const [rows, setRows] = React.useState(recordList); const [rowModesModel,setRowModesModel] = React.useState({}); + const theme = useTheme(); + const isMdOrLg = useMediaQuery(theme.breakpoints.up('md')); + // const theme = useTheme(); // const navigate = useNavigate() @@ -74,7 +77,8 @@ export default function UploadFileTable({recordList, setRecordList,}) { id: 'name', field: 'name', headerName: '檔案名稱', - flex: 1, + width: isMdOrLg ? 'auto' : 160, + flex: isMdOrLg ? 1 : undefined, }, { id: 'size', @@ -84,13 +88,14 @@ export default function UploadFileTable({recordList, setRecordList,}) { // console.log(params) return Math.ceil(params.value/1024)+" KB"; }, - flex: 1, + width: isMdOrLg ? 'auto' : 160, + flex: isMdOrLg ? 1 : undefined, }, ]; return ( - - + ); }