From b19394294d6c10b72f52fcb88b7b4200708a2613 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 28 二月 2024 15:02:35 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/locales/en-US.ts | 8 ++++
zy-asrs-flow/src/pages/system/role/components/scope.jsx | 8 ++--
zy-asrs-flow/src/pages/system/menu/components/edit.jsx | 9 ----
zy-asrs-flow/src/pages/system/dept/components/edit.jsx | 6 ---
zy-asrs-flow/src/pages/system/role/index.jsx | 58 +++++++++++++++--------------
zy-asrs-flow/src/pages/system/role/components/edit.jsx | 9 ++--
6 files changed, 47 insertions(+), 51 deletions(-)
diff --git a/zy-asrs-flow/src/locales/en-US.ts b/zy-asrs-flow/src/locales/en-US.ts
index 7f35c7c..77e3ebf 100644
--- a/zy-asrs-flow/src/locales/en-US.ts
+++ b/zy-asrs-flow/src/locales/en-US.ts
@@ -19,6 +19,14 @@
'page.export':'Export',
'page.selected':' has been selected',
'page.delete.batch':'Batch Delete',
+ 'page.assigning':'Assigning',
+ 'page.assign.success':'Assignment Successful',
+ 'page.assign.fail':'Assignment failed, please try again!',
+ 'page.assign.permission':'Assign',
+ 'page.permission.menu':'Menu',
+ 'page.role.assign.ec':'Expand/Collapse',
+ 'page.role.assign.sd':'Select All/Deselect All',
+ '':'',
'':'',
'':'',
'personal.base.setting':'Basic Settings',
diff --git a/zy-asrs-flow/src/pages/system/dept/components/edit.jsx b/zy-asrs-flow/src/pages/system/dept/components/edit.jsx
index 6f6b6c5..6ed69a1 100644
--- a/zy-asrs-flow/src/pages/system/dept/components/edit.jsx
+++ b/zy-asrs-flow/src/pages/system/dept/components/edit.jsx
@@ -72,7 +72,6 @@
return props.treeData;
}}
colProps={{ md: 12, xl: 12 }}
- placeholder="璇烽�夋嫨"
rules={[{ required: true, message: "涓婄骇閮ㄩ棬涓嶈兘涓虹┖" }]}
fieldProps={{
treeDefaultExpandedKeys: [0]
@@ -82,7 +81,6 @@
name="name"
label="閮ㄩ棬鍚嶇О"
colProps={{ md: 12, xl: 12 }}
- placeholder="璇疯緭鍏�"
rules={[{ required: true, message: "閮ㄩ棬鍚嶇О涓嶈兘涓虹┖锛�" }]}
/>
</ProForm.Group>
@@ -91,14 +89,12 @@
name="leader"
label="璐熻矗浜�"
colProps={{ md: 12, xl: 12 }}
- placeholder="璇疯緭鍏�"
/>
<ProFormDigit
name="sort"
label="鎺掑簭"
colProps={{ md: 12, xl: 12 }}
fieldProps={{ precision: 0 }}
- placeholder="璇疯緭鍏�"
/>
</ProForm.Group>
<ProForm.Group>
@@ -106,7 +102,6 @@
name="status"
label="鐘舵��"
colProps={{ md: 12, xl: 12 }}
- placeholder="璇烽�夋嫨"
options={[
{ label: '姝ｅ父', value: 1 },
{ label: '绂佺敤', value: 0 },
@@ -116,7 +111,6 @@
name="memo"
label=" 澶囨敞"
colProps={{ md: 12, xl: 12 }}
- placeholder="璇疯緭鍏�"
/>
</ProForm.Group>
diff --git a/zy-asrs-flow/src/pages/system/menu/components/edit.jsx b/zy-asrs-flow/src/pages/system/menu/components/edit.jsx
index f19b93c..7a929f5 100644
--- a/zy-asrs-flow/src/pages/system/menu/components/edit.jsx
+++ b/zy-asrs-flow/src/pages/system/menu/components/edit.jsx
@@ -78,7 +78,6 @@
return props.treeData;
}}
colProps={{ md: 12, xl: 12 }}
- placeholder="璇烽�夋嫨"
rules={[{ required: true, message: "涓婄骇鑿滃崟涓嶈兘涓虹┖" }]}
fieldProps={{
treeDefaultExpandedKeys: [0]
@@ -88,7 +87,6 @@
name="name"
label="鑿滃崟鍚嶇О"
colProps={{ md: 12, xl: 12 }}
- placeholder="璇疯緭鍏�"
rules={[{ required: true, message: "鑿滃崟鍚嶇О涓嶈兘涓虹┖锛�" }]}
/>
</ProForm.Group>
@@ -97,13 +95,11 @@
name="route"
label="璺敱鍦板潃"
colProps={{ md: 12, xl: 12 }}
- placeholder="璇疯緭鍏�"
/>
<ProFormText
name="component"
label="椤甸潰缁勪欢"
colProps={{ md: 12, xl: 12 }}
- placeholder="璇疯緭鍏�"
/>
</ProForm.Group>
<ProForm.Group>
@@ -111,7 +107,6 @@
name="type"
label="绫诲瀷"
colProps={{ md: 10, xl: 610 }}
- placeholder="璇烽�夋嫨"
options={[
{ label: '鑿滃崟', value: 0 },
{ label: '鎸夐挳', value: 1 },
@@ -128,14 +123,12 @@
label="鏉冮檺鏍囪瘑"
hidden={menuType !== 1}
colProps={{ md: 12, xl: 12 }}
- placeholder="璇疯緭鍏�"
/>
<ProFormSelect
name="icon"
label="鑿滃崟鍥炬爣"
hidden={menuType !== 0}
colProps={{ md: 12, xl: 12 }}
- placeholder="璇疯緭鍏�"
valueEnum={{}}
addonBefore={createIcon(menuIconName)}
fieldProps={{
@@ -151,13 +144,11 @@
label="鎺掑簭"
colProps={{ md: 12, xl: 12 }}
fieldProps={{ precision: 0 }}
- placeholder="璇疯緭鍏�"
/>
<ProFormSelect
name="status"
label="鐘舵��"
colProps={{ md: 12, xl: 12 }}
- placeholder="璇烽�夋嫨"
options={[
{ label: '姝ｅ父', value: 1 },
{ label: '绂佺敤', value: 0 },
diff --git a/zy-asrs-flow/src/pages/system/role/components/edit.jsx b/zy-asrs-flow/src/pages/system/role/components/edit.jsx
index 83a6789..2e42b61 100644
--- a/zy-asrs-flow/src/pages/system/role/components/edit.jsx
+++ b/zy-asrs-flow/src/pages/system/role/components/edit.jsx
@@ -38,7 +38,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
@@ -63,14 +67,12 @@
name="name"
label="瑙掕壊鍚嶇О"
colProps={{ md: 12, xl: 12 }}
- placeholder="璇疯緭鍏�"
rules={[{ required: true, message: "璇疯緭鍏ヨ鑹插悕绉帮紒" }]}
/>
<ProFormText
name="code"
label="瑙掕壊鏍囪瘑"
colProps={{ md: 12, xl: 12 }}
- placeholder="璇疯緭鍏�"
rules={[{ required: true, message: "璇疯緭鍏ヨ鑹叉爣璇嗭紒" }]}
/>
</ProForm.Group>
@@ -89,7 +91,6 @@
name="memo"
label="澶囨敞"
colProps={{ md: 12, xl: 12 }}
- placeholder="璇疯緭鍏�"
/>
</ProForm.Group>
</ProForm>
diff --git a/zy-asrs-flow/src/pages/system/role/components/scope.jsx b/zy-asrs-flow/src/pages/system/role/components/scope.jsx
index f600c62..b6b5d89 100644
--- a/zy-asrs-flow/src/pages/system/role/components/scope.jsx
+++ b/zy-asrs-flow/src/pages/system/role/components/scope.jsx
@@ -60,7 +60,7 @@
return (
<>
<Drawer
- title={`鍒嗛厤鏉冮檺 - ${name ? name : '-'}`}
+ title={`${intl.formatMessage({ id: 'page.assign.permission', defaultMessage: '鍒嗛厤鏉冮檺' })} - ${name ? name : '-'}`}
width={640}
forceRender
destroyOnClose
@@ -96,15 +96,15 @@
<ProForm.Item
name="deptIds"
- label="鏉冮檺鑿滃崟"
+ label={intl.formatMessage({ id: 'page.permission.menu', defaultMessage: '鏉冮檺鑿滃崟' })}
colProps={{ md: 24, xl: 24 }}
>
<Row gutter={[16, 16]}>
<Col md={24}>
<Checkbox.Group
options={[
- { label: '灞曞紑/鎶樺彔', value: 'expandAll' },
- { label: '鍏ㄩ��/鍏ㄤ笉閫�', value: 'checkAll' },
+ { label: intl.formatMessage({ id: 'page.role.assign.ec', defaultMessage: '灞曞紑/鎶樺彔' }), value: 'expandAll' },
+ { label: intl.formatMessage({ id: 'page.role.assign.sd', defaultMessage: '鍏ㄩ��/鍏ㄤ笉閫�' }), value: 'checkAll' },
]}
defaultValue={['expandAll']}
onChange={(values) => {
diff --git a/zy-asrs-flow/src/pages/system/role/index.jsx b/zy-asrs-flow/src/pages/system/role/index.jsx
index bf1602e..d68093f 100644
--- a/zy-asrs-flow/src/pages/system/role/index.jsx
+++ b/zy-asrs-flow/src/pages/system/role/index.jsx
@@ -19,18 +19,18 @@
const TABLE_KEY = "pro-table-role";
const handleSave = async (val, intl) => {
- const hide = message.loading('姝ｅ湪娣诲姞');
+ const hide = message.loading(intl.formatMessage({ id: 'page.adding', defaultMessage: '姝ｅ湪娣诲姞' }));
try {
const resp = await Http.doPost('api/role/save', val);
if (resp.code === 200) {
- message.success('娣诲姞鎴愬姛');
+ message.success(intl.formatMessage({ id: 'page.add.success', defaultMessage: '娣诲姞鎴愬姛' }));
return true;
} else {
message.error(resp.msg);
return false;
}
} catch (error) {
- message.error('娣诲姞澶辫触璇烽噸璇曪紒');
+ message.error(intl.formatMessage({ id: 'page.add.fail', defaultMessage: '娣诲姞澶辫触璇烽噸璇曪紒' }));
return false;
} finally {
hide();
@@ -38,18 +38,18 @@
};
const handleUpdate = async (val, intl) => {
- const hide = message.loading('姝ｅ湪鏇存柊');
+ const hide = message.loading(intl.formatMessage({ id: 'page.updating', defaultMessage: '姝ｅ湪鏇存柊' }));
try {
const resp = await Http.doPost('api/role/update', val);
if (resp.code === 200) {
- message.success('鏇存柊鎴愬姛');
+ message.success(intl.formatMessage({ id: 'page.update.success', defaultMessage: '鏇存柊鎴愬姛' }));
return true;
} else {
message.error(resp.msg);
return false;
}
} catch (error) {
- message.error('閰嶇疆澶辫触璇烽噸璇曪紒');
+ message.error(intl.formatMessage({ id: 'page.update.fail', defaultMessage: '鏇存柊澶辫触璇烽噸璇曪紒' }));
return false;
} finally {
hide();
@@ -58,18 +58,18 @@
const handleRemove = async (rows, intl) => {
if (!rows) return true;
- const hide = message.loading('姝ｅ湪鍒犻櫎');
+ const hide = message.loading(intl.formatMessage({ id: 'page.deleting', defaultMessage: '姝ｅ湪鍒犻櫎' }));
try {
const resp = await Http.doPost('api/role/remove/' + rows.map((row) => row.id).join(','));
if (resp.code === 200) {
- message.success('鍒犻櫎鎴愬姛');
+ message.success(intl.formatMessage({ id: 'page.delete.success', defaultMessage: '鍒犻櫎鎴愬姛' }));
return true;
} else {
message.error(resp.msg);
return false;
}
} catch (error) {
- message.error('鍒犻櫎澶辫触锛岃閲嶈瘯');
+ message.error(intl.formatMessage({ id: 'page.delete.fail', defaultMessage: '鍒犻櫎澶辫触锛岃閲嶈瘯锛�' }));
return false;
} finally {
hide();
@@ -77,15 +77,15 @@
};
const handleExport = async (intl) => {
- const hide = message.loading('姝ｅ湪瀵煎嚭');
+ const hide = message.loading(intl.formatMessage({ id: 'page.exporting', defaultMessage: '姝ｅ湪瀵煎嚭' }));
try {
const resp = await Http.doPostBlob('api/role/export');
const blob = new Blob([resp], { type: 'application/vnd.ms-excel' });
window.location.href = window.URL.createObjectURL(blob);
- message.success('瀵煎嚭鎴愬姛');
+ message.success(intl.formatMessage({ id: 'page.export.success', defaultMessage: '瀵煎嚭鎴愬姛' }));
return true;
} catch (error) {
- message.error('瀵煎嚭澶辫触锛岃閲嶈瘯');
+ message.error(intl.formatMessage({ id: 'page.export.fail', defaultMessage: '瀵煎嚭澶辫触锛岃閲嶈瘯' }));
return false;
} finally {
hide();
@@ -93,18 +93,18 @@
};
const handleScope = async (val) => {
- const hide = message.loading('姝ｅ湪鍒嗛厤');
+ const hide = message.loading(intl.formatMessage({ id: 'page.assigning', defaultMessage: '姝ｅ湪鍒嗛厤' }));
try {
const resp = await Http.doPost('api/role/scope/update', val);
if (resp.code === 200) {
- message.success('鍒嗛厤鎴愬姛');
+ message.success(intl.formatMessage({ id: 'page.assign.success', defaultMessage: '鍒嗛厤鎴愬姛' }));
return true;
} else {
message.error(resp.msg);
return false;
}
} catch (error) {
- message.error('鍒嗛厤澶辫触璇烽噸璇曪紒');
+ message.error(intl.formatMessage({ id: 'page.assign.fail', defaultMessage: '鍒嗛厤澶辫触璇烽噸璇曪紒' }));
return false;
} finally {
hide();
@@ -129,7 +129,10 @@
const columns = [
{
- title: 'No',
+ title: intl.formatMessage({
+ id: 'page.table.no',
+ defaultMessage: 'No'
+ }),
dataIndex: 'index',
valueType: 'indexBorder',
width: 60,
@@ -229,7 +232,7 @@
setCurrentRow(record);
}}
>
- 缂栬緫
+ <FormattedMessage id='page.edit' defaultMessage='缂栬緫' />
</Button>,
<Button
type="link"
@@ -244,7 +247,7 @@
});
}}
>
- 鍒嗛厤鏉冮檺
+ <FormattedMessage id='page.assign.permission' defaultMessage='鍒嗛厤鏉冮檺' />
</Button>,
<Button
type="link"
@@ -252,8 +255,8 @@
key="batchRemove"
onClick={async () => {
Modal.confirm({
- title: '鍒犻櫎',
- content: '纭畾鍒犻櫎璇ラ」鍚楋紵',
+ title: intl.formatMessage({ id: 'page.delete', defaultMessage: '鍒犻櫎' }),
+ content: intl.formatMessage({ id: 'page.delete.confirm', defaultMessage: '纭畾鍒犻櫎璇ラ」鍚楋紵' }),
onOk: async () => {
const success = await handleRemove([record], intl);
if (success) {
@@ -265,7 +268,7 @@
});
}}
>
- 鍒犻櫎
+ <FormattedMessage id='page.delete' defaultMessage='鍒犻櫎' />
</Button>,
],
},
@@ -316,7 +319,7 @@
}}
>
<PlusOutlined />
- 娣诲姞
+ <FormattedMessage id='page.add' defaultMessage='娣诲姞' />
</Button>,
<Button
key="export"
@@ -325,7 +328,7 @@
}}
>
<ExportOutlined />
- 瀵煎嚭
+ <FormattedMessage id='page.export' defaultMessage='瀵煎嚭' />
</Button>,
],
}}
@@ -360,9 +363,8 @@
<FooterToolbar
extra={
<div>
- 宸查�夋嫨
<a style={{ fontWeight: 600 }}>{selectedRows.length}</a>
- 椤�
+ <FormattedMessage id='page.selected' defaultMessage=' 椤瑰凡閫夋嫨' />
</div>
}
>
@@ -371,8 +373,8 @@
danger
onClick={async () => {
Modal.confirm({
- title: '鍒犻櫎',
- content: '纭畾鍒犻櫎璇ラ」鍚楋紵',
+ title: intl.formatMessage({ id: 'page.delete', defaultMessage: '鍒犻櫎' }),
+ content: intl.formatMessage({ id: 'page.delete.confirm', defaultMessage: '纭畾鍒犻櫎璇ラ」鍚楋紵' }),
onOk: async () => {
const success = await handleRemove(selectedRows, intl);
if (success) {
@@ -383,7 +385,7 @@
});
}}
>
- 鎵归噺鍒犻櫎
+ <FormattedMessage id='page.delete.batch' defaultMessage='鎵归噺鍒犻櫎' />
</Button>
</FooterToolbar>
)}
--
Gitblit v1.9.1