From e7dcf3d8570b6a9b2967ba0b90e982322b9cfaf7 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期五, 11 七月 2025 17:10:23 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-admin/src/page/system/operationRecord/OperationDetail.jsx | 46 +++++++++++++++++++++++++++++----------------- 1 files changed, 29 insertions(+), 17 deletions(-) diff --git a/rsf-admin/src/page/system/operationRecord/OperationDetail.jsx b/rsf-admin/src/page/system/operationRecord/OperationDetail.jsx index ca45841..f012068 100644 --- a/rsf-admin/src/page/system/operationRecord/OperationDetail.jsx +++ b/rsf-admin/src/page/system/operationRecord/OperationDetail.jsx @@ -6,12 +6,14 @@ DateField, Labeled, } from 'react-admin'; -import { Box, Grid, Stack, IconButton, Typography, Card, CardContent, TextField, Button } from '@mui/material'; +import { Box, Grid, Stack, IconButton, Typography, Card, CardContent, TextField, Button,FormLabel } from '@mui/material'; import CloseIcon from '@mui/icons-material/Close'; import { format } from 'date-fns'; const OperationDetail = (props) => { const { operation, ...rest } = props; + + const translate = useTranslate(); return ( <> @@ -20,44 +22,51 @@ <CardContent> <Grid container rowSpacing={1} mb={1}> <Grid item xs={6}> - <Labeled label="table.field.operationRecord.namespace"> - <Typography - variant="body2" - flexWrap="nowrap" - > - {operation.namespace || ''} - </Typography> - </Labeled> + <FormLabel component="legend"> + {translate('table.field.operationRecord.namespace')} + </FormLabel> + <Typography variant="body2" flexWrap="nowrap"> + {operation.namespace || ''} + </Typography> </Grid> <Grid item xs={6}> - <Labeled label="table.field.operationRecord.url"> + <FormLabel component="legend"> + {translate('table.field.operationRecord.url')} + </FormLabel> + <Typography variant="body2" flexWrap="nowrap" > {operation.url || ''} </Typography> - </Labeled> + </Grid> <Grid item xs={6}> - <Labeled label="table.field.operationRecord.timestamp"> + <FormLabel component="legend"> + {translate('table.field.operationRecord.timestamp')} + </FormLabel> + <Typography variant="body2" flexWrap="nowrap" > {format(new Date(Number(operation.timestamp)), 'yyyy-MM-dd HH:mm:ss')} </Typography> - </Labeled> + </Grid> <Grid item xs={6}> - <Labeled label="table.field.operationRecord.userId"> + <FormLabel component="legend"> + {translate('table.field.operationRecord.userId')} + </FormLabel> + <Typography variant="body2" flexWrap="nowrap" > {operation.userId$ || ''} </Typography> - </Labeled> + </Grid> <Grid item sm={12}> <TextField @@ -77,14 +86,17 @@ /> </Grid> <Grid item xs={6}> - <Labeled label="table.field.operationRecord.clientIp"> + <FormLabel component="legend"> + {translate('table.field.operationRecord.userId')} + </FormLabel> + <Typography variant="body2" flexWrap="nowrap" > {operation.clientIp || ''} </Typography> - </Labeled> + </Grid> </Grid> </CardContent> -- Gitblit v1.9.1