From da64ab0923bf8817fc8599a6e37b953ce38f64c8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 27 八月 2023 18:37:36 +0800
Subject: [PATCH] 2023-08-27
---
src/tabviews/custom/components/card/prop-card/index.jsx | 387 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 266 insertions(+), 121 deletions(-)
diff --git a/src/tabviews/custom/components/card/prop-card/index.jsx b/src/tabviews/custom/components/card/prop-card/index.jsx
index 592322d..f114efa 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,21 +23,19 @@
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()
+ const { config } = this.props
+ let _config = fromJS(config).toJS()
let _data = { $$empty: true }
- let _sync = false
-
let BID = ''
let BData = ''
@@ -51,26 +47,26 @@
if (BData) {
BID = BData.$BID || ''
}
-
- if (_config.wrap.datatype === 'dynamic') {
- _sync = _config.setting.sync === 'true'
- if (_sync && data) {
- _data = data[_config.dataName] || {$$empty: true}
- if (Array.isArray(_data)) {
- _data = _data[0] || {$$empty: true}
+ if (_config.wrap.datatype === 'dynamic') {
+ _config.setting.onload = _config.setting.sync === 'true' ? 'false' : 'true'
+
+ if (_config.setting.sync === 'true' && window.GLOB.SyncData.has(_config.dataName)) {
+ _data = window.GLOB.SyncData.get(_config.dataName) || []
+
+ if (_config.$cache) {
+ Api.writeCacheConfig(_config.uuid, fromJS(_data).toJS(), BID)
}
- _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)) {
+ } else if (_config.wrap.datatype === 'public' && window.GLOB.CacheData.has(_config.wrap.publicId)) {
_data = window.GLOB.CacheData.get(_config.wrap.publicId)
_data = fromJS(_data).toJS()
this.loaded = true
@@ -95,6 +91,14 @@
card.setting.click = ''
}
}
+
+ 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'
@@ -111,43 +115,10 @@
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') {
- setTimeout(() => {
- this.loadData()
- }, _config.setting.delay || 0)
- } 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.datatype === 'dynamic' && this.loaded) {
- if (_config.wrap.goback === 'true' && _data.$$empty) {
- this.timer && this.timer.stop()
-
- MKEmitter.emit('closeTabView', _config.$pageId)
- } else {
- this.autoExec()
- }
- }
- if (_data.$$uuid) {
- setTimeout(() => {
- this.transferLine()
- }, 200)
- }
+ config: _config
})
}
@@ -155,9 +126,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)
@@ -165,19 +145,10 @@
if (config.timer && config.wrap.datatype === 'dynamic') {
this.timer = new TimerTask()
- this.timer.init(config.uuid, config.timer, config.timerRepeats, () => {this.loadData(true)})
+ this.timer.init(config.uuid, config.timer, config.timerRepeats, () => {this.loadData('timer')})
}
- if (config.$cache && !this.loaded) {
- Api.getLCacheConfig(config.uuid).then(res => {
- if (!res || this.loaded) return
-
- let _data = res[0]
- _data.$$uuid = _data[config.setting.primaryKey] || ''
-
- this.setState({data: _data})
- })
- }
+ this.initExec()
}
shouldComponentUpdate (nextProps, nextState) {
@@ -190,53 +161,187 @@
}
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
+ initExec = () => {
+ const { config, selected, data, BID } = 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.wrap.datatype === 'dynamic') {
+ if (config.$cache) {
+ if (config.$time) {
+ if (!this.loaded) {
+ Api.getLCacheConfig(config.uuid, config.$time, BID).then(res => {
+ if (!res.valid && config.setting.onload === 'true') {
+ setTimeout(() => {
+ this.loadData('init')
+ }, config.setting.delay || 0)
+ }
+
+ if (!res.data || this.loaded) return
+
+ let _data = res.data[0] || {$$empty: true}
+ _data.$$uuid = _data[config.setting.primaryKey] || ''
+
+ this.setState({data: _data}, () => {
+ if (selected !== 'false') {
+ this.checkTopLine()
+ }
+ })
+ })
+ } else {
+ if (config.wrap.goback === 'true' && data.$$empty) {
+ this.timer && this.timer.stop()
+
+ MKEmitter.emit('closeTabView', config.$pageId)
+ } else {
+ if (selected !== 'false') {
+ this.checkTopLine()
+ } else {
+ this.transferLine()
+ }
+ this.autoExec()
+ }
+ }
+ } else {
+ if (!this.loaded) {
+ Api.getLCacheConfig(config.uuid, 0, BID).then(res => {
+ if (!res.data || this.loaded) return
+
+ let _data = res.data[0] || {$$empty: true}
+ _data.$$uuid = _data[config.setting.primaryKey] || ''
+
+ this.setState({data: _data})
+ })
+ }
+
+ if (config.setting.onload === 'true') {
+ setTimeout(() => {
+ this.loadData('init')
+ }, config.setting.delay || 0)
+ } else if (this.loaded) {
+ if (config.wrap.goback === 'true' && data.$$empty) {
+ this.timer && this.timer.stop()
+
+ MKEmitter.emit('closeTabView', config.$pageId)
+ } else {
+ if (selected !== 'false') {
+ this.checkTopLine()
+ } else {
+ this.transferLine()
+ }
+ this.autoExec()
+ }
+ }
}
- }
-
- _data.$$BID = BID || ''
- _data.$$BData = BData || ''
- _data.$$uuid = _data[config.setting.primaryKey] || ''
-
- this.loaded = true
-
- this.setState({sync: false, data: _data}, () => {
- if (config.wrap.goback === 'true' && _data.$$empty) {
+ } else if (config.setting.onload === 'true') {
+ setTimeout(() => {
+ this.loadData()
+ }, config.setting.delay || 0)
+ } else if (this.loaded) {
+ 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 (_data.$$uuid) {
+ } else {
this.transferLine()
}
this.autoExec()
}
- })
- } else if (config.setting.useMSearch && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
- this.setState({}, () => {
- this.loadData()
- })
+ }
+ } else if (config.wrap.datatype === 'public') {
+ if (this.loaded) {
+ 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 (data.$$uuid) {
+ this.transferLine()
+ }
+ this.autoExec()
+ }
+ }
+ } else {
+ if (selected !== 'false') {
+ this.checkTopLine()
+ }
+
+ if (config.$cache && config.$time && config.wrap.autoExec) {
+ Api.getLCacheConfig(config.uuid, config.$time, BID).then(res => {
+ if (res.valid) return
+
+ this.autoExec()
+
+ Api.writeCacheConfig(config.uuid, [], BID)
+ })
+ } else {
+ this.autoExec()
+ }
}
+ }
+
+ transferSyncData = (syncId) => {
+ const { config } = this.state
+
+ if (config.$syncId !== syncId) return
+
+ const { BID, BData, selected } = this.state
+
+ let _data = window.GLOB.SyncData.get(config.dataName) || []
+
+ if (config.$cache) {
+ Api.writeCacheConfig(config.uuid, fromJS(_data).toJS(), BID)
+ }
+
+ _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 (_data.$$uuid) {
+ this.transferLine()
+ }
+ this.autoExec()
+ }
+ })
+
+ 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) => {
@@ -268,14 +373,23 @@
}
}
- autoExec = () => {
+ autoExec = (times) => {
const { config, data } = this.state
if (!config.wrap.autoExec) return
- setTimeout(() => {
+ let btn = document.getElementById('button' + config.wrap.autoExec)
+
+ clearTimeout(this.autoTimer)
+
+ if (btn) {
MKEmitter.emit('triggerBtnId', config.wrap.autoExec, data.$$empty ? [] : [data])
- }, 200)
+ } else if (!times || times < 20) {
+ times = times ? times + 1 : 1
+ this.autoTimer = setTimeout(() => {
+ this.autoExec(times)
+ }, 1000)
+ }
}
checkTopLine = () => {
@@ -318,12 +432,21 @@
if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
MKEmitter.emit('reloadData', config.setting.supModule, BID)
} else {
- this.loadData()
+ this.loadData('', 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) => {
@@ -342,18 +465,18 @@
* @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: '',
orderBy: '',
- search: searches,
- menuName: config.name
+ search: searches
})
}
@@ -365,9 +488,8 @@
this.loadData()
}
- async loadData (hastimer) {
- const { mainSearch } = this.props
- const { config, arr_field, BID, BData, selected } = this.state
+ async loadData (type, btn) {
+ const { config, BID, BData, selected } = this.state
if (config.wrap.datatype === 'public') {
MKEmitter.emit('reloadData', config.wrap.publicId)
@@ -378,6 +500,10 @@
this.setState({
data: {$$BID: BID || '', $$BData: BData, $$empty: true},
})
+
+ if (!btn) {
+ this.autoExec()
+ }
return
} else if (config.setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
this.setState({
@@ -387,29 +513,31 @@
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
}
- if (!hastimer) {
+ if (type !== 'timer') {
this.setState({
loading: true
})
}
let _orderBy = config.setting.order || ''
- let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, 1, 1, BID)
+ let param = UtilsDM.getQueryDataParams(config.setting, searches, _orderBy, 1, 1, BID)
let result = await Api.genericInterface(param)
if (result.status) {
let _data = {}
this.loaded = true
- if (config.$cache && config.setting.onload !== 'false') {
- Api.writeCacheConfig(config.uuid, result.data || '')
+ if (config.$cache && type === 'init') {
+ Api.writeCacheConfig(config.uuid, result.data || [], BID)
}
if (!result.data || !result.data[0]) {
@@ -436,7 +564,9 @@
} else {
this.transferLine()
}
- this.autoExec()
+ if (!btn) {
+ this.autoExec()
+ }
}
})
@@ -446,16 +576,31 @@
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 {
this.setState({
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,
@@ -506,7 +651,7 @@
}
return (
- <Col className={className} key={index} span={item.setting.width || 6} offset={item.offset || 0}>
+ <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