From 74e5d38d9a0e94421ceceea37c4677e5b57364ba Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 14 十月 2022 00:33:18 +0800
Subject: [PATCH] 2022-10-14
---
src/menu/components/code/sandbox/index.jsx | 85 ++++++++++++++++++++++--------------------
1 files changed, 45 insertions(+), 40 deletions(-)
diff --git a/src/menu/components/code/sandbox/index.jsx b/src/menu/components/code/sandbox/index.jsx
index 6395466..66148a2 100644
--- a/src/menu/components/code/sandbox/index.jsx
+++ b/src/menu/components/code/sandbox/index.jsx
@@ -43,7 +43,6 @@
type: card.type,
tabId: card.tabId || '',
parentId: card.parentId || '',
- dataName: card.dataName || '',
format: 'object', // 缁勪欢灞炴�� - 鏁版嵁鏍煎紡
pageable: false, // 缁勪欢灞炴�� - 鏄惁鍙垎椤�
switchable: false, // 缁勪欢灞炴�� - 鏁版嵁鏄惁鍙垏鎹�
@@ -51,7 +50,7 @@
name: card.name,
subtype: card.subtype,
setting: { interType: 'system' },
- wrap: { name: card.name, width: card.width || 24, encryption: 'true' },
+ wrap: { name: card.name, datatype: 'dynamic', width: card.width || 24, encryption: 'true' },
style: { marginLeft: '8px', marginRight: '8px', marginTop: '8px', marginBottom: '8px' },
columns: [],
scripts: [],
@@ -75,19 +74,12 @@
_card.scripts = config.scripts
}
- this.setState({
- card: _card
- })
- this.props.updateConfig(_card)
+ this.updateComponent(_card)
} else {
this.setState({
card: fromJS(card).toJS()
})
}
- }
-
- componentDidMount () {
- MKEmitter.addListener('submitStyle', this.getStyle)
}
shouldComponentUpdate (nextProps, nextState) {
@@ -101,51 +93,50 @@
this.setState = () => {
return
}
- MKEmitter.removeListener('submitStyle', this.getStyle)
}
/**
* @description 鍗＄墖琛屽灞備俊鎭洿鏂帮紙鏁版嵁婧愶紝鏍峰紡绛夛級
*/
- updateComponent = (component) => {
+ updateComponent = (card) => {
+ card.width = card.wrap.width
+ card.name = card.wrap.name
+
+ card.errors = []
+
+ let columns = card.columns.map(c => c.field)
+
+ 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 (!columns.includes(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)
}
changeStyle = () => {
const { card } = this.state
- MKEmitter.emit('changeStyle', [card.uuid], ['background', 'border', 'padding', 'margin', 'shadow'], card.style)
+ MKEmitter.emit('changeStyle', ['background', 'border', 'padding', 'margin', 'shadow'], card.style, this.getStyle)
}
- getStyle = (comIds, style) => {
- const { card } = this.state
-
- if (comIds[0] !== card.uuid || comIds.length !== 1) return
-
- let _card = {...card, style}
-
- this.setState({
- card: _card
- })
+ getStyle = (style) => {
+ let _card = {...this.state.card, style}
- this.props.updateConfig(_card)
- }
-
- /**
- * @description 鏇存柊鎼滅储鏉′欢閰嶇疆淇℃伅
- */
- updateconfig = (config) => {
- this.setState({
- card: config
- })
- this.props.updateConfig(config)
+ this.updateComponent(_card)
}
getWrapForms = () => {
@@ -155,7 +146,7 @@
}
updateWrap = (res) => {
- this.updateconfig({...this.state.card, wrap: res})
+ this.updateComponent({...this.state.card, wrap: res})
}
clickComponent = (e) => {
@@ -188,6 +179,20 @@
<ToolOutlined />
</Popover>
<CodeContent name={card.name} html={card.html} css={card.css} js={card.js}/>
+ <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>
</div>
)
}
--
Gitblit v1.8.0