Skip to content

Commit d60fd7b

Browse files
committed
✨ feat(用户、角色): 添加菜单、用户、角色,调整国际化
1 parent a81bcf6 commit d60fd7b

17 files changed

Lines changed: 397 additions & 519 deletions

File tree

bun.lock

Lines changed: 2 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"lodash-es": "^4.17.21",
3636
"react": "^18.3.1",
3737
"react-dom": "^18.3.1",
38-
"react-draggable": "^4.4.6",
38+
"react-draggable": "^4.5.0",
3939
"react-error-boundary": "^6.0.0",
4040
"react-i18next": "^15.5.3",
4141
"react-router": "^7.6.2",

src/locales/en-US/common.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ const translation = {
2323
paste: 'paste',
2424
cut: 'cut',
2525
search: 'search',
26+
selectAll: 'select all',
2627
},
2728
errorMsg: {
2829
requestFailed: 'request failed',

src/locales/en-US/menu.ts

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,55 @@
11
const menu = {
22
home: 'Home',
3+
statics: {
4+
main: 'Statics',
5+
messageSearch: 'Message Search',
6+
errorStatics: 'Error Statics',
7+
endpoint: 'Endpoint',
8+
testMessage: 'Test Message',
9+
},
10+
resources: {
11+
main: 'Resources',
12+
database: 'Database',
13+
dataMode: 'Data Mode',
14+
transfer: 'Transfer',
15+
ssl: 'SSL',
16+
web: 'Web',
17+
dll: 'DLL',
18+
},
19+
connection: {
20+
main: 'Connection',
21+
database: 'Database',
22+
jms: 'JMS',
23+
},
24+
dataHandle: {
25+
main: 'Data Handle',
26+
dataTransfer: 'Data Transfer',
27+
variable: 'Variable',
28+
codeSet: 'Code Set',
29+
script: 'Script',
30+
},
331
system: {
4-
management: 'System',
32+
main: 'System',
533
menu: 'Menu',
634
role: 'Role',
735
user: 'User',
836
dict: 'Dictionary',
937
param: 'Parameters',
38+
announcement: 'Announcement',
39+
},
40+
monitor: {
41+
main: 'Monitor',
42+
timer: 'Timer',
1043
},
1144
integration: {
12-
management: 'Integration',
45+
main: 'Integration',
1346
apps: 'Apps',
1447
endpoint: 'Endpoint',
1548
endpointConfig: 'EndpointConfig',
1649
},
50+
message: {
51+
main: 'Message',
52+
template: 'Template',
53+
},
1754
};
1855
export default menu;

src/locales/zh-CN/common.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ const translation = {
2323
paste: '粘贴',
2424
cut: '剪切',
2525
search: '搜索',
26+
selectAll: '全选',
2627
},
2728
errorMsg: {
2829
requestFailed: '请求失败',

src/locales/zh-CN/menu.ts

Lines changed: 41 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,55 @@
11
const menu = {
22
home: '首页',
3+
statics: {
4+
main: '统计',
5+
messageSearch: '消息查询',
6+
errorStatics: '错误统计',
7+
endpoint: '端点',
8+
testMessage: '测试消息',
9+
},
10+
resources: {
11+
main: '资源维护',
12+
database: '数据库资源',
13+
dataMode: '数据模式',
14+
transfer: '数据转换',
15+
ssl: 'SSL',
16+
web: 'Web服务',
17+
dll: '原生库',
18+
},
19+
connection: {
20+
main: '连接管理',
21+
database: '数据库',
22+
jms: 'JMS',
23+
},
24+
dataHandle: {
25+
main: '数据处理',
26+
dataTransfer: '数据转换',
27+
variable: '变量配置',
28+
codeSet: '代码集',
29+
script: '共享脚本',
30+
},
331
system: {
4-
management: '系统管理',
32+
main: '系统管理',
533
menu: '菜单管理',
6-
role: '角色管理',
34+
role: '角色维护',
735
user: '用户管理',
836
dict: '数据字典',
937
param: '系统参数',
38+
announcement: '系统公告',
39+
},
40+
monitor: {
41+
main: '监控',
42+
timer: '定时器',
1043
},
1144
integration: {
12-
management: '集成管理',
45+
main: '集成管理',
1346
apps: '应用中心',
1447
endpoint: '端点维护',
1548
endpointConfig: '端点配置管理',
1649
},
50+
message: {
51+
main: '消息中心',
52+
template: '消息模板',
53+
},
1754
};
18-
export default menu;
55+
export default menu;

src/pages/Login/index.tsx

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -188,27 +188,15 @@ const Login: React.FC = () => {
188188
</p>
189189
</div>
190190
<div className="form" style={{ marginTop: '40px' }}>
191-
<Form
192-
form={form}
193-
name="login"
194-
labelCol={{ span: 5 }}
195-
initialValues={{
196-
username: 'admin',
197-
password: '123456qwe,.',
198-
remember: true,
199-
}}
200-
size="large"
201-
autoComplete="off"
202-
onFinish={submit}
203-
>
191+
<Form form={form} name="login" labelCol={{ span: 5 }} size="large" autoComplete="off" onFinish={submit}>
204192
<Form.Item name="username" rules={[{ required: true, message: t('login.enterUsername') }]}>
205193
<Input
206194
size="large"
207195
ref={inputRef}
208196
autoFocus
209197
autoComplete="off"
210198
allowClear
211-
// placeholder="用户名:admin"
199+
placeholder="用户名(访问用户):nexus"
212200
prefix={<UserOutlined />}
213201
/>
214202
</Form.Item>
@@ -217,7 +205,7 @@ const Login: React.FC = () => {
217205
size="large"
218206
allowClear
219207
autoComplete="off"
220-
// placeholder="密码:123456qwe,."
208+
placeholder="密码:123456"
221209
prefix={<LockOutlined />}
222210
/>
223211
</Form.Item>

0 commit comments

Comments
 (0)