From bda849855c1036b352b4ea29bf1c1d7460d340be Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 04 四月 2023 17:14:15 +0800
Subject: [PATCH] 2023-04-04
---
src/menu/components/form/simple-form/index.jsx | 113 ++++++++++++++++++--------------------------------------
1 files changed, 37 insertions(+), 76 deletions(-)
diff --git a/src/menu/components/form/simple-form/index.jsx b/src/menu/components/form/simple-form/index.jsx
index 2b1e483..049c02d 100644
--- a/src/menu/components/form/simple-form/index.jsx
+++ b/src/menu/components/form/simple-form/index.jsx
@@ -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'))
@@ -462,6 +462,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 +513,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 +558,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') {
@@ -621,6 +580,8 @@
_card.subcards[0].setting.align = _card.wrap.align
_card.subcards[0].setting.enable = _card.wrap.enable
_card.subcards[0].setting.verticalSpace = _card.wrap.verticalSpace
+
+
if (_card.wrap.closeEnable === 'true' && !_card.subcards[0].closeButton) {
_card.subcards[0].closeButton = {label: '鍏抽棴', enable: 'true', type: 'close', style: {backgroundColor: '#ffffff', color: 'rgba(0,0,0,0.65)', borderColor: '#d9d9d9', borderWidth: '1px', paddingLeft: '25px', paddingRight: '25px', paddingTop: '5px', paddingBottom: '5px', marginLeft: '10px'}}
@@ -671,7 +632,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)} />
--
Gitblit v1.8.0