From f267d04e0561a0a20d1f2a9f558a273558ece90d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 24 五月 2021 17:50:19 +0800
Subject: [PATCH] 2021-05-24
---
src/menu/components/table/normal-table/columns/index.jsx | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/src/menu/components/table/normal-table/columns/index.jsx b/src/menu/components/table/normal-table/columns/index.jsx
index 87d7708..eefeb09 100644
--- a/src/menu/components/table/normal-table/columns/index.jsx
+++ b/src/menu/components/table/normal-table/columns/index.jsx
@@ -37,13 +37,15 @@
shouldComponentUpdate (nextProps, nextState) {
+ if (this.props.rowSpan !== nextProps.rowSpan || this.props.colSpan !== nextProps.colSpan) {
+ return true
+ }
+
if (!nextProps.column) return false
return !is(fromJS(this.props.column), fromJS(nextProps.column)) ||
!is(fromJS(this.props.fields), fromJS(nextProps.fields)) ||
- this.props.index !== nextProps.index ||
- this.props.rowSpan !== nextProps.rowSpan ||
- this.props.colSpan !== nextProps.colSpan
+ this.props.index !== nextProps.index
}
render() {
@@ -154,7 +156,7 @@
} else if (column) {
return (
<td style={{...style, minWidth: column.Width || 100}} className={className}>
- {column.field}
+ {column.field || (column.type === 'index' ? '$Index' : '')}
{column.marks && column.marks.length ? <Icon className="profile" type="ant-design"/> : null}
</td>
)
@@ -175,7 +177,7 @@
}
state = {
- dict: localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+ dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
tableId: '',
data: [{uuid: Utils.getuuid()}],
refresh: false, // 寮哄埗鍒锋柊
@@ -395,8 +397,8 @@
let oInput = document.createElement('input')
let val = {
- copyType: 'columns',
- columns: columns
+ copyType: 'cols',
+ cols: columns.filter(col => !col.origin)
}
oInput.value = window.btoa(window.encodeURIComponent(JSON.stringify(val)))
@@ -494,8 +496,16 @@
const columns = this.handlecolumns(this.state.columns, fields, config)
+ let style = {}
+ if (config.wrap.color) {
+ style.color = config.wrap.color
+ }
+ if (config.wrap.fontSize) {
+ style.fontSize = config.wrap.fontSize
+ }
+
return (
- <div className={`normal-table-columns ${config.setting.laypage} ${config.wrap.tableType}`} id={tableId}>
+ <div className={`normal-table-columns ${config.setting.laypage} ${config.wrap.tableType} ${config.wrap.mode || ''}`} id={tableId}>
<div className="col-control">
<Icon title="澶嶅埗" type="copy" onClick={this.copycolumn} />
<MarkColumn columns={fields} type="line" marks={lineMarks} onSubmit={this.updateLineMarks} />
@@ -504,7 +514,9 @@
<DndProvider>
<Table
rowKey="uuid"
+ size={config.wrap.size || 'middle'}
rowClassName="editable-row"
+ style={style}
bordered={config.wrap.bordered !== 'false'}
components={components}
dataSource={this.state.data}
--
Gitblit v1.8.0