From 9d0acfb65c80c4948c305ca01338f894b87346a0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 08 四月 2024 09:44:37 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-flow/src/pages/system/user/components/assignRole.jsx | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-flow/src/pages/system/user/components/assignRole.jsx b/zy-asrs-flow/src/pages/system/user/components/assignRole.jsx
index 6f2d08a..a81d401 100644
--- a/zy-asrs-flow/src/pages/system/user/components/assignRole.jsx
+++ b/zy-asrs-flow/src/pages/system/user/components/assignRole.jsx
@@ -4,17 +4,20 @@
ProFormDigit,
ProFormSelect,
} from '@ant-design/pro-components';
+import { FormattedMessage, useIntl } from '@umijs/max';
import { Form, Modal } from 'antd';
import Http from '@/utils/http';
const AssignRole = (props) => {
+ const intl = useIntl();
const [form] = Form.useForm();
const { } = props;
useEffect(() => {
form.resetFields();
form.setFieldsValue({
- ...props.values
+ ...props.values,
+ roleIds: props.values.userRoleIds
})
}, [form, props])
@@ -33,7 +36,7 @@
return (
<>
<Modal
- title="Assign Role"
+ title={intl.formatMessage({ id: "page.assign.role", defaultMessage: "鍒嗛厤瑙掕壊" })}
width={600}
forceRender
destroyOnClose
@@ -56,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 });
--
Gitblit v1.9.1