From 5ff23c882da8bd2dca0848ae1a97d23f6bfecd9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 27 六月 2021 23:10:07 +0800
Subject: [PATCH] 2021-06-27
---
src/tabviews/custom/components/form/normal-form/index.jsx | 153 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 106 insertions(+), 47 deletions(-)
diff --git a/src/tabviews/custom/components/form/normal-form/index.jsx b/src/tabviews/custom/components/form/normal-form/index.jsx
index d94b17b..b0e13a5 100644
--- a/src/tabviews/custom/components/form/normal-form/index.jsx
+++ b/src/tabviews/custom/components/form/normal-form/index.jsx
@@ -3,10 +3,9 @@
import { is, fromJS } from 'immutable'
import { connect } from 'react-redux'
import { Spin, notification, Button } from 'antd'
-// import moment from 'moment'
import Api from '@/api'
-// import Utils from '@/utils/utils.js'
+import Utils from '@/utils/utils.js'
import UtilsDM from '@/utils/utils-datamanage.js'
import asyncComponent from '@/utils/asyncComponent'
import asyncSpinComponent from '@/utils/asyncSpinComponent'
@@ -33,7 +32,6 @@
BID: '', // 涓婄骇ID
config: null, // 鍥捐〃閰嶇疆淇℃伅
loading: false, // 鏁版嵁鍔犺浇鐘舵��
- activeKey: '', // 閫変腑鏁版嵁
sync: false, // 鏄惁缁熶竴璇锋眰鏁版嵁
data: null, // 鏁版嵁
group: null,
@@ -41,12 +39,13 @@
}
UNSAFE_componentWillMount () {
- const { data, BID, config } = this.props
+ const { data, BID } = this.props
+ let config = fromJS(this.props.config).toJS()
let _data = null
let _sync = false
- if (config.setting && config.wrap.datatype !== 'static') {
+ if (config.wrap.datatype !== 'static') {
_sync = config.setting.sync === 'true'
if (_sync && data && data[config.dataName]) {
@@ -60,13 +59,42 @@
_data = {}
}
+ if (!config.wrap.groupLabel) {
+ if (config.subcards.length > 1) {
+ config.wrap.groupLabel = 'show'
+ } else {
+ config.wrap.groupLabel = 'hidden'
+ }
+ }
+
+ let roleId = sessionStorage.getItem('role_id') || ''
+
config.subcards = config.subcards.map(group => {
group.subButton.uuid = group.uuid
group.subButton.$menuId = group.uuid
group.subButton.Ot = 'requiredSgl'
- group.subButton.btnstyle = group.subButton.style
+ group.subButton.$forbid = true
group.subButton.OpenType = 'formSubmit'
group.subButton.execError = 'never'
+
+ group.fields = group.fields.map(cell => {
+ // 鏁版嵁婧恠ql璇彞锛岄澶勭悊锛屾潈闄愰粦鍚嶅崟瀛楁璁剧疆涓洪殣钘忚〃鍗�
+ if (['select', 'link', 'multiselect', 'radio', 'checkbox', 'checkcard'].includes(cell.type) && cell.resourceType === '1') {
+ let _option = Utils.getSelectQueryOptions(cell)
+
+ cell.data_sql = Utils.formatOptions(_option.sql)
+ cell.base_sql = window.btoa(window.encodeURIComponent(_option.sql))
+ cell.arr_field = _option.field
+ }
+
+ // 瀛楁鏉冮檺榛戝悕鍗�
+ if (!cell.blacklist || !roleId || cell.blacklist.length === 0) return cell
+ if (cell.blacklist.filter(v => roleId.indexOf(v) > -1).length > 0) {
+ cell.hidden = 'true'
+ }
+
+ return cell
+ })
return group
})
@@ -96,6 +124,7 @@
}
componentDidMount () {
+ MKEmitter.addListener('reloadData', this.reloadData)
MKEmitter.addListener('mkFormSubmit', this.mkFormSubmit)
MKEmitter.addListener('resetSelectLine', this.resetParentParam)
MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
@@ -109,6 +138,7 @@
this.setState = () => {
return
}
+ MKEmitter.removeListener('reloadData', this.reloadData)
MKEmitter.removeListener('mkFormSubmit', this.mkFormSubmit)
MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
@@ -136,13 +166,19 @@
}
this.setState({sync: false, data: _data, group: _group, step: _group.sort - 1,})
- } else if (nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
- if (config.wrap.datatype !== 'static' && config.setting.syncRefresh === 'true') {
- this.setState({}, () => {
- this.loadData()
- })
- }
+ } else if (config.setting.syncRefresh && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
+ this.setState({}, () => {
+ this.loadData()
+ })
}
+ }
+
+ reloadData = (menuId, id) => {
+ const { config } = this.state
+
+ if (config.uuid !== menuId) return
+
+ this.loadData(null, 'refresh')
}
/**
@@ -159,6 +195,26 @@
if (btn.syncComponentId && btn.syncComponentId !== config.uuid && btn.syncComponentId !== config.setting.supModule) {
MKEmitter.emit('reloadData', btn.syncComponentId) // 鍚岀骇鏍囩鍒锋柊
}
+
+ if (config.wrap.datatype !== 'static' && config.setting) {
+ this.loadData(btn)
+ } else {
+ this.execSuccess(btn)
+ }
+ }
+
+ resetParentParam = (MenuID, id) => {
+ const { config } = this.state
+ if (config.wrap.datatype === 'static' || !config.setting.supModule || config.setting.supModule !== MenuID) return
+ if (id !== this.state.BID) {
+ this.setState({ BID: id }, () => {
+ this.loadData()
+ })
+ }
+ }
+
+ execSuccess = (btn) => {
+ const { config, group } = this.state
if (config.subcards.length > group.sort) {
let _group = config.subcards.filter(item => item.sort === (group.sort + 1))[0]
@@ -197,36 +253,24 @@
}
}
- resetParentParam = (MenuID, id) => {
- const { config } = this.state
- if (config.wrap.datatype === 'static' || !config.setting.supModule || config.setting.supModule !== MenuID) return
- if (id !== this.state.BID) {
- this.setState({ BID: id }, () => {
- this.loadData()
- })
- }
- }
-
- async loadData () {
+ async loadData (btn, type) {
const { mainSearch, menuType } = this.props
const { config, arr_field, BID, group } = this.state
if (config.wrap.datatype === 'static' || (config.setting.supModule && !BID)) {
this.setState({
- data: {},
- loading: false
+ data: {}
})
+ btn && this.execSuccess(btn)
return
}
- let searches = []
- if (mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
- let keys = searches.map(item => item.key)
- mainSearch.forEach(item => {
- if (!keys.includes(item.key)) {
- searches.push(item)
- }
- })
+ let searches = config.setting.useMSearch && mainSearch ? mainSearch : []
+
+ let requireFields = searches.filter(item => item.required && item.value === '')
+ if (requireFields.length > 0) {
+ btn && this.execSuccess(btn)
+ return
}
this.setState({
@@ -239,20 +283,34 @@
let result = await Api.genericInterface(param)
if (result.status) {
let _data = result.data && result.data[0] ? result.data[0] : {}
- let _group = group
- if (config.wrap.statusControl && _data[config.wrap.statusControl]) {
- let _status = _data[config.wrap.statusControl]
- let _groups = config.subcards.filter(item => item.setting.status === _status)[0]
- _group = _groups || _group
- }
- this.setState({
- group: _group,
- step: _group.sort - 1,
- activeKey: '',
- data: _data || {},
- loading: false
- })
+ if (btn) {
+ this.setState({
+ data: _data || {},
+ loading: false
+ })
+ this.execSuccess(btn)
+ } else {
+ let _group = group
+
+ if (type === 'refresh') {
+ _group = config.subcards[0]
+ }
+
+ if (config.wrap.statusControl && _data[config.wrap.statusControl]) {
+ let _status = _data[config.wrap.statusControl]
+ let _groups = config.subcards.filter(item => item.setting.status === _status)[0]
+ _group = _groups || _group
+ }
+ this.setState({
+ group: null,
+ step: _group.sort - 1,
+ data: _data || {},
+ loading: false
+ }, () => {
+ this.setState({group: _group})
+ })
+ }
} else {
this.setState({
loading: false,
@@ -262,6 +320,7 @@
message: result.message,
duration: 10
})
+ btn && this.execSuccess(btn)
}
}
@@ -306,7 +365,7 @@
<Spin />
</div> : null
}
- {config.subcards.length > 1 ? <div className="mk-normal-form-title">
+ {config.wrap.groupLabel !== 'hidden' ? <div className="mk-normal-form-title">
{config.subcards.map(card => (
<div key={card.uuid} className={'form-title' + (card.sort <= step ? ' active' : '')}>
<span className="form-sort" style={{background: config.wrap.color}}>{card.sort}</span>
--
Gitblit v1.8.0