From 402ff95c839ef311bbf521de093d4123c9fd174c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 16 十一月 2023 11:27:04 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/form/simple-form/index.jsx | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/tabviews/custom/components/form/simple-form/index.jsx b/src/tabviews/custom/components/form/simple-form/index.jsx
index ebb2f97..6b082d1 100644
--- a/src/tabviews/custom/components/form/simple-form/index.jsx
+++ b/src/tabviews/custom/components/form/simple-form/index.jsx
@@ -222,24 +222,25 @@
if (group.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) {
--
Gitblit v1.8.0