#

luxiaotao1123

2024-09-10 9776a87bb29d147da919cedb3e4f897263f2b499

#

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

@@ -145,6 +145,8 @@
            user: {
                username: "username",
                password: "password",
                password: "password",
                confirmPwd: "confirm password",
                nickname: "nickname",
                avatar: "avatar",
                code: "code",

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

@@ -145,6 +145,7 @@
            user: {
                username: "账号",
                password: "密码",
                confirmPwd: "确认密码",
                nickname: "昵称",
                avatar: "头像",
                code: "代号",

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

@@ -139,10 +139,16 @@
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <PasswordInput source="password" />
                                    <PasswordInput
                                        label="table.field.user.password"
                                        source="password"
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <PasswordInput source="confirmPassword" />
                                    <PasswordInput
                                        label="table.field.user.confirmPwd"
                                        source="confirmPassword"
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <SelectInput

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

@@ -30,6 +30,7 @@
import MemoInput from "../components/MemoInput";
import StatusSelectInput from "../components/StatusSelectInput";
import RolesSelect from "./RolesSelect";
import TreeSelectInput from "../components/TreeSelectInput";

const FormToolbar = () => {
    const { getValues } = useFormContext();
@@ -76,6 +77,9 @@
                            errors.email = error;
                        }
                    }
                    if (!values.password) {
                        errors.password = 'ra.validation.required';
                    }
                    if (values.password && values.password !== values.confirmPassword) {
                        errors.confirmPassword = 'validate.pwdMisMatch';
                    }
@@ -95,32 +99,13 @@
                                autoFocus
                                validate={required()}
                            />
                            {/* <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.user.password"
                                source="password"
                                parse={v => v}
                            />
                        </Stack> */}
                            <TextInput
                                label="table.field.user.nickname"
                                source="nickname"
                                parse={v => v}
                            />
                        </Stack>
                        {/* <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.user.avatar"
                                source="avatar"
                                parse={v => v}
                            />
                        </Stack> */}
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.user.code"
                                source="code"
                                parse={v => v}
                            />
                            <SelectInput
                                label="table.field.user.sex"
                                source="sex"
@@ -129,6 +114,11 @@
                                    { id: 1, name: '男' },
                                    { id: 2, name: '女' },
                                ]}
                            />
                            <TextInput
                                label="table.field.user.code"
                                source="code"
                                parse={v => v}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
@@ -143,16 +133,6 @@
                                parse={v => v}
                            />
                        </Stack>
                        {/* <Stack direction='row' gap={2}>
                            <SelectInput
                                label="table.field.user.emailVerified"
                                source="emailVerified"
                                choices={[
                                    { id: 0, name: '否' },
                                    { id: 1, name: '是' },
                                ]}
                            />
                        </Stack> */}
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.user.realName"
@@ -173,6 +153,7 @@
                            />
                            <TextInput
                                label="table.field.user.introduction"
                                multiline
                                source="introduction"
                                parse={v => v}
                            />
@@ -181,8 +162,14 @@
                            {translate('common.edit.title.changePwd')}
                        </Typography>
                        <Stack direction='row' gap={2}>
                            <PasswordInput source="password" />
                            <PasswordInput source="confirmPassword" />
                            <PasswordInput
                                label="table.field.user.password"
                                source="password"
                            />
                            <PasswordInput
                                label="table.field.user.confirmPwd"
                                source="confirmPassword"
                            />
                        </Stack>
                    </Grid>
                    <Grid item xs={12} md={4}>
@@ -190,6 +177,10 @@
                            {translate('common.edit.title.common')}
                        </Typography>
                        <Stack direction='row' gap={2}>
                            <TreeSelectInput
                                label="table.field.user.deptId"
                                value={record?.deptId}
                            />
                            <ReferenceInput
                                source="deptId"
                                reference="dept"