From b573a0dea9afc9b773d71fe3e3062be7150c830a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 16 八月 2022 09:28:39 +0800
Subject: [PATCH] 2022-08-16
---
src/menu/components/card/prop-card/index.jsx | 101 +++++++++++++++++++++++++++++++-------------------
1 files changed, 62 insertions(+), 39 deletions(-)
diff --git a/src/menu/components/card/prop-card/index.jsx b/src/menu/components/card/prop-card/index.jsx
index 9e382eb..c2ad186 100644
--- a/src/menu/components/card/prop-card/index.jsx
+++ b/src/menu/components/card/prop-card/index.jsx
@@ -185,7 +185,7 @@
}
if (card.wrap.datatype === 'static') {
- let supModule = card.wrap.supModule ? card.wrap.supModule[card.wrap.supModule.length - 1] : ''
+ // let supModule = card.wrap.supModule ? card.wrap.supModule[card.wrap.supModule.length - 1] : ''
card.subcards.forEach((item, i) => {
let linkbtn = item.setting.linkbtn || ''
@@ -194,12 +194,12 @@
if (cell.OpenType === 'pop' || (cell.OpenType === 'funcbutton' && cell.execMode === 'pop')) {
if (!cell.modal || cell.modal.fields.length === 0) {
card.errors.push({ level: 1, detail: `鎸夐挳鈥�${cell.label}鈥濅腑琛ㄥ崟灏氭湭娣诲姞`})
- } else if (!supModule) {
- cell.modal.fields.forEach(m => {
- if (m.type === 'linkMain') {
- card.errors.push({ level: 1, detail: `鎸夐挳鈥�${cell.label}鈥濅腑鍏宠仈涓昏〃琛ㄥ崟鈥�${m.label}鈥濇棤鏁坄})
- }
- })
+ // } else if (!supModule) {
+ // cell.modal.fields.forEach(m => {
+ // if (m.type === 'linkMain') {
+ // card.errors.push({ level: 1, detail: `鎸夐挳鈥�${cell.label}鈥濅腑鍏宠仈涓昏〃琛ㄥ崟鈥�${m.label}鈥濇棤鏁坄})
+ // }
+ // })
}
}
if (linkbtn && linkbtn === cell.uuid) {
@@ -216,12 +216,12 @@
if (cell.OpenType === 'pop' || (cell.OpenType === 'funcbutton' && cell.execMode === 'pop')) {
if (!cell.modal || cell.modal.fields.length === 0) {
card.errors.push({ level: 1, detail: `鎸夐挳鈥�${cell.label}鈥濅腑琛ㄥ崟灏氭湭娣诲姞`})
- } else if (!supModule) {
- cell.modal.fields.forEach(m => {
- if (m.type === 'linkMain') {
- card.errors.push({ level: 1, detail: `鎸夐挳鈥�${cell.label}鈥濅腑鍏宠仈涓昏〃琛ㄥ崟鈥�${m.label}鈥濇棤鏁坄})
- }
- })
+ // } else if (!supModule) {
+ // cell.modal.fields.forEach(m => {
+ // if (m.type === 'linkMain') {
+ // card.errors.push({ level: 1, detail: `鎸夐挳鈥�${cell.label}鈥濅腑鍏宠仈涓昏〃琛ㄥ崟鈥�${m.label}鈥濇棤鏁坄})
+ // }
+ // })
}
}
if (linkbtn && linkbtn === cell.uuid) {
@@ -238,22 +238,24 @@
}
})
} else {
+ // let supModule = card.setting.supModule ? card.setting.supModule[card.setting.supModule.length - 1] || '' : ''
+ // if (supModule === 'empty') {
+ // supModule = ''
+ // }
+ let columns = card.columns.map(c => c.field)
+ // let lowcols = card.columns.map(c => c.field.toLowerCase())
+
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: '鏈缃笂绾х粍浠讹紒'})
}
-
- let supModule = card.setting.supModule ? card.setting.supModule[card.setting.supModule.length - 1] || '' : ''
- if (supModule === 'empty') {
- supModule = ''
- }
- let columns = card.columns.map(c => c.field)
- let lowcols = card.columns.map(c => c.field.toLowerCase())
card.subcards.forEach((item, i) => {
let linkbtn = item.setting.linkbtn || ''
@@ -262,14 +264,14 @@
if (cell.OpenType === 'pop' || (cell.OpenType === 'funcbutton' && cell.execMode === 'pop')) {
if (!cell.modal || cell.modal.fields.length === 0) {
card.errors.push({ level: 1, detail: `鎸夐挳鈥�${cell.label}鈥濅腑琛ㄥ崟灏氭湭娣诲姞`})
- } else {
- cell.modal.fields.forEach(m => {
- if (m.type === 'linkMain' && !supModule) {
- card.errors.push({ level: 1, detail: `鎸夐挳鈥�${cell.label}鈥濅腑鍏宠仈涓昏〃琛ㄥ崟鈥�${m.label}鈥濇棤鏁坄})
- } else if (m.field && !columns.includes(m.field) && lowcols.includes(m.field.toLowerCase())) {
- card.errors.push({ level: 1, detail: `鎸夐挳鈥�${cell.label}鈥濅腑琛ㄥ崟鈥�${m.label}鈥濆ぇ灏忓啓涓庡瓧娈甸泦涓嶄竴鑷碻})
- }
- })
+ // } else {
+ // cell.modal.fields.forEach(m => {
+ // if (m.type === 'linkMain' && !supModule) {
+ // card.errors.push({ level: 1, detail: `鎸夐挳鈥�${cell.label}鈥濅腑鍏宠仈涓昏〃琛ㄥ崟鈥�${m.label}鈥濇棤鏁坄})
+ // } else if (m.field && !columns.includes(m.field) && lowcols.includes(m.field.toLowerCase())) {
+ // card.errors.push({ level: 1, detail: `鎸夐挳鈥�${cell.label}鈥濅腑琛ㄥ崟鈥�${m.label}鈥濆ぇ灏忓啓涓庡瓧娈甸泦涓嶄竴鑷碻})
+ // }
+ // })
}
}
if (linkbtn && linkbtn === cell.uuid) {
@@ -286,14 +288,14 @@
if (cell.OpenType === 'pop' || (cell.OpenType === 'funcbutton' && cell.execMode === 'pop')) {
if (!cell.modal || cell.modal.fields.length === 0) {
card.errors.push({ level: 1, detail: `鎸夐挳鈥�${cell.label}鈥濅腑琛ㄥ崟灏氭湭娣诲姞`})
- } else {
- cell.modal.fields.forEach(m => {
- if (m.type === 'linkMain' && !supModule) {
- card.errors.push({ level: 1, detail: `鎸夐挳鈥�${cell.label}鈥濅腑鍏宠仈涓昏〃琛ㄥ崟鈥�${m.label}鈥濇棤鏁坄})
- } else if (m.field && !columns.includes(m.field) && lowcols.includes(m.field.toLowerCase())) {
- card.errors.push({ level: 1, detail: `鎸夐挳鈥�${cell.label}鈥濅腑琛ㄥ崟鈥�${m.label}鈥濆ぇ灏忓啓涓庡瓧娈甸泦涓嶄竴鑷碻})
- }
- })
+ // } else {
+ // cell.modal.fields.forEach(m => {
+ // if (m.type === 'linkMain' && !supModule) {
+ // card.errors.push({ level: 1, detail: `鎸夐挳鈥�${cell.label}鈥濅腑鍏宠仈涓昏〃琛ㄥ崟鈥�${m.label}鈥濇棤鏁坄})
+ // } else if (m.field && !columns.includes(m.field) && lowcols.includes(m.field.toLowerCase())) {
+ // card.errors.push({ level: 1, detail: `鎸夐挳鈥�${cell.label}鈥濅腑琛ㄥ崟鈥�${m.label}鈥濆ぇ灏忓啓涓庡瓧娈甸泦涓嶄竴鑷碻})
+ // }
+ // })
}
}
if (linkbtn && linkbtn === cell.uuid) {
@@ -574,7 +576,9 @@
}
updateWrap = (res) => {
- let _card = {...this.state.card, wrap: res}
+ const { card } = this.state
+
+ let _card = {...card, wrap: res}
if (res.datatype === 'static') {
if (res.supModule && res.supModule.length > 0) {
@@ -587,7 +591,26 @@
_card.wrap.pagestyle = 'page'
}
- this.updateComponent(_card)
+ if (res.selStyle === 'tabs' && card.wrap.selStyle !== 'tabs') {
+ Object.keys(_card.style).forEach(key => {
+ if (/^border/.test(key)) {
+ delete _card.style[key]
+ }
+ })
+ _card.style.borderBottomColor = '#eeeeee'
+ _card.style.borderBottomWidth = '1px'
+ _card.style.paddingBottom = '0px'
+
+ _card.subcards.forEach(item => {
+ delete item.style.marginBottom
+ })
+
+ this.setState({card: {..._card, subcards: []}}, () => {
+ this.updateComponent(_card)
+ })
+ } else {
+ this.updateComponent(_card)
+ }
}
clickComponent = (e) => {
@@ -624,7 +647,7 @@
} trigger="hover">
<ToolOutlined />
</Popover>
- <div className={(card.wrap.layout || 'grid') + '-layout float-' + (card.wrap.cardFloat || 'left')}>
+ <div className={(card.wrap.layout || 'grid') + '-layout float-' + (card.wrap.cardFloat || 'left') + ' select-' + card.wrap.selStyle}>
{card.subcards.map(subcard => (<CardComponent key={subcard.uuid} cards={card} card={subcard} move={this.move} updateElement={this.updateCard} deleteElement={this.deleteCard}/>))}
</div>
<div className="component-name">
--
Gitblit v1.8.0