From 5cfe6db94c1449810a44660b299dba8e7e98e5c5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 10 六月 2021 14:43:39 +0800
Subject: [PATCH] 2021-06-10
---
src/tabviews/custom/components/table/normal-table/index.jsx | 263 +++++++++++++++++++++++++++++++++++++--------------
1 files changed, 189 insertions(+), 74 deletions(-)
diff --git a/src/tabviews/custom/components/table/normal-table/index.jsx b/src/tabviews/custom/components/table/normal-table/index.jsx
index 3831a8f..17b9f45 100644
--- a/src/tabviews/custom/components/table/normal-table/index.jsx
+++ b/src/tabviews/custom/components/table/normal-table/index.jsx
@@ -2,7 +2,7 @@
import PropTypes from 'prop-types'
import {connect} from 'react-redux'
import { is, fromJS } from 'immutable'
-import { notification } from 'antd'
+import { notification, Collapse } from 'antd'
import Api from '@/api'
import Utils from '@/utils/utils.js'
@@ -18,6 +18,8 @@
const MainAction = asyncComponent(() => import('@/tabviews/zshare/actionList'))
const MainTable = asyncComponent(() => import('@/tabviews/custom/components/share/normalTable'))
const NormalHeader = asyncComponent(() => import('@/tabviews/custom/components/share/normalheader'))
+
+const { Panel } = Collapse
class NormalTable extends Component {
static propTpyes = {
@@ -46,7 +48,6 @@
pageSize: 10, // 姣忛〉鏁版嵁鏉℃暟
orderBy: '', // 鎺掑簭
search: '', // 鎼滅储鏉′欢鏁扮粍锛屼娇鐢ㄦ椂闇�鍒嗗満鏅鐞�
- statFields: [], // 鍚堣瀛楁
statFValue: [] // 鍚堣鍊�
}
@@ -74,6 +75,7 @@
item.key = index
item.$$uuid = item[_config.setting.primaryKey] || ''
item.$$BID = BID || ''
+ item.$Index = index + 1 + ''
return item
})
}
@@ -95,13 +97,25 @@
}
})
+ let setting = {..._config.setting, ..._config.wrap, style: {}}
+ if (setting.color) {
+ setting.style.color = setting.color
+ }
+ if (setting.fontSize) {
+ setting.style.fontSize = setting.fontSize
+ }
+
+ if (_config.wrap.collapse === 'true') {
+ _config.wrap.title = _config.wrap.title || ' '
+ }
+
this.setState({
BID: BID || '',
title: _config.wrap.title,
sync: _sync,
data: _data,
config: _config,
- setting: {..._config.setting, ..._config.wrap},
+ setting: setting,
searchlist: _config.search,
actions: _config.action,
columns: _config.cols,
@@ -110,6 +124,8 @@
}, () => {
if (_config.setting.sync !== 'true' && _config.setting.onload === 'true') {
this.loadmaindata()
+ this.getStatFieldsValue()
+ } else if (_config.setting.onload === 'true') {
this.getStatFieldsValue()
}
})
@@ -121,8 +137,8 @@
* @param { String } repage 琛ㄦ牸鏄惁閲嶇疆椤电爜
*/
async loadmaindata (reset, repage) {
+ const { mainSearch } = this.props
const { setting, config, arr_field, search, orderBy, BID, pageIndex, pageSize } = this.state
- let requireFields = search.filter(item => item.required && (!item.value || item.value.length === 0))
if (setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
this.setState({
@@ -134,14 +150,21 @@
reset && MKEmitter.emit('resetTable', config.uuid, repage) // 鍒楄〃閲嶇疆
return
}
- if (requireFields.length > 0) {
- let labels = requireFields.map(item => item.label)
- labels = Array.from(new Set(labels))
- notification.warning({
- top: 92,
- message: this.state.dict['form.required.input'] + labels.join('銆�') + ' !',
- duration: 3
+ let searches = fromJS(search).toJS()
+ if (mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
+ let keys = searches.map(item => item.key.toLowerCase())
+ mainSearch.forEach(item => {
+ if (!keys.includes(item.key.toLowerCase())) {
+ searches.push(item)
+ }
+ })
+ }
+
+ let requireFields = searches.filter(item => item.required && (!item.value || item.value.length === 0))
+ if (requireFields.length > 0) {
+ this.setState({
+ loading: false
})
return
}
@@ -151,7 +174,7 @@
})
let _orderBy = orderBy || setting.order
- let param = UtilsDM.getQueryDataParams(setting, arr_field, search, _orderBy, pageIndex, pageSize, BID, this.props.menuType)
+ let param = UtilsDM.getQueryDataParams(setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID, this.props.menuType)
if (param.func === 'sPC_Get_TableData') {
param.menuname = config.name || ''
@@ -162,11 +185,17 @@
MKEmitter.emit('resetSelectLine', config.uuid, '', '') // 骞挎挱鏁版嵁鍒囨崲
reset && MKEmitter.emit('resetTable', config.uuid, repage) // 鍒楄〃閲嶇疆
+ let start = 1
+ if (setting.laypage) {
+ start = pageSize * (pageIndex - 1) + 1
+ }
+
this.setState({
data: result.data.map((item, index) => {
item.key = index
item.$$uuid = item[setting.primaryKey] || ''
item.$$BID = BID || ''
+ item.$Index = start + index + ''
return item
}),
selectedData: [],
@@ -189,14 +218,25 @@
* @description 鑾峰彇鍗曡鏁版嵁
*/
async loadmainLinedata (id) {
+ const { mainSearch } = this.props
const { setting, config, arr_field, search, orderBy, BID, pageIndex, pageSize } = this.state
+
+ let searches = fromJS(search).toJS()
+ if (mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
+ let keys = searches.map(item => item.key.toLowerCase())
+ mainSearch.forEach(item => {
+ if (!keys.includes(item.key.toLowerCase())) {
+ searches.push(item)
+ }
+ })
+ }
this.setState({
loading: true
})
let _orderBy = orderBy || setting.order
- let param = UtilsDM.getQueryDataParams(setting, arr_field, search, _orderBy, pageIndex, pageSize, BID, this.props.menuType, id)
+ let param = UtilsDM.getQueryDataParams(setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID, this.props.menuType, id)
if (param.func === 'sPC_Get_TableData') {
param.menuname = config.name || ''
@@ -205,19 +245,26 @@
let result = await Api.genericInterface(param)
if (result.status) {
let data = fromJS(this.state.data).toJS()
+ let selectedData = fromJS(this.state.selectedData).toJS()
if (result.data && result.data[0]) {
- let _data = result.data[0]
-
+ let _data = result.data[0] || {}
+ _data.$$uuid = _data[setting.primaryKey] || ''
+ _data.$$BID = BID || ''
try {
data = data.map(item => {
- if (item[setting.primaryKey] === _data[setting.primaryKey]) {
+ if (item.$$uuid === _data.$$uuid) {
_data.key = item.key
- _data.$$uuid = _data[setting.primaryKey] || ''
- _data.$$BID = BID || ''
+ _data.$Index = item.$Index
return _data
} else {
return item
}
+ })
+ selectedData = selectedData.map(item => {
+ if (_data.$$uuid === item.$$uuid) {
+ return _data
+ }
+ return item
})
} catch {
console.warn('鏁版嵁鏌ヨ閿欒')
@@ -225,7 +272,8 @@
}
this.setState({
- data: data,
+ data,
+ selectedData,
loading: false
})
} else {
@@ -244,7 +292,8 @@
* @description 鑾峰彇鍚堣瀛楁鍊�
*/
getStatFieldsValue = () => {
- const { setting, config, search, BID, orderBy, statFields } = this.state
+ const { mainSearch } = this.props
+ const { setting, config, search, BID, orderBy } = this.state
if (setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
this.setState({
@@ -253,15 +302,24 @@
return
}
- if (statFields.length === 0 || setting.interType !== 'system' || !setting.dataresource) return
+ if (config.statFields.length === 0 || setting.interType !== 'system' || !setting.dataresource) return
- let requireFields = search.filter(item => item.required && (!item.value || item.value.length === 0))
+ let searches = fromJS(search).toJS()
+ if (mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
+ let keys = searches.map(item => item.key.toLowerCase())
+ mainSearch.forEach(item => {
+ if (!keys.includes(item.key.toLowerCase())) {
+ searches.push(item)
+ }
+ })
+ }
+ let requireFields = searches.filter(item => item.required && (!item.value || item.value.length === 0))
if (requireFields.length > 0) {
return
}
let _orderBy = orderBy || setting.order
- let param = UtilsDM.getStatQueryDataParams(setting, statFields, search, _orderBy, BID, this.props.menuType)
+ let param = UtilsDM.getStatQueryDataParams(setting, config.statFields, searches, _orderBy, BID, this.props.menuType)
if (param.func === 'sPC_Get_TableData') {
param.menuname = config.name || ''
@@ -273,7 +331,7 @@
let values = []
if (_data) {
- statFields.forEach(item => {
+ config.statFields.forEach(item => {
if (_data[item.field] || _data[item.field] === 0) {
let val = +_data[item.field]
if (isNaN(val)) {
@@ -366,39 +424,38 @@
}
/**
- * @description 鎸夐挳鎿嶄綔瀹屾垚鍚庯紙鎴愬姛鎴栧け璐ワ級锛岄〉闈㈠埛鏂帮紝閲嶇疆椤电爜鍙婇�夋嫨椤�
- */
- refreshbyaction = (position, btn) => {
- if (position === 'grid' || position === 'view') {
- this.reloadtable(btn)
- }
- }
-
- /**
* @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
*/
- getexceloutparam = () => {
+ queryModuleParam = (menuId, btnId) => {
+ const { mainSearch } = this.props
const { arr_field, config, orderBy, search, setting} = this.state
- return {
+ if (config.uuid !== menuId) return
+
+ let searches = search ? fromJS(search).toJS() : []
+ if (mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
+ let keys = searches.map(item => item.key.toLowerCase())
+ mainSearch.forEach(item => {
+ if (!keys.includes(item.key.toLowerCase())) {
+ searches.push(item)
+ }
+ })
+ }
+
+ MKEmitter.emit('returnModuleParam', config.uuid, btnId, {
arr_field: arr_field,
orderBy: orderBy || setting.order,
- search: search,
+ search: searches,
menuName: config.name
- }
+ })
}
- reloadData = (menuId, id, btn) => {
+ reloadData = (menuId, id) => {
const { config } = this.state
if (config.uuid !== menuId) return
if (id === 'empty') return
- if (id === 'formtab') { // 琛ㄥ崟鏍囩椤靛埛鏂�
- this.reloadtable(btn)
- return
- }
-
if (!id) {
this.reloadtable()
} else {
@@ -422,6 +479,31 @@
}
}
+ /**
+ * @description 鎸夐挳鎵ц瀹屾垚鍚庨〉闈㈠埛鏂�
+ * @param {*} menuId // 鑿滃崟Id
+ * @param {*} position // 鍒锋柊浣嶇疆
+ * @param {*} btn // 鎵ц鐨勬寜閽�
+ */
+ refreshByButtonResult = (menuId, position, btn) => {
+ const { config, BID } = this.state
+
+ if (config.uuid !== menuId) return
+
+ 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'))
+ btn.$tabId && MKEmitter.emit('refreshPopButton', btn.$tabId)
+ }
+ }
+
UNSAFE_componentWillReceiveProps(nextProps) {
const { sync, config, BID } = this.state
@@ -434,13 +516,14 @@
item.key = index
item.$$uuid = item[config.setting.primaryKey] || ''
item.$$BID = BID || ''
+ item.$Index = index + 1 + ''
return item
})
this.setState({sync: false, data: _data})
- } else if (!is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
+ } else if (nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
if (config.setting.syncRefresh === 'true') {
- this.setState({}, () => {
+ this.setState({pageIndex: 1}, () => {
this.reloadtable()
})
}
@@ -454,6 +537,8 @@
componentDidMount () {
MKEmitter.addListener('reloadData', this.reloadData)
MKEmitter.addListener('resetSelectLine', this.resetParentParam)
+ MKEmitter.addListener('queryModuleParam', this.queryModuleParam)
+ MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
}
/**
@@ -465,43 +550,73 @@
}
MKEmitter.removeListener('reloadData', this.reloadData)
MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
+ MKEmitter.removeListener('queryModuleParam', this.queryModuleParam)
+ MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
}
render() {
const { BID, setting, searchlist, actions, config, columns, selectedData } = this.state
return (
- <div className="custom-normal-table">
- <NormalHeader config={config}/>
- {searchlist && searchlist.length ?
- <MainSearch BID={BID} searchlist={searchlist} menuType={this.props.menuType} refreshdata={this.refreshbysearch}/> : null
- }
- <MainAction
- BID={BID}
- setting={setting}
- actions={actions}
- BData={this.state.BData}
- columns={config.columns}
- selectedData={selectedData}
- refreshdata={this.refreshbyaction}
- getexceloutparam={this.getexceloutparam}
- />
- <div className="main-table-box">
- <MainTable
+ <div className="custom-normal-table" style={config.style}>
+ {config.wrap.collapse === 'true' ? <Collapse bordered={false} defaultActiveKey="1" expandIconPosition="right">
+ <Panel forceRender={true} header={<NormalHeader config={config}/>} key="1">
+ {searchlist && searchlist.length ?
+ <MainSearch BID={BID} setting={config.wrap} searchlist={searchlist} menuType={this.props.menuType} refreshdata={this.refreshbysearch}/> : null
+ }
+ <MainAction
+ BID={BID}
+ setting={setting}
+ actions={actions}
+ BData={this.state.BData}
+ columns={config.columns}
+ selectedData={selectedData}
+ />
+ <div className={'main-table-box ' + (!actions || actions.length === 0 ? 'no-action' : '')}>
+ <MainTable
+ setting={setting}
+ columns={columns}
+ MenuID={config.uuid}
+ data={this.state.data}
+ fields={config.columns}
+ total={this.state.total}
+ lineMarks={config.lineMarks}
+ loading={this.state.loading}
+ refreshdata={this.refreshbytable}
+ statFValue={this.state.statFValue}
+ chgSelectData={(selects) => this.setState({selectedData: selects})}
+ />
+ </div>
+ </Panel>
+ </Collapse> : <>
+ <NormalHeader config={config}/>
+ {searchlist && searchlist.length ?
+ <MainSearch BID={BID} setting={config.wrap} searchlist={searchlist} menuType={this.props.menuType} refreshdata={this.refreshbysearch}/> : null
+ }
+ <MainAction
+ BID={BID}
setting={setting}
- columns={columns}
- MenuID={config.uuid}
- data={this.state.data}
- fields={config.columns}
- total={this.state.total}
- lineMarks={config.lineMarks}
- loading={this.state.loading}
- refreshdata={this.refreshbytable}
- statFValue={this.state.statFValue}
- refreshbyaction={this.refreshbyaction}
- chgSelectData={(selects) => this.setState({selectedData: selects})}
+ actions={actions}
+ BData={this.state.BData}
+ columns={config.columns}
+ selectedData={selectedData}
/>
- </div>
+ <div className={'main-table-box ' + (!actions || actions.length === 0 ? 'no-action' : '')}>
+ <MainTable
+ setting={setting}
+ columns={columns}
+ MenuID={config.uuid}
+ data={this.state.data}
+ fields={config.columns}
+ total={this.state.total}
+ lineMarks={config.lineMarks}
+ loading={this.state.loading}
+ refreshdata={this.refreshbytable}
+ statFValue={this.state.statFValue}
+ chgSelectData={(selects) => this.setState({selectedData: selects})}
+ />
+ </div>
+ </>}
</div>
)
}
--
Gitblit v1.8.0