From ba4d6e414fbb37121e80815d3f5ab1aca7a60b08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 28 十月 2024 13:59:34 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/pc/components/navbar/normal-navbar/linksetting/linkform/index.jsx | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/pc/components/navbar/normal-navbar/linksetting/linkform/index.jsx b/src/pc/components/navbar/normal-navbar/linksetting/linkform/index.jsx
index 77f1387..531c3b9 100644
--- a/src/pc/components/navbar/normal-navbar/linksetting/linkform/index.jsx
+++ b/src/pc/components/navbar/normal-navbar/linksetting/linkform/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'
@@ -108,11 +109,12 @@
<Radio.Group onChange={this.changeProperty}>
<Radio value="link">閾炬帴</Radio>
<Radio value="linkmenu">鍏宠仈鑿滃崟</Radio>
+ <Radio value="text">鏂囨湰</Radio>
</Radio.Group>
)}
</Form.Item>
</Col>
- <Col span={22}>
+ {property !== 'text' ? <Col span={22}>
<Form.Item label="鎵撳紑鏂瑰紡">
{getFieldDecorator('open', {
initialValue: menu.open || 'blank'
@@ -123,7 +125,7 @@
</Radio.Group>
)}
</Form.Item>
- </Col>
+ </Col> : null}
{property === 'link' ? <Col span={22}>
<Form.Item label="閾炬帴鍦板潃">
{getFieldDecorator('link', {
@@ -138,7 +140,7 @@
{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>
}>
--
Gitblit v1.8.0