From b59a321435b48626ab268d48df841923f86f1451 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 19 八月 2022 17:51:40 +0800
Subject: [PATCH] 2022-08-19
---
src/tabviews/custom/components/card/prop-card/index.jsx | 96 ++++++++++++++++++++++++++++++-----------------
1 files changed, 61 insertions(+), 35 deletions(-)
diff --git a/src/tabviews/custom/components/card/prop-card/index.jsx b/src/tabviews/custom/components/card/prop-card/index.jsx
index a639f5f..026d811 100644
--- a/src/tabviews/custom/components/card/prop-card/index.jsx
+++ b/src/tabviews/custom/components/card/prop-card/index.jsx
@@ -16,11 +16,9 @@
class PropCard extends Component {
static propTpyes = {
- BID: PropTypes.any, // 鐖剁骇Id
data: PropTypes.array, // 缁熶竴鏌ヨ鏁版嵁
config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅
mainSearch: PropTypes.any, // 澶栧眰鎼滅储鏉′欢
- menuType: PropTypes.any, // 鑿滃崟绫诲瀷
}
state = {
@@ -36,12 +34,24 @@
}
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') {
_sync = _config.setting.sync === 'true'
@@ -53,7 +63,7 @@
}
_sync = false
} else if (_sync && initdata) {
- _data = initdata || {$$empty: true}
+ _data = initdata
if (Array.isArray(_data)) {
_data = _data[0] || {$$empty: true}
}
@@ -72,7 +82,6 @@
_cols.set(item.field, item)
})
- let _width = 0
_config.subcards.forEach(card => {
if (card.setting.click === 'button' && !card.setting.linkbtn) {
card.elements.forEach(ele => {
@@ -84,7 +93,6 @@
card.setting.click = ''
}
}
- _width += card.setting.width
card.elements = card.elements.map(item => {
if (item.eleType === 'number' && item.field && _cols.has(item.field) && typeof(item.decimal) !== 'number') {
item.decimal = _cols.get(item.field).decimal || 0
@@ -99,22 +107,13 @@
})
})
- let offset = 0
- if (_config.wrap.cardFloat && _config.wrap.cardFloat !== 'left' && _width < 24) {
- offset = 24 - _width
- if (_config.wrap.cardFloat === 'center') {
- offset = Math.floor(offset / 2)
- }
- _config.subcards[0].offset = offset
- }
-
let selected = _config.wrap.selected || 'false'
_config.wrap.selStyle = _config.wrap.selStyle || 'active'
_config.wrap.priKeyType = _config.wrap.priKeyType || 'static'
_config.wrap.scale = _config.wrap.scale === 'true' ? 'scale' : ''
- _config.wrap.wrapClass = `${_config.wrap.selStyle} ${_config.wrap.cardType || ''} ${_config.wrap.scale || ''}`
+ _config.wrap.wrapClass = `${_config.wrap.selStyle} ${_config.wrap.cardType || ''} ${_config.wrap.scale || ''} ${_config.wrap.layout || 'grid'}-layout float-${_config.wrap.cardFloat || 'left'}`
this.setState({
selected,
@@ -129,7 +128,7 @@
setTimeout(() => {
this.loadData()
}, _config.setting.delay || 0)
- } else if ((!_sync || _config.wrap.priKeyType === 'static') && selected !== 'false') {
+ } else if (!_sync && selected !== 'false') {
setTimeout(() => {
this.checkTopLine()
}, 200)
@@ -140,6 +139,7 @@
componentDidMount () {
MKEmitter.addListener('reloadData', this.reloadData)
MKEmitter.addListener('resetSelectLine', this.resetParentParam)
+ MKEmitter.addListener('queryModuleParam', this.queryModuleParam)
MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
this.handleTimer()
}
@@ -155,6 +155,7 @@
}
MKEmitter.removeListener('reloadData', this.reloadData)
MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
+ MKEmitter.removeListener('queryModuleParam', this.queryModuleParam)
MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
}
@@ -178,7 +179,7 @@
_data.$$uuid = _data[config.setting.primaryKey] || ''
this.setState({sync: false, data: _data}, () => {
- if (config.wrap.priKeyType !== 'static' && selected !== 'false') {
+ if (selected !== 'false') {
setTimeout(() => {
this.checkTopLine()
}, 200)
@@ -240,22 +241,30 @@
})
return
} else if (result.run_type) {
- this.setState({timer})
+ let repeats = config.timerRepeats || 0
+ this.setState({timer, repeats})
this.timer = setTimeout(() => {
- this.timerTask()
+ this.timerTask(repeats)
}, timer)
}
})
}
- timerTask = () => {
- const { timer } = this.state
+ timerTask = (times) => {
+ const { timer, repeats } = this.state
if (!timer) return
this.loadData(true)
+ if (repeats) {
+ times = times - 1
+ if (times <= 0) {
+ clearTimeout(this.timer)
+ return
+ }
+ }
this.timer = setTimeout(() => {
- this.timerTask()
+ this.timerTask(times)
}, timer)
}
@@ -270,16 +279,13 @@
if (config.uuid !== menuId) return
- this.loadData() // 鏁版嵁鍒锋柊
-
- if (btn.syncComponentId && btn.syncComponentId !== config.uuid && btn.syncComponentId !== config.setting.supModule) {
- MKEmitter.emit('reloadData', btn.syncComponentId) // 鍚岀骇鏍囩鍒锋柊
+ if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
+ MKEmitter.emit('reloadData', config.setting.supModule, BID)
+ } else {
+ this.loadData()
}
- if (position === 'mainline' && config.setting.supModule) { // 涓昏〃琛屽埛鏂�
- MKEmitter.emit('reloadData', config.setting.supModule, (BID || 'empty'))
- } else if (position === 'popclose') { // 鏍囩鍏抽棴鍒锋柊
- config.setting.supModule && MKEmitter.emit('reloadData', config.setting.supModule, (BID || 'empty'))
+ if (position === 'popclose') { // 鎵ц鍚姩寮圭獥鐨勬寜閽墍閫夋嫨鐨勫埛鏂伴」
btn.$tabId && MKEmitter.emit('refreshPopButton', btn.$tabId)
}
}
@@ -288,11 +294,31 @@
const { config } = this.state
if (!config.setting.supModule || config.setting.supModule !== MenuID) return
+
if (id !== this.state.BID || id !== '') {
this.setState({ BID: id, BData: data }, () => {
this.loadData()
})
}
+ }
+
+ /**
+ * @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
+ */
+ queryModuleParam = (menuId, callback) => {
+ const { mainSearch } = this.props
+ const { config } = this.state
+
+ if (config.uuid !== menuId) return
+
+ let searches = config.setting.useMSearch && mainSearch ? mainSearch : []
+
+ callback({
+ arr_field: '',
+ orderBy: '',
+ search: searches,
+ menuName: config.name
+ })
}
reloadData = (menuId) => {
@@ -304,7 +330,7 @@
}
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 === 'static') {
@@ -333,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) {
@@ -353,7 +379,7 @@
data: _data,
loading: false
}, () => {
- if (config.wrap.priKeyType !== 'static' && selected !== 'false') {
+ if (selected !== 'false') {
this.checkTopLine()
}
})
@@ -402,7 +428,7 @@
if (config.wrap.empty === 'hidden' && (!data || data.$$empty)) return null
return (
- <div className="custom-prop-card-box" style={config.style}>
+ <div className="custom-prop-card-box" id={'anchor' + config.uuid} style={config.style}>
{loading ?
<div className="loading-mask">
<div className="ant-spin-blur"></div>
--
Gitblit v1.8.0