From 24842b40de5cd60700bf69dfd38a0332f5431e36 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 23 五月 2025 10:55:07 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/table/base-table/index.jsx | 146 ++++++++++++++++++++++--------------------------
1 files changed, 67 insertions(+), 79 deletions(-)
diff --git a/src/tabviews/custom/components/table/base-table/index.jsx b/src/tabviews/custom/components/table/base-table/index.jsx
index b02d9ae..4117ef4 100644
--- a/src/tabviews/custom/components/table/base-table/index.jsx
+++ b/src/tabviews/custom/components/table/base-table/index.jsx
@@ -65,10 +65,16 @@
let setting = {..._config.setting, ..._config.wrap}
- if (setting.selected !== 'always' && setting.selected !== 'init' && setting.selected !== 'sign') {
+ if (!['always', 'init', 'sign', 'local'].includes(setting.selected)) {
setting.selected = 'false'
- } else {
- setting.orisel = true
+ }
+
+ if (_config.setting.supModule && !BID) {
+ _config.setting.onload = 'false'
+ }
+
+ if (setting.tableMode === 'fast') {
+ _config.lineMarks = null
}
_config.style = _config.style || {}
@@ -85,7 +91,7 @@
}, () => {
if (_config.setting.onload === 'true') {
setTimeout(() => {
- this.loadmaindata()
+ this.loadData()
this.getStatFieldsValue()
}, _config.setting.delay || 0)
}
@@ -94,10 +100,8 @@
/**
* @description 涓昏〃鏁版嵁鍔犺浇
- * @param { Boolean } reset 琛ㄦ牸鏄惁閲嶇疆
- * @param { String } repage 琛ㄦ牸鏄惁閲嶇疆椤电爜
*/
- async loadmaindata (reset, repage, id) {
+ async loadData (reset, repage, id) {
const { setting, config, search, orderBy, BID, pageIndex, pageSize, BData } = this.state
if (setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
@@ -110,9 +114,6 @@
MKEmitter.emit('resetSelectLine', config.uuid, '', '') // 骞挎挱鏁版嵁鍒囨崲
reset && MKEmitter.emit('resetTable', config.uuid, 'true') // 鍒楄〃閲嶇疆
- // if (setting.$hasSyncModule) {
- // MKEmitter.emit('syncBalconyData', config.uuid, [], false)
- // }
this.requestId = ''
return
@@ -147,38 +148,12 @@
if (result.status) {
if (result.$requestId && this.requestId !== result.$requestId) return
- if (repage === 'false' && result.data && result.data.length === 0 && result.total > 0 && pageIndex > 1) {
- let _pageIndex = Math.ceil(result.total / pageSize)
-
- if (_pageIndex < pageIndex) {
- MKEmitter.emit('resetTable', config.uuid, 'repage', _pageIndex)
- this.setState({
- pageIndex: _pageIndex,
- data: [],
- selectedData: [],
- total: result.total
- }, () => {
- this.loadmaindata()
- })
- return
- }
+ if (result.data.length === 0 && pageIndex > 1) {
+ this.reloadIndex()
+ return
}
- if ((setting.selected !== 'false' || (setting.orisel && id)) && result.data && result.data.length > 0) {
- setTimeout(() => {
- MKEmitter.emit('mkCheckTopLine', config.uuid, id, setting.selected)
- }, 200)
- if (setting.selected === 'init') {
- this.setState({setting: {...setting, selected: 'false'}})
- }
- } else {
- MKEmitter.emit('resetSelectLine', config.uuid, '', '') // 骞挎挱鏁版嵁鍒囨崲
- // if (setting.$hasSyncModule) {
- // MKEmitter.emit('syncBalconyData', config.uuid, [], false)
- // }
- }
-
- reset && MKEmitter.emit('resetTable', config.uuid, repage) // 鍒楄〃閲嶇疆
+ reset && MKEmitter.emit('resetTable', config.uuid, repage || '') // 鍒楄〃閲嶇疆
let start = 1
if (setting.laypage) {
@@ -214,12 +189,28 @@
total = data[data.length - 1].mk_total || 0
}
+ if (data.length && (id || setting.selected !== 'false')) {
+ let keys = null
+ if (setting.selected === 'local') {
+ keys = this.state.selectedData.map(cell => cell.$$uuid)
+ }
+ setTimeout(() => {
+ MKEmitter.emit('mkCheckTopLine', config.uuid, id, setting.selected, keys)
+ }, 200)
+ } else {
+ MKEmitter.emit('resetSelectLine', config.uuid, '', '') // 骞挎挱鏁版嵁鍒囨崲
+ }
+
this.setState({
data: data,
selectedData: [],
total: total,
loading: false
})
+
+ if (setting.selected === 'init') {
+ this.setState({setting: {...setting, selected: 'false'}})
+ }
if (config.autoMatic) {
if (result.data && result.data.length > 0) {
@@ -249,11 +240,6 @@
async loadLinedata (id, position) {
const { setting, config, search, orderBy, BID, pageIndex, pageSize, BData } = this.state
- if (config.forbidLine) {
- this.reloadtable()
- return
- }
-
let searches = fromJS(search).toJS()
if (config.setting.useMSearch) { // 涓昏〃鎼滅储鏉′欢
let mainSearch = window.GLOB.SearchBox.get(config.$searchId) || []
@@ -275,7 +261,7 @@
let result = await Api.genericInterface(param)
if (result.status) {
if (position === 'line_grid' && (!result.data || !result.data[0])) {
- this.loadmaindata(true, 'false')
+ this.reloadIndex()
return
}
@@ -450,7 +436,7 @@
if (config.setting.supModule && !BID) {
notification.warning({
top: 92,
- message: window.GLOB.dict['sup_key_req'] || '闇�瑕佷笂绾т富閿�硷紒',
+ message: config.setting.supModTip || window.GLOB.dict['sup_key_req'] || '闇�瑕佷笂绾т富閿�硷紒',
duration: 5
})
this.setState({
@@ -463,7 +449,7 @@
pageIndex: 1,
search: searches
}, () => {
- this.loadmaindata(true, 'true')
+ this.loadData(true, 'true')
this.getStatFieldsValue()
})
@@ -476,12 +462,12 @@
/**
* @description 琛ㄦ牸鏉′欢鏀瑰彉鏃堕噸缃暟鎹紙鍒嗛〉鎴栨帓搴忥級
*/
- refreshbytable = (pagination, filters, sorter) => {
+ refreshbytable = (pagination, sorter) => {
if (!sorter) { // 鏃犱汉鍊煎畧
this.setState({
pageIndex: pagination.pageIndex
}, () => {
- this.loadmaindata()
+ this.loadData()
})
} else {
if (sorter.order) {
@@ -497,25 +483,8 @@
pageSize: pagination.pageSize,
orderBy: (sorter.field && sorter.order) ? `${sorter.field} ${sorter.order}` : ''
}, () => {
- this.loadmaindata()
+ this.loadData()
})
- }
- }
-
- /**
- * @description 琛ㄦ牸鍒锋柊
- */
- reloadtable = (btn, id) => {
- if (!btn || btn.resetPageIndex !== 'false') {
- this.setState({
- pageIndex: 1
- }, () => {
- this.loadmaindata(true, 'true', id)
- this.getStatFieldsValue()
- })
- } else {
- this.loadmaindata(true, 'false', id)
- this.getStatFieldsValue()
}
}
@@ -550,7 +519,10 @@
if (config.uuid !== menuId) return
if (!id) {
- this.reloadtable()
+ this.reloadIndex()
+ } else if (config.forbidLine) {
+ this.loadData(true, 'false', id)
+ this.getStatFieldsValue()
} else {
this.loadLinedata(id)
}
@@ -567,7 +539,7 @@
BData: data
}, () => {
if (!setting.checkBid) {
- this.loadmaindata(true, 'true')
+ this.loadData(true, 'true')
this.getStatFieldsValue()
}
})
@@ -576,25 +548,32 @@
/**
* @description 鎸夐挳鎵ц瀹屾垚鍚庨〉闈㈠埛鏂�
- * @param {*} menuId // 鑿滃崟Id
- * @param {*} position // 鍒锋柊浣嶇疆
- * @param {*} btn // 鎵ц鐨勬寜閽�
*/
refreshByButtonResult = (menuId, position, btn, id, lines) => {
const { config, BID } = this.state
if (config.uuid !== menuId) return
+ let _id = config.wrap.selected === 'always' ? (id || '') : ''
if (position === 'line' || position === 'line_grid') {
- if (lines && lines.length === 1 && !config.forbidLine) {
- this.loadLinedata(lines[0].$$uuid, position)
+ if (lines && lines.length === 1) {
+ if (config.forbidLine) {
+ this.loadData(true, 'false', lines[0].$$uuid)
+ this.getStatFieldsValue()
+ } else {
+ this.loadLinedata(lines[0].$$uuid, position)
+ }
} else {
- this.reloadtable(btn, id)
+ this.loadData(true, 'false', _id)
+ this.getStatFieldsValue()
}
} else if (['mainline', 'maingrid', 'popclose'].includes(position) && config.setting.supModule) {
MKEmitter.emit('reloadData', config.setting.supModule, position === 'maingrid' ? '' : BID)
+ } else if (btn.resetPageIndex !== 'false') {
+ this.reloadIndex()
} else {
- this.reloadtable(btn, id)
+ this.loadData(true, 'false', _id)
+ this.getStatFieldsValue()
}
}
@@ -602,8 +581,17 @@
const { config } = this.state
if (config.$searchId !== searchId) return
-
- this.reloadtable()
+
+ this.reloadIndex()
+ }
+
+ reloadIndex = () => {
+ this.setState({
+ pageIndex: 1
+ }, () => {
+ this.loadData(true, 'true')
+ this.getStatFieldsValue()
+ })
}
autoExec = (times) => {
--
Gitblit v1.8.0