From cb8913249ee79dd5167e427c54760704dbf34260 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期二, 27 一月 2026 13:10:08 +0800
Subject: [PATCH] #
---
rsf-admin/src/page/orders/asnOrderItem/AsnOrderItemList.jsx | 77 ++++++++++++++++++++++++--------------
1 files changed, 49 insertions(+), 28 deletions(-)
diff --git a/rsf-admin/src/page/orders/asnOrderItem/AsnOrderItemList.jsx b/rsf-admin/src/page/orders/asnOrderItem/AsnOrderItemList.jsx
index 7e9a946..ff77191 100644
--- a/rsf-admin/src/page/orders/asnOrderItem/AsnOrderItemList.jsx
+++ b/rsf-admin/src/page/orders/asnOrderItem/AsnOrderItemList.jsx
@@ -2,10 +2,10 @@
import { useNavigate, useLocation } from 'react-router-dom';
import {
List,
- DatagridConfigurable,
+ DataTable,
SearchInput,
TopToolbar,
- SelectColumnsButton,
+ ColumnsButton,
EditButton,
FilterButton,
CreateButton,
@@ -34,6 +34,7 @@
Button,
useRefresh,
Pagination,
+ useSidebarState,
} from 'react-admin';
import { Box, Typography, Card, Stack, Dialog, DialogActions, DialogTitle, LinearProgress } from '@mui/material';
import { styled } from '@mui/material/styles';
@@ -41,21 +42,6 @@
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import { fetchInOrderItemColumns } from '../config/orderItemColumns';
-
-const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
- '& .css-1vooibu-MuiSvgIcon-root': {
- height: '.9em',
-
- },
- '& .RaDatagrid-row': {
- cursor: 'auto'
- },
- '& .column-name': {
- },
- '& .opt': {
- width: 200
- },
-}));
const filters = [
<SearchInput source="condition" alwaysOn />,
@@ -114,14 +100,14 @@
actions={(
<TopToolbar>
<FilterButton />
- <SelectColumnsButton preferenceKey='asnOrderItem' />
+ <ColumnsButton storeKey='asnOrderItem' />
<ExportButton />
</TopToolbar>
)}
perPage={DEFAULT_PAGE_SIZE}
pagination={<Pagination rowsPerPageOptions={[5, 10, 20, 25, 50, 100]} />}
>
- <DynamicFields />
+ <DynamicFields drawerVal={drawerVal} />
</List>
<PageDrawer
title='AsnOrderItem Detail'
@@ -136,12 +122,22 @@
export default AsnOrderItemList;
-const DynamicFields = (props) => {
+const DynamicFields = ({ drawerVal }) => {
const translate = useTranslate();
const notify = useNotify();
const [columns, setColumns] = useState([]);
const { isLoading } = useListContext();
const refresh = useRefresh();
+ const [sidebarIsOpen] = useSidebarState();
+
+ const omittedFields = [
+ 'id', 'orderId', 'orderCode', 'poCode', 'poId', 'wkType', 'type', 'checkType',
+ 'spec', 'model', 'purQty', 'purUnit', 'qrcode', 'trackCode', 'splrCode',
+ 'splrName', 'projectCode', 'supplierId', 'supplierName', 'priceUnitId',
+ 'shipperId', 'businessTime', 'extendFields.[businessTime]',
+ 'extendFields.[wkType]', 'extendFields.[type]'
+ ];
+
useEffect(() => {
getDynamicFields();
}, []);
@@ -162,8 +158,24 @@
}
}
+ const sidebarWidth = sidebarIsOpen ? 200 : 50;
+ const contentPadding = 10; // 棰勭暀杈硅窛
+ const rightDrawerWidth = drawerVal ? PAGE_DRAWER_WIDTH : 0;
+ const boxMaxWidth = `calc(100vw - ${sidebarWidth + rightDrawerWidth + contentPadding}px)`;
+ // 璁＄畻 maxHeight: 100vh - (Header+Tabs 86px) - (Toolbar ~50px) - (Filters ~60px) - (Pagination ~50px) - (Padding ~40px) 鈮� 290px
+ const boxMaxHeight = `calc(100vh - 210px)`;
+
return (
- <Box sx={{ position: 'relative', minHeight: "60vh", }}>
+ <Box sx={{
+ position: 'relative',
+ maxHeight: boxMaxHeight,
+ maxWidth: boxMaxWidth,
+ overflowX: 'auto',
+ overflowY: 'auto',
+ '& .MuiTableCell-root': {
+ whiteSpace: 'nowrap',
+ }
+ }}>
{isLoading && (
<LinearProgress
sx={{
@@ -176,15 +188,24 @@
/>
)}
{columns.length > 0 &&
- <StyledDatagrid
- preferenceKey='asnOrderItem'
+ <DataTable
+ storeKey='asnOrderItem'
bulkActionButtons={false}
- rowClick={(id, resource, record) => false}
- omit={['id', 'orderId', 'orderCode', 'poCode', 'poId', 'wkType', 'type', 'checkType', 'spec', 'model', 'purQty', 'purUnit', 'qrcode', 'trackCode', 'splrCode', 'splrName', 'projectCode', 'supplierId', 'supplierName', 'priceUnitId', 'shipperId', 'businessTime', 'extendFields.[businessTime]', 'extendFields.[wkType]', 'extendFields.[type]']}
- // omit={['id', 'orderId', 'poDetlId', 'matnrId', 'spec', 'model', 'purQty', 'purUnit', 'qrcode', 'trackCode', 'splrCode', 'platWorkCode', 'projectCode', 'createBy', 'createTime']}
+ rowClick={false}
+ hiddenColumns={omittedFields}
>
- {columns.map((column) => column)}
- </StyledDatagrid>}
+ {columns
+ .map((column) => (
+ <DataTable.Col
+ key={column.key || column.props.source}
+ source={column.props.source}
+ label={column.props.label}
+ >
+ {column}
+ </DataTable.Col>
+ ))
+ }
+ </DataTable>}
</Box>
)
}
--
Gitblit v1.9.1