From f07c42a322f41e14ef5b1bf8f2fd66fc5d338cdd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 28 六月 2023 18:17:09 +0800
Subject: [PATCH] 2023-06-28
---
src/tabviews/custom/components/form/step-form/index.jsx | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/src/tabviews/custom/components/form/step-form/index.jsx b/src/tabviews/custom/components/form/step-form/index.jsx
index f3711b3..50d09cc 100644
--- a/src/tabviews/custom/components/form/step-form/index.jsx
+++ b/src/tabviews/custom/components/form/step-form/index.jsx
@@ -62,6 +62,7 @@
_data = _data[0] || {$$empty: true}
}
_sync = false
+ _data.$$uuid = _data[config.setting.primaryKey] || ''
}
} else {
_data = {$$empty: true}
@@ -97,8 +98,8 @@
let _group = config.subcards[0]
- if (_data && config.wrap.statusControl && _data[config.wrap.statusControl]) {
- let _status = _data[config.wrap.statusControl]
+ if (_data && config.wrap.statusControl && _data[config.wrap.statusControl] !== undefined) {
+ let _status = _data[config.wrap.statusControl] + ''
let _groups = config.subcards.filter(item => item.setting.status === _status)[0]
_group = _groups || _group
@@ -169,8 +170,10 @@
}
}
- if (config.wrap.statusControl && _data[config.wrap.statusControl]) {
- let _status = _data[config.wrap.statusControl]
+ _data.$$uuid = _data[config.setting.primaryKey] || ''
+
+ if (config.wrap.statusControl && _data[config.wrap.statusControl] !== undefined) {
+ let _status = _data[config.wrap.statusControl] + ''
let _groups = config.subcards.filter(item => item.setting.status === _status)[0]
_group = _groups || _group
}
@@ -304,12 +307,14 @@
let _data = result.data && result.data[0] ? result.data[0] : {$$empty: true}
let _group = this.state.group
+ _data.$$uuid = _data[config.setting.primaryKey] || ''
+
if (type === 'refresh') {
_group = config.subcards[0]
}
- if (config.wrap.statusControl && _data[config.wrap.statusControl]) {
- let _status = _data[config.wrap.statusControl]
+ if (config.wrap.statusControl && _data[config.wrap.statusControl] !== undefined) {
+ let _status = _data[config.wrap.statusControl] + ''
let _groups = config.subcards.filter(item => item.setting.status === _status)[0]
_group = _groups || _group
}
@@ -328,16 +333,31 @@
}, () => {
this.setState({group: _group})
})
+
+ if (result.message) {
+ if (result.ErrCode === 'Y') {
+ Modal.success({
+ title: result.message
+ })
+ } else if (result.ErrCode === 'S') {
+ notification.success({
+ top: 92,
+ message: result.message,
+ duration: 2
+ })
+ }
+ }
} else {
this.setState({
loading: false,
})
+ if (!result.message) return
if (result.ErrCode === 'N') {
Modal.error({
title: result.message,
})
- } else {
+ } else if (result.ErrCode !== '-2') {
notification.error({
top: 92,
message: result.message,
@@ -391,6 +411,7 @@
const { config, loading, BID, BData, data, group, dict, step } = this.state
if (config.wrap.empty === 'hidden' && (!data || data.$$empty)) return null
+ if (config.idCtrl && (!data || data.$$empty)) return null
return (
<div className="custom-normal-form-box" id={'anchor' + config.uuid} style={{...config.style}}>
--
Gitblit v1.8.0