From 669d7cc31eb3728ad09bfb7ce6e615f5c571c14e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 08 一月 2020 15:58:39 +0800
Subject: [PATCH] 2020-01-08
---
src/templates/modalconfig/index.jsx | 58 +++++++++++++++++++++++++---------------------------------
1 files changed, 25 insertions(+), 33 deletions(-)
diff --git a/src/templates/modalconfig/index.jsx b/src/templates/modalconfig/index.jsx
index cbd7f55..79654ca 100644
--- a/src/templates/modalconfig/index.jsx
+++ b/src/templates/modalconfig/index.jsx
@@ -53,9 +53,7 @@
selectedTables: [], // 宸查�夎〃鍚�
originConfig: null, // 鍘熷鑿滃崟
groupVisible: false, // 鍏ㄥ眬閰嶇疆妯℃�佹
- curgroup: null, // 褰撳墠缁勶紝鏂板缓鎴栫紪杈�
- formItems: [], // 琛ㄥ崟鍙�夌被鍨�
- billCodes: null // 鎸夐挳涓畾涔夌殑鍗曞彿鐢熸垚鍑芥暟瀛楁闆�
+ curgroup: null // 褰撳墠缁勶紝鏂板缓鎴栫紪杈�
}
/**
@@ -90,21 +88,9 @@
// 涓昏彍鍗曞凡鏈夐�夋嫨鐨勮〃鍚嶏紝妯℃�佹娌℃湁琛ㄥ悕鏃讹紝澶嶅埗涓昏彍鍗曡〃鍚�
_config.tables = _config.tables.length === 0 ? _menu.tables : _config.tables
- let _formItems = JSON.parse(JSON.stringify((Source.searchItems)))
- if (editAction && editAction.intertype === 'inner' && !editAction.innerFunc) {
- _formItems.push({
- type: 'form',
- label: '鍑芥暟鍙橀噺',
- subType: 'funcvar',
- url: ''
- })
- }
-
this.setState({
menu: _menu,
config: _config,
- formItems: _formItems,
- billCodes: editAction && editAction.verify && editAction.verify.billcodes ? editAction.verify.billcodes : [],
selectedTables: _config.tables || [],
originConfig: JSON.parse(JSON.stringify(_config)),
modalformlist: [
@@ -328,8 +314,6 @@
* 3銆佽缃紪杈戝弬鏁伴」-formlist
*/
handleForm = (card) => {
- const { billCodes } = this.state
-
this.setState({
visible: true,
card: card,
@@ -515,18 +499,6 @@
value: 'false',
text: this.state.dict['header.form.false']
}]
- },
- {
- type: 'select',
- key: 'linkfield',
- label: '鍏宠仈鍙橀噺',
- initVal: card.linkfield || '',
- required: true,
- options: billCodes.map(code => {
- code.value = code.field
- code.text = code.field
- return code
- })
}
]
})
@@ -613,7 +585,7 @@
submitConfig = () => {
const { editAction } = this.props
const { config, menu } = this.state
-
+
if ((!config.groups[0] && !config.fields[0]) || (config.fields[0] && config.fields[0].origin)) {
notification.warning({
top: 92,
@@ -621,6 +593,27 @@
duration: 10
})
return
+ }
+
+ if (config.setting.display === 'prompt') {
+ let _fields = []
+ if (config.groups.length > 0) {
+ config.groups.forEach(group => {
+ _fields = [..._fields, ...group.sublist]
+ })
+ } else {
+ _fields = config.fields
+ }
+
+ let readfields = _fields.filter(item => item.initval || item.initval === 0)
+ if (readfields.length < _fields.length) {
+ notification.warning({
+ top: 92,
+ message: '浠ャ�婃槸鍚︽銆嬫樉绀虹殑寮规锛屾墍鏈夎〃鍗曞繀椤诲惈鏈夐粯璁ゅ�硷紒',
+ duration: 10
+ })
+ return
+ }
}
let _LongParam = ''
@@ -1088,7 +1081,7 @@
}
render () {
- const { menu, config, formItems } = this.state
+ const { menu, config } = this.state
return (
<div className="modal-form-board">
@@ -1135,7 +1128,7 @@
</Panel>
<Panel header={this.state.dict['header.menu.form']} key="1">
<div className="search-element">
- {formItems.map((item, index) => {
+ {Source.searchItems.map((item, index) => {
return (<SourceElement key={index} content={item}/>)
})}
</div>
@@ -1221,7 +1214,6 @@
{<ModalForm
dict={this.state.dict}
card={this.state.card}
- billCodes={this.state.billCodes}
formlist={this.state.formlist}
wrappedComponentRef={(inst) => this.formRef = inst}
/>}
--
Gitblit v1.8.0