From e74fd0d03db7298c9195c373bca2bc3db0470bdc Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 28 二月 2024 15:40:02 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/system/user/components/edit.jsx | 28 +++++++++++++---------------
zy-asrs-flow/src/pages/system/user/components/pwd.jsx | 4 ++--
zy-asrs-flow/src/locales/en-US.ts | 10 ++++++++++
zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/BetterGenerator.java | 2 +-
zy-asrs-flow/src/pages/system/user/components/assignRole.jsx | 5 ++---
5 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/zy-asrs-flow/src/locales/en-US.ts b/zy-asrs-flow/src/locales/en-US.ts
index fd38f31..359f4ea 100644
--- a/zy-asrs-flow/src/locales/en-US.ts
+++ b/zy-asrs-flow/src/locales/en-US.ts
@@ -88,4 +88,14 @@
'':'',
'':'',
'system.dept':'Department',
+ 'system.role':'Role',
+ '':'',
+ '':'',
+ '':'',
+ '':'',
+ '':'',
+ '':'',
+ '':'',
+ '':'',
+ '':'',
};
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 efa3a73..a81d401 100644
--- a/zy-asrs-flow/src/pages/system/user/components/assignRole.jsx
+++ b/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 });
diff --git a/zy-asrs-flow/src/pages/system/user/components/edit.jsx b/zy-asrs-flow/src/pages/system/user/components/edit.jsx
index 77e7cb0..c5d0cff 100644
--- a/zy-asrs-flow/src/pages/system/user/components/edit.jsx
+++ b/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>
diff --git a/zy-asrs-flow/src/pages/system/user/components/pwd.jsx b/zy-asrs-flow/src/pages/system/user/components/pwd.jsx
index 35bb812..13e70f8 100644
--- a/zy-asrs-flow/src/pages/system/user/components/pwd.jsx
+++ b/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={[
diff --git a/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/BetterGenerator.java b/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/BetterGenerator.java
index 755b764..5895730 100644
--- a/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/BetterGenerator.java
+++ b/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");
}
// 鏋氫妇
--
Gitblit v1.9.1