From ac1d52c46ff9019fcc93cf3d5e7ab17cf850824e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 10 八月 2023 16:05:24 +0800
Subject: [PATCH] 2023-08-10
---
src/menu/components/form/simple-form/index.jsx | 175 ++++++++++++++++++++-------------------------------------
1 files changed, 62 insertions(+), 113 deletions(-)
diff --git a/src/menu/components/form/simple-form/index.jsx b/src/menu/components/form/simple-form/index.jsx
index 2b1e483..91474ce 100644
--- a/src/menu/components/form/simple-form/index.jsx
+++ b/src/menu/components/form/simple-form/index.jsx
@@ -9,7 +9,7 @@
import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
import { getModalForm } from '@/templates/zshare/formconfig'
-import { resetStyle, getTables } 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 './options'
@@ -23,7 +23,7 @@
const FormAction = asyncComponent(() => import('../formaction'))
const NormalHeader = asyncComponent(() => import('@/menu/components/share/normalheader'))
const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
-const PasteComponent = asyncIconComponent(() => import('@/menu/components/share/pastecomponent'))
+const PasteForms = asyncIconComponent(() => import('@/menu/components/share/pasteforms'))
const UserComponent = asyncIconComponent(() => import('@/menu/components/share/usercomponent'))
const FieldsComponent = asyncComponent(() => import('@/templates/sharecomponent/fieldscomponent'))
@@ -69,7 +69,7 @@
scripts: [],
subcards: [{
uuid: Utils.getuuid(),
- setting: {title: '绌�', align: 'left_right', enable: 'true'},
+ setting: {title: '', align: 'left_right', enable: 'true'},
style: {},
fields: [],
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'}},
@@ -132,19 +132,9 @@
if (supModule === 'empty') {
supModule = ''
}
- let columns = card.columns.map(c => c.field)
- 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 (!columns.includes(card.setting.primaryKey)) {
- card.errors.push({ level: 0, detail: '涓婚敭宸插け鏁堬紒'})
- } else if (!card.setting.supModule) {
- card.errors.push({ level: 0, detail: '鏈缃笂绾х粍浠讹紒'})
- }
+ card.$c_ds = true
+ card.errors = checkComponent(card)
if (card.errors.length === 0) {
card.$tables = getTables(card)
@@ -344,50 +334,48 @@
let _linkableFields = []
let _linksupFields = []
let standardform = null
-
- let uniq = new Map()
let index = null
- uniq.set(_form.field, true)
card.subcards[0].fields.forEach((item, i) => {
if (_form.uuid === item.uuid) {
index = i
}
- if (['text', 'number', 'textarea', 'color'].includes(item.type) && _item.field !== item.field) {
+ 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 (_form.field !== item.field && item.hidden !== 'true' && ['text', 'number', 'select', 'link'].includes(item.type)) {
+ if (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: 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)) {
- uniq.set(item.field, true)
+ if (!['select', 'link', 'radio', 'checkcard', 'multiselect'].includes(item.type)) return
- _linkableFields.push({
- field: item.field,
- label: item.label + '-琛ㄥ崟'
- })
- _linksupFields.push({
- field: item.field,
- label: item.label
- })
- }
+ _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) {
@@ -398,10 +386,9 @@
}
}
+ let _fields = _linkableFields.map(cell => cell.field)
card.columns.forEach(col => {
- if (col.field && !uniq.has(col.field)) {
- uniq.set(col.field, true)
-
+ if (col.field && !_fields.includes(col.field)) {
_linkableFields.push({
field: col.field,
label: col.label + '-鏄剧ず鍒�'
@@ -443,6 +430,8 @@
fieldrepet = true
}
+ delete item.focus
+
if (item.uuid === res.uuid) {
if (item.style) {
res.style = item.style
@@ -462,6 +451,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
@@ -511,93 +502,43 @@
})
}
- pasteForm = (res) => {
+ pasteForm = (forms, res) => {
let _config = fromJS(this.state.card).toJS()
+
+ _config.subcards[0].fields = forms
if (res.subButton) {
let that = this
- _config.subcards[0].setting.focus = res.focus
- _config.subcards[0].setting.cache = res.cache
- _config.subcards[0].setting.align = res.align
- _config.subcards[0].setting.enable = res.enable
- _config.subcards[0].setting.verticalSpace = res.verticalSpace || ''
- _config.wrap.focus = res.focus
- _config.wrap.cache = res.cache
- _config.wrap.align = res.align
- _config.wrap.enable = res.enable
- _config.wrap.verticalSpace = res.verticalSpace || ''
-
- _config.subcards[0].subButton = res.subButton
+ // _config.subcards[0].setting.focus = res.focus
+ // _config.subcards[0].setting.cache = res.cache
+ // _config.subcards[0].setting.align = res.align
+ // _config.subcards[0].setting.enable = res.enable
+ // _config.subcards[0].setting.verticalSpace = res.verticalSpace || ''
+ // _config.wrap.focus = res.focus
+ // _config.wrap.cache = res.cache
+ // _config.wrap.align = res.align
+ // _config.wrap.enable = res.enable
+ // _config.wrap.verticalSpace = res.verticalSpace || ''
- _config.subcards[0].fields = res.fields.map(item => {
- item.uuid = Utils.getuuid()
- return item
- })
-
confirm({
- content: '鏇挎崲琛ㄥ崟鍙婃寜閽厤缃紵',
+ content: '鏄惁鏇挎崲鎸夐挳閰嶇疆锛�',
+ okText: '鏄�',
+ cancelText: '鍚�',
onOk() {
+ _config.subcards[0].subButton = res.subButton
+
that.updateComponent(_config)
},
- onCancel() {}
+ onCancel() {
+ that.updateComponent(_config)
+ }
})
- return
- } else if (res.fields) {
- if (_config.subcards[0].fields.length > 0) {
- let that = this
- _config.subcards[0].fields = res.fields.map(item => {
- item.uuid = Utils.getuuid()
- return item
- })
+ } else {
+ _config.subcards[0].fields = forms
- confirm({
- title: '纭畾鏇挎崲琛ㄥ崟鍚楋紵',
- content: '鍘熻〃鍗曞皢鍒犻櫎銆�',
- onOk() {
- that.updateComponent(_config)
- },
- onCancel() {}
- })
- } else {
- _config.subcards[0].fields = res.fields.map(item => {
- item.uuid = Utils.getuuid()
- return item
- })
-
- this.updateComponent(_config)
- }
-
- return
+ this.updateComponent(_config)
}
-
- let fieldrepet = false // 瀛楁閲嶅
-
- _config.subcards[0].fields.forEach(item => {
- if (res.field && item.field && item.field.toLowerCase() === res.field.toLowerCase()) {
- fieldrepet = true
- }
- })
-
- if (fieldrepet) {
- notification.warning({
- top: 92,
- message: '瀛楁宸插瓨鍦紒',
- duration: 10
- })
- return
- }
- _config.subcards[0].fields.push(res)
-
- this.updateComponent(_config)
-
- this.handleForm(res)
-
- notification.success({
- top: 92,
- message: '绮樿创鎴愬姛锛�',
- duration: 2
- })
}
getWrapForms = () => {
@@ -606,6 +547,13 @@
updateWrap = (res) => {
let _card = fromJS(this.state.card).toJS()
+ let buttons = res.buttons
+
+ delete res.buttons
+
+ res.enable = buttons.includes('enable') ? 'true' : 'false'
+ res.closeEnable = buttons.includes('closeEnable') ? 'true' : 'false'
+
_card.wrap = res
if (res.datatype === 'static') {
@@ -671,7 +619,7 @@
<EditOutlined style={{color: '#1890ff'}} title="缂栬緫"/>
</NormalForm>
<CopyComponent type="simpleform" card={card}/>
- <PasteComponent config={card} options={['form', 'forms', 'formgroup']} updateConfig={this.pasteForm} />
+ <PasteForms config={card.subcards[0]} update={this.pasteForm} />
<FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
<UserComponent config={card}/>
<DeleteOutlined className="close" title="鍒犻櫎缁勪欢" onClick={() => this.props.deletecomponent(card.uuid)} />
@@ -712,7 +660,7 @@
<div className="center">
<div className="title" onDoubleClick={() => {
let oInput = document.createElement('input')
- oInput.value = card.uuid
+ oInput.value = 'anchor' + card.uuid
document.body.appendChild(oInput)
oInput.select()
document.execCommand('Copy')
@@ -732,6 +680,7 @@
</div>
<Modal
title="缂栬緫"
+ wrapClassName="mk-scroll-modal"
visible={this.state.visible}
width={950}
maskClosable={false}
--
Gitblit v1.8.0