From 2ae980243b7ad705dea575eadcfc4cf4e24073bd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 17 五月 2022 22:57:19 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/table/edit-table/index.jsx | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/tabviews/custom/components/table/edit-table/index.jsx b/src/tabviews/custom/components/table/edit-table/index.jsx
index 613acf2..98aed40 100644
--- a/src/tabviews/custom/components/table/edit-table/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/index.jsx
@@ -54,7 +54,7 @@
const { BID, BData } = this.props
let _config = fromJS(this.props.config).toJS()
let _cols = new Map()
- let setting = {..._config.setting, ..._config.wrap, style: {}}
+ let setting = {..._config.setting, ..._config.wrap}
setting.tableId = Utils.getuuid()
_config.submit.style = _config.submit.style || {}
@@ -132,12 +132,12 @@
}
}
- if (setting.color) {
- setting.style.color = setting.color
- }
- if (setting.fontSize) {
- setting.style.fontSize = setting.fontSize
- }
+ // if (setting.color) {
+ // setting.style.color = setting.color
+ // }
+ // if (setting.fontSize) {
+ // setting.style.fontSize = setting.fontSize
+ // }
if (!_config.lineMarks || _config.lineMarks.length === 0) {
_config.lineMarks = null
@@ -589,7 +589,7 @@
const { BID, setting, searchlist, actions, config, columns, BData, selectedData, lock } = this.state
return (
- <div className="custom-edit-table" style={config.style}>
+ <div className="custom-edit-table" id={'anchor' + config.uuid} style={config.style}>
<NormalHeader config={config}/>
{searchlist && searchlist.length ?
<MainSearch BID={BID} setting={config.wrap} searchlist={searchlist} menuType={this.props.menuType} refreshdata={this.refreshbysearch}/> : null
--
Gitblit v1.8.0