From bfcacf54ad793bc33560f8bb15833508cf73aa5b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 31 三月 2023 01:18:44 +0800
Subject: [PATCH] 2023-03-31
---
src/menu/components/form/step-form/index.jsx | 128 ++++++++++++++++++++++++++----------------
1 files changed, 78 insertions(+), 50 deletions(-)
diff --git a/src/menu/components/form/step-form/index.jsx b/src/menu/components/form/step-form/index.jsx
index 32bc1f9..71a2b3a 100644
--- a/src/menu/components/form/step-form/index.jsx
+++ b/src/menu/components/form/step-form/index.jsx
@@ -132,6 +132,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] || '' : ''
@@ -158,6 +159,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}鈥濇槸鍚︽湁鏁坄})
}
@@ -170,12 +174,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
@@ -555,6 +564,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
@@ -563,7 +574,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}`
}
@@ -608,60 +619,29 @@
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
- if (!res.prevButton) {
- res.prevButton = {label: '涓婁竴姝�', type: 'prev', enable: 'false', style: {marginRight: '15px', paddingTop: '5px', paddingBottom: '5px'}}
- }
- if (!res.nextButton) {
- res.nextButton = {label: '璺宠繃', type: 'next', enable: 'false', style: {paddingTop: '5px', paddingBottom: '5px'}}
- }
-
- 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
+ if (!res.prevButton) {
+ res.prevButton = {label: '涓婁竴姝�', type: 'prev', enable: 'false', style: {marginRight: '15px', paddingTop: '5px', paddingBottom: '5px'}}
}
- _config.fields.push(res)
+ if (!res.nextButton) {
+ res.nextButton = {label: '璺宠繃', type: 'next', enable: 'false', style: {paddingTop: '5px', paddingBottom: '5px'}}
+ }
- this.updateGroup(_config)
-
- this.handleForm(res)
+ card.subcards.push(res)
+
+ this.setState({
+ group: res
+ })
+ this.updateComponent(card)
notification.success({
top: 92,
@@ -686,6 +666,52 @@
}
this.updateComponent(_card)
+ }
+
+ clearGroup = () => {
+ let group = fromJS(this.state.group).toJS()
+ let card = fromJS(this.state.card).toJS()
+ let _this = this
+
+ group.fields = []
+
+ card.subcards = card.subcards.map(item => {
+ if (item.uuid === group.uuid) {
+ return group
+ }
+ return item
+ })
+
+ confirm({
+ content: `纭畾娓呯┖琛ㄥ崟鍚楋紵`,
+ onOk() {
+ _this.setState({group})
+ _this.updateComponent(card)
+ },
+ onCancel() {}
+ })
+ }
+
+ 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) {
+ return _group
+ }
+ return item
+ })
+
+ if (_group.uuid === group.uuid) {
+ this.setState({group: _group})
+ this.updateComponent(card)
+ } else {
+ this.updateComponent(card)
+ }
}
clickComponent = (e) => {
@@ -718,7 +744,7 @@
<EditOutlined style={{color: '#1890ff'}} title="缂栬緫"/>
</NormalForm>
<CopyComponent type="stepform" 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)} />
@@ -734,12 +760,14 @@
selectId={group ? group.uuid : ''}
handleList={this.changecards}
handleGroup={this.changeGroup}
+ handleForm={this.parseForm}
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>
<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}
--
Gitblit v1.8.0