From f6626b05f1275cc2f8ca77f773d4f6a6af1b0a89 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 十一月 2022 16:11:55 +0800
Subject: [PATCH] 2022-11-21
---
src/tabviews/custom/components/form/simple-form/index.jsx | 49 ++++++++++++++++++++++++++-----------------------
1 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/src/tabviews/custom/components/form/simple-form/index.jsx b/src/tabviews/custom/components/form/simple-form/index.jsx
index 74d5900..cecadd1 100644
--- a/src/tabviews/custom/components/form/simple-form/index.jsx
+++ b/src/tabviews/custom/components/form/simple-form/index.jsx
@@ -1,8 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { connect } from 'react-redux'
-import { Spin, notification } from 'antd'
+import { Spin, notification, Modal, Button } from 'antd'
import Api from '@/api'
import UtilsDM from '@/utils/utils-datamanage.js'
@@ -58,8 +57,8 @@
if (config.wrap.datatype !== 'static') {
_sync = config.setting.sync === 'true'
- if (_sync && data && data[config.dataName]) {
- _data = data[config.dataName]
+ if (_sync && data) {
+ _data = data[config.dataName] || {$$empty: true}
if (Array.isArray(_data)) {
_data = _data[0] || {$$empty: true}
}
@@ -71,7 +70,7 @@
let _group = config.subcards[0]
- if (_group.subButton.enable === 'false') {
+ if (_group.subButton.enable === 'false' && (!_group.closeButton || _group.closeButton.enable !== 'true')) {
_group.subButton.style.display = 'none'
_group.$button = 'no-button'
}
@@ -130,7 +129,7 @@
}
this.setState({sync: false, data: _data})
- } else if (config.setting.syncRefresh && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
+ } else if (config.setting.useMSearch && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
this.setState({}, () => {
this.loadData()
})
@@ -196,7 +195,7 @@
execSuccess = (btn, id) => {
if (btn.linkmenu && btn.linkmenu.length > 0) {
let menu_id = btn.linkmenu[btn.linkmenu.length - 1]
- let menu = this.props.permMenus.filter(m => m.MenuID === menu_id)[0] || ''
+ let menu = window.GLOB.mkThdMenus.filter(m => m.MenuID === menu_id)[0] || ''
if (!menu) return
@@ -259,11 +258,18 @@
this.setState({
loading: false,
})
- notification.error({
- top: 92,
- message: result.message,
- duration: 10
- })
+
+ if (result.ErrCode === 'N') {
+ Modal.error({
+ title: result.message,
+ })
+ } else {
+ notification.error({
+ top: 92,
+ message: result.message,
+ duration: 10
+ })
+ }
}
}
@@ -275,6 +281,12 @@
this.formRef.handleConfirm().then(res => {
MKEmitter.emit('triggerFormSubmit', {menuId: btnId, form: res})
})
+ }
+
+ closeTab = () => {
+ const { group } = this.state
+
+ MKEmitter.emit('closeTabView', group.subButton.$MenuID)
}
render() {
@@ -306,20 +318,11 @@
columns={config.columns}
selectedData={data.$$empty ? [] : [data]}
/>
+ {group.closeButton && group.closeButton.enable === 'true' ? <Button type="link" onClick={this.closeTab} style={group.closeButton.style}>{group.closeButton.label}</Button> : null}
</div> : null}
</div>
)
}
}
-const mapStateToProps = (state) => {
- return {
- permMenus: state.permMenus,
- }
-}
-
-const mapDispatchToProps = () => {
- return {}
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(SimpleForm)
\ No newline at end of file
+export default SimpleForm
\ No newline at end of file
--
Gitblit v1.8.0