From b5364600d98c8749caba625ec813d4fe670d0a19 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 16 十二月 2021 17:29:55 +0800
Subject: [PATCH] 2021-12-16
---
src/pc/components/navbar/normal-navbar/menusetting/menuform/index.jsx | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/src/pc/components/navbar/normal-navbar/menusetting/menuform/index.jsx b/src/pc/components/navbar/normal-navbar/menusetting/menuform/index.jsx
index fad6b76..39da53f 100644
--- a/src/pc/components/navbar/normal-navbar/menusetting/menuform/index.jsx
+++ b/src/pc/components/navbar/normal-navbar/menusetting/menuform/index.jsx
@@ -1,6 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Input, Radio, Tooltip, Icon, Select } from 'antd'
+import { Form, Row, Col, Input, Radio, Tooltip, Select } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import './index.scss'
@@ -22,7 +23,7 @@
if (appMenus) {
try {
appMenus = JSON.parse(appMenus)
- } catch {
+ } catch (e) {
appMenus = []
}
} else {
@@ -120,8 +121,8 @@
})(
<Radio.Group onChange={this.changeProperty}>
<Radio value="menu">鑿滃崟</Radio>
- <Radio value="link">閾炬帴</Radio>
<Radio value="linkmenu">鍏宠仈鑿滃崟</Radio>
+ <Radio value="link">閾炬帴</Radio>
{menu.level === 1 || menu.level === 2 ? <Radio value="classify">鍒嗙被</Radio> : null}
</Radio.Group>
)}
@@ -139,17 +140,6 @@
)}
</Form.Item>
</Col>
- {property === 'link' ? <Col span={22}>
- <Form.Item label="閾炬帴鍦板潃">
- {getFieldDecorator('link', {
- initialValue: menu.link || '',
- rules: [{
- required: true,
- message: '璇疯緭鍏ラ摼鎺ュ湴鍧�!'
- }]
- })(<TextArea rows={2} />)}
- </Form.Item>
- </Col> : null}
{property !== 'classify' ? <Col span={22}>
<Form.Item label="鎵撳紑鏂瑰紡">
{getFieldDecorator('open', {
@@ -162,10 +152,21 @@
)}
</Form.Item>
</Col> : null}
+ {property === 'link' ? <Col span={22}>
+ <Form.Item label="閾炬帴鍦板潃">
+ {getFieldDecorator('link', {
+ initialValue: menu.link || '',
+ rules: [{
+ required: true,
+ message: '璇疯緭鍏ラ摼鎺ュ湴鍧�!'
+ }]
+ })(<TextArea rows={2} />)}
+ </Form.Item>
+ </Col> : null}
{property === 'linkmenu' ? <Col span={22}>
<Form.Item label={
<Tooltip placement="topLeft" title="鍏宠仈褰撳墠app涓凡鏈夌殑鑿滃崟銆�">
- <Icon type="question-circle" style={{color: '#c49f47', marginRight: '3px'}}/>
+ <QuestionCircleOutlined className="mk-form-tip" />
鍏宠仈鑿滃崟
</Tooltip>
}>
@@ -185,14 +186,14 @@
{property === 'menu' ? <Col span={22}>
<Form.Item label={
<Tooltip placement="topLeft" title="澶嶅埗鑿滃崟浠呭湪褰撳墠鑿滃崟涓嶅瓨鍦ㄦ椂鏈夋晥銆�">
- <Icon type="question-circle" style={{color: '#c49f47', marginRight: '3px'}}/>
+ <QuestionCircleOutlined className="mk-form-tip" />
澶嶅埗鑿滃崟
</Tooltip>
}>
{getFieldDecorator('copyMenuId', {
initialValue: menu.copyMenuId || ''
})(
- <Select>
+ <Select allowClear>
{appMenus.map(item => (<Select.Option key={item.MenuID} value={item.MenuID}>{item.MenuName}</Select.Option>))}
</Select>
)}
--
Gitblit v1.8.0