From c683346efce70ebdecc89c1bd7bb0f412a9ba617 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 19 七月 2023 17:13:49 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/table/edit-table/index.jsx | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/src/tabviews/custom/components/table/edit-table/index.jsx b/src/tabviews/custom/components/table/edit-table/index.jsx
index f21a620..cbbbbed 100644
--- a/src/tabviews/custom/components/table/edit-table/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/index.jsx
@@ -262,16 +262,31 @@
})
MKEmitter.emit('transferData', config.uuid, data)
+
+ if (result.message) {
+ if (result.ErrCode === 'Y') {
+ Modal.success({
+ title: result.message
+ })
+ } else if (result.ErrCode === 'S') {
+ notification.success({
+ top: 92,
+ message: result.message,
+ duration: 2
+ })
+ }
+ }
} else {
this.setState({
loading: false
})
+ if (!result.message) return
if (result.ErrCode === 'N') {
Modal.error({
title: result.message,
})
- } else {
+ } else if (result.ErrCode !== '-2') {
notification.error({
top: 92,
message: result.message,
@@ -496,10 +511,6 @@
} else {
this.reloadtable(btn)
}
-
- if (position === 'popclose') { // 鎵ц鍚姩寮圭獥鐨勬寜閽墍閫夋嫨鐨勫埛鏂伴」
- btn.$tabId && MKEmitter.emit('refreshPopButton', btn.$tabId)
- }
}
refreshLineData = (menuId, btn, uuid, count) => {
@@ -507,15 +518,17 @@
if (config.uuid !== menuId) return
- let _data = fromJS(this.state.data).toJS().forEach(item => {
+ let _data = fromJS(this.state.data).toJS().map(item => {
if (item.$$uuid === uuid) {
item[btn.field] = count
}
+ return item
})
- let _selectedData = fromJS(this.state.selectedData).toJS().forEach(item => {
+ let _selectedData = fromJS(this.state.selectedData).toJS().map(item => {
if (item.$$uuid === uuid) {
item[btn.field] = count
}
+ return item
})
this.setState({
--
Gitblit v1.8.0