From 0472ec32cadb4f9bca6dbab82ac33a42e76f37ed Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 28 六月 2022 16:24:15 +0800
Subject: [PATCH] 菜单栏&时间轴
---
src/tabviews/custom/components/table/edit-table/index.jsx | 84 +++++++++++++++++++++++------------------
1 files changed, 47 insertions(+), 37 deletions(-)
diff --git a/src/tabviews/custom/components/table/edit-table/index.jsx b/src/tabviews/custom/components/table/edit-table/index.jsx
index 75c6619..2075ffd 100644
--- a/src/tabviews/custom/components/table/edit-table/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/index.jsx
@@ -54,8 +54,22 @@
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 || {}
+ _config.submit.wrapStyle = {}
+ _config.submit.hasAction = _config.action.length > 0
+ if (!_config.submit.hasAction) {
+ if (_config.submit.style.marginTop) {
+ _config.submit.wrapStyle.paddingTop = _config.submit.style.marginTop
+ }
+ if (_config.submit.style.marginBottom) {
+ _config.submit.wrapStyle.paddingBottom = _config.submit.style.marginBottom
+ }
+ } else {
+ _config.submit.wrapStyle.paddingTop = '15px'
+ }
if (setting.height) {
setting.operType = 'btnMode'
@@ -118,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
@@ -475,7 +489,6 @@
const { config } = this.state
if (config.uuid !== menuId) return
- if (id === 'empty') return
if (!id) {
this.reloadtable()
@@ -511,20 +524,19 @@
if (config.uuid !== menuId) return
- if (position === 'line' && lines && lines.length === 1) {
- this.loadmainLinedata(lines[0].$$uuid)
+ if (position === 'line') {
+ if (lines && lines.length === 1) {
+ this.loadmainLinedata(lines[0].$$uuid)
+ } else {
+ this.reloadtable(btn)
+ }
+ } else if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
+ MKEmitter.emit('reloadData', config.setting.supModule, BID)
} else {
- this.reloadtable(btn) // 鏁版嵁鍒锋柊
+ this.reloadtable(btn)
}
- if (btn.syncComponentId && btn.syncComponentId !== config.uuid && btn.syncComponentId !== config.setting.supModule) {
- MKEmitter.emit('reloadData', btn.syncComponentId) // 鍚岀骇鏍囩鍒锋柊
- }
-
- if (position === 'mainline' && config.setting.supModule) { // 涓昏〃琛屽埛鏂�
- MKEmitter.emit('reloadData', config.setting.supModule, (BID || 'empty'))
- } else if (position === 'popclose') { // 鏍囩鍏抽棴鍒锋柊
- config.setting.supModule && MKEmitter.emit('reloadData', config.setting.supModule, (BID || 'empty'))
+ if (position === 'popclose') { // 鎵ц鍚姩寮圭獥鐨勬寜閽墍閫夋嫨鐨勫埛鏂伴」
btn.$tabId && MKEmitter.emit('refreshPopButton', btn.$tabId)
}
}
@@ -567,7 +579,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
@@ -581,23 +593,21 @@
columns={config.columns}
selectedData={selectedData}
/>
- <div className={'main-table-box ' + (!actions || actions.length === 0 ? 'no-action' : '')}>
- <MainTable
- BID={BID}
- setting={setting}
- columns={columns}
- MenuID={config.uuid}
- submit={config.submit}
- fields={config.columns}
- total={this.state.total}
- lineMarks={config.lineMarks}
- loading={this.state.loading}
- refreshdata={this.refreshbytable}
- chgSelectData={(selects) => this.setState({selectedData: selects})}
- changeLock={(lock) => this.setState({lock: lock})}
- statFValue={this.state.statFValue}
- />
- </div>
+ <MainTable
+ BID={BID}
+ setting={setting}
+ columns={columns}
+ MenuID={config.uuid}
+ submit={config.submit}
+ fields={config.columns}
+ total={this.state.total}
+ lineMarks={config.lineMarks}
+ loading={this.state.loading}
+ refreshdata={this.refreshbytable}
+ chgSelectData={(selects) => this.setState({selectedData: selects})}
+ changeLock={(lock) => this.setState({lock: lock})}
+ statFValue={this.state.statFValue}
+ />
</div>
)
}
--
Gitblit v1.8.0