From 04e0677e23d17324ef80508b1019a0fa19db6aa4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 10 十月 2024 15:52:18 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/settings/MapSettings.jsx | 102 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 75 insertions(+), 27 deletions(-)
diff --git a/zy-acs-flow/src/map/settings/MapSettings.jsx b/zy-acs-flow/src/map/settings/MapSettings.jsx
index 30e5a33..1e40325 100644
--- a/zy-acs-flow/src/map/settings/MapSettings.jsx
+++ b/zy-acs-flow/src/map/settings/MapSettings.jsx
@@ -11,9 +11,6 @@
MenuItem,
InputLabel,
FormControl,
- FormHelperText,
- Checkbox,
- FormControlLabel,
Stack,
} from '@mui/material';
import { useTranslate } from 'react-admin';
@@ -35,7 +32,7 @@
},
});
- // 鐩戝惉琛ㄥ崟鍊肩殑鍙樺寲
+ // 鐩戝惉鎵�鏈夊瓧娈电殑鍙樺寲
const watchAllFields = watch();
useEffect(() => {
@@ -71,14 +68,25 @@
}
};
+ // 鏃嬭浆婊戝潡鐨勫埢搴�
+ const rotationMarks = [
+ { value: 0, label: '0掳' },
+ { value: 90, label: '90掳' },
+ { value: 180, label: '180掳' },
+ { value: 270, label: '270掳' },
+ { value: 360, label: '360掳' },
+ ];
+
return (
- <Box component="form" onSubmit={handleSubmit(onFormSubmit)} noValidate sx={{ mt: 2 }}>
- <Grid container spacing={2}>
+ <Box component="form" onSubmit={handleSubmit(onFormSubmit)} noValidate sx={{ mt: 0 }}>
+ <Grid container spacing={1}>
{/* 浣嶇疆 */}
- <Grid item xs={2}>
- <Typography variant="h6">{translate('page.map.settings.map.base.position')}</Typography>
+ <Grid item xs={12}>
+ <Typography variant="button">
+ {translate('page.map.settings.map.base.position')}
+ </Typography>
</Grid>
- <Grid item xs={5}>
+ <Grid item xs={6}>
<Controller
name="x"
control={control}
@@ -96,7 +104,7 @@
)}
/>
</Grid>
- <Grid item xs={5}>
+ <Grid item xs={6}>
<Controller
name="y"
control={control}
@@ -116,10 +124,12 @@
</Grid>
{/* 缂╂斁 */}
- <Grid item xs={2}>
- <Typography variant="h6">{translate('page.map.settings.map.base.scale')}</Typography>
+ <Grid item xs={12}>
+ <Typography variant="button">
+ {translate('page.map.settings.map.base.scale')}
+ </Typography>
</Grid>
- <Grid item xs={5}>
+ <Grid item xs={6}>
<Controller
name="scaleX"
control={control}
@@ -138,7 +148,7 @@
)}
/>
</Grid>
- <Grid item xs={5}>
+ <Grid item xs={6}>
<Controller
name="scaleY"
control={control}
@@ -159,10 +169,12 @@
</Grid>
{/* 鏃嬭浆 */}
- <Grid item xs={2}>
- <Typography variant="h6">{translate('page.map.settings.map.base.rotation')}</Typography>
+ <Grid item xs={12}>
+ <Typography variant="button">
+ {translate('page.map.settings.map.base.rotation')}
+ </Typography>
</Grid>
- <Grid item xs={10}>
+ <Grid item xs={8}>
<Controller
name="rotation"
control={control}
@@ -172,7 +184,9 @@
min={0}
max={360}
step={1}
+ marks={rotationMarks}
valueLabelDisplay="auto"
+ valueLabelFormat={(value) => `${value}掳`}
onChange={(e, value) => {
field.onChange(value);
updateSprite({ ...watchAllFields, rotation: value });
@@ -181,29 +195,63 @@
)}
/>
</Grid>
+ <Grid item xs={4}>
+ <Controller
+ name="rotation"
+ control={control}
+ render={({ field }) => (
+ <TextField
+ {...field}
+ label={`${translate('page.map.settings.map.base.rotation')} (掳)`}
+ type="number"
+ fullWidth
+ inputProps={{ min: 0, max: 360 }}
+ onChange={(e) => {
+ field.onChange(e);
+ updateSprite({ ...watchAllFields, rotation: parseFloat(e.target.value) });
+ }}
+ />
+ )}
+ />
+ </Grid>
{/* 澶嶅埗 */}
- <Grid item xs={2}>
- <Typography variant="h6">{translate('page.map.settings.map.copy.title')}</Typography>
+ <Grid item xs={12}>
+ <Typography variant="button">
+ {translate('page.map.settings.map.copy.title')}
+ </Typography>
</Grid>
- <Grid item xs={5}>
+ <Grid item xs={6}>
<Controller
name="copyDirection"
control={control}
render={({ field }) => (
<FormControl fullWidth>
- <InputLabel>{translate('page.map.settings.map.copy.direction')}</InputLabel>
- <Select {...field} label={translate('page.map.settings.map.copy.direction')}>
- <MenuItem value="left">{translate('page.map.settings.map.copy.left')}</MenuItem>
- <MenuItem value="right">{translate('page.map.settings.map.copy.right')}</MenuItem>
- <MenuItem value="up">{translate('page.map.settings.map.copy.up')}</MenuItem>
- <MenuItem value="down">{translate('page.map.settings.map.copy.down')}</MenuItem>
+ <InputLabel>
+ {translate('page.map.settings.map.copy.direction')}
+ </InputLabel>
+ <Select
+ {...field}
+ label={translate('page.map.settings.map.copy.direction')}
+ >
+ <MenuItem value="left">
+ {translate('page.map.settings.map.copy.left')}
+ </MenuItem>
+ <MenuItem value="right">
+ {translate('page.map.settings.map.copy.right')}
+ </MenuItem>
+ <MenuItem value="up">
+ {translate('page.map.settings.map.copy.up')}
+ </MenuItem>
+ <MenuItem value="down">
+ {translate('page.map.settings.map.copy.down')}
+ </MenuItem>
</Select>
</FormControl>
)}
/>
</Grid>
- <Grid item xs={5}>
+ <Grid item xs={6}>
<Controller
name="copyCount"
control={control}
--
Gitblit v1.9.1