From 3c6862fdfc6af3ae176436d2e22f1b7f8bcc8479 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 07 六月 2023 17:55:07 +0800
Subject: [PATCH] 2023-06-07
---
src/tabviews/custom/components/table/base-table/index.jsx | 64 ++++++++++++++------------------
1 files changed, 28 insertions(+), 36 deletions(-)
diff --git a/src/tabviews/custom/components/table/base-table/index.jsx b/src/tabviews/custom/components/table/base-table/index.jsx
index c4753cc..9658a04 100644
--- a/src/tabviews/custom/components/table/base-table/index.jsx
+++ b/src/tabviews/custom/components/table/base-table/index.jsx
@@ -46,7 +46,6 @@
*/
UNSAFE_componentWillMount () {
let _config = fromJS(this.props.config).toJS()
- let _cols = new Map()
let BID = ''
let BData = ''
@@ -70,22 +69,11 @@
let setting = {..._config.setting, ..._config.wrap}
- if (setting.selected !== 'always' && setting.selected !== 'init') {
+ if (setting.selected !== 'always' && setting.selected !== 'init' && setting.selected !== 'sign') {
setting.selected = 'false'
} else {
setting.orisel = true
}
-
- _config.columns.forEach(item => {
- if (item.type !== 'number') return
- _cols.set(item.field, item)
- })
-
- _config.cols.forEach(column => {
- if (column.type === 'action') {
- column.operations = column.elements
- }
- })
_config.style = _config.style || {}
@@ -126,7 +114,7 @@
})
MKEmitter.emit('resetSelectLine', config.uuid, '', '') // 骞挎挱鏁版嵁鍒囨崲
- reset && MKEmitter.emit('resetTable', config.uuid, repage) // 鍒楄〃閲嶇疆
+ reset && MKEmitter.emit('resetTable', config.uuid, 'true') // 鍒楄〃閲嶇疆
if (setting.$hasSyncModule) {
MKEmitter.emit('syncBalconyData', config.uuid, [], false)
}
@@ -157,9 +145,26 @@
let result = await Api.genericInterface(param)
if (result.status) {
+ 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 ((setting.selected !== 'false' || (setting.orisel && id)) && result.data && result.data.length > 0) {
setTimeout(() => {
- MKEmitter.emit('mkCheckTopLine', config.uuid, id)
+ MKEmitter.emit('mkCheckTopLine', config.uuid, id, setting.selected)
}, 200)
if (setting.selected === 'init') {
this.setState({setting: {...setting, selected: 'false'}})
@@ -195,7 +200,7 @@
})
}
if (setting.controlField) {
- if (setting.controlVal.includes(item[setting.controlField])) {
+ if (setting.controlVal.includes(item[setting.controlField] + '')) {
item.$disabled = true
}
}
@@ -391,26 +396,13 @@
* 鍚湁鍒濆涓嶅姞杞界殑椤甸潰锛屼慨鏀硅缃�
*/
refreshbysearch = (searches) => {
- const { setting } = this.state
-
- if (setting.onload === 'false') {
- this.setState({
- pageIndex: 1,
- search: searches,
- setting: {...setting, onload: 'true'}
- }, () => {
- this.loadmaindata()
- this.getStatFieldsValue()
- })
- } else {
- this.setState({
- pageIndex: 1,
- search: searches
- }, () => {
- this.loadmaindata(true, 'true')
- this.getStatFieldsValue()
- })
- }
+ this.setState({
+ pageIndex: 1,
+ search: searches
+ }, () => {
+ this.loadmaindata(true, 'true')
+ this.getStatFieldsValue()
+ })
}
/**
--
Gitblit v1.8.0