From 0c439ced2c97905cb2b02f5f689a37b19369fb8a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 22 七月 2022 15:00:58 +0800
Subject: [PATCH] 2022-07-22
---
src/tabviews/custom/components/card/prop-card/index.jsx | 57 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 32 insertions(+), 25 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..6f2d0e3 100644
--- a/src/tabviews/custom/components/card/prop-card/index.jsx
+++ b/src/tabviews/custom/components/card/prop-card/index.jsx
@@ -20,7 +20,6 @@
data: PropTypes.array, // 缁熶竴鏌ヨ鏁版嵁
config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅
mainSearch: PropTypes.any, // 澶栧眰鎼滅储鏉′欢
- menuType: PropTypes.any, // 鑿滃崟绫诲瀷
}
state = {
@@ -53,7 +52,7 @@
}
_sync = false
} else if (_sync && initdata) {
- _data = initdata || {$$empty: true}
+ _data = initdata
if (Array.isArray(_data)) {
_data = _data[0] || {$$empty: true}
}
@@ -72,7 +71,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 +82,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 +96,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,
@@ -140,6 +128,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 +144,7 @@
}
MKEmitter.removeListener('reloadData', this.reloadData)
MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
+ MKEmitter.removeListener('queryModuleParam', this.queryModuleParam)
MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
}
@@ -270,16 +260,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 +275,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, btnId) => {
+ const { mainSearch } = this.props
+ const { config } = this.state
+
+ if (config.uuid !== menuId) return
+
+ let searches = config.setting.useMSearch && mainSearch ? mainSearch : []
+
+ MKEmitter.emit('returnModuleParam', config.uuid, btnId, {
+ arr_field: '',
+ orderBy: '',
+ search: searches,
+ menuName: config.name
+ })
}
reloadData = (menuId) => {
@@ -304,7 +311,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 +340,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) {
@@ -402,7 +409,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