From 76a4300654a18d228838c3f27455dc8e7a8cd616 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 15 一月 2021 17:04:42 +0800
Subject: [PATCH] Merge branch 'master' into bms
---
src/tabviews/custom/components/table/normal-table/index.jsx | 58 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 40 insertions(+), 18 deletions(-)
diff --git a/src/tabviews/custom/components/table/normal-table/index.jsx b/src/tabviews/custom/components/table/normal-table/index.jsx
index 714259b..516709b 100644
--- a/src/tabviews/custom/components/table/normal-table/index.jsx
+++ b/src/tabviews/custom/components/table/normal-table/index.jsx
@@ -399,41 +399,38 @@
}
/**
- * @description 鎸夐挳鎿嶄綔瀹屾垚鍚庯紙鎴愬姛鎴栧け璐ワ級锛岄〉闈㈠埛鏂帮紝閲嶇疆椤电爜鍙婇�夋嫨椤�
- */
- refreshbyaction = (position, btn) => {
- if (position === 'grid' || position === 'view') {
- this.reloadtable(btn)
- }
- }
-
- /**
* @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
*/
getexceloutparam = (menuId, btnId) => {
+ const { mainSearch } = this.props
const { arr_field, config, orderBy, search, setting} = this.state
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('execExcelout', 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 {
@@ -454,6 +451,31 @@
this.loadmaindata(true, 'true')
this.getStatFieldsValue()
})
+ }
+ }
+
+ /**
+ * @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)
}
}
@@ -490,6 +512,7 @@
MKEmitter.addListener('reloadData', this.reloadData)
MKEmitter.addListener('resetSelectLine', this.resetParentParam)
MKEmitter.addListener('getexceloutparam', this.getexceloutparam)
+ MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
}
/**
@@ -502,6 +525,7 @@
MKEmitter.removeListener('reloadData', this.reloadData)
MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
MKEmitter.removeListener('getexceloutparam', this.getexceloutparam)
+ MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
}
render() {
@@ -520,7 +544,6 @@
BData={this.state.BData}
columns={config.columns}
selectedData={selectedData}
- refreshdata={this.refreshbyaction}
/>
<div className={'main-table-box ' + (!actions || actions.length === 0 ? 'no-action' : '')}>
<MainTable
@@ -534,7 +557,6 @@
loading={this.state.loading}
refreshdata={this.refreshbytable}
statFValue={this.state.statFValue}
- refreshbyaction={this.refreshbyaction}
chgSelectData={(selects) => this.setState({selectedData: selects})}
/>
</div>
--
Gitblit v1.8.0