From d0e8c7cb64d7d219f7cfec8bc87cf699b9cfe7b2 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 08 十一月 2022 12:35:25 +0800
Subject: [PATCH] 2022-11-08
---
src/tabviews/custom/components/form/simple-form/index.jsx | 58 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 35 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 35fd004..31331d5 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 } from 'antd'
import Api from '@/api'
import UtilsDM from '@/utils/utils-datamanage.js'
@@ -19,7 +18,6 @@
class SimpleForm extends Component {
static propTpyes = {
- BID: PropTypes.any, // 鐖剁骇Id
data: PropTypes.array, // 缁熶竴鏌ヨ鏁版嵁
config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅
mainSearch: PropTypes.any, // 澶栧眰鎼滅储鏉′欢
@@ -38,11 +36,23 @@
}
UNSAFE_componentWillMount () {
- const { data, BID, BData } = this.props
+ const { data } = this.props
let config = fromJS(this.props.config).toJS()
let _data = null
let _sync = false
+
+ let BID = ''
+ let BData = ''
+
+ if (config.setting.supModule) {
+ BData = window.GLOB.CacheData.get(config.setting.supModule)
+ } else {
+ BData = window.GLOB.CacheData.get(config.$pageId)
+ }
+ if (BData) {
+ BID = BData.$BID || ''
+ }
if (config.wrap.datatype !== 'static') {
_sync = config.setting.sync === 'true'
@@ -119,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()
})
@@ -185,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
@@ -206,7 +216,12 @@
const { mainSearch } = this.props
const { config, arr_field, BID } = this.state
- if (config.wrap.datatype === 'static' || (config.setting.supModule && !BID)) {
+ if (config.wrap.datatype === 'static') {
+ this.setState({
+ data: {$$empty: true}
+ })
+ return
+ } else if (config.setting.supModule && !BID) {
this.setState({
data: null
}, () => {
@@ -243,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
+ })
+ }
}
}
@@ -296,14 +318,4 @@
}
}
-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