From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/mob/components/navbar/normal-navbar/menus/menuform/index.jsx | 54 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 49 insertions(+), 5 deletions(-)
diff --git a/src/mob/components/navbar/normal-navbar/menus/menuform/index.jsx b/src/mob/components/navbar/normal-navbar/menus/menuform/index.jsx
index 70e6d2f..2ffce2b 100644
--- a/src/mob/components/navbar/normal-navbar/menus/menuform/index.jsx
+++ b/src/mob/components/navbar/normal-navbar/menus/menuform/index.jsx
@@ -168,6 +168,23 @@
)}
</Form.Item>
</Col>
+ {property === 'menu' || property === 'linkmenu' ? <Col span={12}>
+ <Form.Item label={
+ <Tooltip placement="topLeft" title="鏇挎崲褰撳墠椤甸潰鎴栨墦寮�鏂伴〉闈紝鍦℉5鎴栧皬绋嬪簭涓湁鏁堛��">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 鎵撳紑鏂瑰紡
+ </Tooltip>
+ }>
+ {getFieldDecorator('open', {
+ initialValue: menu.open || 'self'
+ })(
+ <Radio.Group>
+ <Radio value="self">鏍囩椤�</Radio>
+ <Radio value="blank">鏂伴〉闈�</Radio>
+ </Radio.Group>
+ )}
+ </Form.Item>
+ </Col> : null}
{property === 'link' ? <Col span={24}>
<Form.Item label="閾炬帴鍦板潃" className="textarea">
{getFieldDecorator('link', {
@@ -193,10 +210,14 @@
message: '璇烽�夋嫨鍏宠仈鑿滃崟!'
}]
})(
- <Select>
- {appMenus.map(item => (<Select.Option key={item.MenuID} value={item.MenuID}>{item.MenuName}</Select.Option>))}
+ <Select
+ showSearch
+ filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0 ||
+ option.props.extend.toLowerCase().indexOf(input.toLowerCase()) >= 0}
+ >
+ {appMenus.map(item => (<Select.Option key={item.MenuID} extend={item.MenuNo || ''} value={item.MenuID}>{item.MenuName}</Select.Option>))}
{/* <Select.Option key="IM" value="IM">鍗虫椂閫氫俊锛堢郴缁熼〉锛�</Select.Option> */}
- <Select.Option key="AIService" value="AIService">鏅鸿兘瀹㈡湇锛堢郴缁熼〉锛�</Select.Option>
+ <Select.Option key="AIService" extend={''} value="AIService">鏅鸿兘瀹㈡湇锛堢郴缁熼〉锛�</Select.Option>
</Select>
)}
</Form.Item>
@@ -211,8 +232,14 @@
{getFieldDecorator('copyMenuId', {
initialValue: menu.copyMenuId || ''
})(
- <Select allowClear onChange={(val) => this.setState({copyMenu: val})}>
- {appMenus.map(item => (<Select.Option key={item.MenuID} value={item.MenuID}>{item.MenuName}</Select.Option>))}
+ <Select
+ allowClear
+ showSearch
+ filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0 ||
+ option.props.extend.toLowerCase().indexOf(input.toLowerCase()) >= 0}
+ onChange={(val) => this.setState({copyMenu: val})}
+ >
+ {appMenus.map(item => (<Select.Option key={item.MenuID} extend={item.MenuNo || ''} value={item.MenuID}>{item.MenuName}</Select.Option>))}
</Select>
)}
</Form.Item>
@@ -234,6 +261,23 @@
)}
</Form.Item>
</Col> : null}
+ <Col span={12}>
+ <Form.Item label={
+ <Tooltip placement="topLeft" title="鍦℉5鎴栧皬绋嬪簭涓湁鏁堛��">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 鑿滃崟鏍峰紡
+ </Tooltip>
+ }>
+ {getFieldDecorator('class', {
+ initialValue: menu.class || 'default'
+ })(
+ <Radio.Group>
+ <Radio value="default">榛樿</Radio>
+ <Radio value="zoomIn">鏀惧ぇ</Radio>
+ </Radio.Group>
+ )}
+ </Form.Item>
+ </Col>
</Row>
</Form>
)
--
Gitblit v1.8.0