From f9697383bc9097be8a444558e09ae21b27f1e831 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 31 十二月 2019 09:27:21 +0800
Subject: [PATCH] 2019-12-31
---
src/templates/comtableconfig/index.jsx | 206 ++++++++++++++++++++++++++++-----------------------
1 files changed, 112 insertions(+), 94 deletions(-)
diff --git a/src/templates/comtableconfig/index.jsx b/src/templates/comtableconfig/index.jsx
index 3506b6b..bfe8078 100644
--- a/src/templates/comtableconfig/index.jsx
+++ b/src/templates/comtableconfig/index.jsx
@@ -108,9 +108,9 @@
})
}
- _config.tabs = _config.tabs || []
- _config.tabgroups = _config.tabgroups || ['tabs']
- _config.setting.subtabs = _config.setting.subtabs || []
+ // _config.tabs = _config.tabs || []
+ // _config.tabgroups = _config.tabgroups || ['tabs']
+ // _config.setting.subtabs = _config.setting.subtabs || []
this.setState({
originActions: _oriActions,
@@ -549,36 +549,54 @@
initVal: card.OpenType,
required: true,
options: [{
- MenuID: 'pop',
+ value: 'pop',
text: this.state.dict['header.form.popform']
}, {
- MenuID: 'prompt',
+ value: 'prompt',
text: this.state.dict['header.form.prompt']
}, {
- MenuID: 'exec',
+ value: 'exec',
text: this.state.dict['header.form.exec']
}, {
- MenuID: 'excelIn',
+ value: 'excelIn',
text: this.state.dict['header.form.excelIn']
}, {
- MenuID: 'excelOut',
+ value: 'excelOut',
text: this.state.dict['header.form.excelOut']
}, {
- MenuID: 'popview',
+ value: 'popview',
text: this.state.dict['header.form.popview']
}, {
- MenuID: 'tab',
+ value: 'tab',
text: this.state.dict['header.form.tab']
}, {
- MenuID: 'blank',
+ value: 'blank',
text: this.state.dict['header.form.blank']
}, {
- MenuID: 'innerpage',
+ value: 'innerpage',
text: this.state.dict['header.form.newpage.inner']
}, {
- MenuID: 'outerpage',
+ value: 'outerpage',
text: this.state.dict['header.form.newpage.outer']
}]
+ }, {
+ type: 'select',
+ key: 'tabType',
+ label: this.state.dict['header.form.tabType'],
+ initVal: card.tabType || 'SubTable',
+ required: true,
+ options: [{
+ value: 'SubTable',
+ text: this.state.dict['header.menu.tab.subtable']
+ }]
+ },
+ {
+ type: 'select',
+ key: 'linkTab',
+ label: '鍏宠仈鏍囩',
+ initVal: card.linkTab || '',
+ required: false,
+ options: []
},
{
type: 'select',
@@ -602,10 +620,10 @@
initVal: card.intertype,
required: true,
options: [{
- MenuID: 'inner',
+ value: 'inner',
text: this.state.dict['header.form.interface.inner']
}, {
- MenuID: 'outer',
+ value: 'outer',
text: this.state.dict['header.form.interface.outer']
}]
},
@@ -654,10 +672,10 @@
initVal: card.position || 'toolbar',
required: true,
options: [{
- MenuID: 'toolbar',
+ value: 'toolbar',
text: this.state.dict['header.form.toolbar']
}, {
- MenuID: 'grid',
+ value: 'grid',
text: this.state.dict['header.form.grid']
}]
},
@@ -676,13 +694,13 @@
initVal: card.execSuccess || 'never',
required: true,
options: [{
- MenuID: 'never',
+ value: 'never',
text: this.state.dict['header.form.refresh.never']
}, {
- MenuID: 'grid',
+ value: 'grid',
text: this.state.dict['header.form.refresh.grid']
}, {
- MenuID: 'view',
+ value: 'view',
text: this.state.dict['header.form.refresh.view']
}]
},
@@ -693,13 +711,30 @@
initVal: card.execError || 'never',
required: true,
options: [{
- MenuID: 'never',
+ value: 'never',
text: this.state.dict['header.form.refresh.never']
}, {
- MenuID: 'grid',
+ value: 'grid',
text: this.state.dict['header.form.refresh.grid']
}, {
- MenuID: 'view',
+ value: 'view',
+ text: this.state.dict['header.form.refresh.view']
+ }]
+ },
+ {
+ type: 'select',
+ key: 'popClose',
+ label: this.state.dict['header.form.popClose'],
+ initVal: card.popClose || 'never',
+ required: true,
+ options: [{
+ value: 'never',
+ text: this.state.dict['header.form.refresh.never']
+ }, {
+ value: 'grid',
+ text: this.state.dict['header.form.refresh.grid']
+ }, {
+ value: 'view',
text: this.state.dict['header.form.refresh.view']
}]
},
@@ -712,22 +747,22 @@
tooltipClass: 'middle',
required: false,
options: [{
- MenuID: 'S',
+ value: 'S',
text: 'S(鎻愰啋妗�-0)'
}, {
- MenuID: '-1',
+ value: '-1',
text: '-1(涓嶆彁绀�)'
}, {
- MenuID: 'N',
+ value: 'N',
text: 'N(鎻愰啋妗�-1)'
}, {
- MenuID: 'F',
+ value: 'F',
text: 'F(鎻愰啋妗�-2)'
}, {
- MenuID: 'E',
+ value: 'E',
text: 'E(纭妗�)'
}, {
- MenuID: 'NM',
+ value: 'NM',
text: 'NM(椤堕儴鎻愮ず)'
}]
},
@@ -806,16 +841,16 @@
initVal: card.type,
required: true,
options: [{
- MenuID: 'text',
+ value: 'text',
text: this.state.dict['header.form.text']
}, {
- MenuID: 'number',
+ value: 'number',
text: this.state.dict['header.form.number']
}, {
- MenuID: 'picture',
+ value: 'picture',
text: this.state.dict['header.form.picture']
}, {
- MenuID: 'textarea',
+ value: 'textarea',
text: this.state.dict['header.form.textarea']
}]
},
@@ -826,13 +861,13 @@
initVal: card.Align,
required: true,
options: [{
- MenuID: 'left',
+ value: 'left',
text: this.state.dict['header.form.alignLeft']
}, {
- MenuID: 'right',
+ value: 'right',
text: this.state.dict['header.form.alignRight']
}, {
- MenuID: 'center',
+ value: 'center',
text: this.state.dict['header.form.alignCenter']
}]
},
@@ -843,10 +878,10 @@
initVal: card.Hide,
required: true,
options: [{
- MenuID: 'true',
+ value: 'true',
text: this.state.dict['header.form.true']
}, {
- MenuID: 'false',
+ value: 'false',
text: this.state.dict['header.form.false']
}]
},
@@ -857,10 +892,10 @@
initVal: card.IsSort,
required: true,
options: [{
- MenuID: 'true',
+ value: 'true',
text: this.state.dict['header.form.true']
}, {
- MenuID: 'false',
+ value: 'false',
text: this.state.dict['header.form.false']
}]
},
@@ -890,10 +925,10 @@
label: this.state.dict['header.form.format'],
initVal: card.format || '',
options: [{
- MenuID: '',
+ value: '',
text: this.state.dict['header.form.empty']
}, {
- MenuID: 'thdSeparator',
+ value: 'thdSeparator',
text: this.state.dict['header.form.thdSeparator']
}],
required: false
@@ -922,19 +957,19 @@
label: this.state.dict['header.form.match'],
initVal: card.match || '',
options: [{
- MenuID: '',
+ value: '',
text: this.state.dict['header.form.empty']
}, {
- MenuID: '>',
+ value: '>',
text: '>'
}, {
- MenuID: '<',
+ value: '<',
text: '<'
}, {
- MenuID: '>=',
+ value: '>=',
text: '>='
}, {
- MenuID: '<=',
+ value: '<=',
text: '<='
}],
required: false
@@ -956,25 +991,25 @@
label: this.state.dict['header.form.color'],
initVal: card.color || '',
options: [{
- MenuID: '',
+ value: '',
text: this.state.dict['header.form.empty']
}, {
- MenuID: 'red',
+ value: 'red',
text: '绾㈣壊锛堝唴瀹癸級'
}, {
- MenuID: 'redbg',
+ value: 'redbg',
text: '绾㈣壊锛堣儗鏅級'
}, {
- MenuID: 'orange',
+ value: 'orange',
text: '姗欒壊锛堝唴瀹癸級'
}, {
- MenuID: 'orangebg',
+ value: 'orangebg',
text: '姗欒壊锛堣儗鏅級'
}, {
- MenuID: 'green',
+ value: 'green',
text: '缁胯壊锛堝唴瀹癸級'
}, {
- MenuID: 'greenbg',
+ value: 'greenbg',
text: '缁胯壊锛堣儗鏅級'
}],
required: false
@@ -1021,7 +1056,7 @@
_usedTabMap.set(subtab, true)
})
})
- console.log(config)
+
config.setting.subtabs.forEach(subtab => { // 涓昏〃宸查�夌殑涓嬬骇鏍囩
_usedTabMap.set(subtab, true)
})
@@ -1048,8 +1083,8 @@
{
type: 'select',
key: 'type',
- label: this.state.dict['header.form.type'],
- initVal: card.type || '',
+ label: this.state.dict['header.form.tabType'],
+ initVal: card.type || 'SubTable',
required: true,
options: [{
value: 'SubTable',
@@ -2476,6 +2511,7 @@
* @description 璁剧疆鍙厤缃寜閽�
*/
setSubConfig = (btn, type) => {
+ console.log(btn)
const { menu } = this.props
const { config, originMenu } = this.state
@@ -2515,13 +2551,26 @@
message: '鑿滃崟閰嶇疆宸蹭慨鏀癸紝璇蜂繚瀛橈紒',
duration: 10
})
- } else if (type === 'button') {
+ } else {
this.setState({
loading: true
})
+
+ let uuid = ''
+ let _type = type
+ if (type === 'button' && btn.OpenType === 'popview') {
+ _type = 'tab'
+ }
+
+ if (_type === 'button') {
+ uuid = btn.uuid
+ } else {
+ uuid = btn.linkTab
+ }
+
Api.getSystemConfig({
func: 'sPC_Get_LongParam',
- MenuID: btn.uuid
+ MenuID: uuid
}).then(res => {
if (res.status) {
this.setState({
@@ -2536,40 +2585,8 @@
_LongParam = ''
}
}
- this.props.handleSubConfig(btn, originMenu, _LongParam, type)
- } else {
- this.setState({
- loading: false
- })
- notification.warning({
- top: 92,
- message: res.message,
- duration: 10
- })
- }
- })
- } else if (type === 'tab') {
- this.setState({
- loading: true
- })
- Api.getSystemConfig({
- func: 'sPC_Get_LongParam',
- MenuID: btn.linkTab
- }).then(res => {
- if (res.status) {
- this.setState({
- loading: false
- })
- let _LongParam = ''
- if (res.LongParam) {
- _LongParam = window.decodeURIComponent(window.atob(res.LongParam))
- try {
- _LongParam = JSON.parse(_LongParam)
- } catch (e) {
- _LongParam = ''
- }
- }
- if (!_LongParam) {
+
+ if (_type === 'tab' && !_LongParam) {
_LongParam = {
...btn,
uuid: btn.linkTab,
@@ -2577,7 +2594,7 @@
}
}
- this.props.handleSubConfig(btn, originMenu, _LongParam, type)
+ this.props.handleSubConfig(btn, originMenu, _LongParam, _type)
} else {
this.setState({
loading: false
@@ -2912,6 +2929,7 @@
<ActionForm
dict={this.state.dict}
card={this.state.card}
+ tabs={this.state.tabviews}
formlist={this.state.formlist}
wrappedComponentRef={(inst) => this.formRef = inst}
/> : null
--
Gitblit v1.8.0