From f4b9504cad034ddcdef21c2081d14a4984fcd2d3 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 15 七月 2024 17:14:48 +0800
Subject: [PATCH] 2024-07-15
---
src/menu/components/share/clockcomponent/index.jsx | 31 ++++++++++---------------------
1 files changed, 10 insertions(+), 21 deletions(-)
diff --git a/src/menu/components/share/clockcomponent/index.jsx b/src/menu/components/share/clockcomponent/index.jsx
index 65549fc..24de95e 100644
--- a/src/menu/components/share/clockcomponent/index.jsx
+++ b/src/menu/components/share/clockcomponent/index.jsx
@@ -1,35 +1,23 @@
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 zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
import ClockForm from './settingform'
import './index.scss'
class ClockComponent extends Component {
static propTpyes = {
- btnlog: PropTypes.array,
updateConfig: PropTypes.func
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
- visible: false,
- timer: '',
- }
-
- shouldComponentUpdate (nextProps, nextState) {
- return !is(fromJS(this.state), fromJS(nextState))
+ visible: false
}
trigger = () => {
- const { config } = this.props
-
this.setState({
- visible: true,
- timer: config.timer || ''
+ visible: true
})
}
@@ -40,16 +28,17 @@
this.setState({
visible: false
})
- this.props.updateConfig({...config, timer: res.timer})
+ this.props.updateConfig({...config, timer: res.timer, timerRepeats: res.timerRepeats, clearField: res.clearField || '', clearValue: res.clearValue || ''})
})
}
render () {
- const { visible, loading, timer } = this.state
+ const { config } = this.props
+ 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}
@@ -60,7 +49,7 @@
onCancel={() => this.setState({ visible: false })}
destroyOnClose
>
- <ClockForm timer={timer} inputSubmit={this.submit} wrappedComponentRef={(inst) => this.verifyRef = inst}/>
+ <ClockForm config={config} inputSubmit={this.submit} wrappedComponentRef={(inst) => this.verifyRef = inst}/>
</Modal>
</div>
)
--
Gitblit v1.8.0