#

luxiaotao1123

2024-09-10 8c8b3cc23896b5b7bc98ba7829abeb30d505de3c

#

 zy-acs-flow/src/page/components/EditTopToolBar.jsx

@@ -1,12 +1,13 @@
import React, { useState, useRef, useEffect, useMemo } from "react";
import { TopToolbar } from "react-admin";
import { TopToolbar, useResourceContext, useTranslate } from "react-admin";
import { Stack, Button, Box, Chip } from '@mui/material';
import ArrowBackIosNewIcon from '@mui/icons-material/ArrowBackIosNew';
import { useNavigate } from 'react-router-dom';

const CustomerTopToolBar = (props) => {
const CustomerTopToolBar = ({ ...rest }) => {
    const navigate = useNavigate();

    const resource = useResourceContext();
    const translate = useTranslate();
    return (
        <TopToolbar sx={{
            marginTop: 1,
@@ -14,7 +15,7 @@
            justifyContent: 'flex-start'
        }}>
            <Button
                onClick={() => navigate(-1)}
                onClick={() => navigate('/' + resource)}
                sx={{
                    border: '1px solid #ccc',
                    padding: '6px 12px',
@@ -22,7 +23,7 @@
                }}
                startIcon={<ArrowBackIosNewIcon />}
            >
                Back
                {translate('ra.action.back')}
            </Button>
        </TopToolbar>
    )

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

@@ -45,14 +45,9 @@

const UserEdit = () => {
    const translate = useTranslate();
    const record = useRecordContext();

    return (
        <Edit
            redirect="list"
            mutationMode={EDIT_MODE}
            actions={<CustomerTopToolBar />}
            aside={<EditBaseAside />}
        >
            <SimpleForm
                shouldUnregister
                warnWhenUnsavedChanges
@@ -67,8 +62,8 @@
                    if (!values.nickname) {
                        errors.nickname = 'ra.validation.required';
                    }
                    if (!values.roleIds) {
                        errors.roleIds = 'ra.validation.required';
                if (!values.userRoleIds) {
                    errors.userRoleIds = 'ra.validation.required';
                    }
                    if (!values.email) {
                    } else {
@@ -83,6 +78,8 @@
                    if (values.password && values.password !== values.confirmPassword) {
                        errors.confirmPassword = 'validate.pwdMisMatch';
                    }
                console.log(values);

                    return errors;
                }}
            >
@@ -169,6 +166,7 @@
                            <PasswordInput
                                label="table.field.user.confirmPwd"
                                source="confirmPassword"
                            value={record?.password}
                            />
                        </Stack>
                    </Grid>
@@ -180,21 +178,14 @@
                            <TreeSelectInput
                                label="table.field.user.deptId"
                                value={record?.deptId}
                            />
                            <ReferenceInput
                            resource={'dept'}
                                source="deptId"
                                reference="dept"
                            >
                                <AutocompleteInput
                                    label="table.field.user.deptId"
                                    optionText="name"
                                />
                            </ReferenceInput>
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <RolesSelect
                                label="table.field.user.role"
                                source="roleIds"
                            source="userRoleIds"
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
@@ -205,8 +196,24 @@
                    </Grid>
                </Grid>
            </SimpleForm>
        </Edit >
    )
}

export default UserEdit;
export default function () {
    return (
        <Edit
            redirect="list"
            mutationMode={EDIT_MODE}
            actions={<CustomerTopToolBar />}
            aside={<EditBaseAside />}
            transform={(data) => {
                return {
                    ...data,
                    roleIds: data['userRoleIds'] || []
                };
            }}
        >
            <UserEdit />
        </Edit>
    )
};