From 9ecbd8f279f6e0a1037e282418e8f9bfc0250769 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 25 四月 2023 17:04:11 +0800 Subject: [PATCH] 2023-04-25 --- src/tabviews/custom/components/table/edit-table/index.jsx | 26 +++++++------------------- 1 files changed, 7 insertions(+), 19 deletions(-) diff --git a/src/tabviews/custom/components/table/edit-table/index.jsx b/src/tabviews/custom/components/table/edit-table/index.jsx index 49dae01..a0568c2 100644 --- a/src/tabviews/custom/components/table/edit-table/index.jsx +++ b/src/tabviews/custom/components/table/edit-table/index.jsx @@ -48,7 +48,6 @@ */ UNSAFE_componentWillMount () { let _config = fromJS(this.props.config).toJS() - let _cols = new Map() let setting = {..._config.setting, ..._config.wrap} setting.tableId = Utils.getuuid() @@ -82,11 +81,6 @@ setting.operType = 'btnMode' } - _config.columns.forEach(item => { - if (item.type !== 'number') return - _cols.set(item.field, item) - }) - let _columns = [] let signAdd = false _config.cols.forEach(column => { @@ -115,17 +109,6 @@ return !cell.Hide }) - } - - if (column.type === 'custom') { - column.elements = column.elements.map(item => { - if (item.eleType === 'number' && item.field && _cols.has(item.field) && typeof(item.decimal) !== 'number') { - item.decimal = _cols.get(item.field).decimal || 0 - } - return item - }) - } else if (column.type === 'action') { - column.operations = column.elements } _columns.push(column) @@ -606,10 +589,15 @@ } render() { - const { BID, setting, actions, config, columns, BData, selectedData, lock } = this.state + const { BID, setting, actions, config, columns, BData, data, selectedData, lock } = this.state + + let style = {...config.style} + if (config.wrap.empty === 'hidden' && data.length === 0) { + style.display = 'none' + } return ( - <div className="custom-edit-table" id={'anchor' + config.uuid} style={config.style}> + <div className="custom-edit-table" id={'anchor' + config.uuid} style={style}> <NormalHeader config={config}/> {config.search && config.search.length ? <MainSearch BID={BID} config={config} refreshdata={this.refreshbysearch}/> : null -- Gitblit v1.8.0