From 52d2bcad2ad696e1293d3ae53f0d927bee3b7f78 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 05 一月 2024 11:47:32 +0800
Subject: [PATCH] 2024-01-05
---
src/tabviews/custom/components/form/simple-form/index.jsx | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/tabviews/custom/components/form/simple-form/index.jsx b/src/tabviews/custom/components/form/simple-form/index.jsx
index 9f8adb5..2968377 100644
--- a/src/tabviews/custom/components/form/simple-form/index.jsx
+++ b/src/tabviews/custom/components/form/simple-form/index.jsx
@@ -220,26 +220,27 @@
refreshByButtonResult = (menuId, position, btn, id) => {
const { config, group, BID } = this.state
- if (group.uuid !== menuId) return
+ if (config.uuid !== menuId) return
+
+ if (position === 'grid' && config.wrap.refocus) {
+ let _group = fromJS(group).toJS()
+ _group.setting.focus = config.wrap.refocus
+
+ this.setState({
+ group: _group
+ })
+ }
if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) {
MKEmitter.emit('reloadData', config.setting.supModule, BID)
} else if (position === 'grid' && config.wrap.datatype === 'static') {
- if (config.wrap.refocus && group.setting.focus === config.wrap.refocus) {
- let _group = fromJS(group).toJS()
- _group.setting.focus = config.wrap.focus
-
- this.setState({
- group: _group
- })
- }
this.setState({
data: null
}, () => {
this.setState({data: {$$empty: true}})
})
} else {
- this.loadData()
+ this.loadData(position === 'grid')
}
if (id) {
@@ -383,12 +384,12 @@
}
}
- mkFormSubmit = (btnId, callback) => {
+ mkFormSubmit = (btnId, callback, formId) => {
const { group } = this.state
if (group.uuid !== btnId) return
- this.formRef.handleConfirm().then(res => {
+ this.formRef.handleConfirm(formId).then(res => {
MKEmitter.emit('triggerFormSubmit', {menuId: btnId, form: res})
}, () => {
callback && callback()
@@ -432,7 +433,7 @@
data={data}
action={group}
unload={config.setting.supModule && !BID}
- inputSubmit={() => this.mkFormSubmit(group.uuid)}
+ inputSubmit={(id) => this.mkFormSubmit(group.uuid, null, id)}
wrappedComponentRef={(inst) => this.formRef = inst}
/> : null}
{data ? <div className={'mk-form-action ' + (group.$button || '')}>
--
Gitblit v1.8.0