#

luxiaotao1123

2024-10-11 a908604f5aa2da9921cd99c12a6fa422d5893f4a

#

 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: {

 zy-acs-flow/src/i18n/zh.js

@@ -648,6 +648,11 @@
                        reverse: '撤销',
                        field: {
                            gap: '间距',
                            autoIncrement: '自增长',
                            incrementValue: '自增长值',
                            incrementMode: '增长方式',
                            ascend: '升序',
                            descend: '降序',
                        },
                    },
                    more: {

 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 && (
                                        <>
                                        </>