From d1cd5af5adb53e91efdd278328e1b6f8ad834fb5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 06 二月 2025 21:11:56 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/menu/components/form/step-form/index.jsx | 163 +++++++++++++++++++----------------------------------
1 files changed, 59 insertions(+), 104 deletions(-)
diff --git a/src/menu/components/form/step-form/index.jsx b/src/menu/components/form/step-form/index.jsx
index 7520ab5..e968838 100644
--- a/src/menu/components/form/step-form/index.jsx
+++ b/src/menu/components/form/step-form/index.jsx
@@ -2,7 +2,7 @@
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
import { Popover, Modal, Button, Switch, notification, message } from 'antd'
-import { PlusOutlined, SettingOutlined, EditOutlined, ToolOutlined, DeleteOutlined, FontColorsOutlined } from '@ant-design/icons'
+import { PlusOutlined, SettingOutlined, EditOutlined, ToolOutlined, DeleteOutlined, SwapOutlined, FontColorsOutlined } from '@ant-design/icons'
import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
@@ -20,6 +20,7 @@
const MobCardComponent = asyncComponent(() => import('@/mob/components/formdragelement'))
const FormTitle = asyncComponent(() => import('../dragtitle'))
const FormAction = asyncComponent(() => import('../formaction'))
+const FormFork = asyncComponent(() => import('@/menu/modalconfig/formfork'))
const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
const PasteComponent = asyncIconComponent(() => import('@/menu/components/share/pastecomponent'))
const FieldsComponent = asyncComponent(() => import('@/templates/sharecomponent/fieldscomponent'))
@@ -42,8 +43,7 @@
visible: false,
editform: null,
formlist: null,
- sqlVerifing: false,
- standardform: null
+ sqlVerifing: false
}
UNSAFE_componentWillMount () {
@@ -144,6 +144,16 @@
}
card.subcards.forEach(item => {
+ if (item.subButton.intertype === 'system' && !item.subButton.sqlType) {
+ card.errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳璇疯缃搷浣滅被鍨媊})
+ }
+ if (item.subButton.verify && !item.subButton.output) {
+ if (item.subButton.verify.noteEnable === 'true') {
+ card.errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳鏈缃繑鍥炲�肩煭淇″彂閫佹棤鏁堬紒`})
+ } else if (item.subButton.verify.emailEnable === 'true') {
+ card.errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳鏈缃繑鍥炲�奸偖浠跺彂閫佹棤鏁堬紒`})
+ }
+ }
item.fields.forEach(m => {
if (m.dataSource && /@ID@/ig.test(m.dataSource)) {
idCtrl = true
@@ -162,6 +172,16 @@
card.$tables = getTables(card)
card.subcards.forEach(item => {
+ if (item.subButton.intertype === 'system' && !item.subButton.sqlType) {
+ card.errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳璇疯缃搷浣滅被鍨媊})
+ }
+ if (item.subButton.verify && !item.subButton.output) {
+ if (item.subButton.verify.noteEnable === 'true') {
+ card.errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳鏈缃繑鍥炲�肩煭淇″彂閫佹棤鏁堬紒`})
+ } else if (item.subButton.verify.emailEnable === 'true') {
+ card.errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳鏈缃繑鍥炲�奸偖浠跺彂閫佹棤鏁堬紒`})
+ }
+ }
item.fields.forEach(m => {
if (m.dataSource && /@ID@/ig.test(m.dataSource)) {
idCtrl = true
@@ -218,7 +238,7 @@
style: {},
fields: [],
prevButton: {label: '涓婁竴姝�', type: 'prev', enable: 'false', style: {marginRight: '15px', 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'}},
+ subButton: {label: '鎻愪氦', type: 'submit', intertype: 'system', reload: 'false', sqlType: '', sql: '', Ot: 'notRequired', execSuccess: 'never', enable: 'true', style: {backgroundColor: '#1890ff', color: '#ffffff', paddingLeft: '25px', paddingRight: '25px', paddingTop: '5px', paddingBottom: '5px'}},
nextButton: {label: '璺宠繃', type: 'next', enable: 'false', style: {paddingTop: '5px', paddingBottom: '5px'}}
}
@@ -253,7 +273,7 @@
closeGroup = (cell) => {
const { group } = this.state
let card = fromJS(this.state.card).toJS()
- const _this = this
+ const that = this
confirm({
content: '纭畾鍒犻櫎鍒嗙粍鍚楋紵',
@@ -265,8 +285,8 @@
_group = card.subcards[0] || null
}
- _this.setState({group: _group})
- _this.updateComponent(card)
+ that.setState({group: _group})
+ that.updateComponent(card)
},
onCancel() {}
})
@@ -297,7 +317,7 @@
changecols = (type) => {
let card = fromJS(this.state.card).toJS()
let config = fromJS(this.state.group).toJS()
- let _this = this
+ let that = this
config.fields = config.fields.map(item => {
item.labelwidth = 33.3
@@ -329,8 +349,8 @@
}
return item
})
- _this.setState({group: config})
- _this.updateComponent(card)
+ that.setState({group: config})
+ that.updateComponent(card)
},
onCancel() {}
})
@@ -360,7 +380,7 @@
closeForm = (cell) => {
let group = fromJS(this.state.group).toJS()
let card = fromJS(this.state.card).toJS()
- let _this = this
+ let that = this
group.fields = group.fields.filter(item => item.uuid !== cell.uuid)
@@ -374,8 +394,8 @@
confirm({
content: `纭畾鍒犻櫎<<${cell.label}>>鍚楋紵`,
onOk() {
- _this.setState({group})
- _this.updateComponent(card)
+ that.setState({group})
+ that.updateComponent(card)
},
onCancel() {}
})
@@ -405,6 +425,7 @@
orderType: 'asc',
readonly: 'false',
required: 'true',
+ readin: 'top',
focus: true
}
@@ -427,91 +448,14 @@
* @description 琛ㄥ崟缂栬緫
*/
handleForm = (_item) => {
- const { card, group, appType } = this.state
+ const { card, group } = this.state
+
let _form = fromJS(_item).toJS()
- let _inputfields = []
- let _tabfields = []
- let _linkableFields = []
- let _linksupFields = []
- let standardform = null
- let index = null
-
- group.fields.forEach((item, i) => {
- if (_form.uuid === item.uuid) {
- index = i
- }
-
- if (!item.field || _form.field === item.field) return
-
- if (['text', 'number', 'textarea', 'color'].includes(item.type)) {
- _inputfields.push({
- field: item.field,
- label: item.label
- })
- }
-
- if (item.hidden !== 'true' && ['text', 'number', 'select', 'link'].includes(item.type)) {
- _tabfields.push({
- field: item.field,
- label: item.label
- })
- }
-
- if (item.type === 'switch' || item.type === 'check') {
- _linksupFields.push({
- field: item.field,
- label: item.label
- })
- }
-
- 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
-
- _linkableFields.push({
- field: item.field,
- label: item.label + '-琛ㄥ崟'
- })
- })
-
- if (index !== null) {
- if (index === 0) {
- standardform = group.fields[index + 1] || null
- } else {
- standardform = group.fields[index - 1] || null
- }
- }
-
- let _fields = _linkableFields.map(cell => cell.field)
- card.columns.forEach(col => {
- if (col.field && !_fields.includes(col.field)) {
- _linkableFields.push({
- field: col.field,
- label: col.label + '-鏄剧ず鍒�'
- })
- }
- })
-
- if (_form.linkSubField && _form.linkSubField.length > 0) {
- let fields = _inputfields.map(item => item.field)
- _form.linkSubField = _form.linkSubField.filter(item => fields.includes(item))
- }
-
- if (appType !== 'mob' && !_form.span && standardform && standardform.span) {
- _form.span = standardform.span
- _form.labelwidth = standardform.labelwidth
- }
this.setState({
- standardform,
visible: true,
editform: _form,
- formlist: getModalForm(_form, _inputfields, _tabfields, _linkableFields, _linksupFields, card.columns)
+ formlist: getModalForm(_form, group.fields, card.columns)
})
}
@@ -524,7 +468,7 @@
handleSubmit = () => {
let _config = fromJS(this.state.group).toJS()
- this.formRef.handleConfirm(_config.fields).then(res => {
+ this.formRef.handleConfirm().then(res => {
_config.fields = _config.fields.map(item => {
delete item.focus
@@ -572,6 +516,7 @@
res.fields.forEach(item => {
item.uuid = Utils.getuuid()
+ delete item.focus
})
if (!res.prevButton) {
@@ -627,7 +572,7 @@
clearGroup = () => {
let group = fromJS(this.state.group).toJS()
let card = fromJS(this.state.card).toJS()
- let _this = this
+ let that = this
group.fields = []
@@ -641,8 +586,8 @@
confirm({
content: `纭畾娓呯┖琛ㄥ崟鍚楋紵`,
onOk() {
- _this.setState({group})
- _this.updateComponent(card)
+ that.setState({group})
+ that.updateComponent(card)
},
onCancel() {}
})
@@ -721,12 +666,22 @@
{group ? <div className={`form-area mk-${card.wrap.formStyle || ''}`}>
<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="寮�" 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}
- {appType !== 'mob' ? <Button className="mk-cols-change" onClick={() => this.changecols(4)}>4鍒�</Button> : null}
+ <div className="mk-form-tool">
+ <DeleteOutlined title="娓呯┖" onClick={this.clearGroup} />
+ {appType !== 'mob' ? <Popover title="鍒囨崲甯冨眬" overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
+ <>
+ <Button style={{marginRight: '10px'}} onClick={() => this.changecols(1)}>1鍒�</Button>
+ <Button style={{marginRight: '10px'}} onClick={() => this.changecols(2)}>2鍒�</Button>
+ <Button style={{marginRight: '10px'}} onClick={() => this.changecols(3)}>3鍒�</Button>
+ <Button onClick={() => this.changecols(4)}>4鍒�</Button>
+ </>
+ } trigger="hover">
+ <SwapOutlined />
+ </Popover> : null}
+ <FormFork forms={group.fields}/>
+ {/* <CopyOutlined title="澶嶅埗" onClick={this.triggerCopy} /> */}
+ <Switch checkedChildren="寮�" unCheckedChildren="鍏�" defaultChecked={this.state.showField} onChange={(val) => this.setState({showField: val})} />
+ </div>
<div style={{clear: 'both'}}></div>
{appType !== 'mob' ? <CardComponent
list={group.fields}
@@ -782,7 +737,7 @@
card={this.state.editform}
formlist={this.state.formlist}
inputSubmit={this.handleSubmit}
- standardform={this.state.standardform}
+ fields={group.fields}
wrappedComponentRef={(inst) => this.formRef = inst}
/>
</Modal>
--
Gitblit v1.8.0