From e657b7ed2c047af4b54cbc26e5ac66cb7656dbb5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 12 十月 2022 12:13:05 +0800
Subject: [PATCH] 2022-10-12
---
src/tabviews/custom/components/form/simple-form/index.jsx | 46 +++++++++++++++++++++++++---------------------
1 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/src/tabviews/custom/components/form/simple-form/index.jsx b/src/tabviews/custom/components/form/simple-form/index.jsx
index 151cf82..5711995 100644
--- a/src/tabviews/custom/components/form/simple-form/index.jsx
+++ b/src/tabviews/custom/components/form/simple-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 } from 'antd'
import Api from '@/api'
@@ -19,11 +18,9 @@
class SimpleForm extends Component {
static propTpyes = {
- BID: PropTypes.any, // 鐖剁骇Id
data: PropTypes.array, // 缁熶竴鏌ヨ鏁版嵁
config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅
mainSearch: PropTypes.any, // 澶栧眰鎼滅储鏉′欢
- menuType: PropTypes.any, // 鑿滃崟绫诲瀷
}
state = {
@@ -39,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'
@@ -132,7 +141,7 @@
if (config.uuid !== menuId) return
- this.loadData('refresh')
+ this.loadData()
}
/**
@@ -186,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
@@ -203,11 +212,16 @@
}
}
- async loadData (type) {
- const { mainSearch, menuType } = this.props
+ async loadData () {
+ 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
}, () => {
@@ -228,7 +242,7 @@
})
let _orderBy = config.setting.order || ''
- let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, 1, 1, BID, menuType)
+ let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, 1, 1, BID)
let result = await Api.genericInterface(param)
if (result.status) {
@@ -297,14 +311,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