From 71a0e75ecb56ae643fe1e86188d45f93f48388c9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 28 八月 2020 14:07:41 +0800
Subject: [PATCH] 2020-08-28
---
src/menu/actioncomponent/actionform/index.jsx | 21 ++++-----------------
1 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/src/menu/actioncomponent/actionform/index.jsx b/src/menu/actioncomponent/actionform/index.jsx
index e159cec..25d206c 100644
--- a/src/menu/actioncomponent/actionform/index.jsx
+++ b/src/menu/actioncomponent/actionform/index.jsx
@@ -73,7 +73,6 @@
let _menulist = this.props.formlist.filter(form => form.key === 'linkmenu')[0] || ''
let _opentype = card.OpenType // 鎵撳紑鏂瑰紡
- let _tabType = card.tabType || 'SubTable' // 鎸夐挳涓哄脊绐楋紙鏍囩锛夋椂锛屾爣绛剧殑绫诲瀷
let _options = null // 閫夐」鍒楄〃
if (card.execMode) { // 杞崲鎵撳嵃鏃舵墦寮�鏂瑰紡
@@ -83,18 +82,13 @@
_opentype = 'innerpage'
}
- let _tabs = this.props.tabs.filter(tab => tab.type === _tabType)
-
if (_opentype === 'innerpage') { // 鏂伴〉闈紝鍙�夋ā鏉�(鑷畾涔夋椂锛屽彲濉叆澶栭儴閾炬帴)
_options = ['label', 'Ot', 'OpenType', 'pageTemplate', 'icon', 'class', 'position']
if (card.pageTemplate === 'custom') {
_options.push('url', 'joint')
}
} else if (_opentype === 'blank' || _opentype === 'tab') { // 鏂版爣绛炬垨褰撳墠椤甸潰鏇挎崲
- _options = ['label', 'Ot', 'OpenType', 'icon', 'class', 'position', 'tabTemplate']
- if (card.tabTemplate === 'ThdMenu') {
- _options.push('linkmenu')
- }
+ _options = ['label', 'Ot', 'OpenType', 'icon', 'class', 'position', 'tabTemplate', 'linkmenu']
} else if (_opentype === 'popview') { // 妯℃�佹鏍囩椤�
_options = ['label', 'Ot', 'OpenType', 'icon', 'class', 'position', 'tabType', 'linkTab', 'popClose']
} else if (_opentype === 'excelOut') { // 瀵煎叆瀵煎嚭
@@ -161,7 +155,7 @@
value: '',
text: '鏂板缓'
},
- ..._tabs
+ ...this.props.tabs
]
} else if (item.key === 'OpenType') {
item.initVal = _opentype
@@ -203,10 +197,7 @@
_options.push('url', 'joint')
}
} else if (value === 'blank' || value === 'tab') {
- _options = ['label', 'Ot', 'OpenType', 'icon', 'class', 'position', 'tabTemplate']
- if (card.tabTemplate === 'ThdMenu') {
- _options.push('linkmenu')
- }
+ _options = ['label', 'Ot', 'OpenType', 'icon', 'class', 'position', 'tabTemplate', 'linkmenu']
} else if (value === 'popview') {
_options = ['label', 'Ot', 'OpenType', 'icon', 'class', 'position', 'tabType', 'linkTab', 'popClose']
} else if (value === 'excelOut') {
@@ -424,11 +415,7 @@
this.props.form.setFieldsValue(_fieldval)
})
} else if (key === 'tabTemplate') {
- let _options = ['label', 'Ot', 'OpenType', 'icon', 'class', 'position', 'tabTemplate']
-
- if (value === 'ThdMenu') {
- _options.push('linkmenu')
- }
+ let _options = ['label', 'Ot', 'OpenType', 'icon', 'class', 'position', 'tabTemplate', 'linkmenu']
this.setState({
openType: value,
--
Gitblit v1.8.0