From 08f7aadb915f6cd5f709aa3aed02d7dc8000a0f6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 21 一月 2022 18:27:28 +0800
Subject: [PATCH] 2022-01-21
---
src/menu/components/share/clockcomponent/settingform/index.jsx | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/menu/components/share/clockcomponent/settingform/index.jsx b/src/menu/components/share/clockcomponent/settingform/index.jsx
index dd4c146..099f414 100644
--- a/src/menu/components/share/clockcomponent/settingform/index.jsx
+++ b/src/menu/components/share/clockcomponent/settingform/index.jsx
@@ -1,6 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Select, Tooltip, Icon, Input } from 'antd'
+import { Form, Row, Col, Select, Tooltip, Input } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import './index.scss'
@@ -11,7 +12,8 @@
}
state = {
- clearField: this.props.config.clearField || ''
+ clearField: this.props.config.clearField || '',
+ timer: this.props.config.timer || ''
}
handleConfirm = () => {
@@ -29,7 +31,7 @@
render() {
const { config } = this.props
- const { clearField } = this.state
+ const { clearField, timer } = this.state
const { getFieldDecorator } = this.props.form
const formItemLayout = {
@@ -52,7 +54,7 @@
{getFieldDecorator('timer', {
initialValue: config.timer || ''
})(
- <Select>
+ <Select onChange={(val) => this.setState({timer: val})}>
<Select.Option value=""> 鏃� </Select.Option>
<Select.Option value="5s"> 5绉� </Select.Option>
<Select.Option value="15s"> 15绉� </Select.Option>
@@ -67,10 +69,10 @@
)}
</Form.Item>
</Col>
- {config.subtype === 'balcony' || config.subtype === 'propcard' ? <Col span={22}>
+ {(config.subtype === 'balcony' || config.subtype === 'propcard') && timer ? <Col span={22}>
<Form.Item label={
<Tooltip placement="topLeft" title="鍙互鎸囧畾瀛楁鐢ㄤ簬鎺у埗瀹氭椂鍣ㄧ殑鍏抽棴銆�">
- <Icon type="question-circle" style={{marginRight: '3px', color: '#c49f47'}} />
+ <QuestionCircleOutlined className="mk-form-tip" />
鍏抽棴瀹氭椂
</Tooltip>
}>
@@ -83,10 +85,10 @@
)}
</Form.Item>
</Col> : null}
- {(config.subtype === 'balcony' || config.subtype === 'propcard') && clearField ? <Col span={22}>
+ {(config.subtype === 'balcony' || config.subtype === 'propcard') && clearField && timer ? <Col span={22}>
<Form.Item label={
<Tooltip placement="topLeft" title="褰撳瓧娈靛�间笌鍏抽棴鍊肩浉绛夋椂锛屽叧闂畾鏃跺櫒锛屽涓�煎彲鐢ㄩ�楀彿鍒嗛殧銆�">
- <Icon type="question-circle" style={{marginRight: '3px', color: '#c49f47'}} />
+ <QuestionCircleOutlined className="mk-form-tip" />
鍏抽棴鍊�
</Tooltip>
}>
--
Gitblit v1.8.0