From b6cbfb08b51e87e6eac995be8e7751815715e6a1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 29 三月 2022 15:36:21 +0800
Subject: [PATCH] 2022-03-29
---
src/tabviews/custom/components/table/edit-table/index.jsx | 87 ++++++++++++++++++++++++++-----------------
1 files changed, 52 insertions(+), 35 deletions(-)
diff --git a/src/tabviews/custom/components/table/edit-table/index.jsx b/src/tabviews/custom/components/table/edit-table/index.jsx
index 9c8d79c..613acf2 100644
--- a/src/tabviews/custom/components/table/edit-table/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/index.jsx
@@ -1,6 +1,6 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import {connect} from 'react-redux'
+import { connect } from 'react-redux'
import { is, fromJS } from 'immutable'
import { notification } from 'antd'
@@ -15,13 +15,11 @@
// 閫氱敤缁勪欢
const MainSearch = asyncComponent(() => import('@/tabviews/zshare/topSearch'))
const MainAction = asyncComponent(() => import('@/tabviews/zshare/actionList'))
-// const MainTable = asyncComponent(() => import('./normalTable'))
const NormalHeader = asyncComponent(() => import('@/tabviews/custom/components/share/normalheader'))
class EditableTable extends Component {
static propTpyes = {
BID: PropTypes.any, // 鐖剁骇Id
- data: PropTypes.array, // 缁熶竴鏌ヨ鏁版嵁
config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅
mainSearch: PropTypes.any, // 澶栧眰鎼滅储鏉′欢
menuType: PropTypes.any, // 鑿滃崟绫诲瀷
@@ -58,6 +56,20 @@
let _cols = new Map()
let setting = {..._config.setting, ..._config.wrap, style: {}}
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'
@@ -477,7 +489,6 @@
const { config } = this.state
if (config.uuid !== menuId) return
- if (id === 'empty') return
if (!id) {
this.reloadtable()
@@ -513,20 +524,29 @@
if (config.uuid !== menuId) return
- if (position === 'line' && lines && lines.length === 1) {
- this.loadmainLinedata(lines[0].$$uuid)
- } else {
- this.reloadtable(btn) // 鏁版嵁鍒锋柊
+ let supModule = config.setting.supModule
+
+ btn.syncComponentId && MKEmitter.emit('reloadData', btn.syncComponentId)
+
+ if (!btn.syncComponentId || btn.syncComponentId !== supModule) {
+ if (position === 'line') {
+ if (lines && lines.length === 1) {
+ this.loadmainLinedata(lines[0].$$uuid)
+ } else {
+ this.reloadtable(btn)
+ }
+ } else if (position === 'mainline' || position === 'popclose') { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
+ if (supModule && BID) {
+ MKEmitter.emit('reloadData', supModule, BID)
+ } else {
+ this.reloadtable(btn)
+ }
+ } else {
+ 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)
}
}
@@ -566,7 +586,7 @@
}
render() {
- const { BID, setting, searchlist, actions, config, columns, BData, data, selectedData, lock } = this.state
+ const { BID, setting, searchlist, actions, config, columns, BData, selectedData, lock } = this.state
return (
<div className="custom-edit-table" style={config.style}>
@@ -583,24 +603,21 @@
columns={config.columns}
selectedData={selectedData}
/>
- <div className={'main-table-box ' + (!actions || actions.length === 0 ? 'no-action' : '')}>
- <MainTable
- BID={BID}
- data={data}
- 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