From 71e3da644eca32a5aa40503e903efb0640748093 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 21 七月 2023 17:00:59 +0800
Subject: [PATCH] 2023-07-21
---
src/tabviews/custom/components/card/prop-card/index.jsx | 259 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 164 insertions(+), 95 deletions(-)
diff --git a/src/tabviews/custom/components/card/prop-card/index.jsx b/src/tabviews/custom/components/card/prop-card/index.jsx
index 2ad4a02..fbec582 100644
--- a/src/tabviews/custom/components/card/prop-card/index.jsx
+++ b/src/tabviews/custom/components/card/prop-card/index.jsx
@@ -15,9 +15,7 @@
class PropCard extends Component {
static propTpyes = {
- data: PropTypes.array, // 缁熶竴鏌ヨ鏁版嵁
- config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅
- mainSearch: PropTypes.any, // 澶栧眰鎼滅储鏉′欢
+ config: PropTypes.object
}
state = {
@@ -25,19 +23,18 @@
config: null, // 鍥捐〃閰嶇疆淇℃伅
loading: false, // 鏁版嵁鍔犺浇鐘舵��
activeKey: '', // 閫変腑鏁版嵁
- sync: false, // 鏄惁缁熶竴璇锋眰鏁版嵁
data: {}, // 鏁版嵁
BData: '',
selected: 'false',
}
loaded = false
+ autoTimer = null
UNSAFE_componentWillMount () {
- const { data, initdata } = this.props
- let _config = fromJS(this.props.config).toJS()
- let _cols = new Map()
+ const { config } = this.props
+ let _config = fromJS(config).toJS()
let _data = { $$empty: true }
let _sync = false
@@ -54,22 +51,20 @@
}
if (_config.wrap.datatype === 'dynamic') {
- _sync = _config.setting.sync === 'true'
+ if (_config.setting.sync === 'true' && window.GLOB.SyncData.has(_config.dataName)) {
+ _data = window.GLOB.SyncData.get(_config.dataName) || []
- if (_sync && data) {
- _data = data[_config.dataName] || {$$empty: true}
- if (Array.isArray(_data)) {
- _data = _data[0] || {$$empty: true}
+ if (_config.$cache) {
+ Api.writeCacheConfig(_config.uuid, fromJS(_data).toJS())
}
- _sync = false
+
+ _config.setting.sync = 'false'
+
+ _data = _data[0] || {$$empty: true}
+
this.loaded = true
- } else if (_sync && initdata) {
- _data = initdata
- if (Array.isArray(_data)) {
- _data = _data[0] || {$$empty: true}
- }
- _sync = false
- this.loaded = true
+
+ window.GLOB.SyncData.delete(_config.dataName)
}
} else if (_config.wrap.datatype === 'public' && window.GLOB.CacheData.get(_config.wrap.publicId)) {
_data = window.GLOB.CacheData.get(_config.wrap.publicId)
@@ -85,11 +80,6 @@
_data.$$uuid = _data[_config.setting.primaryKey] || ''
}
- _config.columns.forEach(item => {
- if (item.type !== 'number') return
- _cols.set(item.field, item)
- })
-
_config.subcards.forEach(card => {
if (card.setting.click === 'button' && !card.setting.linkbtn) {
card.elements.forEach(ele => {
@@ -101,18 +91,14 @@
card.setting.click = ''
}
}
- 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
- }
- return item
- })
- card.backElements = card.backElements.map(item => {
- if (item.eleType === 'number' && item.field && _cols.has(item.field) && typeof(item.decimal) !== 'number') {
- item.decimal = _cols.get(item.field).decimal || 0
- }
- return item
- })
+
+ if (card.style.clear === 'left') {
+ card.wStyle = {clear: 'left'}
+ } else if (card.style.clear === 'right') {
+ card.wStyle = {float: 'right'}
+ }
+
+ delete card.style.clear
})
let selected = _config.wrap.selected || 'false'
@@ -129,14 +115,13 @@
this.setState({
selected,
- sync: _sync,
data: _data,
BID: BID || '',
BData: BData || '',
config: _config,
arr_field: _config.columns.map(col => col.field).join(','),
}, () => {
- if (_config.wrap.datatype === 'dynamic' && _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)
@@ -152,10 +137,18 @@
}, 200)
}
- if (_config.wrap.datatype === 'dynamic') {
+ if (_config.wrap.datatype === 'dynamic' && this.loaded) {
+ if (_config.wrap.goback === 'true' && _data.$$empty) {
+ this.timer && this.timer.stop()
+
+ MKEmitter.emit('closeTabView', _config.$pageId)
+ } else {
+ this.autoExec()
+ }
+ } else if (_config.wrap.datatype === 'static') {
this.autoExec()
}
- if (!_config.wrap.cardType && _data.$$uuid) {
+ if (_data.$$uuid) {
setTimeout(() => {
this.transferLine()
}, 200)
@@ -167,9 +160,18 @@
const { config } = this.state
MKEmitter.addListener('reloadData', this.reloadData)
+ MKEmitter.addListener('refreshLineData', this.refreshLineData)
MKEmitter.addListener('resetSelectLine', this.resetParentParam)
MKEmitter.addListener('queryModuleParam', this.queryModuleParam)
MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
+
+ if (config.setting.useMSearch) {
+ MKEmitter.addListener('searchRefresh', this.searchRefresh)
+ }
+
+ if (config.setting.sync === 'true') {
+ MKEmitter.addListener('transferSyncData', this.transferSyncData)
+ }
if (config.wrap.datatype === 'public') {
MKEmitter.addListener('mkPublicData', this.mkPublicData)
@@ -184,7 +186,7 @@
Api.getLCacheConfig(config.uuid).then(res => {
if (!res || this.loaded) return
- let _data = res[0]
+ let _data = res[0] || {$$empty: true}
_data.$$uuid = _data[config.setting.primaryKey] || ''
this.setState({data: _data})
@@ -202,47 +204,65 @@
}
MKEmitter.removeListener('reloadData', this.reloadData)
MKEmitter.removeListener('mkPublicData', this.mkPublicData)
+ MKEmitter.removeListener('searchRefresh', this.searchRefresh)
+ MKEmitter.removeListener('refreshLineData', this.refreshLineData)
MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
+ MKEmitter.removeListener('transferSyncData', this.transferSyncData)
MKEmitter.removeListener('queryModuleParam', this.queryModuleParam)
MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
this.timer && this.timer.stop()
}
- /**
- * @description 鏁版嵁鏇存柊锛屽埛鏂板唴瀹�
- */
- UNSAFE_componentWillReceiveProps (nextProps) {
- const { sync, config, BID, BData, selected } = this.state
+ transferSyncData = (syncId) => {
+ const { config } = this.state
- if (sync && !is(fromJS(this.props.data), fromJS(nextProps.data))) {
- let _data = { $$empty: true }
- if (nextProps.data && nextProps.data[config.dataName]) {
- _data = nextProps.data[config.dataName]
- if (Array.isArray(_data)) {
- _data = _data[0] || {$$empty: true}
- }
- }
+ if (config.$syncId !== syncId) return
- _data.$$BID = BID || ''
- _data.$$BData = BData || ''
- _data.$$uuid = _data[config.setting.primaryKey] || ''
+ const { BID, BData, selected } = this.state
- this.loaded = true
+ let _data = window.GLOB.SyncData.get(config.dataName) || []
- this.setState({sync: false, data: _data}, () => {
+ if (config.$cache) {
+ Api.writeCacheConfig(config.uuid, fromJS(_data).toJS())
+ }
+
+ _data = _data[0] || {$$empty: true}
+
+ _data.$$BID = BID || ''
+ _data.$$BData = BData || ''
+ _data.$$uuid = _data[config.setting.primaryKey] || ''
+
+ this.loaded = true
+
+ this.setState({data: _data}, () => {
+ if (config.wrap.goback === 'true' && _data.$$empty) {
+ this.timer && this.timer.stop()
+
+ MKEmitter.emit('closeTabView', config.$pageId)
+ } else {
if (selected !== 'false') {
this.checkTopLine()
- } else if (!config.wrap.cardType && _data.$$uuid) {
+ } else if (_data.$$uuid) {
this.transferLine()
}
this.autoExec()
- })
- } else if (config.setting.useMSearch && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
- this.setState({}, () => {
- this.loadData()
- })
- }
+ }
+ })
+
+ window.GLOB.SyncData.delete(config.dataName)
+
+ MKEmitter.removeListener('transferSyncData', this.transferSyncData)
+ }
+
+ searchRefresh = (searchId) => {
+ const { config } = this.state
+
+ if (config.$searchId !== searchId) return
+
+ this.setState({}, () => {
+ this.loadData()
+ })
}
mkPublicData = (publicId, data) => {
@@ -258,23 +278,39 @@
this.loaded = true
this.setState({data: _data}, () => {
- if (selected !== 'false') {
- this.checkTopLine()
+ if (config.wrap.goback === 'true' && _data.$$empty) {
+ this.timer && this.timer.stop()
+
+ MKEmitter.emit('closeTabView', config.$pageId)
} else {
- this.transferLine()
+ if (selected !== 'false') {
+ this.checkTopLine()
+ } else {
+ this.transferLine()
+ }
+ this.autoExec()
}
})
}
}
- autoExec = () => {
+ autoExec = (times) => {
const { config, data } = this.state
- if (!config.wrap.autoExec || data.$$empty) return
+ if (!config.wrap.autoExec) return
- setTimeout(() => {
- MKEmitter.emit('triggerBtnId', config.wrap.autoExec, [data])
- }, 200)
+ let btn = document.getElementById('button' + config.wrap.autoExec)
+
+ clearTimeout(this.autoTimer)
+
+ if (btn) {
+ MKEmitter.emit('triggerBtnId', config.wrap.autoExec, data.$$empty ? [] : [data])
+ } else if (!times || times < 20) {
+ times = times ? times + 1 : 1
+ this.autoTimer = setTimeout(() => {
+ this.autoExec(times)
+ }, 1000)
+ }
}
checkTopLine = () => {
@@ -317,12 +353,21 @@
if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
MKEmitter.emit('reloadData', config.setting.supModule, BID)
} else {
- this.loadData()
+ this.loadData(false, btn)
}
+ }
- if (position === 'popclose') { // 鎵ц鍚姩寮圭獥鐨勬寜閽墍閫夋嫨鐨勫埛鏂伴」
- btn.$tabId && MKEmitter.emit('refreshPopButton', btn.$tabId)
- }
+ refreshLineData = (menuId, btn, uuid, count) => {
+ const { config, data } = this.state
+
+ if (config.uuid !== menuId) return
+
+ let _data = fromJS(data).toJS()
+ _data[btn.field] = count
+
+ this.setState({
+ data: _data
+ })
}
resetParentParam = (MenuID, id, data) => {
@@ -341,12 +386,14 @@
* @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 : []
+ let searches = []
+ if (config.setting.useMSearch) { // 涓昏〃鎼滅储鏉′欢
+ searches = window.GLOB.SearchBox.get(config.$searchId) || []
+ }
callback({
arr_field: '',
@@ -364,8 +411,7 @@
this.loadData()
}
- async loadData (hastimer) {
- const { mainSearch } = this.props
+ async loadData (hastimer, btn) {
const { config, arr_field, BID, BData, selected } = this.state
if (config.wrap.datatype === 'public') {
@@ -377,6 +423,10 @@
this.setState({
data: {$$BID: BID || '', $$BData: BData, $$empty: true},
})
+
+ if (!btn) {
+ this.autoExec()
+ }
return
} else if (config.setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
this.setState({
@@ -386,10 +436,12 @@
return
}
- let searches = config.setting.useMSearch && mainSearch ? mainSearch : []
+ let searches = []
+ if (config.setting.useMSearch) { // 涓昏〃鎼滅储鏉′欢
+ searches = window.GLOB.SearchBox.get(config.$searchId) || []
+ }
- let requireFields = searches.filter(item => item.required && item.value === '')
- if (requireFields.length > 0) {
+ if (config.$s_req && searches.filter(item => item.required && item.value === '').length > 0) {
return
}
@@ -407,8 +459,8 @@
let _data = {}
this.loaded = true
- if (config.$cache) {
- Api.writeCacheConfig(config.uuid, result.data || '')
+ if (config.$cache && config.setting.onload !== 'false') {
+ Api.writeCacheConfig(config.uuid, result.data || [])
}
if (!result.data || !result.data[0]) {
@@ -435,14 +487,29 @@
} else {
this.transferLine()
}
- this.autoExec()
+ if (!btn) {
+ this.autoExec()
+ }
}
})
- if (config.timer && config.clearField) {
+ if (config.timer && config.clearField && result.data && result.data[0]) {
let vals = (config.clearValue || '').split(',')
- if (vals.includes(_data[config.clearField])) {
+ if (vals.includes(result.data[0][config.clearField])) {
this.timer && this.timer.stop()
+ }
+ }
+ if (result.message) {
+ if (result.ErrCode === 'Y') {
+ Modal.success({
+ title: result.message
+ })
+ } else if (result.ErrCode === 'S') {
+ notification.success({
+ top: 92,
+ message: result.message,
+ duration: 2
+ })
}
}
} else {
@@ -450,11 +517,13 @@
loading: false
})
this.timer && this.timer.stop()
+
+ if (!result.message) return
if (result.ErrCode === 'N') {
Modal.error({
title: result.message,
})
- } else {
+ } else if (result.ErrCode !== '-2') {
notification.error({
top: 92,
message: result.message,
@@ -499,14 +568,14 @@
<NormalHeader config={config}/>
<Row className={`card-row-list data-zoom ${config.wrap.wrapClass}`}>
{config.subcards.map((item, index) => {
- let className = item.setting.click ? 'mk-card pointer ' : 'mk-card '
+ let className = 'mk-card '
if (activeKey === index) {
className += 'active'
}
return (
- <Col className={className} key={index} span={item.setting.width || 6} offset={item.offset || 0} onClick={() => {this.changeCard(index, item)}}>
- <CardItem card={item} cards={config} data={data}/>
+ <Col className={className} key={index} style={item.wStyle} span={item.setting.width || 6} offset={item.offset || 0}>
+ <CardItem card={item} cards={config} data={data} onClick={() => {this.changeCard(index, item)}}/>
</Col>
)
})}
--
Gitblit v1.8.0