From d72bf2b2b0b0378cf95bc8e548f41b5ab4122db4 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 14 七月 2023 15:16:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/form/simple-form/index.jsx | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/tabviews/custom/components/form/simple-form/index.jsx b/src/tabviews/custom/components/form/simple-form/index.jsx
index 96156c2..4d1bb99 100644
--- a/src/tabviews/custom/components/form/simple-form/index.jsx
+++ b/src/tabviews/custom/components/form/simple-form/index.jsx
@@ -158,7 +158,7 @@
if (group.uuid !== menuId) return
- if (position === 'mainline' && config.setting.supModule && BID) {
+ if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) {
MKEmitter.emit('reloadData', config.setting.supModule, BID)
} else {
this.loadData()
@@ -226,6 +226,7 @@
}, () => {
this.setState({data: {$$empty: true}})
})
+ MKEmitter.emit('resetSelectLine', config.uuid, '', '')
return
}
@@ -255,16 +256,33 @@
}, () => {
this.setState({data: _data})
})
+
+ MKEmitter.emit('resetSelectLine', config.uuid, _data.$$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,
--
Gitblit v1.8.0