From 1a11f7115e61c548f9ffc77d0a9e504307ca71b2 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 24 八月 2021 18:37:20 +0800
Subject: [PATCH] 2021-08-24
---
src/tabviews/custom/components/form/normal-form/index.jsx | 54 +++++++++++++++++++++---------------------------------
1 files changed, 21 insertions(+), 33 deletions(-)
diff --git a/src/tabviews/custom/components/form/normal-form/index.jsx b/src/tabviews/custom/components/form/normal-form/index.jsx
index dfc65f7..54a0d90 100644
--- a/src/tabviews/custom/components/form/normal-form/index.jsx
+++ b/src/tabviews/custom/components/form/normal-form/index.jsx
@@ -186,7 +186,7 @@
if (config.uuid !== menuId) return
- this.loadData(null, 'refresh')
+ this.loadData('refresh')
}
/**
@@ -205,7 +205,7 @@
}
if (config.wrap.datatype !== 'static' && config.setting) {
- this.loadData(btn)
+ this.loadData()
}
if (id) {
@@ -266,7 +266,7 @@
}
}
- async loadData (btn, type) {
+ async loadData (type) {
const { mainSearch, menuType } = this.props
const { config, arr_field, BID, group } = this.state
@@ -274,7 +274,6 @@
this.setState({
data: {}
})
- btn && this.execSuccess(btn)
return
}
@@ -282,7 +281,6 @@
let requireFields = searches.filter(item => item.required && item.value === '')
if (requireFields.length > 0) {
- btn && this.execSuccess(btn)
return
}
@@ -296,34 +294,25 @@
let result = await Api.genericInterface(param)
if (result.status) {
let _data = result.data && result.data[0] ? result.data[0] : {}
+ let _group = group
- if (btn) {
- this.setState({
- data: _data || {},
- loading: false
- })
- this.execSuccess(btn)
- } else {
- let _group = group
-
- if (type === 'refresh') {
- _group = config.subcards[0]
- }
-
- if (config.wrap.statusControl && _data[config.wrap.statusControl]) {
- let _status = _data[config.wrap.statusControl]
- let _groups = config.subcards.filter(item => item.setting.status === _status)[0]
- _group = _groups || _group
- }
- this.setState({
- group: null,
- step: _group.sort - 1,
- data: _data || {},
- loading: false
- }, () => {
- this.setState({group: _group})
- })
+ if (type === 'refresh') {
+ _group = config.subcards[0]
}
+
+ if (config.wrap.statusControl && _data[config.wrap.statusControl]) {
+ let _status = _data[config.wrap.statusControl]
+ let _groups = config.subcards.filter(item => item.setting.status === _status)[0]
+ _group = _groups || _group
+ }
+ this.setState({
+ group: null,
+ step: _group.sort - 1,
+ data: _data || {},
+ loading: false
+ }, () => {
+ this.setState({group: _group})
+ })
} else {
this.setState({
loading: false,
@@ -333,7 +322,6 @@
message: result.message,
duration: 10
})
- btn && this.execSuccess(btn)
}
}
@@ -393,7 +381,7 @@
dict={dict}
data={data}
action={group}
- inputSubmit={this.handleOk}
+ inputSubmit={() => this.mkFormSubmit(group.uuid)}
wrappedComponentRef={(inst) => this.formRef = inst}
/> : null}
{group && data ? <div className={'mk-form-action ' + (group.$button || '')}>
--
Gitblit v1.8.0