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/form/tab-form/index.jsx | 308 +++++++++++++++++++++++++++++++--------------------
1 files changed, 186 insertions(+), 122 deletions(-)
diff --git a/src/menu/components/form/tab-form/index.jsx b/src/menu/components/form/tab-form/index.jsx
index bb2b210..5852b91 100644
--- a/src/menu/components/form/tab-form/index.jsx
+++ b/src/menu/components/form/tab-form/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Icon, Popover, Modal, Button, Switch, notification } from 'antd'
+import { Popover, Modal, Button, Switch, notification } from 'antd'
+import { PlusOutlined, SettingOutlined, EditOutlined, ToolOutlined, DeleteOutlined, FontColorsOutlined } from '@ant-design/icons'
import moment from 'moment'
import Api from '@/api'
@@ -11,17 +12,17 @@
import { resetStyle } from '@/utils/utils-custom.js'
import MKEmitter from '@/utils/events.js'
import Utils from '@/utils/utils.js'
+import getWrapForm from '../normal-form/options'
import zhCN from '@/locales/zh-CN/model.js'
import enUS from '@/locales/en-US/model.js'
import './index.scss'
const ModalForm = asyncComponent(() => import('@/templates/zshare/modalform'))
const SettingComponent = asyncIconComponent(() => import('@/menu/datasource'))
-const WrapComponent = asyncIconComponent(() => import('@/menu/components/form/wrapsetting'))
+const NormalForm = asyncIconComponent(() => import('@/components/normalform'))
const CardComponent = asyncComponent(() => import('@/templates/modalconfig/dragelement'))
const MobCardComponent = asyncComponent(() => import('@/mob/components/formdragelement'))
const FormTitle = asyncComponent(() => import('../dragtitle'))
-const GroupForm = asyncComponent(() => import('./groupform'))
const FormAction = asyncComponent(() => import('../formaction'))
const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
const PasteComponent = asyncIconComponent(() => import('@/menu/components/share/pastecomponent'))
@@ -58,7 +59,6 @@
let _card = {
uuid: card.uuid,
type: card.type,
- floor: card.floor,
tabId: card.tabId || '',
parentId: card.parentId || '',
format: 'object', // 缁勪欢灞炴�� - 鏁版嵁鏍煎紡
@@ -75,7 +75,21 @@
scripts: [],
subcards: [{
uuid: Utils.getuuid(),
- setting: {title: '绗竴姝�', align: 'left_right'},
+ setting: {title: '鍒嗙粍1', 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'}},
+ }, {
+ 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'}},
+ }, {
+ uuid: Utils.getuuid(),
+ setting: {title: '鍒嗙粍3', align: 'left_right'},
sort: 1,
style: {},
fields: [],
@@ -90,6 +104,10 @@
_card.wrap.name = card.name
_card.style = config.style
+ _card.setting = config.setting
+ _card.columns = config.columns
+ _card.scripts = config.scripts
+
_card.subcards = config.subcards.map(scard => {
scard.uuid = Utils.getuuid()
scard.fields = scard.fields.map(elem => {
@@ -100,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({
@@ -153,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)
}
/**
@@ -175,9 +205,7 @@
return item
})
- this.setState({card})
-
- this.props.updateConfig(card)
+ this.updateComponent(card)
}
changeStyle = () => {
@@ -187,17 +215,27 @@
}
getStyle = (comIds, style) => {
- const { card } = this.state
+ const { card, group } = this.state
+
+ if (comIds[0] === 'form') {
+ let Index = group.fields.findIndex(n => n.uuid === comIds[1])
+
+ if (Index === -1) return
+
+ let _group = fromJS(group).toJS()
+
+ _group.fields[Index].style = style
+
+ this.updateGroup(_group)
+
+ return
+ }
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 = () => {
@@ -215,11 +253,9 @@
card.subcards.push(newcard)
this.setState({
- card,
- group: newcard,
- groupvisible: true
+ group: newcard
})
- this.props.updateConfig(card)
+ this.updateComponent(card)
}
changecards = (list) => {
@@ -229,20 +265,12 @@
return item
})
- this.setState({card})
- this.props.updateConfig(card)
+ this.updateComponent(card)
}
selectGroup = (item) => {
this.setState({
group: item
- })
- }
-
- changeGroup = (item) => {
- this.setState({
- group: item,
- groupvisible: true
})
}
@@ -261,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() {}
})
@@ -278,23 +306,16 @@
return item
})
- this.setState({card, group})
- this.props.updateConfig(card)
+ this.setState({group})
+ this.updateComponent(card)
}
- handleGroupSubmit = () => {
- let group = fromJS(this.state.group).toJS()
+ plusFields = (items) => {
+ let _group = fromJS(this.state.group).toJS()
- this.groupRef.handleConfirm().then(res => {
- group.subButton.enable = res.subEnable
+ _group.fields.push(...items)
- delete res.subEnable
-
- group.setting = res
-
- this.setState({groupvisible: false})
- this.updateGroup(group)
- })
+ this.updateGroup(_group)
}
changecols = (type) => {
@@ -332,8 +353,8 @@
}
return item
})
- _this.setState({group: config, card})
- _this.props.updateConfig(card)
+ _this.setState({group: config})
+ _this.updateComponent(card)
},
onCancel() {}
})
@@ -352,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) => {
@@ -377,8 +398,8 @@
confirm({
content: `纭畾鍒犻櫎<<${cell.label}>>鍚楋紵`,
onOk() {
- _this.setState({card, group})
- _this.props.updateConfig(card)
+ _this.setState({group})
+ _this.updateComponent(card)
},
onCancel() {}
})
@@ -400,7 +421,6 @@
initval: '',
type: 'text',
resourceType: '0',
- setAll: 'false',
span: span,
labelwidth: 33.3,
options: [],
@@ -436,42 +456,68 @@
let _inputfields = []
let _tabfields = []
let _linkableFields = []
- let _linksupFields = [{
- value: '',
- text: '绌�'
- }]
+ let _linksupFields = []
let standardform = null
- _inputfields = group.fields.filter(item => item.type === 'text' || item.type === 'number' || item.type === 'textarea' || item.type === 'color')
- if (appType === 'mob') {
- _tabfields = group.fields.filter(item => _form.field !== item.field && item.hidden !== 'true' && ['text', 'number'].includes(item.type))
- } else {
- _tabfields = group.fields.filter(item => _form.field !== item.field && item.hidden !== 'true' && ['text', 'number', 'select', 'link'].includes(item.type))
- }
- _tabfields.unshift({field: '', text: '鍘熻〃鍗�'})
-
let uniq = new Map()
- uniq.set(_form.field, true)
let index = null
+ uniq.set(_form.field, true)
+
+ let _inputIndex = 1
+ let _tabIndex = 1
+ let _linkIndex = 1
group.fields.forEach((item, i) => {
if (_form.uuid === item.uuid) {
index = i
}
+
+ let label = item.label || ''
+ if (item.field && item.field.toLowerCase() !== label.toLowerCase()) {
+ label = label + ' (' + item.field + ')'
+ }
+
+ if (['text', 'number', 'textarea', 'color'].includes(item.type) && _item.field !== item.field) {
+ _inputfields.push({
+ field: item.field,
+ label: _inputIndex + '銆�' + label
+ })
+ _inputIndex++
+ }
+ if (_form.field !== item.field && item.hidden !== 'true' && ['text', 'number', 'select', 'link'].includes(item.type)) {
+ _tabfields.push({
+ field: item.field,
+ label: _tabIndex + '銆�' + label
+ })
+ _tabIndex++
+ }
+
+ if (item.type === 'switch') {
+ _linksupFields.push({
+ field: item.field,
+ label: _linkIndex + '銆�' + label
+ })
+ }
if (!['select', 'link', 'radio', 'checkcard'].includes(item.type)) return
+ if (item.type === 'checkcard' && item.multiple === 'true') return // 閫夐」鍗″閫�
if (item.field && !uniq.has(item.field)) {
uniq.set(item.field, true)
_linkableFields.push({
value: item.field,
- text: item.label + ' (琛ㄥ崟)'
+ text: _linkIndex + '銆�' + item.label + ' (琛ㄥ崟)'
})
_linksupFields.push({
value: item.field,
- text: item.label
+ text: _linkIndex + '銆�' + label
})
+
+ _linkIndex++
}
})
+
+ _tabfields.unshift({field: '', label: '鍘熻〃鍗�'})
+
if (index !== null) {
if (index === 0) {
standardform = group.fields[index + 1] || null
@@ -485,9 +531,10 @@
uniq.set(col.field, true)
_linkableFields.push({
- value: col.field,
- text: col.label + ' (鏄剧ず鍒�)'
+ field: col.field,
+ label: _linkIndex + '銆�' + col.label + ' (鏄剧ず鍒�)'
})
+ _linkIndex++
}
})
@@ -505,7 +552,7 @@
standardform,
visible: true,
editform: _form,
- formlist: getModalForm(_form, _inputfields, _tabfields, _linkableFields, _linksupFields, false)
+ formlist: getModalForm(_form, _inputfields, _tabfields, _linkableFields, _linksupFields)
})
}
@@ -519,16 +566,16 @@
this.formRef.handleConfirm().then(res => {
let _config = fromJS(this.state.group).toJS()
let fieldrepet = false // 瀛楁閲嶅
- let labelrepet = false // 鎻愮ず鏂囧瓧閲嶅
_config.fields = _config.fields.map(item => {
if (item.uuid !== res.uuid && res.field && item.field && item.field.toLowerCase() === res.field.toLowerCase()) {
fieldrepet = true
- } else if (res.label && item.uuid !== res.uuid && item.label === res.label) {
- labelrepet = true
}
if (item.uuid === res.uuid) {
+ if (item.style) {
+ res.style = item.style
+ }
return res
} else {
return item
@@ -539,13 +586,6 @@
notification.warning({
top: 92,
message: '瀛楁宸插瓨鍦紒',
- duration: 10
- })
- return
- } else if (labelrepet) {
- notification.warning({
- top: 92,
- message: '鍚嶇О宸插瓨鍦紒',
duration: 10
})
return
@@ -601,13 +641,10 @@
pasteForm = (res) => {
let _config = fromJS(this.state.group).toJS()
let fieldrepet = false // 瀛楁閲嶅
- let labelrepet = false // 鎻愮ず鏂囧瓧閲嶅
_config.fields.forEach(item => {
if (res.field && item.field && item.field.toLowerCase() === res.field.toLowerCase()) {
fieldrepet = true
- } else if (res.label && item.label === res.label) {
- labelrepet = true
}
})
@@ -615,13 +652,6 @@
notification.warning({
top: 92,
message: '瀛楁宸插瓨鍦紒',
- duration: 10
- })
- return
- } else if (labelrepet) {
- notification.warning({
- top: 92,
- message: '鍚嶇О宸插瓨鍦紒',
duration: 10
})
return
@@ -639,6 +669,38 @@
})
}
+ getWrapForms = () => {
+ return getWrapForm(this.state.card)
+ }
+
+ updateWrap = (res) => {
+ this.updateComponent({...this.state.card, wrap: res})
+ }
+
+ clearGroup = () => {
+ let group = fromJS(this.state.group).toJS()
+ let card = fromJS(this.state.card).toJS()
+ let _this = this
+
+ group.fields = []
+
+ card.subcards = card.subcards.map(item => {
+ if (item.uuid === group.uuid) {
+ return group
+ }
+ return item
+ })
+
+ confirm({
+ content: `纭畾娓呯┖琛ㄥ崟鍚楋紵`,
+ onOk() {
+ _this.setState({group})
+ _this.updateComponent(card)
+ },
+ onCancel() {}
+ })
+ }
+
clickComponent = (e) => {
if (sessionStorage.getItem('style-control') === 'true' || sessionStorage.getItem('style-control') === 'component') {
e.stopPropagation()
@@ -653,31 +715,34 @@
<div className="menu-normal-form-edit-box" style={resetStyle(card.style)} onClick={this.clickComponent} id={card.uuid}>
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
- <Icon className="plus" title="娣诲姞鍒嗙粍" onClick={this.addCard} type="plus" />
- <WrapComponent config={card} updateConfig={this.updateComponent} />
- <CopyComponent type="propcard" card={card}/>
+ <PlusOutlined className="plus" title="娣诲姞鍒嗙粍" onClick={this.addCard}/>
+ <NormalForm title="琛ㄥ崟璁剧疆" width={800} update={this.updateWrap} getForms={this.getWrapForms}>
+ <EditOutlined style={{color: '#1890ff'}} title="缂栬緫"/>
+ </NormalForm>
+ <CopyComponent type="tabform" card={card}/>
<PasteComponent config={card} options={['form']} updateConfig={this.pasteForm} />
- <Icon className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle} type="font-colors" />
+ <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
<UserComponent config={card}/>
- <Icon className="close" title="鍒犻櫎缁勪欢" type="delete" onClick={() => this.props.deletecomponent(card.uuid)} />
+ <DeleteOutlined className="close" title="鍒犻櫎缁勪欢" onClick={() => this.props.deletecomponent(card.uuid)} />
{card.wrap.datatype !== 'static' ? <SettingComponent config={card} updateConfig={this.updateComponent} /> : null}
- {card.wrap.datatype === 'static' ? <Icon style={{color: '#eeeeee', cursor: 'not-allowed'}} type="setting"/> : null}
+ {card.wrap.datatype === 'static' ? <SettingOutlined style={{color: '#eeeeee', cursor: 'not-allowed'}}/> : null}
</div>
} trigger="hover">
- <Icon type="tool" />
+ <ToolOutlined />
</Popover>
<FormTitle
list={card.subcards}
tabtype={card.wrap.tabtype || ''}
selectId={group ? group.uuid : ''}
handleList={this.changecards}
- handleGroup={this.changeGroup}
+ handleGroup={this.updateGroup}
closeGroup={this.closeGroup}
selectGroup={this.selectGroup}
/>
{group ? <div className="form-area">
- <Icon className="plus" title="娣诲姞琛ㄥ崟" onClick={this.addForm} type="plus" />
- <FieldsComponent config={group} type="form" updatefield={this.updateGroup} />
+ <PlusOutlined className="plus" title="娣诲姞琛ㄥ崟" onClick={this.addForm}/>
+ <FieldsComponent config={group} type="form" plusFields={this.plusFields} />
+ <span style={{color: 'red', marginLeft: '30px', cursor: 'pointer'}} onClick={this.clearGroup}>娓呯┖</span>
<Switch checkedChildren={dict['model.switch.open']} unCheckedChildren={dict['model.switch.close']} defaultChecked={this.state.showField} onChange={(val) => this.setState({showField: val})} />
{appType !== 'mob' ? <Button className="mk-cols-change" onClick={() => this.changecols(1)}>1鍒�</Button> : null}
{appType !== 'mob' ? <Button className="mk-cols-change" onClick={() => this.changecols(2)}>2鍒�</Button> : null}
@@ -702,26 +767,25 @@
/>}
<FormAction config={card} group={group} updateconfig={this.updateGroup}/>
</div> : null}
- <Modal
- title="鍒嗙粍缂栬緫"
- visible={this.state.groupvisible}
- width={850}
- maskClosable={false}
- onCancel={() => this.setState({groupvisible: false})}
- onOk={this.handleGroupSubmit}
- destroyOnClose
- >
- <GroupForm
- dict={dict}
- group={group}
- inputSubmit={this.handleGroupSubmit}
- wrappedComponentRef={(inst) => this.groupRef = inst}
- />
- </Modal>
+ <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}
- width={850}
+ width={950}
+ maskClosable={false}
onCancel={this.editModalCancel}
onOk={this.handleSubmit}
confirmLoading={this.state.sqlVerifing}
--
Gitblit v1.8.0