From cc1a76df575c18f0d0ee96e8658461efdce3a918 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 17 一月 2023 18:01:01 +0800
Subject: [PATCH] 2023-01-17
---
src/tabviews/custom/components/share/normalTable/index.jsx | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx
index 9efe403..328ccb5 100644
--- a/src/tabviews/custom/components/share/normalTable/index.jsx
+++ b/src/tabviews/custom/components/share/normalTable/index.jsx
@@ -837,13 +837,20 @@
MKEmitter.emit('resetSelectLine', MenuID, _id, _data)
}
- resetTable = (id, repage) => {
+ resetTable = (id, repage, pageIndex) => {
const { MenuID } = this.props
if (id !== MenuID) return
if (repage === 'false') {
this.setState({
+ selectedRowKeys: [],
+ activeIndex: null,
+ pickup: false
+ })
+ } else if (repage === 'repage') {
+ this.setState({
+ pageIndex: pageIndex,
selectedRowKeys: [],
activeIndex: null,
pickup: false
@@ -979,6 +986,10 @@
}
let height = setting.height || false
+ let loading = this.props.loading
+ if (setting.mask === 'hidden') {
+ loading = false
+ }
return (
<div className={`normal-custom-table ${setting.tableHeader || ''} ${height ? 'fixed-height' : ''} ${setting.mode || ''} table-vertical-${setting.vertical || ''}`} id={tableId}>
@@ -992,7 +1003,7 @@
rowSelection={rowSelection}
columns={this.state.columns}
dataSource={_data}
- loading={this.props.loading}
+ loading={loading}
scroll={{ x: '100%', y: height }}
onRow={(record, index) => {
return {
--
Gitblit v1.8.0