From 53b9fb93d0376eb02bb996935f1720b4e95cd897 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期三, 12 十月 2022 14:41:06 +0800 Subject: [PATCH] 2022-10-12 --- src/tabviews/custom/components/form/step-form/index.jsx | 37 +++++++++++++++++++++---------------- 1 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/tabviews/custom/components/form/step-form/index.jsx b/src/tabviews/custom/components/form/step-form/index.jsx index 91eb195..d942371 100644 --- a/src/tabviews/custom/components/form/step-form/index.jsx +++ b/src/tabviews/custom/components/form/step-form/index.jsx @@ -1,7 +1,6 @@ import React, {Component} from 'react' import PropTypes from 'prop-types' import { is, fromJS } from 'immutable' -import { connect } from 'react-redux' import { Spin, notification, Button } from 'antd' import Api from '@/api' @@ -18,7 +17,6 @@ class StepForm extends Component { static propTpyes = { - BID: PropTypes.any, // 鐖剁骇Id data: PropTypes.array, // 缁熶竴鏌ヨ鏁版嵁 config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅 mainSearch: PropTypes.any, // 澶栧眰鎼滅储鏉′欢 @@ -37,11 +35,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' @@ -234,7 +244,7 @@ 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 @@ -255,7 +265,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 }, () => { @@ -395,14 +410,4 @@ } } -const mapStateToProps = (state) => { - return { - permMenus: state.permMenus, - } -} - -const mapDispatchToProps = () => { - return {} -} - -export default connect(mapStateToProps, mapDispatchToProps)(StepForm) \ No newline at end of file +export default StepForm \ No newline at end of file -- Gitblit v1.8.0