From b10c0830c11e37ceb6031b7a6dbb526f638a6a59 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 11 十月 2024 14:40:06 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/settings/MapSettings.jsx | 4 ++++
zy-acs-flow/src/map/settings/CopyDrawer.jsx | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
2 files changed, 52 insertions(+), 3 deletions(-)
diff --git a/zy-acs-flow/src/map/settings/CopyDrawer.jsx b/zy-acs-flow/src/map/settings/CopyDrawer.jsx
index 1fa447a..7418b4f 100644
--- a/zy-acs-flow/src/map/settings/CopyDrawer.jsx
+++ b/zy-acs-flow/src/map/settings/CopyDrawer.jsx
@@ -15,6 +15,7 @@
Divider,
Drawer,
IconButton,
+ LinearProgress,
} from '@mui/material';
import CloseIcon from '@mui/icons-material/Close';
import { useTranslate } from 'react-admin';
@@ -26,7 +27,7 @@
import { useNotification } from '../Notification';
const CopyDrawer = (props) => {
- const { open, onCancel, sprite, width = PAGE_DRAWER_WIDTH, handleOnCopy } = props;
+ const { open, onCancel, sprite, value, width = PAGE_DRAWER_WIDTH, handleOnCopy } = props;
const notify = useNotification();
const translate = useTranslate();
const deviceType = sprite?.data?.type;
@@ -35,7 +36,14 @@
defaultValues: {},
});
+ useEffect(() => {
+ if (value && Object.keys(value).length > 0) {
+ setValue('copyDirect', value.copyDirect);
+ setValue('copyCount', value.copyCount);
+ }
+ }, [value, setValue])
+ // if (!value || !sprite) return <LinearProgress />;
const handleClose = () => {
onCancel();
@@ -43,6 +51,8 @@
const onFormSubmit = (data) => {
if (data) {
+ console.log(data);
+
}
if (handleOnCopy) {
handleOnCopy(data);
@@ -59,7 +69,7 @@
onClose={handleClose}
sx={{ zIndex: 100, opacity: 1 }}
>
- {open && (
+ {(open) && (
<Box pt={12} width={{ xs: '100vW', sm: width }} height={'calc(100vh - 200px);'} mt={{ xs: 2, sm: 1 }} sx={{
}}>
<Stack direction="row" p={2}>
@@ -74,6 +84,41 @@
<Box p={3}>
<Box component="form" onSubmit={handleSubmit(onFormSubmit)} noValidate sx={{ mt: 0 }}>
<Grid container spacing={1.4}>
+
+ <Grid item xs={6}>
+ <Controller
+ name="copyDirect"
+ control={control}
+ render={({ field }) => (
+ <TextField
+ {...field}
+ label={translate('page.map.settings.map.copy.direction')}
+ InputProps={{
+ readOnly: true,
+ }}
+ fullWidth
+ />
+ )}
+ />
+ </Grid>
+
+ <Grid item xs={6}>
+ <Controller
+ name="copyCount"
+ control={control}
+ render={({ field }) => (
+ <TextField
+ {...field}
+ label={translate('page.map.settings.map.copy.count')}
+ InputProps={{
+ readOnly: true,
+ }}
+ fullWidth
+ />
+ )}
+ />
+ </Grid>
+
{deviceType === DEVICE_TYPE.SHELF && (
<>
</>
@@ -98,7 +143,7 @@
<Grid item xs={12}>
<Divider />
</Grid>
-
+
<Grid item xs={12} mt={2}>
<Stack direction="row" spacing={2}>
<Button variant="contained" color="primary" type="submit">
diff --git a/zy-acs-flow/src/map/settings/MapSettings.jsx b/zy-acs-flow/src/map/settings/MapSettings.jsx
index f5c3489..d470e19 100644
--- a/zy-acs-flow/src/map/settings/MapSettings.jsx
+++ b/zy-acs-flow/src/map/settings/MapSettings.jsx
@@ -352,6 +352,10 @@
}}
width={width}
sprite={sprite}
+ value={{
+ copyDirect: watch('copyDirection'),
+ copyCount: watch('copyCount'),
+ }}
handleOnCopy={() => {
}}
--
Gitblit v1.9.1