From 43398618f35eb084ed4eb4000bd2e082196cbf71 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 27 五月 2022 16:12:37 +0800
Subject: [PATCH] 错误信息收集&注释btnlog
---
src/menu/components/table/normal-table/index.jsx | 258 +++++++++++++++++++++++++++++++-------------------
1 files changed, 159 insertions(+), 99 deletions(-)
diff --git a/src/menu/components/table/normal-table/index.jsx b/src/menu/components/table/normal-table/index.jsx
index 30c4592..f081cb1 100644
--- a/src/menu/components/table/normal-table/index.jsx
+++ b/src/menu/components/table/normal-table/index.jsx
@@ -1,7 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Popover, notification } from 'antd'
+import { Popover } from 'antd'
import { PlusOutlined, PlusCircleOutlined, PlusSquareOutlined, EditOutlined, ToolOutlined, DeleteOutlined, FontColorsOutlined } from '@ant-design/icons'
import asyncComponent from '@/utils/asyncComponent'
@@ -21,7 +21,7 @@
const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
const UserComponent = asyncIconComponent(() => import('@/menu/components/share/usercomponent'))
const PasteComponent = asyncIconComponent(() => import('@/menu/components/share/pastecomponent'))
-const LogComponent = asyncIconComponent(() => import('@/menu/components/share/logcomponent'))
+// const LogComponent = asyncIconComponent(() => import('@/menu/components/share/logcomponent'))
const ColumnComponent = asyncComponent(() => import('./columns'))
class TableCardEditComponent extends Component {
@@ -128,12 +128,8 @@
_card.search = []
_card.action = _card.action.filter(a => !a.origin)
}
-
- this.setState({
- card: _card
- })
- this.filterOrigin(_card)
+ this.updateComponent(_card)
} else {
let _card = fromJS(card).toJS()
if (appType === 'mob') {
@@ -149,7 +145,7 @@
componentDidMount () {
MKEmitter.addListener('submitStyle', this.getStyle)
MKEmitter.addListener('submitModal', this.handleSave)
- MKEmitter.addListener('logButton', this.logButton)
+ // MKEmitter.addListener('logButton', this.logButton)
MKEmitter.addListener('completeSave', this.completeSave)
}
@@ -166,7 +162,7 @@
}
MKEmitter.removeListener('submitStyle', this.getStyle)
MKEmitter.removeListener('submitModal', this.handleSave)
- MKEmitter.removeListener('logButton', this.logButton)
+ // MKEmitter.removeListener('logButton', this.logButton)
MKEmitter.removeListener('completeSave', this.completeSave)
}
@@ -202,48 +198,116 @@
return col
}
- filterOrigin = (component) => {
- if (component.isNew) {
- let item = fromJS(component).toJS()
- item.search = item.search.filter(a => !a.origin)
- item.action = item.action.filter(a => !a.origin)
- item.cols = item.cols.filter(a => !a.origin)
-
- delete item.isNew
-
- this.props.updateConfig(item)
- } else {
- this.props.updateConfig(component)
- }
- }
-
/**
* @description 鍗＄墖琛屽灞備俊鎭洿鏂帮紙鏁版嵁婧愶紝鏍峰紡绛夛級
*/
- updateComponent = (component) => {
- this.setState({
- card: component
- })
+ updateComponent = (card) => {
+ card.width = card.wrap.width
+ card.name = card.wrap.name
- component.width = component.wrap.width
- component.name = component.wrap.name
-
- this.filterOrigin(component)
- }
-
- logButton = (id, item) => {
- const { card } = this.state
-
- if (id !== card.uuid) return
-
- let btnlog = card.btnlog || []
- btnlog.push(item)
+ if (!window.GLOB.styling || !card.errors) { // 鏍峰紡淇敼鏃朵笉鍋氱瓫鏌�
+ card.errors = []
+
+ 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 doubleClick = card.wrap.doubleClick || ''
+
+ let columns = card.columns.map(c => c.field)
+ let lowcols = card.columns.map(c => c.field.toLowerCase())
+
+ card.action.forEach(cell => {
+ 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 (doubleClick === cell.uuid) {
+ doubleClick = ''
+ }
+ })
+
+ card.cols.forEach(col => {
+ if (col.type === 'action') {
+ col.elements.forEach(cell => {
+ 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 (doubleClick === cell.uuid) {
+ doubleClick = ''
+ }
+ })
+ } else if (col.type === 'custom') {
+ col.elements.forEach(cell => {
+ if (cell.datatype === 'dynamic' && cell.field && !columns.includes(cell.field)) {
+ card.errors.push({ level: 1, detail: `鏄剧ず鍒椻��${col.label}鈥濅腑鍔ㄦ�佸瓧娈碘��${cell.field}鈥濇棤鏁坄})
+ }
+ })
+ } else if (col.field && !columns.includes(col.field)) {
+ card.errors.push({ level: 1, detail: `鏄剧ず鍒椻��${col.label}鈥濅腑瀛楁鈥�${col.field}鈥濇棤鏁坄})
+ }
+ })
+
+ if (doubleClick) {
+ card.errors.push({ level: 1, detail: `缁戝畾鐨勫弻鍑绘寜閽凡鍒犻櫎`})
+ }
+ }
this.setState({
- card: {...card, btnlog}
+ card: card
})
- this.filterOrigin({...card, btnlog})
+
+ let _card = card.isNew ? fromJS(card).toJS() : card
+ if (_card.isNew) {
+ _card.cols = _card.cols.filter(a => !a.origin)
+ _card.search = _card.search.filter(a => !a.origin)
+ _card.action = _card.action.filter(a => !a.origin)
+
+ delete _card.isNew
+ }
+
+ this.props.updateConfig(_card)
}
+
+ // logButton = (id, item) => {
+ // const { card } = this.state
+
+ // if (id !== card.uuid) return
+
+ // let btnlog = card.btnlog || []
+ // btnlog.push(item)
+
+ // this.updateComponent({...card, btnlog})
+ // }
changeStyle = () => {
const { card } = this.state
@@ -277,11 +341,7 @@
_card.wrap.fontSize = fontSize
_card.wrap.fontWeight = fontWeight
- this.setState({
- card: _card
- })
-
- this.filterOrigin(_card)
+ this.updateComponent(_card)
}
addColumns = () => {
@@ -326,16 +386,6 @@
MKEmitter.emit('addButton', card.uuid, newcard)
}
- /**
- * @description 鏇存柊鎼滅储鏉′欢閰嶇疆淇℃伅
- */
- updateconfig = (config) => {
- this.setState({
- card: config
- })
- this.filterOrigin(config)
- }
-
setSubConfig = (item) => {
const { card, appType } = this.state
let btn = fromJS(item).toJS()
@@ -372,49 +422,46 @@
return cell
})
- this.setState({card})
- this.filterOrigin(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.cols.forEach(col => {
- if (col.type !== 'action') return
- if (item.$parentId === col.uuid) {
- col.elements = col.elements ? [...col.elements, item] : [item]
- done = true
- }
- })
- }
+ // if (type === 'revert') {
+ // let done = false
+ // if (item.$parentId) {
+ // card.cols.forEach(col => {
+ // if (col.type !== 'action') return
+ // if (item.$parentId === col.uuid) {
+ // col.elements = col.elements ? [...col.elements, item] : [item]
+ // done = true
+ // }
+ // })
+ // }
- if (!done) {
- card.action = card.action ? [...card.action, item] : [item]
- }
+ // if (!done) {
+ // card.action = card.action ? [...card.action, item] : [item]
+ // }
- card.btnlog = logs
+ // card.btnlog = logs
- this.setState({ card })
- this.filterOrigin(card)
- notification.success({
- top: 92,
- message: '鎭㈠鎴愬姛锛�',
- duration: 2
- })
- } else {
- card.btnlog = logs
- this.setState({ card })
- this.filterOrigin(card)
- notification.success({
- top: 92,
- message: '娓呴櫎鎴愬姛锛�',
- duration: 2
- })
- }
- }
+ // this.updateComponent(card)
+ // notification.success({
+ // top: 92,
+ // message: '鎭㈠鎴愬姛锛�',
+ // duration: 2
+ // })
+ // } else {
+ // card.btnlog = logs
+ // this.updateComponent(card)
+ // notification.success({
+ // top: 92,
+ // message: '娓呴櫎鎴愬姛锛�',
+ // duration: 2
+ // })
+ // }
+ // }
getWrapForms = () => {
const { wrap, action, columns, cols } = this.state.card
@@ -469,7 +516,7 @@
<CopyComponent type="normaltable" card={card}/>
<PasteComponent config={card} options={options} updateConfig={this.updateComponent} />
<FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
- <LogComponent btnlog={card.btnlog || []} handlelog={this.handleLog} />
+ {/* <LogComponent btnlog={card.btnlog || []} handlelog={this.handleLog} /> */}
<UserComponent config={card}/>
<DeleteOutlined className="close" title="鍒犻櫎缁勪欢" onClick={() => this.props.deletecomponent(card.uuid)} />
<SettingComponent config={card} updateConfig={this.updateComponent} />
@@ -477,10 +524,23 @@
} trigger="hover">
<ToolOutlined />
</Popover>
- <SearchComponent config={card} updatesearch={this.updateconfig}/>
+ <SearchComponent config={card} updatesearch={this.updateComponent}/>
<ActionComponent config={card} setSubConfig={this.setSubConfig} updateaction={this.updateComponent}/>
- <ColumnComponent config={card} updatecolumn={this.updateconfig}/>
- <div className="component-name"><div className="center">{card.name}</div></div>
+ <ColumnComponent config={card} updatecolumn={this.updateComponent}/>
+ <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