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/tab-form/index.jsx | 128 ++++++++++--------------------------------
1 files changed, 31 insertions(+), 97 deletions(-)
diff --git a/src/menu/components/form/tab-form/index.jsx b/src/menu/components/form/tab-form/index.jsx
index b8c0790..0d1e4f1 100644
--- a/src/menu/components/form/tab-form/index.jsx
+++ b/src/menu/components/form/tab-form/index.jsx
@@ -144,6 +144,7 @@
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] || '' : ''
@@ -170,6 +171,9 @@
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}鈥濇槸鍚︽湁鏁坄})
}
@@ -182,12 +186,17 @@
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: card
@@ -560,6 +569,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
@@ -568,7 +579,7 @@
let param = {
func: 's_debug_sql',
exec_type: 'y',
- LText: `declare @mk_organization nvarchar(512)
+ LText: `declare @mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20)
${res.dataSource}`
}
@@ -613,56 +624,25 @@
if (res.subtype === 'simpleform') {
res = res.subcards[0]
}
- if (res.subButton) {
- let card = fromJS(this.state.card).toJS()
- res.uuid = Utils.getuuid()
- res.sort = card.subcards.length + 1
+ let card = fromJS(this.state.card).toJS()
- res.fields.forEach(item => {
- item.uuid = Utils.getuuid()
- })
+ res.uuid = Utils.getuuid()
+ res.sort = card.subcards.length + 1
- delete res.prevButton
- delete res.nextButton
-
- card.subcards.push(res)
-
- this.setState({
- group: res
- })
- this.updateComponent(card)
-
- notification.success({
- top: 92,
- message: '绮樿创鎴愬姛锛�',
- duration: 2
- })
- return
- }
-
- let _config = fromJS(this.state.group).toJS()
- let fieldrepet = false // 瀛楁閲嶅
-
- _config.fields.forEach(item => {
- if (res.field && item.field && item.field.toLowerCase() === res.field.toLowerCase()) {
- fieldrepet = true
- }
+ 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,
@@ -713,58 +693,12 @@
})
}
- parseForm = (g, res) => {
- let _group = fromJS(g).toJS()
- let _confirm = false
-
- if (res.copyType === 'form') {
- let fieldrepet = false // 瀛楁閲嶅
- res.uuid = Utils.getuuid()
-
- _group.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
- }
- _group.fields.push(res)
- } else {
- if (_group.fields.length > 0) {
- _confirm = true
- }
-
- _group.fields = res.fields.map(item => {
- item.uuid = Utils.getuuid()
- return item
- })
- }
-
- if (_confirm) {
- let that = this
- confirm({
- title: '纭畾鏇挎崲琛ㄥ崟鍚楋紵',
- content: '鍘熻〃鍗曞皢鍒犻櫎銆�',
- onOk() {
- that.updateForms(_group)
- },
- onCancel() {}
- })
- } else {
- this.updateForms(_group)
- }
- }
-
- updateForms = (_group) => {
+ 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) {
@@ -811,7 +745,7 @@
<EditOutlined style={{color: '#1890ff'}} title="缂栬緫"/>
</NormalForm>
<CopyComponent type="tabform" card={card}/>
- <PasteComponent config={card} options={['form', 'formgroup', 'simpleform']} 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)} />
@@ -832,7 +766,7 @@
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} />
<span style={{color: 'red', marginLeft: '30px', cursor: 'pointer'}} onClick={this.clearGroup}>娓呯┖</span>
--
Gitblit v1.8.0