From cdd5b449130ea4d7223fde4f414a11a7d0c33d6d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 07 三月 2024 17:52:16 +0800
Subject: [PATCH] 2024-03-07
---
src/tabviews/custom/components/table/normal-table/index.jsx | 107 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 81 insertions(+), 26 deletions(-)
diff --git a/src/tabviews/custom/components/table/normal-table/index.jsx b/src/tabviews/custom/components/table/normal-table/index.jsx
index 63b75d4..92c7018 100644
--- a/src/tabviews/custom/components/table/normal-table/index.jsx
+++ b/src/tabviews/custom/components/table/normal-table/index.jsx
@@ -38,7 +38,8 @@
pageSize: 10, // 姣忛〉鏁版嵁鏉℃暟
orderBy: '', // 鎺掑簭
search: '', // 鎼滅储鏉′欢鏁扮粍锛屼娇鐢ㄦ椂闇�鍒嗗満鏅鐞�
- statFValue: [] // 鍚堣鍊�
+ statFValue: [], // 鍚堣鍊�
+ allSearch: null
}
loaded = false
@@ -138,6 +139,18 @@
_config.style = _config.style || {}
+ let allSearch = null
+ if (_config.colsCtrls && _config.colsCtrls.length > 0) {
+ allSearch = [{key: 'BID', value: BID || ''}]
+ allSearch.push(..._config.$searches)
+ if (_config.setting.useMSearch) {
+ let mainSearch = window.GLOB.SearchBox.get(_config.$searchId) || []
+ allSearch.push(...mainSearch)
+ }
+ } else {
+ _config.colsCtrls = null
+ }
+
this.setState({
pageSize: setting.pageSize || 10,
BID: BID || '',
@@ -148,7 +161,8 @@
setting: setting,
actions: _config.action,
columns: _config.cols,
- search: _config.$searches
+ search: _config.$searches,
+ allSearch
})
}
@@ -185,6 +199,8 @@
}
this.initExec()
+
+ this.autoExec()
}
/**
@@ -287,6 +303,25 @@
}
}
+ autoExec = (times) => {
+ const { config } = this.state
+
+ if (!config.wrap.autoExec) return
+
+ let btn = document.getElementById('button' + config.wrap.autoExec)
+
+ this.autoTimer && clearTimeout(this.autoTimer)
+
+ if (btn) {
+ MKEmitter.emit('triggerBtnId', config.wrap.autoExec, [])
+ } else if (!times || times < 20) {
+ times = times ? times + 1 : 1
+ this.autoTimer = setTimeout(() => {
+ this.autoExec(times)
+ }, 1000)
+ }
+ }
+
transferSyncData = (syncId) => {
const { config } = this.state
@@ -355,6 +390,7 @@
this.setState({
data: [],
selectedData: [],
+ loading: false,
total: 0
})
@@ -365,6 +401,7 @@
}
this.loaded = true
+ this.requestId = ''
return
}
@@ -392,8 +429,12 @@
let _orderBy = orderBy || setting.order
let param = UtilsDM.getQueryDataParams(setting, searches, _orderBy, pageIndex, pageSize, BID)
- let result = await Api.genericInterface(param)
+ this.requestId = config.uuid + new Date().getTime()
+
+ let result = await Api.genericInterface(param, '', '', this.requestId)
if (result.status) {
+ if (result.$requestId && this.requestId !== result.$requestId) return
+
this.loaded = true
if (config.$cache && type === 'init') {
Api.writeCacheConfig(config.uuid, result.data || [], BID)
@@ -467,9 +508,16 @@
total = data[data.length - 1].mk_total || 0
}
+ let allSearch = null
+ if (config.colsCtrls) {
+ allSearch = [{key: 'BID', value: BID || ''}]
+ allSearch.push(...searches)
+ }
+
this.setState({
data: data,
selectedData: [],
+ allSearch: allSearch,
total: total,
loading: false
})
@@ -518,7 +566,7 @@
/**
* @description 鑾峰彇鍗曡鏁版嵁
*/
- async loadmainLinedata (id) {
+ async loadLinedata (id, position) {
const { setting, config, search, orderBy, BID, pageIndex, pageSize, BData } = this.state
if (config.forbidLine) {
@@ -546,6 +594,11 @@
let result = await Api.genericInterface(param)
if (result.status) {
+ if (position === 'line_grid' && (!result.data || !result.data[0])) {
+ this.loadmaindata(true, 'false')
+ return
+ }
+
let data = fromJS(this.state.data).toJS()
let selectedData = fromJS(this.state.selectedData).toJS()
@@ -722,7 +775,7 @@
if (!id) {
this.reloadtable()
} else {
- this.loadmainLinedata(id)
+ this.loadLinedata(id)
}
}
@@ -737,7 +790,9 @@
BID: id,
BData: data
}, () => {
- this.loadmaindata(true, 'true')
+ if (!setting.checkBid) {
+ this.loadmaindata(true, 'true')
+ }
})
}
}
@@ -753,9 +808,9 @@
if (config.uuid !== menuId) return
- if (position === 'line') {
+ if (position === 'line' || position === 'line_grid') {
if (lines && lines.length === 1) {
- this.loadmainLinedata(lines[0].$$uuid)
+ this.loadLinedata(lines[0].$$uuid, position)
} else {
this.reloadtable(btn, id)
}
@@ -801,7 +856,7 @@
}
render() {
- const { BID, setting, actions, config, columns, selectedData, BData, data } = this.state
+ const { BID, setting, actions, config, columns, selectedData, BData, data, allSearch } = this.state
let style = {...config.style}
if (config.wrap.empty === 'hidden' && (!data || data.length === 0)) {
@@ -809,7 +864,7 @@
}
let content = <>
- {config.search && config.search.length ?
+ {config.search.length ?
<MainSearch BID={BID} config={config} refreshdata={this.refreshbysearch}/> : null
}
{actions.length > 0 ? <MainAction
@@ -819,22 +874,22 @@
BData={BData}
columns={config.columns}
selectedData={selectedData}
- /> : <div className="mk-action-space" style={{height: '25px'}}></div>}
- <div className={'main-table-box ' + (!actions || actions.length === 0 ? 'no-action' : '')}>
- <MainTable
- setting={setting}
- columns={columns}
- MenuID={config.uuid}
- data={this.state.data}
- fields={config.columns}
- total={this.state.total}
- lineMarks={config.lineMarks}
- loading={this.state.loading}
- refreshdata={this.refreshbytable}
- statFValue={this.state.statFValue}
- chgSelectData={(selects) => this.setState({selectedData: selects})}
- />
- </div>
+ /> : (setting.tableType || config.search.length > 0 ? <div className="mk-action-space" style={{height: '25px'}}></div> : null)}
+ <MainTable
+ setting={setting}
+ columns={columns}
+ MenuID={config.uuid}
+ allSearch={allSearch}
+ data={this.state.data}
+ fields={config.columns}
+ total={this.state.total}
+ colsCtrls={config.colsCtrls}
+ lineMarks={config.lineMarks}
+ loading={this.state.loading}
+ refreshdata={this.refreshbytable}
+ statFValue={this.state.statFValue}
+ chgSelectData={(selects) => this.setState({selectedData: selects})}
+ />
</>
return (
--
Gitblit v1.8.0