From 52faefc67ffef29e3d208d2233c2547fc0ee47d3 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 04 三月 2023 21:11:41 +0800
Subject: [PATCH] 2023-03-04
---
src/tabviews/custom/components/share/normalTable/index.jsx | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx
index 9efe403..1926c23 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
@@ -929,7 +936,7 @@
render() {
const { setting, statFValue, lineMarks, data } = this.props
- const { selectedRowKeys, activeIndex, pickup, tableId, pageOptions } = this.state
+ const { selectedRowKeys, activeIndex, pickup, tableId, pageOptions, columns } = this.state
// 璁剧疆琛ㄦ牸閫夋嫨灞炴�э細鍗曢�夈�佸閫夈�佷笉鍙��
let rowSelection = null
@@ -979,9 +986,13 @@
}
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}>
+ <div className={`normal-custom-table ${setting.tableHeader || ''} ${height ? 'fixed-height' : ''} ${setting.mode || ''} table-vertical-${setting.vertical || 'middle'} table-col-${columns.length}`} id={tableId}>
{(setting.tableType === 'radio' || setting.tableType === 'checkbox') && data && data.length > 0 ?
<Switch title="鏀惰捣" className="main-pickup" checkedChildren="寮�" unCheckedChildren="鍏�" checked={pickup} onChange={this.pickupChange} /> : null
}
@@ -990,9 +1001,9 @@
size={setting.size || 'middle'}
bordered={setting.bordered !== 'false'}
rowSelection={rowSelection}
- columns={this.state.columns}
+ columns={columns}
dataSource={_data}
- loading={this.props.loading}
+ loading={loading}
scroll={{ x: '100%', y: height }}
onRow={(record, index) => {
return {
--
Gitblit v1.8.0