From ba9e189dd33c8d48f7f4ac36bcefeef9afb426f8 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期一, 17 七月 2023 23:40:49 +0800 Subject: [PATCH] 2023-07-17 --- src/tabviews/custom/components/form/step-form/index.jsx | 34 ++++++++++++++++++++++++++-------- 1 files changed, 26 insertions(+), 8 deletions(-) diff --git a/src/tabviews/custom/components/form/step-form/index.jsx b/src/tabviews/custom/components/form/step-form/index.jsx index 83349ad..3965ad6 100644 --- a/src/tabviews/custom/components/form/step-form/index.jsx +++ b/src/tabviews/custom/components/form/step-form/index.jsx @@ -98,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 @@ -172,8 +172,8 @@ _data.$$uuid = _data[config.setting.primaryKey] || '' - 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 } @@ -205,7 +205,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() @@ -285,6 +285,7 @@ }, () => { this.setState({data: {$$empty: true}}) }) + MKEmitter.emit('resetSelectLine', config.uuid, '', '') return } @@ -313,8 +314,8 @@ _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 } @@ -333,16 +334,33 @@ }, () => { this.setState({group: _group}) }) + + 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, -- Gitblit v1.8.0