From a908604f5aa2da9921cd99c12a6fa422d5893f4a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 11 十月 2024 15:17:04 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/settings/CopyDrawer.jsx | 90 ++++++++++++++++++++++++++++++++++++++-------
zy-acs-flow/src/i18n/en.js | 5 ++
zy-acs-flow/src/i18n/zh.js | 5 ++
3 files changed, 86 insertions(+), 14 deletions(-)
diff --git a/zy-acs-flow/src/i18n/en.js b/zy-acs-flow/src/i18n/en.js
index 461d795..808c772 100644
--- a/zy-acs-flow/src/i18n/en.js
+++ b/zy-acs-flow/src/i18n/en.js
@@ -650,6 +650,11 @@
reverse: 'Reverse',
field: {
gap: 'Gap',
+ autoIncrement: 'Auto Increment',
+ incrementValue: 'Increment Value',
+ incrementMode: 'Increment Mode',
+ ascend: 'Ascend',
+ descend: 'Descend',
},
},
more: {
diff --git a/zy-acs-flow/src/i18n/zh.js b/zy-acs-flow/src/i18n/zh.js
index aec1860..11093ca 100644
--- a/zy-acs-flow/src/i18n/zh.js
+++ b/zy-acs-flow/src/i18n/zh.js
@@ -648,6 +648,11 @@
reverse: '鎾ら攢',
field: {
gap: '闂磋窛',
+ autoIncrement: '鑷闀�',
+ incrementValue: '鑷闀垮��',
+ incrementMode: '澧為暱鏂瑰紡',
+ ascend: '鍗囧簭',
+ descend: '闄嶅簭',
},
},
more: {
diff --git a/zy-acs-flow/src/map/settings/CopyDrawer.jsx b/zy-acs-flow/src/map/settings/CopyDrawer.jsx
index d7561b9..8f6b767 100644
--- a/zy-acs-flow/src/map/settings/CopyDrawer.jsx
+++ b/zy-acs-flow/src/map/settings/CopyDrawer.jsx
@@ -16,6 +16,11 @@
Drawer,
IconButton,
LinearProgress,
+ Switch,
+ FormControlLabel,
+ FormLabel,
+ ToggleButtonGroup,
+ ToggleButton,
} from '@mui/material';
import CloseIcon from '@mui/icons-material/Close';
import { useTranslate } from 'react-admin';
@@ -34,20 +39,20 @@
const { control, handleSubmit, reset, watch, setValue, formState: { errors } } = useForm({
defaultValues: {
- // copyDirect: value?.copyDirect || '',
- // copyCount: value?.copyCount || '',
- gap: value?.gap || 0.0,
+ copyDirect: value?.copyDirect || '',
+ copyCount: value?.copyCount || '',
+ gap: 0.0,
+ autoIncrement: false,
+ incrementMode: 'ascending',
},
});
useEffect(() => {
if (value && Object.keys(value).length > 0) {
- setValue('copyDirect', value.copyDirect);
- setValue('copyCount', value.copyCount);
+ // setValue('copyDirect', value.copyDirect);
+ // setValue('copyCount', value.copyCount);
}
}, [value, setValue])
-
- // if (!value || !sprite) return <LinearProgress />;
const handleClose = () => {
onCancel();
@@ -89,7 +94,7 @@
<Box component="form" onSubmit={handleSubmit(onFormSubmit)} noValidate sx={{ mt: 0 }}>
<Grid container spacing={1.4}>
- <Grid item xs={6}>
+ {/* <Grid item xs={6}>
<Typography variant="body1">
{translate('page.map.settings.map.copy.direction')}: {value?.copyDirect}
</Typography>
@@ -98,9 +103,9 @@
<Typography variant="body1">
{translate('page.map.settings.map.copy.count')}: {value?.copyCount}
</Typography>
- </Grid>
+ </Grid> */}
- {/* <Grid item xs={6}>
+ <Grid item xs={6}>
<Controller
name="copyDirect"
control={control}
@@ -131,7 +136,7 @@
/>
)}
/>
- </Grid> */}
+ </Grid>
<Grid item xs={12}>
<Controller
@@ -144,15 +149,72 @@
type="number"
sx={{ width: '50%' }}
fullWidth
- onChange={(e) => {
- const value = parseFloat(e.target.value).toFixed(1);
- field.onChange(value);
+ inputProps={{
+ min: 0,
+ step: 1,
}}
/>
)}
/>
</Grid>
+ <Grid item xs={12} mt={2} mb={1}>
+ <Divider />
+ </Grid>
+
+ <Grid item xs={12}>
+ <Controller
+ name="autoIncrement"
+ control={control}
+ render={({ field }) => (
+ <FormControlLabel
+ control={
+ <Switch
+ {...field}
+ checked={field.value || false}
+ onChange={(e) => field.onChange(e.target.checked)}
+ />
+ }
+ label={translate('page.map.settings.map.copy.field.autoIncrement')}
+ />
+ )}
+ />
+ </Grid>
+
+ {watch('autoIncrement') && (
+ <Grid item xs={12}>
+ <FormControl fullWidth>
+ <FormLabel sx={{
+ mb: 1
+ }}>
+ {translate('page.map.settings.map.copy.field.incrementMode')}
+ </FormLabel>
+ <Controller
+ name="incrementMode"
+ control={control}
+ render={({ field }) => (
+ <ToggleButtonGroup
+ {...field}
+ value={field.value}
+ exclusive
+ onChange={(event, value) => {
+ field.onChange(value);
+ }}
+ fullWidth
+ >
+ <ToggleButton value="ascending">
+ {translate('page.map.settings.map.copy.field.ascend')}
+ </ToggleButton>
+ <ToggleButton value="descending">
+ {translate('page.map.settings.map.copy.field.descend')}
+ </ToggleButton>
+ </ToggleButtonGroup>
+ )}
+ />
+ </FormControl>
+ </Grid>
+ )}
+
{deviceType === DEVICE_TYPE.SHELF && (
<>
</>
--
Gitblit v1.9.1