From 8801918dc8ecaf6d3436c1d23b5ad3c09cb6c4db Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 15 十一月 2023 14:54:01 +0800
Subject: [PATCH] 2023-11-15
---
src/tabviews/custom/components/form/step-form/index.scss | 3 +++
src/tabviews/custom/components/form/step-form/index.jsx | 2 +-
src/tabviews/custom/components/form/simple-form/index.jsx | 19 ++++++++++---------
3 files changed, 14 insertions(+), 10 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) {
diff --git a/src/tabviews/custom/components/form/step-form/index.jsx b/src/tabviews/custom/components/form/step-form/index.jsx
index 442829d..2b7de64 100644
--- a/src/tabviews/custom/components/form/step-form/index.jsx
+++ b/src/tabviews/custom/components/form/step-form/index.jsx
@@ -493,7 +493,7 @@
inputSubmit={() => this.mkFormSubmit(group.uuid)}
wrappedComponentRef={(inst) => this.formRef = inst}
/> : null}
- {group && data ? <div className={'mk-form-action ' + (group.$button || '')}>
+ {group && data ? <div className={'mk-form-action ' + (group.$button || '') + (group.nextButton.enable === 'true' ? ' has-skip' : '')}>
{group.prevButton.enable === 'true' ? <Button type="link" className="prev" onClick={this.prevStep} style={group.prevButton.style}>{group.prevButton.label}</Button> : null}
<NormalButton
BID={BID}
diff --git a/src/tabviews/custom/components/form/step-form/index.scss b/src/tabviews/custom/components/form/step-form/index.scss
index 8a2908a..6638ab3 100644
--- a/src/tabviews/custom/components/form/step-form/index.scss
+++ b/src/tabviews/custom/components/form/step-form/index.scss
@@ -84,6 +84,9 @@
padding: 0;
height: 0;
}
+ .mk-form-action.has-skip {
+ padding-right: 50px;
+ }
.loading-mask {
position: absolute;
--
Gitblit v1.8.0