From d72bf2b2b0b0378cf95bc8e548f41b5ab4122db4 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 14 七月 2023 15:16:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/form/simple-form/index.jsx | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/src/tabviews/custom/components/form/simple-form/index.jsx b/src/tabviews/custom/components/form/simple-form/index.jsx
index 336de9c..4d1bb99 100644
--- a/src/tabviews/custom/components/form/simple-form/index.jsx
+++ b/src/tabviews/custom/components/form/simple-form/index.jsx
@@ -63,6 +63,7 @@
_data = _data[0] || {$$empty: true}
}
_sync = false
+ _data.$$uuid = _data[config.setting.primaryKey] || ''
}
} else {
_data = {$$empty: true}
@@ -128,6 +129,8 @@
}
}
+ _data.$$uuid = _data[config.setting.primaryKey] || ''
+
this.setState({sync: false, data: _data})
} else if (config.setting.useMSearch && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
this.setState({}, () => {
@@ -155,7 +158,7 @@
if (group.uuid !== menuId) return
- if (position === 'mainline' && config.setting.supModule && BID) {
+ if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) {
MKEmitter.emit('reloadData', config.setting.supModule, BID)
} else {
this.loadData()
@@ -223,6 +226,7 @@
}, () => {
this.setState({data: {$$empty: true}})
})
+ MKEmitter.emit('resetSelectLine', config.uuid, '', '')
return
}
@@ -244,22 +248,41 @@
if (result.status) {
let _data = result.data && result.data[0] ? result.data[0] : {$$empty: true}
+ _data.$$uuid = _data[config.setting.primaryKey] || ''
+
this.setState({
data: null,
loading: false
}, () => {
this.setState({data: _data})
})
+
+ MKEmitter.emit('resetSelectLine', config.uuid, _data.$$uuid, _data)
+
+ 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,
@@ -289,6 +312,7 @@
const { config, loading, BID, BData, data, group, dict } = this.state
if (config.wrap.empty === 'hidden' && (!data || data.$$empty)) return null
+ if (config.idCtrl && (!data || data.$$empty)) return null
return (
<div className="custom-simple-form-box" id={'anchor' + config.uuid} style={{...config.style}}>
--
Gitblit v1.8.0