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/menu/components/edit.jsx | 57 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 41 insertions(+), 16 deletions(-)
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 d37e82e..7a929f5 100644
--- a/zy-asrs-flow/src/pages/system/menu/components/edit.jsx
+++ b/zy-asrs-flow/src/pages/system/menu/components/edit.jsx
@@ -7,12 +7,19 @@
ProFormDateTimePicker,
ProFormTreeSelect
} from '@ant-design/pro-components';
-import { Form, Modal } from 'antd';
+import { FormattedMessage, useIntl } from '@umijs/max';
+import { Form, Modal, Col } from 'antd';
import moment from 'moment';
import Http from '@/utils/http';
+import { createIcon } from '@/utils/icon-util'
+import IconSelector from '@/components/IconSelector';
const Edit = (props) => {
+ const intl = useIntl();
const [menuType, setMenuType] = useState(0);
+ const [menuIconName, setMenuIconName] = useState();
+ const [iconSelectorOpen, setIconSelectorOpen] = useState(false);
+
const [form] = Form.useForm();
const { } = props;
@@ -38,7 +45,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
@@ -67,7 +78,6 @@
return props.treeData;
}}
colProps={{ md: 12, xl: 12 }}
- placeholder="璇烽�夋嫨"
rules={[{ required: true, message: "涓婄骇鑿滃崟涓嶈兘涓虹┖" }]}
fieldProps={{
treeDefaultExpandedKeys: [0]
@@ -75,10 +85,9 @@
/>
<ProFormText
name="name"
- label="鍚嶇О"
+ label="鑿滃崟鍚嶇О"
colProps={{ md: 12, xl: 12 }}
- placeholder="璇疯緭鍏�"
- rules={[{ required: true, message: "鍚嶇О涓嶈兘涓虹┖锛�" }]}
+ rules={[{ required: true, message: "鑿滃崟鍚嶇О涓嶈兘涓虹┖锛�" }]}
/>
</ProForm.Group>
<ProForm.Group>
@@ -86,21 +95,18 @@
name="route"
label="璺敱鍦板潃"
colProps={{ md: 12, xl: 12 }}
- placeholder="璇疯緭鍏�"
/>
<ProFormText
name="component"
label="椤甸潰缁勪欢"
colProps={{ md: 12, xl: 12 }}
- placeholder="璇疯緭鍏�"
/>
</ProForm.Group>
<ProForm.Group>
<ProFormSelect
name="type"
label="绫诲瀷"
- colProps={{ md: 12, xl: 12 }}
- placeholder="璇烽�夋嫨"
+ colProps={{ md: 10, xl: 610 }}
options={[
{ label: '鑿滃崟', value: 0 },
{ label: '鎸夐挳', value: 1 },
@@ -117,14 +123,19 @@
label="鏉冮檺鏍囪瘑"
hidden={menuType !== 1}
colProps={{ md: 12, xl: 12 }}
- placeholder="璇疯緭鍏�"
/>
- <ProFormText
+ <ProFormSelect
name="icon"
label="鑿滃崟鍥炬爣"
hidden={menuType !== 0}
colProps={{ md: 12, xl: 12 }}
- placeholder="璇疯緭鍏�"
+ valueEnum={{}}
+ addonBefore={createIcon(menuIconName)}
+ fieldProps={{
+ onClick: () => {
+ setIconSelectorOpen(true);
+ },
+ }}
/>
</ProForm.Group>
<ProForm.Group>
@@ -133,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 },
@@ -147,7 +156,23 @@
/>
</ProForm.Group>
</ProForm>
- </Modal>
+ <Modal
+ width={800}
+ open={iconSelectorOpen}
+ onCancel={() => {
+ setIconSelectorOpen(false);
+ }}
+ footer={null}
+ >
+ <IconSelector
+ onSelect={(name) => {
+ form.setFieldsValue({ icon: name });
+ setMenuIconName(name);
+ setIconSelectorOpen(false);
+ }}
+ />
+ </Modal>
+ </Modal >
</>
)
}
--
Gitblit v1.9.1