From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/card/prop-card/index.jsx | 330 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 238 insertions(+), 92 deletions(-)
diff --git a/src/menu/components/card/prop-card/index.jsx b/src/menu/components/card/prop-card/index.jsx
index 2d82ac0..9e382eb 100644
--- a/src/menu/components/card/prop-card/index.jsx
+++ b/src/menu/components/card/prop-card/index.jsx
@@ -1,7 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Popover, Modal, notification } from 'antd'
+import { Popover, Modal } from 'antd'
import { PlusOutlined, SettingOutlined, EditOutlined, ToolOutlined, DeleteOutlined, FontColorsOutlined } from '@ant-design/icons'
import asyncComponent from '@/utils/asyncComponent'
@@ -17,7 +17,7 @@
const CardComponent = asyncComponent(() => import('../cardcomponent'))
const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
const PasteComponent = asyncIconComponent(() => import('@/components/paste'))
-const LogComponent = asyncIconComponent(() => import('@/menu/components/share/logcomponent'))
+// const LogComponent = asyncIconComponent(() => import('@/menu/components/share/logcomponent'))
const UserComponent = asyncIconComponent(() => import('@/menu/components/share/usercomponent'))
const ClockComponent = asyncIconComponent(() => import('@/menu/components/share/clockcomponent'))
const NormalHeader = asyncComponent(() => import('@/menu/components/share/normalheader'))
@@ -100,10 +100,7 @@
return scard
})
}
- this.setState({
- card: _card
- })
- this.props.updateConfig(_card)
+ this.updateComponent(_card)
} else {
this.setState({
card: fromJS(card).toJS()
@@ -113,7 +110,7 @@
componentDidMount () {
MKEmitter.addListener('submitStyle', this.getStyle)
- MKEmitter.addListener('logButton', this.logButton)
+ // MKEmitter.addListener('logButton', this.logButton)
MKEmitter.addListener('submitComponentStyle', this.updateComponentStyle)
}
@@ -129,7 +126,7 @@
return
}
MKEmitter.removeListener('submitStyle', this.getStyle)
- MKEmitter.removeListener('logButton', this.logButton)
+ // MKEmitter.removeListener('logButton', this.logButton)
MKEmitter.removeListener('submitComponentStyle', this.updateComponentStyle)
}
@@ -150,32 +147,175 @@
})
}
- logButton = (id, item) => {
- const { card } = this.state
+ // 鎸夐挳鍘嗗彶璁板綍
+ // logButton = (id, item) => {
+ // const { card } = this.state
- if (id !== card.uuid) return
+ // if (id !== card.uuid) return
- let btnlog = card.btnlog || []
- btnlog.push(item)
+ // let btnlog = card.btnlog || []
+ // btnlog.push(item)
- this.setState({
- card: {...card, btnlog}
- })
- this.props.updateConfig({...card, btnlog})
- }
+ // this.updateComponent({...card, btnlog})
+ // }
/**
* @description 鍗＄墖琛屽灞備俊鎭洿鏂帮紙鏁版嵁婧愶紝鏍峰紡绛夛級
*/
- updateComponent = (component) => {
+ updateComponent = (card) => {
+ const { appType } = this.state
+
+ card.width = card.wrap.width
+ card.name = card.wrap.name
+ card.btnlog = []
+
+ if (window.GLOB.styling && card.errors) { // 鏍峰紡淇敼鏃朵笉鍋氱瓫鏌�
+ this.setState({
+ card: card
+ })
+
+ this.props.updateConfig(card)
+ return
+ }
+
+ card.errors = []
+
+ if (card.subcards.length === 0) {
+ card.errors.push({ level: 0, detail: '鍗＄墖涓嶅彲涓虹┖锛�'})
+ }
+
+ if (card.wrap.datatype === 'static') {
+ let supModule = card.wrap.supModule ? card.wrap.supModule[card.wrap.supModule.length - 1] : ''
+ card.subcards.forEach((item, i) => {
+ let linkbtn = item.setting.linkbtn || ''
+
+ item.elements.forEach(cell => {
+ if (cell.eleType === 'button') {
+ 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}鈥濇棤鏁坄})
+ }
+ })
+ }
+ }
+ if (linkbtn && linkbtn === cell.uuid) {
+ linkbtn = ''
+ }
+ } else if (cell.datatype === 'dynamic' && cell.field) {
+ card.errors.push({ level: 1, detail: `鍗＄墖涓姩鎬佸瓧娈碘��${cell.field}鈥濇棤鏁坄})
+ }
+ })
+
+ if (item.setting.type === 'multi' && appType !== 'mob') {
+ item.backElements.forEach(cell => {
+ if (cell.eleType === 'button') {
+ 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}鈥濇棤鏁坄})
+ }
+ })
+ }
+ }
+ if (linkbtn && linkbtn === cell.uuid) {
+ linkbtn = ''
+ }
+ } else if (cell.datatype === 'dynamic' && cell.field) {
+ card.errors.push({ level: 1, detail: `鍗＄墖涓姩鎬佸瓧娈碘��${cell.field}鈥濇棤鏁坄})
+ }
+ })
+ }
+
+ if (linkbtn) {
+ card.errors.push({ level: 1, detail: `绗�${i + 1}寮犲崱鐗囦腑缁戝畾鎸夐挳宸插垹闄})
+ }
+ })
+ } else {
+ 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: '鏈缃笂绾х粍浠讹紒'})
+ }
+
+ 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 || ''
+ item.elements.forEach(cell => {
+ if (cell.eleType === 'button') {
+ 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}鈥濆ぇ灏忓啓涓庡瓧娈甸泦涓嶄竴鑷碻})
+ }
+ })
+ }
+ }
+ if (linkbtn && linkbtn === cell.uuid) {
+ linkbtn = ''
+ }
+ } else if (cell.datatype === 'dynamic' && cell.field && !columns.includes(cell.field)) {
+ card.errors.push({ level: 1, detail: `鍗＄墖涓姩鎬佸瓧娈碘��${cell.field}鈥濇棤鏁坄})
+ }
+ })
+
+ if (item.setting.type === 'multi' && appType !== 'mob') {
+ item.backElements.forEach(cell => {
+ if (cell.eleType === 'button') {
+ 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}鈥濆ぇ灏忓啓涓庡瓧娈甸泦涓嶄竴鑷碻})
+ }
+ })
+ }
+ }
+ if (linkbtn && linkbtn === cell.uuid) {
+ linkbtn = ''
+ }
+ } else if (cell.datatype === 'dynamic' && cell.field && !columns.includes(cell.field)) {
+ card.errors.push({ level: 1, detail: `鍗＄墖涓姩鎬佸瓧娈碘��${cell.field}鈥濇棤鏁坄})
+ }
+ })
+ }
+
+ if (linkbtn) {
+ card.errors.push({ level: 1, detail: `绗�${i + 1}寮犲崱鐗囦腑缁戝畾鎸夐挳宸插垹闄})
+ }
+ })
+ }
+
this.setState({
- card: component
+ card: card
})
- component.width = component.wrap.width
- component.name = component.wrap.name
-
- this.props.updateConfig(component)
+ this.props.updateConfig(card)
}
/**
@@ -189,9 +329,7 @@
return item
})
- this.setState({card})
-
- this.props.updateConfig(card)
+ this.updateComponent(card)
}
/**
@@ -207,12 +345,11 @@
onOk() {
card.subcards = card.subcards.filter(item => item.uuid !== cell.uuid)
- if (card.btnlog) {
- card.btnlog = card.btnlog.filter(c => c.$parentId !== cell.uuid)
- }
+ // if (card.btnlog) {
+ // card.btnlog = card.btnlog.filter(c => c.$parentId !== cell.uuid)
+ // }
- _this.setState({card})
- _this.props.updateConfig(card)
+ _this.updateComponent(card)
if (appType === 'mob') return
@@ -249,12 +386,8 @@
if (comIds.length !== 1 || comIds[0] !== card.uuid) return
let _card = {...card, style}
-
- this.setState({
- card: _card
- })
- this.props.updateConfig(_card)
+ this.updateComponent(_card)
}
addCard = (copy) => {
@@ -292,59 +425,56 @@
}
card.subcards.push(newcard)
-
- this.setState({card})
- this.props.updateConfig(card)
+
+ this.updateComponent(card)
}
- handleLog = (type, logs, item) => {
- let card = fromJS(this.state.card).toJS()
+ // handleLog = (type, logs, item) => {
+ // let card = fromJS(this.state.card).toJS()
- if (type === 'revert') {
- let done = false
- if (item.$parentId) {
- card.subcards.forEach(col => {
- if (item.$parentId === col.uuid) {
- if (item.$side !== 'back') {
- col.elements = col.elements ? [...col.elements, item] : [item]
- } else {
- col.backElements = col.backElements ? [...col.backElements, item] : [item]
- }
- done = true
- }
- })
- }
+ // if (type === 'revert') {
+ // let done = false
+ // if (item.$parentId) {
+ // card.subcards.forEach(col => {
+ // if (item.$parentId === col.uuid) {
+ // if (item.$side !== 'back') {
+ // col.elements = col.elements ? [...col.elements, item] : [item]
+ // } else {
+ // col.backElements = col.backElements ? [...col.backElements, item] : [item]
+ // }
+ // done = true
+ // }
+ // })
+ // }
- card.btnlog = logs
+ // card.btnlog = logs
- this.setState({ card: {...card, subcards: []} }, () => {
- this.setState({ card })
- this.props.updateConfig(card)
- })
- if (!done) {
- notification.warning({
- top: 92,
- message: '闄勫睘鍗＄墖宸插垹闄わ紒',
- duration: 2
- })
- } else {
- notification.success({
- top: 92,
- message: '鎭㈠鎴愬姛锛�',
- duration: 2
- })
- }
- } else {
- card.btnlog = logs
- this.setState({ card })
- this.props.updateConfig(card)
- notification.success({
- top: 92,
- message: '娓呴櫎鎴愬姛锛�',
- duration: 2
- })
- }
- }
+ // this.setState({ card: {...card, subcards: []} }, () => {
+ // this.updateComponent(card)
+ // })
+ // if (!done) {
+ // notification.warning({
+ // top: 92,
+ // message: '闄勫睘鍗＄墖宸插垹闄わ紒',
+ // duration: 2
+ // })
+ // } else {
+ // notification.success({
+ // top: 92,
+ // message: '鎭㈠鎴愬姛锛�',
+ // duration: 2
+ // })
+ // }
+ // } else {
+ // card.btnlog = logs
+ // this.updateComponent(card)
+ // notification.success({
+ // top: 92,
+ // message: '娓呴櫎鎴愬姛锛�',
+ // duration: 2
+ // })
+ // }
+ // }
move = (item, direction) => {
let card = fromJS(this.state.card).toJS()
@@ -362,8 +492,7 @@
card.subcards.splice(hoverIndex, 0, ...card.subcards.splice(dragIndex, 1))
- this.setState({card})
- this.props.updateConfig(card)
+ this.updateComponent(card)
}
pasteComponent = (res, resolve) => {
@@ -377,7 +506,7 @@
res.setting.width = res.setting.width || 6
let copyBtns = []
- let mobtypes = ['pop', 'prompt', 'exec', 'innerpage']
+ let mobtypes = ['pop', 'prompt', 'exec', 'innerpage', 'funcbutton']
let elements = []
res.elements && res.elements.forEach(cell => {
@@ -447,8 +576,12 @@
updateWrap = (res) => {
let _card = {...this.state.card, wrap: res}
- if (res.supModule && res.supModule.length > 0) {
- _card.setting.supModule = res.supModule
+ if (res.datatype === 'static') {
+ if (res.supModule && res.supModule.length > 0) {
+ _card.setting.supModule = res.supModule
+ } else {
+ _card.setting.supModule = ''
+ }
}
if (res.layout === 'flex') {
_card.wrap.pagestyle = 'page'
@@ -481,7 +614,7 @@
<CopyComponent type="propcard" card={card}/>
<PasteComponent options={['cardcell']} updateConfig={this.pasteComponent} />
<FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
- <LogComponent btnlog={card.btnlog || []} handlelog={this.handleLog} />
+ {/* <LogComponent btnlog={card.btnlog || []} handlelog={this.handleLog} /> */}
<ClockComponent config={card} updateConfig={this.updateComponent}/>
<UserComponent config={card}/>
<DeleteOutlined className="close" title="鍒犻櫎缁勪欢" onClick={() => this.props.deletecomponent(card.uuid)} />
@@ -494,7 +627,20 @@
<div className={(card.wrap.layout || 'grid') + '-layout float-' + (card.wrap.cardFloat || 'left')}>
{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"><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>
</div>
)
}
--
Gitblit v1.8.0