#

luxiaotao1123

2024-02-28 e74fd0d03db7298c9195c373bca2bc3db0470bdc

#

 zy-asrs-flow/src/locales/en-US.ts

@@ -88,4 +88,14 @@
  '':'',
  '':'',
  'system.dept':'Department',
  'system.role':'Role',
  '':'',
  '':'',
  '':'',
  '':'',
  '':'',
  '':'',
  '':'',
  '':'',
  '':'',
};

 zy-asrs-flow/src/pages/system/user/components/assignRole.jsx

@@ -36,7 +36,7 @@
    return (
        <>
            <Modal
                title="Assign Role"
                title={intl.formatMessage({ id: "page.assign.role", defaultMessage: "分配角色" })}
                width={600}
                forceRender
                destroyOnClose
@@ -59,9 +59,8 @@
                    <ProFormSelect
                        name="roleIds"
                        mode="multiple"
                        label="角色"
                        label={intl.formatMessage({ id: "system.role", defaultMessage: "角色" })}
                        colProps={{ md: 24, xl: 24 }}
                        placeholder="请选择"
                        rules={[{ required: true, type: 'array', message: '角色不能为空!' }]}
                        request={async ({ keyWords }) => {
                            const resp = await Http.doPostForm('api/role/query', { condition: keyWords });

 zy-asrs-flow/src/pages/system/user/components/edit.jsx

@@ -41,7 +41,11 @@
    return (
        <>
            <Modal
                title="Edit"
                title={
                    Object.keys(props.values).length > 0
                        ? intl.formatMessage({ id: 'page.edit', defaultMessage: '编辑' })
                        : intl.formatMessage({ id: 'page.add', defaultMessage: '添加' })
                }
                width={640}
                forceRender
                destroyOnClose
@@ -70,18 +74,16 @@
                                return props.treeData;
                            }}
                            colProps={{ md: 12, xl: 12 }}
                            placeholder="请选择"
                            fieldProps={{
                                treeDefaultExpandedKeys: [0]
                            }}
                            rules={[{ required: true, message: "所属部门不能为空" }]}
                            rules={[{ required: true }]}
                        />
                        <ProFormText
                            name="username"
                            label="登录账号"
                            colProps={{ md: 12, xl: 12 }}
                            placeholder="请输入"
                            rules={[{ required: true, message: "登录账号不能为空！" }]}
                            rules={[{ required: true }]}
                        />
                    </ProForm.Group>
                    <ProForm.Group>
@@ -89,14 +91,12 @@
                            name="nickname"
                            label="名称"
                            colProps={{ md: 12, xl: 12 }}
                            placeholder="请输入"
                            rules={[{ required: true, message: "名称不能为空！" }]}
                            rules={[{ required: true }]}
                        />
                        <ProFormSelect
                            name="sex"
                            label="性别"
                            colProps={{ md: 12, xl: 12 }}
                            placeholder="请选择"
                            options={[
                                { label: '未知', value: 0 },
                                { label: '男', value: 1 },
@@ -126,7 +126,6 @@
                            name="email"
                            label="邮箱"
                            colProps={{ md: 12, xl: 12 }}
                            placeholder="请输入"
                            rules={[
                                {
                                    type: 'email',
@@ -134,7 +133,6 @@
                                },
                                {
                                    required: false,
                                    message: '邮箱不能为空!',
                                },
                            ]}
                        />
@@ -144,13 +142,11 @@
                            name="realName"
                            label="真实姓名"
                            colProps={{ md: 12, xl: 12 }}
                            placeholder="请输入"
                        />
                        <ProFormText
                            name="idCard"
                            label="身份证号"
                            colProps={{ md: 12, xl: 12 }}
                            placeholder="请输入"
                        />
                    </ProForm.Group>
                    <ProForm.Group>
@@ -158,10 +154,14 @@
                            name="status"
                            label="状态"
                            colProps={{ md: 12, xl: 12 }}
                            placeholder="请选择"
                            options={[
                                { label: '正常', value: 1 },
                                { label: '禁用', value: 0 },
                            ]}
                            rules={[
                                {
                                    required: true,
                                },
                            ]}
                        />
                        <ProFormSelect
@@ -169,7 +169,6 @@
                            mode="multiple"
                            label="角色"
                            colProps={{ md: 12, xl: 12 }}
                            placeholder="请选择"
                            rules={[{ required: true, type: 'array', message: '角色不能为空!' }]}
                            request={async ({ keyWords }) => {
                                const resp = await Http.doPostForm('api/role/query', { condition: keyWords });
@@ -181,7 +180,6 @@
                        name="memo"
                        label="备注"
                        colProps={{ md: 24, xl: 24 }}
                        placeholder="请输入"
                    />
                </ProForm>
            </Modal>

 zy-asrs-flow/src/pages/system/user/components/pwd.jsx

@@ -36,7 +36,7 @@
    return (
        <>
            <Modal
                title="Reset Password"
                title={intl.formatMessage({ id: 'page.reset.pwd', defaultMessage: '重置密码' })}
                width={400}
                forceRender
                destroyOnClose
@@ -58,7 +58,7 @@
                    />
                    <ProFormText
                        name="password"
                        label="新密码"
                        label={intl.formatMessage({ id: 'personal.security.new.pwd', defaultMessage: '新密码' })}
                        colProps={{ md: 24, xl: 24 }}
                        placeholder="请输入"
                        rules={[

 zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/BetterGenerator.java

@@ -922,7 +922,7 @@

            // 非空
            if (column.isNotNull()) {
                sb.append("                            rules={[{ required: true, message: \"").append(column.getComment()).append("不能为空！\" }]}\n");
                sb.append("                            rules={[{ required: true }]}\n");
            }

            // 枚举