From 75623dd039b742dbb44fb4c6b4af563404ed9c7f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 03 二月 2020 16:06:04 +0800
Subject: [PATCH] 2020-02-03
---
src/templates/subtableconfig/index.jsx | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/templates/subtableconfig/index.jsx b/src/templates/subtableconfig/index.jsx
index e0a3e2a..9283033 100644
--- a/src/templates/subtableconfig/index.jsx
+++ b/src/templates/subtableconfig/index.jsx
@@ -38,6 +38,8 @@
editTab: PropTypes.any,
tabConfig: PropTypes.any,
editSubTab: PropTypes.any,
+ btnTab: PropTypes.any,
+ btnTabConfig: PropTypes.any,
config: PropTypes.any,
handleView: PropTypes.func
}
@@ -270,15 +272,20 @@
// 椤甸潰杩斿洖
handleViewBack = () => {
- const {menu, editTab, tabConfig, editSubTab} = this.props
+ const {menu, editTab, tabConfig, editSubTab, btnTab, btnTabConfig} = this.props
let _tabview = menu ? menu.LongParam.Template : ''
+ let _subconfig = null
if (editSubTab) {
+ _subconfig = tabConfig
if (editTab.hasOwnProperty('OpenType')) {
_tabview = editTab.tabType
} else {
_tabview = editTab.type
}
+ } else if (!editSubTab && btnTab) {
+ _tabview = btnTab.tabTemplate
+ _subconfig = btnTabConfig
}
let param = {
@@ -287,8 +294,10 @@
tabConfig: null,
editSubTab: null,
subTabConfig: null,
+ btnTab: btnTab,
+ btnTabConfig: btnTabConfig,
editAction: null,
- subConfig: tabConfig,
+ subConfig: _subconfig,
tabview: _tabview
}
@@ -1698,7 +1707,7 @@
* @description 璁剧疆鍙厤缃寜閽�
*/
setSubConfig = (btn) => {
- const {menu, editTab, tabConfig, editSubTab} = this.props
+ const {menu, editTab, tabConfig, editSubTab, btnTab, btnTabConfig} = this.props
const { config, originConfig } = this.state
if (originConfig.isAdd) {
@@ -1739,6 +1748,8 @@
tabConfig: editSubTab ? tabConfig : originConfig,
editSubTab: _subtab,
subTabConfig: editSubTab ? originConfig : null,
+ btnTab: btnTab,
+ btnTabConfig: btnTabConfig,
editAction: btn,
subConfig: '',
tabview: _view
--
Gitblit v1.8.0