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/comtableconfig/index.jsx | 42 ++++++++++++++++++++----------------------
1 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/src/templates/comtableconfig/index.jsx b/src/templates/comtableconfig/index.jsx
index 60b8e4c..6718bf5 100644
--- a/src/templates/comtableconfig/index.jsx
+++ b/src/templates/comtableconfig/index.jsx
@@ -86,6 +86,7 @@
if (!menu.isSubtable) { // 涓嶆槸閫夋嫨涓诲瓙琛ㄦ椂锛岄殣钘忔爣绛鹃〉
_config.tabs = []
}
+ _config.isAdd = true
} else {
_config = _LongParam
}
@@ -1293,17 +1294,19 @@
this.menuformRef.handleConfirm().then(res => {
- if (config.search[0] && config.search[0].origin) {
- config.search = config.search.filter(item => !item.origin)
- }
- if (config.action[0] && config.action[0].origin) {
- config.action = config.action.filter(item => !item.origin)
- }
- if (config.columns[0] && config.columns[0].origin) {
- config.columns = config.columns.filter(item => !item.origin)
- }
- if (config.tabs[0] && config.tabs[0].origin) {
- config.tabs = config.tabs.filter(item => !item.origin)
+ if (config.isAdd) {
+ if (config.search[0] && config.search[0].origin) {
+ config.search = config.search.filter(item => !item.origin)
+ }
+ if (config.action[0] && config.action[0].origin) {
+ config.action = config.action.filter(item => !item.origin)
+ }
+ if (config.columns[0] && config.columns[0].origin) {
+ config.columns = config.columns.filter(item => !item.origin)
+ }
+ if (config.tabs[0] && config.tabs[0].origin) {
+ config.tabs = config.tabs.filter(item => !item.origin)
+ }
}
let _LongParam = ''
@@ -1323,6 +1326,7 @@
// 淇濆瓨鏃跺垹闄ら厤缃被鍨嬶紝system 銆乽ser
delete _config.type
+ delete _config.isAdd
try {
_LongParam = window.btoa(window.encodeURIComponent(JSON.stringify(_config)))
@@ -1611,18 +1615,8 @@
const { config, originMenu } = this.state
let _this = this
- let isAdd = false
- if (
- (config.search[0] && config.search[0].origin) ||
- (config.action[0] && config.action[0].origin) ||
- (config.columns[0] && config.columns[0].origin) ||
- (config.tabs[0] && config.tabs[0].origin)
- ) {
- isAdd = true
- }
-
- if (isAdd) {
+ if (config.isAdd) {
confirm({
content: '鑿滃崟灏氭湭鎻愪氦锛岀‘瀹氭斁寮冧繚瀛樺悧锛�',
okText: this.state.dict['header.confirm'],
@@ -2017,11 +2011,13 @@
let _view = ''
let uuid = item.uuid
let isbutton = true
+ let _btnTab = null
if (type === 'button' && item.OpenType === 'pop') {
_view = 'Modal' // 琛ㄥ崟椤甸潰
} else if (type === 'button' && (item.OpenType === 'tab' || item.OpenType === 'blank')) {
_view = item.tabTemplate // 鏂版爣绛鹃〉妯℃澘
+ _btnTab = item
} else if (type === 'button' && item.OpenType === 'popview') {
_view = item.tabType // 鏂板脊绐楁爣绛炬ā鏉�
uuid = item.linkTab
@@ -2038,6 +2034,8 @@
tabConfig: null,
editSubTab: null,
subTabConfig: null,
+ btnTab: _btnTab,
+ btnTabConfig: null,
editAction: isbutton ? item : '',
subConfig: '',
tabview: _view
--
Gitblit v1.8.0