From 1d1ef9c117f162f5ee48237b67d69fbd015b10d1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 23 七月 2023 10:32:40 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/interfaces/interItem/index.jsx | 48 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 44 insertions(+), 4 deletions(-)
diff --git a/src/tabviews/custom/components/interfaces/interItem/index.jsx b/src/tabviews/custom/components/interfaces/interItem/index.jsx
index ab62d9b..7e8c885 100644
--- a/src/tabviews/custom/components/interfaces/interItem/index.jsx
+++ b/src/tabviews/custom/components/interfaces/interItem/index.jsx
@@ -39,9 +39,13 @@
}
}
- setTimeout(() => {
- this.loadData()
- }, config.setting.delay)
+ if (config.setting.onload !== 'false') {
+ setTimeout(() => {
+ this.loadData()
+ }, config.setting.delay)
+ } else {
+ MKEmitter.addListener('initFinish', this.initFinish)
+ }
MKEmitter.addListener('reloadData', this.reloadData)
MKEmitter.addListener('resetSelectLine', this.resetParentParam)
@@ -57,8 +61,21 @@
return
}
this.timer && this.timer.stop()
+ MKEmitter.removeListener('initFinish', this.initFinish)
MKEmitter.removeListener('reloadData', this.reloadData)
MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
+ }
+
+ initFinish = (MenuID) => {
+ const { config } = this.props
+
+ if (config.MenuID !== MenuID) return
+
+ if (config.setting.onload === 'false') {
+ setTimeout(() => {
+ this.loadData()
+ }, config.setting.delay)
+ }
}
resetParentParam = (MenuID, id) => {
@@ -111,21 +128,44 @@
MKEmitter.emit('mkPublicData', config.uuid, _data)
MKEmitter.emit('resetSelectLine', config.uuid, _data.$$uuid, _data)
+
+ if (config.setting.loadlevel === 'init') {
+ MKEmitter.emit('interFinish', config.MenuID, config.uuid)
+ }
+
+ 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.loading = false
this.timer && this.timer.stop()
+ 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,
duration: 10
})
}
+
+ if (config.setting.loadlevel === 'init') {
+ MKEmitter.emit('interFinish', config.MenuID, config.uuid)
+ }
}
}
--
Gitblit v1.8.0