From f55f309851c214403c3532372db4fa3331592207 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 09 二月 2023 14:54:12 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/zshare/normalTable/index.jsx | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/tabviews/zshare/normalTable/index.jsx b/src/tabviews/zshare/normalTable/index.jsx
index 0ef8ec8..e08b2cb 100644
--- a/src/tabviews/zshare/normalTable/index.jsx
+++ b/src/tabviews/zshare/normalTable/index.jsx
@@ -1214,7 +1214,7 @@
render() {
const { setting, pickup, statFValue } = this.props
- const { selectedRowKeys, lineMarks, activeIndex, pageOptions } = this.state
+ const { selectedRowKeys, lineMarks, activeIndex, pageOptions, columns } = this.state
let components = {
body: {}
@@ -1276,14 +1276,14 @@
}
return (
- <div className={'normal-data-table mingke-table ' + (height ? 'fixed-height' : '')}>
+ <div className={'normal-data-table mingke-table ' + (height ? 'fixed-height' : '') + ` table-col-${columns.length}`}>
<Table
components={components}
size={setting.size || 'middle'}
style={style}
bordered={setting.bordered !== 'false'}
rowSelection={rowSelection}
- columns={this.state.columns}
+ columns={columns}
dataSource={_data}
rowClassName={(record) => {
let className = ''
--
Gitblit v1.8.0