#

luxiaotao1123

2024-09-10 d4d5b1359706d628ee3b850d6371185184e06ab6

 zy-acs-flow/src/page/user/UserEdit.jsx

@@ -21,7 +21,7 @@
    DeleteButton,
    PasswordInput,
} from 'react-admin';
import { useWatch, useFormContext } from "react-hook-form";
import { useFormContext } from 'react-hook-form';
import { Stack, Grid, Box, Typography } from '@mui/material';
import * as Common from '@/utils/common';
import { EDIT_MODE } from '@/config/setting';
@@ -33,13 +33,45 @@
import TreeSelectInput from "../components/TreeSelectInput";

const FormToolbar = () => {
    const { getValues } = useFormContext();
    const { setValue, getValues } = useFormContext();

    return (
        <Toolbar sx={{ justifyContent: 'space-between' }}>
            <SaveButton />
            <DeleteButton mutationMode="optimistic" />
        </Toolbar>
    )
}

const PasswordInputContainer = () => {
    const translate = useTranslate();
    const { setValue } = useFormContext();
    const record = useRecordContext();

    useEffect(() => {
        setTimeout(() => {
            if (record && record.password) {
                setValue('password', '');
            }
        }, 200)
    }, [setValue, record]);

    return (
        <>
            <Typography variant="h6" gutterBottom>
                {translate('common.edit.title.changePwd')}
            </Typography>
            <Stack direction='row' gap={2}>
                <PasswordInput
                    label="table.field.user.password"
                    source="password"
                />
                <PasswordInput
                    label="table.field.user.confirmPwd"
                    source="confirmPassword"
                />
            </Stack>
        </>
    )
}

@@ -53,7 +85,6 @@
            warnWhenUnsavedChanges
            toolbar={<FormToolbar />}
            mode="onTouched"
            defaultValues={{}}
            validate={(values) => {
                const errors = {};
                if (!values.username) {
@@ -72,14 +103,9 @@
                        errors.email = error;
                    }
                }
                if (!values.password) {
                    errors.password = 'ra.validation.required';
                }
                if (values.password && values.password !== values.confirmPassword) {
                    errors.confirmPassword = 'validate.pwdMisMatch';
                }
                console.log(values);

                return errors;
            }}
        >
@@ -155,20 +181,7 @@
                            parse={v => v}
                        />
                    </Stack>
                    <Typography variant="h6" gutterBottom>
                        {translate('common.edit.title.changePwd')}
                    </Typography>
                    <Stack direction='row' gap={2}>
                        <PasswordInput
                            label="table.field.user.password"
                            source="password"
                        />
                        <PasswordInput
                            label="table.field.user.confirmPwd"
                            source="confirmPassword"
                            value={record?.password}
                        />
                    </Stack>
                    <PasswordInputContainer />
                </Grid>
                <Grid item xs={12} md={4}>
                    <Typography variant="h6" gutterBottom>