From 729fb5e7f41f45c6962993d86c3a4eb81c2c784b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 10 六月 2025 23:06:06 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/form/simple-form/index.jsx | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/tabviews/custom/components/form/simple-form/index.jsx b/src/tabviews/custom/components/form/simple-form/index.jsx
index b62d1ab..fc9822d 100644
--- a/src/tabviews/custom/components/form/simple-form/index.jsx
+++ b/src/tabviews/custom/components/form/simple-form/index.jsx
@@ -308,7 +308,9 @@
})
} else {
this.setState({ BID: id, BData: data }, () => {
- this.loadData()
+ if (config.wrap.datatype !== 'public') {
+ this.loadData()
+ }
})
}
}
@@ -401,12 +403,12 @@
}
}
- mkFormSubmit = (btnId, callback, formId) => {
+ mkFormSubmit = (btnId, callback, formId, errId) => {
const { group } = this.state
if (group.uuid !== btnId) return
- this.formRef.handleConfirm(formId).then(res => {
+ this.formRef.handleConfirm(formId, errId).then(res => {
MKEmitter.emit('triggerFormSubmit', {menuId: btnId, form: res})
}, () => {
callback && callback()
@@ -417,6 +419,14 @@
const { group } = this.state
MKEmitter.emit('closeTabView', group.subButton.$MenuID)
+
+ let tabId = ''
+ if (group.closeButton.refreshTab && group.closeButton.refreshTab.length > 0 && window.GLOB.appType !== 'pc') {
+ tabId = group.closeButton.refreshTab[group.closeButton.refreshTab.length - 1]
+ }
+ if (tabId && group.subButton.$MenuID !== tabId) { // 鍒锋柊褰撳墠鑿滃崟鏃舵棤鏁�
+ MKEmitter.emit('reloadMenuView', tabId)
+ }
}
resetTab = () => {
@@ -450,7 +460,7 @@
data={data}
action={group}
unload={config.setting.supModule && !BID}
- inputSubmit={(id) => this.mkFormSubmit(group.uuid, null, id)}
+ inputSubmit={(id, errId) => this.mkFormSubmit(group.uuid, null, id, errId)}
wrappedComponentRef={(inst) => this.formRef = inst}
/> : null}
{data ? <div className={'mk-form-action ' + (group.$button || '')}>
--
Gitblit v1.8.0