From ed1cc4adc145f8685d04763e19fbd6b0bd80c136 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 09 六月 2022 16:22:44 +0800
Subject: [PATCH] 2022-06-09
---
src/menu/components/form/tab-form/index.jsx | 89 ++++++++++++++++++++++++++------------------
1 files changed, 53 insertions(+), 36 deletions(-)
diff --git a/src/menu/components/form/tab-form/index.jsx b/src/menu/components/form/tab-form/index.jsx
index a369c18..82b91d0 100644
--- a/src/menu/components/form/tab-form/index.jsx
+++ b/src/menu/components/form/tab-form/index.jsx
@@ -79,21 +79,21 @@
sort: 1,
style: {},
fields: [],
- subButton: {label: '鎻愪氦', type: 'submit', enable: 'true', style: {backgroundColor: '#1890ff', color: '#ffffff', paddingLeft: '25px', paddingRight: '25px', paddingTop: '5px', paddingBottom: '5px'}},
+ subButton: {label: '鎻愪氦', type: 'submit', Ot: 'notRequired', execSuccess: 'never', enable: 'true', style: {backgroundColor: '#1890ff', color: '#ffffff', paddingLeft: '25px', paddingRight: '25px', paddingTop: '5px', paddingBottom: '5px'}},
}, {
uuid: Utils.getuuid(),
setting: {title: '鍒嗙粍2', align: 'left_right'},
sort: 1,
style: {},
fields: [],
- subButton: {label: '鎻愪氦', type: 'submit', enable: 'true', style: {backgroundColor: '#1890ff', color: '#ffffff', paddingLeft: '25px', paddingRight: '25px', paddingTop: '5px', paddingBottom: '5px'}},
+ subButton: {label: '鎻愪氦', type: 'submit', Ot: 'notRequired', execSuccess: 'never', enable: 'true', style: {backgroundColor: '#1890ff', color: '#ffffff', paddingLeft: '25px', paddingRight: '25px', paddingTop: '5px', paddingBottom: '5px'}},
}, {
uuid: Utils.getuuid(),
setting: {title: '鍒嗙粍3', align: 'left_right'},
sort: 1,
style: {},
fields: [],
- subButton: {label: '鎻愪氦', type: 'submit', enable: 'true', style: {backgroundColor: '#1890ff', color: '#ffffff', paddingLeft: '25px', paddingRight: '25px', paddingTop: '5px', paddingBottom: '5px'}},
+ subButton: {label: '鎻愪氦', type: 'submit', Ot: 'notRequired', execSuccess: 'never', enable: 'true', style: {backgroundColor: '#1890ff', color: '#ffffff', paddingLeft: '25px', paddingRight: '25px', paddingTop: '5px', paddingBottom: '5px'}},
}]
}
@@ -118,10 +118,9 @@
})
}
this.setState({
- card: _card,
group: _card.subcards[0] || null
})
- this.props.updateConfig(_card)
+ this.updateComponent(_card)
} else {
let _card = fromJS(card).toJS()
this.setState({
@@ -171,15 +170,28 @@
/**
* @description 鍗＄墖琛屽灞備俊鎭洿鏂帮紙鏁版嵁婧愶紝鏍峰紡绛夛級
*/
- updateComponent = (component) => {
+ updateComponent = (card) => {
+ card.width = card.wrap.width
+ card.name = card.wrap.name
+ card.errors = []
+
+ if (card.wrap.datatype !== 'static') {
+ if (card.setting.interType === 'system' && card.setting.execute !== 'false' && !card.setting.dataresource) {
+ card.errors.push({ level: 0, detail: '鏈缃暟鎹簮锛�'})
+ } else if (card.setting.interType === 'system' && card.setting.execute === 'false' && card.scripts.filter(script => script.status !== 'false').length === 0) {
+ card.errors.push({ level: 0, detail: '鏁版嵁婧愪腑鏃犲彲鐢ㄨ剼鏈紒'})
+ } else if (!card.setting.primaryKey) {
+ card.errors.push({ level: 0, detail: '鏈缃富閿紒'})
+ } else if (!card.setting.supModule) {
+ card.errors.push({ level: 0, detail: '鏈缃笂绾х粍浠讹紒'})
+ }
+ }
+
this.setState({
- card: component
+ card: card
})
- component.width = component.wrap.width
- component.name = component.wrap.name
-
- this.props.updateConfig(component)
+ this.props.updateConfig(card)
}
/**
@@ -193,9 +205,7 @@
return item
})
- this.setState({card})
-
- this.props.updateConfig(card)
+ this.updateComponent(card)
}
changeStyle = () => {
@@ -225,11 +235,7 @@
let _card = {...card, style}
- this.setState({
- card: _card
- })
-
- this.props.updateConfig(_card)
+ this.updateComponent(_card)
}
addCard = () => {
@@ -247,10 +253,9 @@
card.subcards.push(newcard)
this.setState({
- card,
group: newcard
})
- this.props.updateConfig(card)
+ this.updateComponent(card)
}
changecards = (list) => {
@@ -260,8 +265,7 @@
return item
})
- this.setState({card})
- this.props.updateConfig(card)
+ this.updateComponent(card)
}
selectGroup = (item) => {
@@ -285,8 +289,8 @@
_group = card.subcards[0] || null
}
- _this.setState({card, group: _group})
- _this.props.updateConfig(card)
+ _this.setState({group: _group})
+ _this.updateComponent(card)
},
onCancel() {}
})
@@ -302,8 +306,8 @@
return item
})
- this.setState({card, group})
- this.props.updateConfig(card)
+ this.setState({group})
+ this.updateComponent(card)
}
plusFields = (items) => {
@@ -349,8 +353,8 @@
}
return item
})
- _this.setState({group: config, card})
- _this.props.updateConfig(card)
+ _this.setState({group: config})
+ _this.updateComponent(card)
},
onCancel() {}
})
@@ -369,12 +373,12 @@
return item
})
- this.setState({card, group}, () => {
+ this.setState({group}, () => {
if (newcard) {
this.handleForm(newcard)
}
})
- this.props.updateConfig(card)
+ this.updateComponent(card)
}
closeForm = (cell) => {
@@ -394,8 +398,8 @@
confirm({
content: `纭畾鍒犻櫎<<${cell.label}>>鍚楋紵`,
onOk() {
- _this.setState({card, group})
- _this.props.updateConfig(card)
+ _this.setState({group})
+ _this.updateComponent(card)
},
onCancel() {}
})
@@ -690,8 +694,8 @@
confirm({
content: `纭畾娓呯┖琛ㄥ崟鍚楋紵`,
onOk() {
- _this.setState({card, group})
- _this.props.updateConfig(card)
+ _this.setState({group})
+ _this.updateComponent(card)
},
onCancel() {}
})
@@ -763,7 +767,20 @@
/>}
<FormAction config={card} group={group} updateconfig={this.updateGroup}/>
</div> : null}
- <div className="component-name"><div className="center">{card.name}</div></div>
+ <div className="component-name">
+ <div className="center">
+ <div className="title">{card.name}</div>
+ <div className="content">
+ {card.errors && card.errors.map((err, index) => {
+ if (err.level === 0) {
+ return <span key={index} className="error">{err.detail}</span>
+ } else {
+ return <span key={index} className="waring">{err.detail}锛�</span>
+ }
+ })}
+ </div>
+ </div>
+ </div>
<Modal
title={this.state.dict['model.edit']}
visible={this.state.visible}
--
Gitblit v1.8.0