From 1f5c6ac307a134dfa45b64c5723f2481ead9f213 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期日, 16 七月 2023 16:23:09 +0800 Subject: [PATCH] 2023-07-16 --- src/menu/components/form/tab-form/index.jsx | 381 +++++++++++++++++++++++++++++++++--------------------- 1 files changed, 234 insertions(+), 147 deletions(-) diff --git a/src/menu/components/form/tab-form/index.jsx b/src/menu/components/form/tab-form/index.jsx index 1493f64..f3dd1bd 100644 --- a/src/menu/components/form/tab-form/index.jsx +++ b/src/menu/components/form/tab-form/index.jsx @@ -1,7 +1,7 @@ import React, {Component} from 'react' import PropTypes from 'prop-types' import { is, fromJS } from 'immutable' -import { Popover, Modal, Button, Switch, notification } from 'antd' +import { Popover, Modal, Button, Switch, notification, message } from 'antd' import { PlusOutlined, SettingOutlined, EditOutlined, ToolOutlined, DeleteOutlined, FontColorsOutlined } from '@ant-design/icons' import moment from 'moment' @@ -9,12 +9,10 @@ import asyncComponent from '@/utils/asyncComponent' import asyncIconComponent from '@/utils/asyncIconComponent' import { getModalForm } from '@/templates/zshare/formconfig' -import { resetStyle } from '@/utils/utils-custom.js' +import { resetStyle, getTables, checkComponent } 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 getWrapForm from '../step-form/options' import './index.scss' const ModalForm = asyncComponent(() => import('@/templates/zshare/modalform')) @@ -31,7 +29,7 @@ const { confirm } = Modal -class PropCardEditComponent extends Component { +class TabFormComponent extends Component { static propTpyes = { card: PropTypes.object, deletecomponent: PropTypes.func, @@ -39,7 +37,6 @@ } state = { - dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS, appType: sessionStorage.getItem('appType'), card: null, back: false, @@ -59,12 +56,9 @@ let _card = { uuid: card.uuid, type: card.type, - tabId: card.tabId || '', - parentId: card.parentId || '', format: 'object', // 缁勪欢灞炴�� - 鏁版嵁鏍煎紡 pageable: false, // 缁勪欢灞炴�� - 鏄惁鍙垎椤� switchable: false, // 缁勪欢灞炴�� - 鏁版嵁鏄惁鍙垏鎹� - dataName: card.dataName || '', width: card.width || 24, name: card.name, subtype: card.subtype, @@ -79,21 +73,21 @@ sort: 1, style: {}, fields: [], - subButton: {label: '鎻愪氦', type: 'submit', enable: 'true', style: {backgroundColor: '#1890ff', color: '#ffffff', paddingLeft: '25px', paddingRight: '25px', paddingTop: '5px', paddingBottom: '5px'}}, + subButton: {label: '鎻愪氦', type: 'submit', intertype: 'system', reload: 'false', sqlType: 'update', sql: '', Ot: 'notRequired', execSuccess: 'never', 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'}}, + subButton: {label: '鎻愪氦', type: 'submit', intertype: 'system', reload: 'false', sqlType: 'update', sql: '', Ot: 'notRequired', execSuccess: 'never', 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: [], - subButton: {label: '鎻愪氦', type: 'submit', enable: 'true', style: {backgroundColor: '#1890ff', color: '#ffffff', paddingLeft: '25px', paddingRight: '25px', paddingTop: '5px', paddingBottom: '5px'}}, + subButton: {label: '鎻愪氦', type: 'submit', intertype: 'system', reload: 'false', sqlType: 'update', sql: '', Ot: 'notRequired', execSuccess: 'never', enable: 'true', style: {backgroundColor: '#1890ff', color: '#ffffff', paddingLeft: '25px', paddingRight: '25px', paddingTop: '5px', paddingBottom: '5px'}}, }] } @@ -118,10 +112,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({ @@ -129,11 +122,6 @@ group: _card.subcards[0] || null }) } - } - - componentDidMount () { - MKEmitter.addListener('submitStyle', this.getStyle) - MKEmitter.addListener('submitComponentStyle', this.updateComponentStyle) } shouldComponentUpdate (nextProps, nextState) { @@ -147,39 +135,64 @@ this.setState = () => { return } - MKEmitter.removeListener('submitStyle', this.getStyle) - MKEmitter.removeListener('submitComponentStyle', this.updateComponentStyle) - } - - updateComponentStyle = (parentId, keys, style) => { - const { card } = this.state - - if (card.uuid !== parentId) return - - let subcards = card.subcards.map(item => { - if (keys.includes(item.uuid)) { - item.style = {...item.style, ...style} - } - return item - }) - - this.setState({card: {...card, subcards: []}}, () => { - this.updateComponent({...card, subcards: subcards}) - }) } /** * @description 鍗$墖琛屽灞備俊鎭洿鏂帮紙鏁版嵁婧愶紝鏍峰紡绛夛級 */ - updateComponent = (component) => { + updateComponent = (card) => { + card.width = card.wrap.width + card.name = card.wrap.name + card.errors = [] + let idCtrl = false + + if (card.wrap.datatype !== 'static') { + let supModule = card.setting.supModule ? card.setting.supModule[card.setting.supModule.length - 1] || '' : '' + if (supModule === 'empty') { + supModule = '' + } + + card.$c_ds = true + card.errors = checkComponent(card) + + if (card.errors.length === 0) { + card.$tables = getTables(card) + } + + card.subcards.forEach(item => { + item.fields.forEach(m => { + if (m.dataSource && /@ID@/ig.test(m.dataSource)) { + idCtrl = true + } + if (m.type === 'linkMain' && !supModule) { + card.errors.push({ level: 1, detail: `璇锋鏌ュ垎缁勨��${item.setting.title}鈥濅腑鍏宠仈涓昏〃鈥�${m.label}鈥濇槸鍚︽湁鏁坄}) + } + }) + }) + } else { + let supModule = card.wrap.supModule ? card.wrap.supModule[card.wrap.supModule.length - 1] : '' + + card.$tables = getTables(card) + + card.subcards.forEach(item => { + item.fields.forEach(m => { + if (m.dataSource && /@ID@/ig.test(m.dataSource)) { + idCtrl = true + } + if (m.type === 'linkMain' && !supModule) { + card.errors.push({ level: 1, detail: `璇锋鏌ュ垎缁勨��${item.setting.title}鈥濅腑鍏宠仈涓昏〃鈥�${m.label}鈥濇槸鍚︽湁鏁坄}) + } + }) + }) + } + + card.idCtrl = idCtrl + this.setState({ - card: component + card: card }) - component.width = component.wrap.width - component.name = component.wrap.name - - this.props.updateConfig(component) + this.props.updateConfig(card) } /** @@ -193,29 +206,19 @@ return item }) - this.setState({card}) - - this.props.updateConfig(card) + this.updateComponent(card) } changeStyle = () => { const { card } = this.state - MKEmitter.emit('changeStyle', [card.uuid], ['height', 'background', 'border', 'padding', 'margin', 'shadow'], card.style) + MKEmitter.emit('changeStyle', ['height', 'font1', 'background', 'border', 'padding', 'margin', 'shadow', 'clear', 'minHeight'], card.style, this.getStyle) } - getStyle = (comIds, style) => { - const { card } = this.state + getStyle = (style) => { + let _card = {...this.state.card, style} - 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 = () => { @@ -227,16 +230,15 @@ sort: card.subcards.length + 1, style: {}, fields: [], - subButton: {label: '鎻愪氦', type: 'submit', enable: 'true', style: {backgroundColor: '#1890ff', color: '#ffffff', paddingLeft: '25px', paddingRight: '25px', paddingTop: '5px', paddingBottom: '5px'}}, + subButton: {label: '鎻愪氦', type: 'submit', intertype: 'system', reload: 'false', sqlType: 'update', sql: '', Ot: 'notRequired', enable: 'true', style: {backgroundColor: '#1890ff', color: '#ffffff', paddingLeft: '25px', paddingRight: '25px', paddingTop: '5px', paddingBottom: '5px'}}, } card.subcards.push(newcard) this.setState({ - card, group: newcard }) - this.props.updateConfig(card) + this.updateComponent(card) } changecards = (list) => { @@ -246,8 +248,7 @@ return item }) - this.setState({card}) - this.props.updateConfig(card) + this.updateComponent(card) } selectGroup = (item) => { @@ -271,8 +272,8 @@ _group = card.subcards[0] || null } - _this.setState({card, group: _group}) - _this.props.updateConfig(card) + _this.setState({group: _group}) + _this.updateComponent(card) }, onCancel() {} }) @@ -288,8 +289,8 @@ return item }) - this.setState({card, group}) - this.props.updateConfig(card) + this.setState({group}) + this.updateComponent(card) } plusFields = (items) => { @@ -335,8 +336,8 @@ } return item }) - _this.setState({group: config, card}) - _this.props.updateConfig(card) + _this.setState({group: config}) + _this.updateComponent(card) }, onCancel() {} }) @@ -355,12 +356,12 @@ return item }) - this.setState({card, group}, () => { + this.setState({group}, () => { if (newcard) { this.handleForm(newcard) } }) - this.props.updateConfig(card) + this.updateComponent(card) } closeForm = (cell) => { @@ -380,8 +381,8 @@ confirm({ content: `纭畾鍒犻櫎<<${cell.label}>>鍚楋紵`, onOk() { - _this.setState({card, group}) - _this.props.updateConfig(card) + _this.setState({group}) + _this.updateComponent(card) }, onCancel() {} }) @@ -445,65 +446,51 @@ 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 } + if (!item.field) return + if (['text', 'number', 'textarea', 'color'].includes(item.type) && _item.field !== item.field) { _inputfields.push({ field: item.field, - label: _inputIndex + '銆�' + item.label + label: item.label }) - _inputIndex++ } - if (appType === 'mob') { - if (_form.field !== item.field && item.hidden !== 'true' && ['text', 'number'].includes(item.type)) { - _tabfields.push({ - field: item.field, - label: _tabIndex + '銆�' + item.label - }) - _tabIndex++ - } - } else { - if (_form.field !== item.field && item.hidden !== 'true' && ['text', 'number', 'select', 'link'].includes(item.type)) { - _tabfields.push({ - field: item.field, - label: _tabIndex + '銆�' + item.label - }) - _tabIndex++ - } + if (_form.field !== item.field && item.hidden !== 'true' && ['text', 'number', 'select', 'link'].includes(item.type)) { + _tabfields.push({ + field: item.field, + label: item.label + }) } - if (item.type === 'switch') { + if (item.type === 'switch' || item.type === 'check') { _linksupFields.push({ field: item.field, - label: _linkIndex + '銆�' + item.label + label: item.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)) { + if (!['select', 'link', 'radio', 'checkcard', 'multiselect'].includes(item.type)) return + + _linksupFields.push({ + field: item.field, + label: item.label + }) + + if (item.type === 'multiselect' || (item.type === 'checkcard' && item.multiple === 'true')) return + + if (!uniq.has(item.field)) { uniq.set(item.field, true) _linkableFields.push({ - value: item.field, - text: _linkIndex + '銆�' + item.label + ' (琛ㄥ崟)' + field: item.field, + label: item.label + '-琛ㄥ崟' }) - _linksupFields.push({ - value: item.field, - text: _linkIndex + '銆�' + item.label - }) - - _linkIndex++ } }) - - _tabfields.unshift({field: '', label: '鍘熻〃鍗�'}) if (index !== null) { if (index === 0) { @@ -519,9 +506,8 @@ _linkableFields.push({ field: col.field, - label: _linkIndex + '銆�' + col.label + ' (鏄剧ず鍒�)' + label: col.label + '-鏄剧ず鍒�' }) - _linkIndex++ } }) @@ -539,7 +525,7 @@ standardform, visible: true, editform: _form, - formlist: getModalForm(_form, _inputfields, _tabfields, _linkableFields, _linksupFields) + formlist: getModalForm(_form, _inputfields, _tabfields, _linkableFields, _linksupFields, card.columns) }) } @@ -559,7 +545,12 @@ fieldrepet = true } + delete item.focus + if (item.uuid === res.uuid) { + if (item.style) { + res.style = item.style + } return res } else { return item @@ -575,6 +566,8 @@ return } + window.GLOB.formId = res.uuid + if (['select', 'multiselect', 'link', 'checkbox', 'radio', 'checkcard'].includes(res.type) && res.resourceType === '1' && /\s/.test(res.dataSource)) { this.setState({ sqlVerifing: true @@ -583,20 +576,22 @@ let param = { func: 's_debug_sql', exec_type: 'y', - LText: res.dataSource + LText: `declare @mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20) + ${res.dataSource}` } - param.LText = param.LText.replace(/@\$|\$@/ig, '') + param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + param.LText = param.LText.replace(/@\$|\$@/ig, '').replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id)@/ig, `'${param.timestamp}'`) + param.LText = param.LText.replace(/\n/g, ' ') param.LText = Utils.formatOptions(param.LText) - param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') param.secretkey = Utils.encrypt('', param.timestamp) if (window.GLOB.mainSystemApi && res.database === 'sso') { param.rduri = window.GLOB.mainSystemApi } - Api.getLocalConfig(param).then(result => { + Api.genericInterface(param).then(result => { if (result.status) { this.setState({ sqlVerifing: false, @@ -623,28 +618,28 @@ } pasteForm = (res) => { - let _config = fromJS(this.state.group).toJS() - let fieldrepet = false // 瀛楁閲嶅 + if (res.subtype === 'simpleform') { + res = res.subcards[0] + } - _config.fields.forEach(item => { - if (res.field && item.field && item.field.toLowerCase() === res.field.toLowerCase()) { - fieldrepet = true - } + let card = fromJS(this.state.card).toJS() + + res.uuid = Utils.getuuid() + res.sort = card.subcards.length + 1 + + res.fields.forEach(item => { + item.uuid = Utils.getuuid() }) - if (fieldrepet) { - notification.warning({ - top: 92, - message: '瀛楁宸插瓨鍦紒', - duration: 10 - }) - return - } - _config.fields.push(res) + delete res.prevButton + delete res.nextButton - this.updateGroup(_config) - - this.handleForm(res) + card.subcards.push(res) + + this.setState({ + group: res + }) + this.updateComponent(card) notification.success({ top: 92, @@ -658,18 +653,85 @@ } updateWrap = (res) => { - this.updateComponent({...this.state.card, wrap: res}) + let _card = {...this.state.card, wrap: res} + + if (res.datatype === 'static') { + if (res.supModule && res.supModule.length > 0) { + _card.setting.supModule = res.supModule + } else { + _card.setting.supModule = '' + } + } + + this.updateComponent(_card) + } + + 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() {} + }) + } + + parseForm = (g, forms) => { + const { group } = this.state + let card = fromJS(this.state.card).toJS() + let _group = fromJS(g).toJS() + + _group.fields = forms + + card.subcards = card.subcards.map(item => { + if (item.uuid === _group.uuid) { + return _group + } + return item + }) + + if (_group.uuid === group.uuid) { + this.setState({group: _group}) + this.updateComponent(card) + } else { + this.updateComponent(card) + } } clickComponent = (e) => { if (sessionStorage.getItem('style-control') === 'true' || sessionStorage.getItem('style-control') === 'component') { e.stopPropagation() - MKEmitter.emit('clickComponent', this.state.card) + MKEmitter.emit('clickComponent', this.state.card.uuid, null, (style) => { + let _card = {...this.state.card} + _card.style = {..._card.style, ...style} + + this.setState({ card: _card }) + this.props.updateConfig(_card) + }) } } render() { - const { card, dict, group, appType } = this.state + const { card, group, appType } = this.state + + let labelSize = 14 + if (card.style.fontSize) { + labelSize = parseInt(card.style.fontSize) + } return ( <div className="menu-normal-form-edit-box" style={resetStyle(card.style)} onClick={this.clickComponent} id={card.uuid}> @@ -680,7 +742,7 @@ <EditOutlined style={{color: '#1890ff'}} title="缂栬緫"/> </NormalForm> <CopyComponent type="tabform" card={card}/> - <PasteComponent config={card} options={['form']} updateConfig={this.pasteForm} /> + <PasteComponent config={card} options={['formgroup', 'simpleform']} updateConfig={this.pasteForm} /> <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/> <UserComponent config={card}/> <DeleteOutlined className="close" title="鍒犻櫎缁勪欢" onClick={() => this.props.deletecomponent(card.uuid)} /> @@ -692,17 +754,20 @@ </Popover> <FormTitle list={card.subcards} + labelSize={labelSize} tabtype={card.wrap.tabtype || ''} selectId={group ? group.uuid : ''} handleList={this.changecards} handleGroup={this.updateGroup} + handleForm={this.parseForm} closeGroup={this.closeGroup} selectGroup={this.selectGroup} /> - {group ? <div className="form-area"> + {group ? <div className={`form-area mk-${card.wrap.formStyle || ''}`}> <PlusOutlined className="plus" title="娣诲姞琛ㄥ崟" onClick={this.addForm}/> <FieldsComponent config={group} type="form" plusFields={this.plusFields} /> - <Switch checkedChildren={dict['model.switch.open']} unCheckedChildren={dict['model.switch.close']} defaultChecked={this.state.showField} onChange={(val) => this.setState({showField: val})} /> + <span style={{color: 'red', marginLeft: '30px', cursor: 'pointer'}} onClick={this.clearGroup}>娓呯┖</span> + <Switch checkedChildren="寮�" unCheckedChildren="鍏�" 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} {appType !== 'mob' ? <Button className="mk-cols-change" onClick={() => this.changecols(3)}>3鍒�</Button> : null} @@ -712,7 +777,6 @@ list={group.fields} setting={group.setting} showField={this.state.showField} - placeholder={dict['header.form.modal.placeholder']} handleList={this.handleList} handleForm={this.handleForm} closeForm={this.closeForm} @@ -726,17 +790,40 @@ />} <FormAction config={card} group={group} updateconfig={this.updateGroup}/> </div> : null} + <div className="component-name"> + <div className="center"> + <div className="title" onDoubleClick={() => { + let oInput = document.createElement('input') + oInput.value = 'anchor' + card.uuid + document.body.appendChild(oInput) + oInput.select() + document.execCommand('Copy') + document.body.removeChild(oInput) + message.success('澶嶅埗鎴愬姛銆�') + }}>{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']} + title="缂栬緫" + wrapClassName="mk-scroll-modal" visible={this.state.visible} - width={850} + width={950} + maskClosable={false} onCancel={this.editModalCancel} onOk={this.handleSubmit} confirmLoading={this.state.sqlVerifing} destroyOnClose > <ModalForm - dict={this.state.dict} card={this.state.editform} formlist={this.state.formlist} inputSubmit={this.handleSubmit} @@ -749,4 +836,4 @@ } } -export default PropCardEditComponent \ No newline at end of file +export default TabFormComponent \ No newline at end of file -- Gitblit v1.8.0