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/menu/components/share/clockcomponent/index.jsx | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/menu/components/share/clockcomponent/index.jsx b/src/menu/components/share/clockcomponent/index.jsx
index ee53e1a..9fb414d 100644
--- a/src/menu/components/share/clockcomponent/index.jsx
+++ b/src/menu/components/share/clockcomponent/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Icon, Modal } from 'antd'
+import { Modal } from 'antd'
+import { ClockCircleOutlined } from '@ant-design/icons'
import ClockForm from './settingform'
import './index.scss'
@@ -32,7 +33,7 @@
this.setState({
visible: false
})
- this.props.updateConfig({...config, timer: res.timer, clearField: res.clearField || '', clearValue: res.clearValue || ''})
+ this.props.updateConfig({...config, timer: res.timer, timerRepeats: res.timerRepeats, clearField: res.clearField || '', clearValue: res.clearValue || ''})
})
}
@@ -41,8 +42,8 @@
const { visible, loading } = this.state
return (
- <div className="clock-component-wrap">
- <Icon type="clock-circle" title="瀹氭椂鍣�" onClick={this.trigger} />
+ <div className={'clock-component-wrap' + (config.timer ? ' tip-sign' : '')}>
+ <ClockCircleOutlined title="瀹氭椂鍣�" onClick={this.trigger} />
<Modal
title="瀹氭椂鍣ㄨ缃�"
visible={visible}
--
Gitblit v1.8.0