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/table-card/index.jsx | 295 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 190 insertions(+), 105 deletions(-)
diff --git a/src/tabviews/custom/components/card/table-card/index.jsx b/src/tabviews/custom/components/card/table-card/index.jsx
index 16fc44e..f131f2c 100644
--- a/src/tabviews/custom/components/card/table-card/index.jsx
+++ b/src/tabviews/custom/components/card/table-card/index.jsx
@@ -5,7 +5,6 @@
import { DownOutlined } from '@ant-design/icons'
import Api from '@/api'
-import Utils from '@/utils/utils.js'
import asyncComponent from '@/utils/asyncComponent'
import UtilsDM from '@/utils/utils-datamanage.js'
import MKEmitter from '@/utils/events.js'
@@ -17,9 +16,7 @@
class TableCard extends Component {
static propTpyes = {
- data: PropTypes.array, // 缁熶竴鏌ヨ鏁版嵁
- config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅
- mainSearch: PropTypes.any, // 澶栧眰鎼滅储鏉′欢
+ config: PropTypes.object
}
state = {
@@ -29,7 +26,6 @@
search: null, // 鎼滅储鏉′欢
pageIndex: 1, // 椤电爜
total: 0, // 鎬绘暟
- sync: false, // 鏄惁缁熶竴璇锋眰鏁版嵁
data: null, // 鏁版嵁
BData: ''
}
@@ -41,12 +37,9 @@
* 1銆� initdata 涓烘墦鍗版椂浣跨敤鐨勬暟鎹泦
*/
UNSAFE_componentWillMount () {
- const { data, initdata } = this.props
- let _config = fromJS(this.props.config).toJS()
+ const { config } = this.props
- let _data = null
- let _sync = _config.setting.sync === 'true'
-
+ let _config = fromJS(config).toJS()
let BID = ''
let BData = ''
@@ -57,25 +50,6 @@
}
if (BData) {
BID = BData.$BID || ''
- }
-
- if (_config.setting.sync === 'true' && data) {
- _data = data[_config.dataName] || []
- _sync = false
- } else if (_config.setting.sync === 'true' && initdata) {
- _data = initdata || []
- _sync = false
- }
-
- if (_data) {
- _data = _data.map((item, index) => {
- item.key = index
- item.$$uuid = item[_config.setting.primaryKey] || ''
- item.$$BID = BID || ''
- item.$$BData = BData || ''
- item.$Index = index + 1 + ''
- return item
- })
}
let showHeader = false
@@ -92,22 +66,40 @@
_config.wrap.contentHeight = showHeader ? 'calc(100% - 45px)' : '100%'
}
- this.loaded = _data !== null
+ let _data = null
+ if (_config.setting.sync === 'true') {
+ _config.setting.onload = 'false'
+
+ if (window.GLOB.SyncData.has(_config.dataName)) {
+ _data = window.GLOB.SyncData.get(_config.dataName) || []
+
+ if (_config.$cache) {
+ Api.writeCacheConfig(_config.uuid, fromJS(_data).toJS(), BID)
+ }
+
+ _config.setting.sync = 'false'
+
+ _data = _data.map((item, index) => {
+ item.key = index
+ item.$$uuid = item[_config.setting.primaryKey] || ''
+ item.$$BID = BID || ''
+ item.$$BData = BData || ''
+ item.$Index = index + 1 + ''
+ return item
+ })
+
+ this.loaded = true
+
+ window.GLOB.SyncData.delete(_config.dataName)
+ }
+ }
this.setState({
- sync: _sync,
BID: BID || '',
BData: BData || '',
data: _data,
config: _config,
- search: Utils.initMainSearch(_config.search),
- arr_field: _config.columns.map(col => col.field).join(','),
- }, () => {
- if (_config.setting.sync !== 'true' && _config.setting.onload === 'true') {
- setTimeout(() => {
- this.loadData()
- }, _config.setting.delay || 0)
- }
+ search: _config.$searches
})
}
@@ -115,9 +107,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.timer) {
this.timer = new TimerTask()
@@ -130,20 +131,7 @@
})
}
- if (config.$cache && !this.loaded) {
- Api.getLCacheConfig(config.uuid).then(res => {
- if (!res || this.loaded) return
-
- let _data = res.map((item, index) => {
- item.key = index
- item.$$uuid = item[config.setting.primaryKey] || ''
- item.$Index = index + 1 + ''
- return item
- })
-
- this.setState({data: _data})
- })
- }
+ this.initExec()
}
shouldComponentUpdate (nextProps, nextState) {
@@ -155,42 +143,110 @@
return
}
MKEmitter.removeListener('reloadData', this.reloadData)
+ 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 } = this.state
+ initExec = () => {
+ const { config, BID } = this.state
- if (sync && !is(fromJS(this.props.data), fromJS(nextProps.data))) {
- let _data = []
- if (nextProps.data && nextProps.data[config.dataName]) {
- _data = nextProps.data[config.dataName] || []
+ if (config.$cache) {
+ if (config.$time && !config.setting.laypage) {
+ 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.map((item, index) => {
+ item.key = index
+ item.$$uuid = item[config.setting.primaryKey] || ''
+ item.$Index = index + 1 + ''
+ return item
+ })
+
+ this.setState({data: _data})
+ })
+ }
+ } else {
+ if (!this.loaded) {
+ Api.getLCacheConfig(config.uuid, 0, BID).then(res => {
+ if (!res.data || this.loaded) return
+
+ let _data = res.data.map((item, index) => {
+ item.key = index
+ item.$$uuid = item[config.setting.primaryKey] || ''
+ item.$Index = index + 1 + ''
+ return item
+ })
+
+ this.setState({data: _data})
+ })
+ }
+
+ if (config.setting.onload === 'true') {
+ setTimeout(() => {
+ this.loadData('init')
+ }, config.setting.delay || 0)
+ }
}
-
- _data = _data.map((item, index) => {
- item.key = index
- item.$$uuid = item[config.setting.primaryKey] || ''
- item.$$BID = BID || ''
- item.$$BData = BData || ''
- item.$Index = index + 1 + ''
- return item
- })
-
- this.loaded = true
-
- this.setState({sync: false, data: _data})
- } else if (config.setting.useMSearch && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
- this.setState({}, () => {
+ } else if (config.setting.onload === 'true') {
+ setTimeout(() => {
this.loadData()
- })
+ }, config.setting.delay || 0)
}
+ }
+
+ transferSyncData = (syncId) => {
+ const { config } = this.state
+
+ if (config.$syncId !== syncId) return
+
+ const { BID, BData } = this.state
+
+ let _data = window.GLOB.SyncData.get(config.dataName) || []
+
+ if (config.$cache) {
+ Api.writeCacheConfig(config.uuid, fromJS(_data).toJS(), BID)
+ }
+
+ _data = _data.map((item, index) => {
+ item.key = index
+ item.$$uuid = item[config.setting.primaryKey] || ''
+ item.$$BID = BID || ''
+ item.$$BData = BData || ''
+ item.$Index = index + 1 + ''
+
+ return item
+ })
+
+ this.loaded = true
+
+ this.setState({data: _data})
+
+ 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()
+ })
}
/**
@@ -209,10 +265,23 @@
} else {
this.loadData()
}
+ }
- 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().map(item => {
+ if (item.$$uuid === uuid) {
+ item[btn.field] = count
+ }
+ return item
+ })
+
+ this.setState({
+ data: _data
+ })
}
resetParentParam = (MenuID, id, data) => {
@@ -238,32 +307,29 @@
* @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
*/
queryModuleParam = (menuId, callback) => {
- const { mainSearch } = this.props
- const { arr_field, config, search } = this.state
+ const { config, search } = this.state
if (config.uuid !== menuId) return
let searches = search ? fromJS(search).toJS() : []
- if (config.setting.useMSearch && mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
- let keys = searches.map(item => item.key.toLowerCase())
+ if (config.setting.useMSearch) { // 涓昏〃鎼滅储鏉′欢
+ let mainSearch = window.GLOB.SearchBox.get(config.$searchId) || []
+ let keys = config.$s_keys || []
mainSearch.forEach(item => {
- if (!keys.includes(item.key.toLowerCase())) {
- searches.push(item)
- }
+ if (keys.includes(item.key.toLowerCase())) return
+
+ searches.push(item)
})
}
callback({
- arr_field: arr_field,
orderBy: config.setting.order || '',
- search: searches,
- menuName: config.name
+ search: searches
})
}
async loadData (type) {
- const { mainSearch } = this.props
- const { config, arr_field, pageIndex, search, BID, BData } = this.state
+ const { config, pageIndex, search, BID, BData } = this.state
if (config.setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
this.setState({
@@ -276,17 +342,17 @@
}
let searches = search ? fromJS(search).toJS() : []
- if (config.setting.useMSearch && mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
- let keys = searches.map(item => item.key)
+ if (config.setting.useMSearch) { // 涓昏〃鎼滅储鏉′欢
+ let mainSearch = window.GLOB.SearchBox.get(config.$searchId) || []
+ let keys = config.$s_keys || []
mainSearch.forEach(item => {
- if (!keys.includes(item.key)) {
- searches.push(item)
- }
+ if (keys.includes(item.key.toLowerCase())) return
+
+ searches.push(item)
})
}
- 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
}
@@ -297,7 +363,7 @@
}
let _orderBy = config.setting.order || ''
- let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, pageIndex, config.setting.pageSize, BID)
+ let param = UtilsDM.getQueryDataParams(config.setting, searches, _orderBy, pageIndex, config.setting.pageSize, BID)
let result = await Api.genericInterface(param)
if (result.status) {
@@ -307,8 +373,8 @@
}
this.loaded = true
- if (config.$cache && pageIndex === 1 && config.setting.onload !== 'false') {
- Api.writeCacheConfig(config.uuid, result.data || '')
+ if (config.$cache && type === 'init') {
+ Api.writeCacheConfig(config.uuid, result.data || [], BID)
}
let data = []
@@ -334,9 +400,14 @@
})
}
+ let total = result.total || 0
+ if (config.setting.custompage && data.length) {
+ total = data[data.length - 1].mk_total || 0
+ }
+
this.setState({
data: data,
- total: result.total,
+ total: total,
loading: false
})
@@ -346,17 +417,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,
--
Gitblit v1.8.0