From 32b8ffb3d9cdf49be768a5ddedec2a58d5893503 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 28 八月 2022 13:58:19 +0800
Subject: [PATCH] 2022-08-28
---
src/tabviews/custom/components/card/prop-card/index.jsx | 12 +++
src/tabviews/custom/components/chart/antv-scatter/index.jsx | 12 +++
src/tabviews/custom/components/chart/antv-bar-line/index.jsx | 12 +++
src/tabviews/custom/components/chart/antv-dashboard/index.jsx | 12 +++
src/menu/components/share/clockcomponent/settingform/index.jsx | 29 ++++++++-
src/tabviews/custom/components/card/balcony/index.jsx | 12 +++
src/tabviews/custom/components/tree/antd-tree/index.jsx | 12 +++
src/tabviews/custom/components/chart/antv-pie/index.jsx | 12 +++
src/tabviews/custom/components/chart/custom-chart/index.jsx | 12 +++
9 files changed, 104 insertions(+), 21 deletions(-)
diff --git a/src/menu/components/share/clockcomponent/settingform/index.jsx b/src/menu/components/share/clockcomponent/settingform/index.jsx
index 3e60007..67b168c 100644
--- a/src/menu/components/share/clockcomponent/settingform/index.jsx
+++ b/src/menu/components/share/clockcomponent/settingform/index.jsx
@@ -1,6 +1,6 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Select, Tooltip, Input, InputNumber } from 'antd'
+import { Form, Row, Col, Select, Tooltip, Input, InputNumber, notification } from 'antd'
import { QuestionCircleOutlined } from '@ant-design/icons'
import './index.scss'
@@ -21,6 +21,15 @@
return new Promise((resolve, reject) => {
this.props.form.validateFieldsAndScroll((err, values) => {
if (!err) {
+ if (values.timer === '2s') {
+ if (!values.timerRepeats) {
+ notification.warning({ top: 92, message: '璇疯缃�2s瀹氭椂鍣ㄦ墽琛屾鏁般��', duration: 3 })
+ return
+ } else if (values.timerRepeats > 3) {
+ notification.warning({ top: 92, message: '2s瀹氭椂鍣ㄦ墽琛屾鏁颁笉鍙秴杩�3娆°��', duration: 3 })
+ return
+ }
+ }
resolve(values)
} else {
reject(err)
@@ -50,12 +59,22 @@
<Form {...formItemLayout}>
<Row gutter={24}>
<Col span={22}>
- <Form.Item label="瀹氭椂鍣�">
+ <Form.Item label={
+ <Tooltip placement="topLeft" title="2s瀹氭椂鍣ㄦ渶澶氬彧鑳芥墽琛屼笁娆★紝瀹氭椂鍣ㄦ墽琛�3娆′互涓婇渶瑕佸湪鍗曠偣绯荤粺璁剧疆鏉冮檺銆�">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 瀹氭椂鍣�
+ </Tooltip>
+ }>
{getFieldDecorator('timer', {
initialValue: config.timer || ''
})(
- <Select onChange={(val) => this.setState({timer: val})}>
+ <Select onChange={(val) => this.setState({timer: val}, () => {
+ if (val === '2s') {
+ this.props.form.setFieldsValue({timerRepeats: 1})
+ }
+ })}>
<Select.Option value=""> 鏃� </Select.Option>
+ <Select.Option value="2s"> 2绉� </Select.Option>
<Select.Option value="5s"> 5绉� </Select.Option>
<Select.Option value="15s"> 15绉� </Select.Option>
<Select.Option value="30s"> 30绉� </Select.Option>
@@ -81,7 +100,7 @@
})(<InputNumber min={0} max={500} precision={0} />)}
</Form.Item>
</Col> : null}
- {(config.subtype === 'balcony' || config.subtype === 'propcard') && timer ? <Col span={22}>
+ {(config.subtype === 'balcony' || config.subtype === 'propcard') && timer && timer !== '2s' ? <Col span={22}>
<Form.Item label={
<Tooltip placement="topLeft" title="鍙互鎸囧畾瀛楁鐢ㄤ簬鎺у埗瀹氭椂鍣ㄧ殑鍏抽棴銆�">
<QuestionCircleOutlined className="mk-form-tip" />
@@ -97,7 +116,7 @@
)}
</Form.Item>
</Col> : null}
- {(config.subtype === 'balcony' || config.subtype === 'propcard') && clearField && timer ? <Col span={22}>
+ {(config.subtype === 'balcony' || config.subtype === 'propcard') && clearField && timer && timer !== '2s' ? <Col span={22}>
<Form.Item label={
<Tooltip placement="topLeft" title="褰撳瓧娈靛�间笌鍏抽棴鍊肩浉绛夋椂锛屽叧闂畾鏃跺櫒锛屽涓�煎彲鐢ㄩ�楀彿鍒嗛殧銆�">
<QuestionCircleOutlined className="mk-form-tip" />
diff --git a/src/tabviews/custom/components/card/balcony/index.jsx b/src/tabviews/custom/components/card/balcony/index.jsx
index b491908..3ab8ae0 100644
--- a/src/tabviews/custom/components/card/balcony/index.jsx
+++ b/src/tabviews/custom/components/card/balcony/index.jsx
@@ -175,11 +175,20 @@
if (!config.timer) return
- const _change = { '5s': 5000, '15s': 15000, '30s': 30000, '1min': 60000, '5min': 300000, '10min': 600000, '15min': 900000, '30min': 1800000, '1hour': 3600000 }
+ const _change = { '2s': 2000, '5s': 5000, '15s': 15000, '30s': 30000, '1min': 60000, '5min': 300000, '10min': 600000, '15min': 900000, '30min': 1800000, '1hour': 3600000 }
let timer = _change[config.timer]
+ let repeats = config.timerRepeats || 0
if (!timer) return
+
+ if (repeats > 0 && repeats <=3) {
+ this.setState({timer, repeats})
+ this.timer = setTimeout(() => {
+ this.timerTask(repeats)
+ }, timer)
+ return
+ }
let _param = {
func: 's_get_timers_role',
@@ -201,7 +210,6 @@
})
return
} else if (result.run_type) {
- let repeats = config.timerRepeats || 0
this.setState({timer, repeats})
this.timer = setTimeout(() => {
this.timerTask(repeats)
diff --git a/src/tabviews/custom/components/card/prop-card/index.jsx b/src/tabviews/custom/components/card/prop-card/index.jsx
index 026d811..f07fb25 100644
--- a/src/tabviews/custom/components/card/prop-card/index.jsx
+++ b/src/tabviews/custom/components/card/prop-card/index.jsx
@@ -215,11 +215,20 @@
if (!config.timer) return
- const _change = { '5s': 5000, '15s': 15000, '30s': 30000, '1min': 60000, '5min': 300000, '10min': 600000, '15min': 900000, '30min': 1800000, '1hour': 3600000 }
+ const _change = { '2s': 2000, '5s': 5000, '15s': 15000, '30s': 30000, '1min': 60000, '5min': 300000, '10min': 600000, '15min': 900000, '30min': 1800000, '1hour': 3600000 }
let timer = _change[config.timer]
+ let repeats = config.timerRepeats || 0
if (!timer) return
+
+ if (repeats > 0 && repeats <=3) {
+ this.setState({timer, repeats})
+ this.timer = setTimeout(() => {
+ this.timerTask(repeats)
+ }, timer)
+ return
+ }
let _param = {
func: 's_get_timers_role',
@@ -241,7 +250,6 @@
})
return
} else if (result.run_type) {
- let repeats = config.timerRepeats || 0
this.setState({timer, repeats})
this.timer = setTimeout(() => {
this.timerTask(repeats)
diff --git a/src/tabviews/custom/components/chart/antv-bar-line/index.jsx b/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
index a9bd708..b90d017 100644
--- a/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
@@ -401,11 +401,20 @@
if (!config.timer) return
- const _change = { '5s': 5000, '15s': 15000, '30s': 30000, '1min': 60000, '5min': 300000, '10min': 600000, '15min': 900000, '30min': 1800000, '1hour': 3600000 }
+ const _change = { '2s': 2000, '5s': 5000, '15s': 15000, '30s': 30000, '1min': 60000, '5min': 300000, '10min': 600000, '15min': 900000, '30min': 1800000, '1hour': 3600000 }
let timer = _change[config.timer]
+ let repeats = config.timerRepeats || 0
if (!timer) return
+
+ if (repeats > 0 && repeats <=3) {
+ this.setState({timer, repeats})
+ this.timer = setTimeout(() => {
+ this.timerTask(repeats)
+ }, timer)
+ return
+ }
let _param = {
func: 's_get_timers_role',
@@ -427,7 +436,6 @@
})
return
} else if (result.run_type) {
- let repeats = config.timerRepeats || 0
this.setState({timer, repeats})
this.timer = setTimeout(() => {
this.timerTask(repeats)
diff --git a/src/tabviews/custom/components/chart/antv-dashboard/index.jsx b/src/tabviews/custom/components/chart/antv-dashboard/index.jsx
index 29dba2e..9d8dbf7 100644
--- a/src/tabviews/custom/components/chart/antv-dashboard/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-dashboard/index.jsx
@@ -188,11 +188,20 @@
if (!config.timer) return
- const _change = { '5s': 5000, '15s': 15000, '30s': 30000, '1min': 60000, '5min': 300000, '10min': 600000, '15min': 900000, '30min': 1800000, '1hour': 3600000 }
+ const _change = { '2s': 2000, '5s': 5000, '15s': 15000, '30s': 30000, '1min': 60000, '5min': 300000, '10min': 600000, '15min': 900000, '30min': 1800000, '1hour': 3600000 }
let timer = _change[config.timer]
+ let repeats = config.timerRepeats || 0
if (!timer) return
+
+ if (repeats > 0 && repeats <=3) {
+ this.setState({timer, repeats})
+ this.timer = setTimeout(() => {
+ this.timerTask(repeats)
+ }, timer)
+ return
+ }
let _param = {
func: 's_get_timers_role',
@@ -214,7 +223,6 @@
})
return
} else if (result.run_type) {
- let repeats = config.timerRepeats || 0
this.setState({timer, repeats})
this.timer = setTimeout(() => {
this.timerTask(repeats)
diff --git a/src/tabviews/custom/components/chart/antv-pie/index.jsx b/src/tabviews/custom/components/chart/antv-pie/index.jsx
index 94798e8..f7fde28 100644
--- a/src/tabviews/custom/components/chart/antv-pie/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-pie/index.jsx
@@ -144,11 +144,20 @@
if (!config.timer) return
- const _change = { '5s': 5000, '15s': 15000, '30s': 30000, '1min': 60000, '5min': 300000, '10min': 600000, '15min': 900000, '30min': 1800000, '1hour': 3600000 }
+ const _change = { '2s': 2000, '5s': 5000, '15s': 15000, '30s': 30000, '1min': 60000, '5min': 300000, '10min': 600000, '15min': 900000, '30min': 1800000, '1hour': 3600000 }
let timer = _change[config.timer]
+ let repeats = config.timerRepeats || 0
if (!timer) return
+
+ if (repeats > 0 && repeats <=3) {
+ this.setState({timer, repeats})
+ this.timer = setTimeout(() => {
+ this.timerTask(repeats)
+ }, timer)
+ return
+ }
let _param = {
func: 's_get_timers_role',
@@ -170,7 +179,6 @@
})
return
} else if (result.run_type) {
- let repeats = config.timerRepeats || 0
this.setState({timer, repeats})
this.timer = setTimeout(() => {
this.timerTask(repeats)
diff --git a/src/tabviews/custom/components/chart/antv-scatter/index.jsx b/src/tabviews/custom/components/chart/antv-scatter/index.jsx
index bbc2f7e..f5b5693 100644
--- a/src/tabviews/custom/components/chart/antv-scatter/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-scatter/index.jsx
@@ -138,11 +138,20 @@
if (!config.timer) return
- const _change = { '5s': 5000, '15s': 15000, '30s': 30000, '1min': 60000, '5min': 300000, '10min': 600000, '15min': 900000, '30min': 1800000, '1hour': 3600000 }
+ const _change = { '2s': 2000, '5s': 5000, '15s': 15000, '30s': 30000, '1min': 60000, '5min': 300000, '10min': 600000, '15min': 900000, '30min': 1800000, '1hour': 3600000 }
let timer = _change[config.timer]
+ let repeats = config.timerRepeats || 0
if (!timer) return
+
+ if (repeats > 0 && repeats <=3) {
+ this.setState({timer, repeats})
+ this.timer = setTimeout(() => {
+ this.timerTask(repeats)
+ }, timer)
+ return
+ }
let _param = {
func: 's_get_timers_role',
@@ -164,7 +173,6 @@
})
return
} else if (result.run_type) {
- let repeats = config.timerRepeats || 0
this.setState({timer, repeats})
this.timer = setTimeout(() => {
this.timerTask(repeats)
diff --git a/src/tabviews/custom/components/chart/custom-chart/index.jsx b/src/tabviews/custom/components/chart/custom-chart/index.jsx
index be4bb7a..3223266 100644
--- a/src/tabviews/custom/components/chart/custom-chart/index.jsx
+++ b/src/tabviews/custom/components/chart/custom-chart/index.jsx
@@ -133,11 +133,20 @@
if (!config.timer) return
- const _change = { '5s': 5000, '15s': 15000, '30s': 30000, '1min': 60000, '5min': 300000, '10min': 600000, '15min': 900000, '30min': 1800000, '1hour': 3600000 }
+ const _change = { '2s': 2000, '5s': 5000, '15s': 15000, '30s': 30000, '1min': 60000, '5min': 300000, '10min': 600000, '15min': 900000, '30min': 1800000, '1hour': 3600000 }
let timer = _change[config.timer]
+ let repeats = config.timerRepeats || 0
if (!timer) return
+
+ if (repeats > 0 && repeats <=3) {
+ this.setState({timer, repeats})
+ this.timer = setTimeout(() => {
+ this.timerTask(repeats)
+ }, timer)
+ return
+ }
let _param = {
func: 's_get_timers_role',
@@ -159,7 +168,6 @@
})
return
} else if (result.run_type) {
- let repeats = config.timerRepeats || 0
this.setState({timer, repeats})
this.timer = setTimeout(() => {
this.timerTask(repeats)
diff --git a/src/tabviews/custom/components/tree/antd-tree/index.jsx b/src/tabviews/custom/components/tree/antd-tree/index.jsx
index 6b82284..3d8f850 100644
--- a/src/tabviews/custom/components/tree/antd-tree/index.jsx
+++ b/src/tabviews/custom/components/tree/antd-tree/index.jsx
@@ -130,11 +130,20 @@
if (!config.timer) return
- const _change = { '5s': 5000, '15s': 15000, '30s': 30000, '1min': 60000, '5min': 300000, '10min': 600000, '15min': 900000, '30min': 1800000, '1hour': 3600000 }
+ const _change = { '2s': 2000, '5s': 5000, '15s': 15000, '30s': 30000, '1min': 60000, '5min': 300000, '10min': 600000, '15min': 900000, '30min': 1800000, '1hour': 3600000 }
let timer = _change[config.timer]
+ let repeats = config.timerRepeats || 0
if (!timer) return
+
+ if (repeats > 0 && repeats <=3) {
+ this.setState({timer, repeats})
+ this.timer = setTimeout(() => {
+ this.timerTask(repeats)
+ }, timer)
+ return
+ }
let _param = {
func: 's_get_timers_role',
@@ -156,7 +165,6 @@
})
return
} else if (result.run_type) {
- let repeats = config.timerRepeats || 0
this.setState({timer, repeats})
this.timer = setTimeout(() => {
this.timerTask(repeats)
--
Gitblit v1.8.0