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/carousel/prop-card/index.jsx | 97 +++++++++++++++++++++++++++++++-----------------
1 files changed, 63 insertions(+), 34 deletions(-)
diff --git a/src/tabviews/custom/components/carousel/prop-card/index.jsx b/src/tabviews/custom/components/carousel/prop-card/index.jsx
index 4004576..2b3d4fe 100644
--- a/src/tabviews/custom/components/carousel/prop-card/index.jsx
+++ b/src/tabviews/custom/components/carousel/prop-card/index.jsx
@@ -13,11 +13,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,37 +28,48 @@
}
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.setting && _config.wrap.datatype !== 'static') {
_sync = _config.setting.sync === 'true'
if (_sync && data) {
- _data = data[_config.dataName] || {}
- if (_data && Array.isArray(_data)) {
- _data = _data[0] || {}
+ _data = data[_config.dataName] || {$$empty: true}
+ if (Array.isArray(_data)) {
+ _data = _data[0] || {$$empty: true}
}
_sync = false
} else if (_sync && initdata) {
- _data = initdata || {}
- if (_data && Array.isArray(_data)) {
- _data = _data[0] || {}
+ _data = initdata
+ if (Array.isArray(_data)) {
+ _data = _data[0] || {$$empty: true}
}
_sync = false
}
}
- if (_data) {
- _data.$$BID = BID || ''
- _data.$$BData = BData || ''
- }
+ _data.$$BID = BID || ''
+ _data.$$BData = BData || ''
_config.columns.forEach(item => {
+ if (item.type !== 'number') return
_cols.set(item.field, item)
})
@@ -70,8 +79,8 @@
card.style.cursor = 'pointer'
}
card.elements = card.elements.map(item => {
- if (item.field && _cols.has(item.field)) {
- item.col = _cols.get(item.field)
+ if (item.eleType === 'number' && item.field && _cols.has(item.field) && typeof(item.decimal) !== 'number') {
+ item.decimal = _cols.get(item.field).decimal || 0
}
return item
})
@@ -88,7 +97,9 @@
arr_field: _config.columns.map(col => col.field).join(','),
}, () => {
if (_config.wrap.datatype !== 'static' && _config.setting && _config.setting.sync !== 'true' && _config.setting.onload === 'true') {
- this.loadData()
+ setTimeout(() => {
+ this.loadData()
+ }, _config.setting.delay || 0)
}
})
}
@@ -96,7 +107,8 @@
componentDidMount () {
MKEmitter.addListener('reloadData', this.reloadData)
MKEmitter.addListener('resetSelectLine', this.resetParentParam)
- MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
+ MKEmitter.addListener('queryModuleParam', this.queryModuleParam)
+ MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
}
shouldComponentUpdate (nextProps, nextState) {
@@ -109,6 +121,7 @@
}
MKEmitter.removeListener('reloadData', this.reloadData)
MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
+ MKEmitter.removeListener('queryModuleParam', this.queryModuleParam)
MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
}
@@ -122,15 +135,13 @@
let _data = {$$empty: true}
if (nextProps.data && nextProps.data[config.dataName]) {
_data = nextProps.data[config.dataName]
- if (_data && Array.isArray(_data)) {
- _data = _data[0]
+ if (Array.isArray(_data)) {
+ _data = _data[0] || {$$empty: true}
}
}
- if (_data) {
- _data.$$BID = BID || ''
- _data.$$BData = BData || ''
- }
+ _data.$$BID = BID || ''
+ _data.$$BData = BData || ''
this.setState({sync: false, data: _data})
} else if (config.setting.syncRefresh && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
@@ -151,16 +162,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)
}
}
@@ -176,6 +184,25 @@
}
}
+ /**
+ * @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) => {
const { config } = this.state
@@ -185,7 +212,7 @@
}
async loadData () {
- const { mainSearch, menuType } = this.props
+ const { mainSearch } = this.props
const { config, arr_field, BID, BData } = this.state
if (config.wrap.datatype === 'static') {
@@ -212,7 +239,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) {
@@ -246,8 +273,10 @@
render() {
const { config, loading, data } = this.state
+ if (config.wrap.empty === 'hidden' && (!data || data.$$empty)) return null
+
return (
- <div className="custom-prop-carousel-box" style={config.style}>
+ <div className="custom-prop-carousel-box" id={'anchor' + config.uuid} style={config.style}>
{loading ?
<div className="loading-mask">
<div className="ant-spin-blur"></div>
--
Gitblit v1.8.0