From 49f09cc6f8ff8c30a75ed1a9d6f510b69b73962a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 12 十二月 2023 21:05:37 +0800
Subject: [PATCH] 2023-12-12
---
src/menu/components/form/tab-form/index.jsx | 120 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 61 insertions(+), 59 deletions(-)
diff --git a/src/menu/components/form/tab-form/index.jsx b/src/menu/components/form/tab-form/index.jsx
index 0d6e367..9368450 100644
--- a/src/menu/components/form/tab-form/index.jsx
+++ b/src/menu/components/form/tab-form/index.jsx
@@ -4,7 +4,6 @@
import { Popover, Modal, Button, Switch, notification, message } from 'antd'
import { PlusOutlined, SettingOutlined, EditOutlined, ToolOutlined, DeleteOutlined, FontColorsOutlined } from '@ant-design/icons'
-import Api from '@/api'
import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
import { getModalForm } from '@/templates/zshare/formconfig'
@@ -71,21 +70,21 @@
sort: 1,
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'}},
+ 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'}},
}, {
uuid: Utils.getuuid(),
setting: {title: '鍒嗙粍2', align: 'left_right'},
sort: 1,
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'}},
+ 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'}},
}, {
uuid: Utils.getuuid(),
setting: {title: '鍒嗙粍3', align: 'left_right'},
sort: 1,
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'}},
+ 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'}},
}]
}
@@ -102,6 +101,10 @@
}
}
+ componentDidMount () {
+ MKEmitter.addListener('mkUpdateInter', this.mkUpdateInter)
+ }
+
shouldComponentUpdate (nextProps, nextState) {
return !is(fromJS(this.state), fromJS(nextState))
}
@@ -112,6 +115,21 @@
componentWillUnmount () {
this.setState = () => {
return
+ }
+ MKEmitter.removeListener('mkUpdateInter', this.mkUpdateInter)
+ }
+
+ mkUpdateInter = (inter, split) => {
+ const { card } = this.state
+
+ if (card.wrap.datatype === 'public' && card.wrap.publicId === inter.uuid) {
+ let _card = {...card, columns: fromJS(inter.columns).toJS()}
+
+ split.delay = split.delay + 10
+
+ setTimeout(() => {
+ this.updateComponent(_card)
+ }, split.delay)
}
}
@@ -124,7 +142,7 @@
card.errors = []
let idCtrl = false
- if (card.wrap.datatype !== 'static') {
+ if (card.wrap.datatype === 'dynamic') {
let supModule = card.setting.supModule ? card.setting.supModule[card.setting.supModule.length - 1] || '' : ''
if (supModule === 'empty') {
supModule = ''
@@ -138,6 +156,9 @@
}
card.subcards.forEach(item => {
+ if (item.subButton.intertype === 'system' && !item.subButton.sqlType) {
+ card.errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳璇疯缃搷浣滅被鍨媊})
+ }
item.fields.forEach(m => {
if (m.dataSource && /@ID@/ig.test(m.dataSource)) {
idCtrl = true
@@ -148,16 +169,22 @@
})
})
} else {
- let supModule = card.wrap.supModule ? card.wrap.supModule[card.wrap.supModule.length - 1] : ''
+ let supModule = ''
+ if (card.wrap.datatype === 'static') {
+ supModule = card.wrap.supModule ? card.wrap.supModule[card.wrap.supModule.length - 1] : ''
+ }
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} 鎸夐挳璇疯缃搷浣滅被鍨媊})
+ }
item.fields.forEach(m => {
if (m.dataSource && /@ID@/ig.test(m.dataSource)) {
idCtrl = true
}
- if (m.type === 'linkMain' && !supModule) {
+ if (m.type === 'linkMain' && !supModule && card.wrap.datatype === 'static') {
card.errors.push({ level: 1, detail: `璇锋鏌ュ垎缁勨��${item.setting.title}鈥濅腑鍏宠仈涓昏〃鈥�${m.label}鈥濇槸鍚︽湁鏁坄})
}
})
@@ -208,7 +235,7 @@
sort: card.subcards.length + 1,
style: {},
fields: [],
- 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'}},
+ 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'}},
}
card.subcards.push(newcard)
@@ -506,68 +533,33 @@
* 3銆侀�氳繃loading鍒锋柊
*/
handleSubmit = () => {
- this.formRef.handleConfirm().then(res => {
- let _config = fromJS(this.state.group).toJS()
- let fieldrepet = false // 瀛楁閲嶅
+ let _config = fromJS(this.state.group).toJS()
+ this.formRef.handleConfirm(_config.fields).then(res => {
_config.fields = _config.fields.map(item => {
- if (item.uuid !== res.uuid && res.field && item.field && item.field.toLowerCase() === res.field.toLowerCase()) {
- fieldrepet = true
- }
-
delete item.focus
- if (item.uuid === res.uuid) {
- if (item.style) {
- res.style = item.style
- }
- return res
+ if (item.uuid === res.values.uuid) {
+ return res.values
} else {
return item
}
})
- if (fieldrepet) {
- notification.warning({
- top: 92,
- message: '瀛楁宸插瓨鍦紒',
- duration: 10
- })
- return
- }
-
- window.GLOB.formId = res.uuid
-
- if (['select', 'multiselect', 'link', 'checkbox', 'radio', 'checkcard'].includes(res.type) && res.resourceType === '1' && /\s/.test(res.dataSource)) {
+ if (res.loading) {
this.setState({
sqlVerifing: true
})
-
- let sql = `declare @mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20)
- ${res.dataSource}`
- sql = sql.replace(/@\$|\$@/ig, '').replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id)@/ig, `'1949-10-01 15:00:00'`)
-
- let rduri = ''
- if (window.GLOB.mainSystemApi && res.database === 'sso') {
- rduri = window.GLOB.mainSystemApi
- }
-
- Api.sDebug(sql, rduri).then(result => {
- if (result.status || result.ErrCode === '-2') {
- this.setState({
- sqlVerifing: false,
- editform: null,
- visible: false
- })
- this.updateGroup(_config)
- } else {
- this.setState({sqlVerifing: false})
-
- Modal.error({
- title: result.message
- })
- }
+ res.promise().then(() => {
+ this.setState({
+ sqlVerifing: false,
+ editform: null,
+ visible: false
+ })
+ this.updateGroup(_config)
+ }, () => {
+ this.setState({sqlVerifing: false})
})
} else {
this.setState({
@@ -622,6 +614,17 @@
_card.setting.supModule = res.supModule
} else {
_card.setting.supModule = ''
+ }
+ } else if (res.datatype === 'public') {
+ let interfaces = window.GLOB.customMenu.interfaces || []
+
+ let d = interfaces.filter(m => m.uuid === res.publicId && m.status === 'true')[0]
+
+ if (d) {
+ _card.columns = fromJS(d.columns).toJS()
+
+ _card.setting = { interType: 'system' }
+ _card.scripts = []
}
}
@@ -707,8 +710,7 @@
<PasteComponent config={card} options={['formgroup', 'simpleform']} updateConfig={this.pasteForm} />
<FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
<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' ? <SettingOutlined style={{color: '#eeeeee', cursor: 'not-allowed'}}/> : null}
+ {card.wrap.datatype === 'dynamic' ? <SettingComponent config={card} updateConfig={this.updateComponent} /> : <SettingOutlined style={{color: '#eeeeee', cursor: 'not-allowed'}}/>}
</div>
} trigger="hover">
<ToolOutlined />
--
Gitblit v1.8.0