From 5046d0d13dc6a8563b8e54e31913bc44cfa1072f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 26 四月 2022 19:23:18 +0800
Subject: [PATCH] 2022-04-26
---
src/tabviews/custom/components/table/normal-table/index.jsx | 62 +++++++++++++++++++-----------
1 files changed, 39 insertions(+), 23 deletions(-)
diff --git a/src/tabviews/custom/components/table/normal-table/index.jsx b/src/tabviews/custom/components/table/normal-table/index.jsx
index 72585ec..8337aed 100644
--- a/src/tabviews/custom/components/table/normal-table/index.jsx
+++ b/src/tabviews/custom/components/table/normal-table/index.jsx
@@ -71,6 +71,8 @@
if (setting.selected !== 'always' && setting.selected !== 'init') {
setting.selected = 'false'
+ } else {
+ setting.orisel = true
}
if (_config.setting.sync === 'true' && data) {
@@ -110,14 +112,15 @@
}
_config.columns.forEach(item => {
+ if (item.type !== 'number') return
_cols.set(item.field, item)
})
_config.cols.forEach(column => {
if (column.type === 'custom') {
column.elements = column.elements.map(item => {
- if (item.field && _cols.has(item.field)) {
- item.col = _cols.get(item.field)
+ if (item.eleType === 'number' && item.field && _cols.has(item.field) && typeof(item.decimal) !== 'number') {
+ item.decimal = _cols.get(item.field).decimal || 0
}
return item
})
@@ -155,8 +158,10 @@
search: Utils.initMainSearch(_config.search) // 鎼滅储鏉′欢鍒濆鍖栵紙鍚湁鏃堕棿鏍煎紡锛岄渶瑕佽浆鍖栵級
}, () => {
if (_config.setting.sync !== 'true' && _config.setting.onload === 'true') {
- this.loadmaindata()
- this.getStatFieldsValue()
+ setTimeout(() => {
+ this.loadmaindata()
+ this.getStatFieldsValue()
+ }, _config.setting.delay || 0)
} else if (_config.setting.onload === 'true') {
this.getStatFieldsValue()
}
@@ -168,7 +173,7 @@
* @param { Boolean } reset 琛ㄦ牸鏄惁閲嶇疆
* @param { String } repage 琛ㄦ牸鏄惁閲嶇疆椤电爜
*/
- async loadmaindata (reset, repage) {
+ async loadmaindata (reset, repage, id) {
const { mainSearch } = this.props
const { setting, config, arr_field, search, orderBy, BID, pageIndex, pageSize, BData } = this.state
@@ -178,6 +183,7 @@
selectedData: [],
total: 0
})
+
MKEmitter.emit('resetSelectLine', config.uuid, '', '') // 骞挎挱鏁版嵁鍒囨崲
reset && MKEmitter.emit('resetTable', config.uuid, repage) // 鍒楄〃閲嶇疆
if (setting.$hasSyncModule) {
@@ -210,9 +216,9 @@
let result = await Api.genericInterface(param)
if (result.status) {
- if (setting.selected !== 'false' && result.data && result.data.length > 0) {
+ if ((setting.selected !== 'false' || (setting.orisel && id)) && result.data && result.data.length > 0) {
setTimeout(() => {
- MKEmitter.emit('mkCheckTopLine', config.uuid)
+ MKEmitter.emit('mkCheckTopLine', config.uuid, id)
}, 200)
if (setting.selected === 'init') {
this.setState({setting: {...setting, selected: 'false'}})
@@ -317,6 +323,8 @@
} catch (e) {
console.warn('鏁版嵁鏌ヨ閿欒')
}
+
+ MKEmitter.emit('resetSelectLine', config.uuid, _data.$$uuid || '', _data)
}
this.setState({
@@ -453,16 +461,16 @@
/**
* @description 琛ㄦ牸鍒锋柊
*/
- reloadtable = (btn) => {
+ reloadtable = (btn, id) => {
if (!btn || btn.resetPageIndex !== 'false') {
this.setState({
pageIndex: 1
}, () => {
- this.loadmaindata(true, 'true')
+ this.loadmaindata(true, 'true', id)
this.getStatFieldsValue()
})
} else {
- this.loadmaindata(true, 'false')
+ this.loadmaindata(true, 'false', id)
this.getStatFieldsValue()
}
}
@@ -498,7 +506,6 @@
const { config } = this.state
if (config.uuid !== menuId) return
- if (id === 'empty') return
if (!id) {
this.reloadtable()
@@ -534,20 +541,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, id)
+ }
+ } else if (position === 'mainline' || position === 'popclose') { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
+ if (supModule && BID) {
+ MKEmitter.emit('reloadData', supModule, BID)
+ } else {
+ this.reloadtable(btn, id)
+ }
+ } else {
+ this.reloadtable(btn, id)
+ }
}
- 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)
}
}
--
Gitblit v1.8.0