From e657b7ed2c047af4b54cbc26e5ac66cb7656dbb5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 12 十月 2022 12:13:05 +0800
Subject: [PATCH] 2022-10-12
---
src/tabviews/custom/components/card/prop-card/index.jsx | 160 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 90 insertions(+), 70 deletions(-)
diff --git a/src/tabviews/custom/components/card/prop-card/index.jsx b/src/tabviews/custom/components/card/prop-card/index.jsx
index 37f61c3..69708a2 100644
--- a/src/tabviews/custom/components/card/prop-card/index.jsx
+++ b/src/tabviews/custom/components/card/prop-card/index.jsx
@@ -2,13 +2,12 @@
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
import { Spin, notification, Col, Row } from 'antd'
-import moment from 'moment'
import Api from '@/api'
-import Utils from '@/utils/utils.js'
import UtilsDM from '@/utils/utils-datamanage.js'
import asyncComponent from '@/utils/asyncComponent'
import MKEmitter from '@/utils/events.js'
+import TimerTask from '@/utils/timer-task.js'
import './index.scss'
const CardItem = asyncComponent(() => import('../cardItem'))
@@ -16,11 +15,9 @@
class PropCard extends Component {
static propTpyes = {
- BID: PropTypes.any, // 鐖剁骇Id
data: PropTypes.array, // 缁熶竴鏌ヨ鏁版嵁
config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅
mainSearch: PropTypes.any, // 澶栧眰鎼滅储鏉′欢
- menuType: PropTypes.any, // 鑿滃崟绫诲瀷
}
state = {
@@ -30,20 +27,31 @@
activeKey: '', // 閫変腑鏁版嵁
sync: false, // 鏄惁缁熶竴璇锋眰鏁版嵁
data: {}, // 鏁版嵁
- timer: null, // 瀹氭椂鍣ㄦ椂闂撮棿闅�
BData: '',
selected: 'false',
}
UNSAFE_componentWillMount () {
- const { data, initdata, BID, BData } = this.props
+ const { data, initdata } = this.props
let _config = fromJS(this.props.config).toJS()
let _cols = new Map()
let _data = { $$empty: true }
let _sync = false
+
+ let BID = ''
+ let BData = ''
+
+ if (_config.setting.supModule) {
+ BData = window.GLOB.CacheData.get(_config.setting.supModule)
+ } else {
+ BData = window.GLOB.CacheData.get(_config.$pageId)
+ }
+ if (BData) {
+ BID = BData.$BID || ''
+ }
- if (_config.wrap.datatype !== 'static') {
+ if (_config.wrap.datatype === 'dynamic') {
_sync = _config.setting.sync === 'true'
if (_sync && data) {
@@ -59,6 +67,9 @@
}
_sync = false
}
+ } else if (_config.wrap.datatype === 'public' && window.GLOB.CacheData.get(_config.wrap.publicId)) {
+ _data = window.GLOB.CacheData.get(_config.wrap.publicId)
+ _data = fromJS(_data).toJS()
}
_data.$$BID = BID || ''
@@ -114,24 +125,46 @@
config: _config,
arr_field: _config.columns.map(col => col.field).join(','),
}, () => {
- if (_config.wrap.datatype !== 'static' && _config.setting.sync !== 'true' && _config.setting.onload === 'true') {
+ if (_config.wrap.datatype === 'dynamic' && _config.setting.sync !== 'true' && _config.setting.onload === 'true') {
setTimeout(() => {
this.loadData()
}, _config.setting.delay || 0)
- } else if ((!_sync || _config.wrap.priKeyType === 'static') && selected !== 'false') {
+ } else if (_config.wrap.datatype === 'public') {
+ if (_data.$$loaded && selected !== 'false') {
+ setTimeout(() => {
+ this.checkTopLine()
+ }, 200)
+ }
+ } else if (!_sync && selected !== 'false') {
setTimeout(() => {
this.checkTopLine()
+ }, 200)
+ }
+
+ if (!_config.wrap.cardType && _data.$$uuid) {
+ setTimeout(() => {
+ this.transferLine()
}, 200)
}
})
}
componentDidMount () {
+ const { config } = this.state
+
MKEmitter.addListener('reloadData', this.reloadData)
MKEmitter.addListener('resetSelectLine', this.resetParentParam)
MKEmitter.addListener('queryModuleParam', this.queryModuleParam)
MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
- this.handleTimer()
+
+ if (config.wrap.datatype === 'public') {
+ MKEmitter.addListener('mkPublicData', this.mkPublicData)
+ }
+
+ if (config.timer && config.wrap.datatype === 'dynamic') {
+ this.timer = new TimerTask()
+ this.timer.init(config.uuid, config.timer, config.timerRepeats, () => {this.loadData(true)})
+ }
}
shouldComponentUpdate (nextProps, nextState) {
@@ -139,14 +172,16 @@
}
componentWillUnmount () {
- clearTimeout(this.timer)
this.setState = () => {
return
}
MKEmitter.removeListener('reloadData', this.reloadData)
+ MKEmitter.removeListener('mkPublicData', this.mkPublicData)
MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
MKEmitter.removeListener('queryModuleParam', this.queryModuleParam)
MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
+
+ this.timer && this.timer.stop()
}
/**
@@ -169,15 +204,35 @@
_data.$$uuid = _data[config.setting.primaryKey] || ''
this.setState({sync: false, data: _data}, () => {
- if (config.wrap.priKeyType !== 'static' && selected !== 'false') {
- setTimeout(() => {
- this.checkTopLine()
- }, 200)
+ if (selected !== 'false') {
+ this.checkTopLine()
+ } else if (!config.wrap.cardType && _data.$$uuid) {
+ this.transferLine()
}
})
- } else if ( config.setting.syncRefresh && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
+ } else if (config.setting.syncRefresh && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
this.setState({}, () => {
this.loadData()
+ })
+ }
+ }
+
+ mkPublicData = (publicId, data) => {
+ const { config, selected, BID, BData } = this.state
+
+ if (config.wrap.datatype === 'public' && config.wrap.publicId === publicId) {
+ let _data = fromJS(data).toJS()
+
+ _data.$$BID = BID || ''
+ _data.$$BData = BData || ''
+ _data.$$uuid = _data[config.setting.primaryKey] || ''
+
+ this.setState({data: _data}, () => {
+ if (selected !== 'false') {
+ this.checkTopLine()
+ } else {
+ this.transferLine()
+ }
})
}
}
@@ -200,54 +255,12 @@
MKEmitter.emit('resetSelectLine', config.uuid, primaryId, data)
}
- handleTimer = () => {
- const { config } = this.state
+ transferLine = () => {
+ const { config, data } = this.state
- if (!config.timer) return
+ if (config.wrap.cardType) return
- const _change = { '5s': 5000, '15s': 15000, '30s': 30000, '1min': 60000, '5min': 300000, '10min': 600000, '15min': 900000, '30min': 1800000, '1hour': 3600000 }
-
- let timer = _change[config.timer]
-
- if (!timer) return
-
- let _param = {
- func: 's_get_timers_role',
- LText: `select '${window.GLOB.appkey || ''}','${config.uuid}'`,
- timer_type: config.timer,
- component_id: config.uuid
- }
-
- _param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') // 鏃堕棿鎴�
- _param.LText = Utils.formatOptions(_param.LText) // 鍏抽敭瀛楃鏇挎崲锛宐ase64鍔犲瘑
- _param.secretkey = Utils.encrypt(_param.LText, _param.timestamp) // md5瀵嗛挜
-
- Api.getSystemConfig(_param).then(result => {
- if (!result.status) {
- notification.warning({
- top: 92,
- message: result.message,
- duration: 5
- })
- return
- } else if (result.run_type) {
- this.setState({timer})
- this.timer = setTimeout(() => {
- this.timerTask()
- }, timer)
- }
- })
- }
-
- timerTask = () => {
- const { timer } = this.state
- if (!timer) return
-
- this.loadData(true)
-
- this.timer = setTimeout(() => {
- this.timerTask()
- }, timer)
+ MKEmitter.emit('resetSelectLine', config.uuid, data.$$uuid || '', data)
}
/**
@@ -287,7 +300,7 @@
/**
* @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
*/
- queryModuleParam = (menuId, btnId) => {
+ queryModuleParam = (menuId, callback) => {
const { mainSearch } = this.props
const { config } = this.state
@@ -295,7 +308,7 @@
let searches = config.setting.useMSearch && mainSearch ? mainSearch : []
- MKEmitter.emit('returnModuleParam', config.uuid, btnId, {
+ callback({
arr_field: '',
orderBy: '',
search: searches,
@@ -312,9 +325,14 @@
}
async loadData (hastimer) {
- const { mainSearch, menuType } = this.props
+ const { mainSearch } = this.props
const { config, arr_field, BID, BData, selected } = this.state
+ if (config.wrap.datatype === 'public') {
+ MKEmitter.emit('reloadData', config.wrap.publicId)
+ return
+ }
+
if (config.wrap.datatype === 'static') {
this.setState({
data: {$$BID: BID || '', $$BData: BData, $$empty: true},
@@ -341,7 +359,7 @@
}
let _orderBy = config.setting.order || ''
- let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, 1, 1, BID, menuType)
+ let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, 1, 1, BID)
let result = await Api.genericInterface(param)
if (result.status) {
@@ -361,22 +379,24 @@
data: _data,
loading: false
}, () => {
- if (config.wrap.priKeyType !== 'static' && selected !== 'false') {
+ if (selected !== 'false') {
this.checkTopLine()
+ } else {
+ this.transferLine()
}
})
if (config.timer && config.clearField) {
let vals = (config.clearValue || '').split(',')
if (vals.includes(_data[config.clearField])) {
- clearTimeout(this.timer)
+ this.timer && this.timer.stop()
}
}
} else {
this.setState({
- loading: false,
- timer: null
+ loading: false
})
+ this.timer && this.timer.stop()
notification.error({
top: 92,
message: result.message,
--
Gitblit v1.8.0