diff --git a/web/src/ui-component/AdminContainer.js b/web/src/ui-component/AdminContainer.js index 85a131e8..9da3166b 100644 --- a/web/src/ui-component/AdminContainer.js +++ b/web/src/ui-component/AdminContainer.js @@ -1,9 +1,12 @@ import { styled } from '@mui/material/styles'; import { Container } from '@mui/material'; -const AdminContainer = styled(Container)({ +const AdminContainer = styled(Container)(({ theme }) => ({ paddingLeft: '0px !important', - paddingRight: '0px !important' -}); + paddingRight: '0px !important', + [theme.breakpoints.up('md')]: { + maxWidth: '1400px' + } +})); export default AdminContainer; diff --git a/web/src/ui-component/TableHead.js b/web/src/ui-component/TableHead.js index 96da229d..db2994d8 100644 --- a/web/src/ui-component/TableHead.js +++ b/web/src/ui-component/TableHead.js @@ -31,7 +31,7 @@ const KeywordTableHead = ({ order, orderBy, headLabel, onRequestSort }) => { headCell.hide && headCell.hide === true ? null : ( diff --git a/web/src/views/Channel/component/TableRow.js b/web/src/views/Channel/component/TableRow.js index 86c3a32b..7e502b5b 100644 --- a/web/src/views/Channel/component/TableRow.js +++ b/web/src/views/Channel/component/TableRow.js @@ -257,7 +257,7 @@ export default function ChannelTableRow({ item, manageChannel, handleOpenModal, - + diff --git a/web/src/views/Pricing/single.js b/web/src/views/Pricing/single.js index 1b9fee40..6de7c2a5 100644 --- a/web/src/views/Pricing/single.js +++ b/web/src/views/Pricing/single.js @@ -182,7 +182,8 @@ const Single = ({ ownedby, prices, reloadData }) => { field: 'model', sortable: true, headerName: '模型名称', - width: 220, + minWidth: 220, + flex: 1, editable: true, hideable: false }, @@ -190,7 +191,8 @@ const Single = ({ ownedby, prices, reloadData }) => { field: 'type', sortable: true, headerName: '类型', - width: 220, + flex: 1, + minWidth: 220, type: 'singleSelect', valueOptions: priceType, editable: true, @@ -200,7 +202,8 @@ const Single = ({ ownedby, prices, reloadData }) => { field: 'channel_type', sortable: true, headerName: '供应商', - width: 220, + flex: 1, + minWidth: 220, type: 'singleSelect', valueOptions: ownedby, editable: true, @@ -210,7 +213,8 @@ const Single = ({ ownedby, prices, reloadData }) => { field: 'input', sortable: false, headerName: '输入倍率', - width: 150, + flex: 0.8, + minWidth: 150, type: 'number', editable: true, valueFormatter: (params) => ValueFormatter(params.value), @@ -220,7 +224,8 @@ const Single = ({ ownedby, prices, reloadData }) => { field: 'output', sortable: false, headerName: '输出倍率', - width: 150, + flex: 0.8, + minWidth: 150, type: 'number', editable: true, valueFormatter: (params) => ValueFormatter(params.value), @@ -230,7 +235,9 @@ const Single = ({ ownedby, prices, reloadData }) => { field: 'actions', type: 'actions', headerName: '操作', - width: 100, + flex: 0.5, + minWidth: 100, + // width: 100, cellClassName: 'actions', hideable: false, getActions: ({ id }) => { @@ -320,6 +327,7 @@ const Single = ({ ownedby, prices, reloadData }) => { > {timestamp2string(item.created_time)} {item.redeemed_time ? timestamp2string(item.redeemed_time) : '尚未兑换'} - +