From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/card/table-card/index.jsx | 25 +++++++------------------
1 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/src/tabviews/custom/components/card/table-card/index.jsx b/src/tabviews/custom/components/card/table-card/index.jsx
index bdc334c..314f10b 100644
--- a/src/tabviews/custom/components/card/table-card/index.jsx
+++ b/src/tabviews/custom/components/card/table-card/index.jsx
@@ -20,7 +20,6 @@
data: PropTypes.array, // 缁熶竴鏌ヨ鏁版嵁
config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅
mainSearch: PropTypes.any, // 澶栧眰鎼滅储鏉′欢
- menuType: PropTypes.any, // 鑿滃崟绫诲瀷
}
state = {
@@ -169,20 +168,10 @@
if (config.uuid !== menuId) return
- let supModule = config.setting.supModule
-
- btn.syncComponentId && MKEmitter.emit('reloadData', btn.syncComponentId)
-
- if (!btn.syncComponentId || btn.syncComponentId !== supModule) {
- if (position === 'mainline' || position === 'popclose') { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
- if (supModule && BID) {
- MKEmitter.emit('reloadData', supModule, BID)
- } else {
- this.loadData()
- }
- } else {
- this.loadData()
- }
+ if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
+ MKEmitter.emit('reloadData', config.setting.supModule, BID)
+ } else {
+ this.loadData()
}
if (position === 'popclose') { // 鎵ц鍚姩寮圭獥鐨勬寜閽墍閫夋嫨鐨勫埛鏂伴」
@@ -237,7 +226,7 @@
}
async loadData () {
- const { mainSearch, menuType } = this.props
+ const { mainSearch } = this.props
const { config, arr_field, pageIndex, search, BID, BData } = this.state
if (config.setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
@@ -268,7 +257,7 @@
})
let _orderBy = config.setting.order || ''
- let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, pageIndex, config.setting.pageSize, BID, menuType)
+ let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, pageIndex, config.setting.pageSize, BID)
let result = await Api.genericInterface(param)
if (result.status) {
@@ -429,7 +418,7 @@
<Spin />
</div> : null
}
- <NormalHeader config={config} BID={BID} menuType={this.props.menuType} refresh={this.refreshSearch} />
+ <NormalHeader config={config} BID={BID} refresh={this.refreshSearch} />
{data && data.length > 0 ? <Row className="card-row-list" style={{height: config.wrap.contentHeight}}>
{data.map(item => this.getLines(item))}
</Row> : null}
--
Gitblit v1.8.0