From c45a375e5b4ce0e33c7fc8a1aecdad67d60acc9e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 01 三月 2021 15:09:06 +0800
Subject: [PATCH] 2021-03-01
---
src/templates/subtableconfig/index.jsx | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/templates/subtableconfig/index.jsx b/src/templates/subtableconfig/index.jsx
index af71c64..931505d 100644
--- a/src/templates/subtableconfig/index.jsx
+++ b/src/templates/subtableconfig/index.jsx
@@ -90,6 +90,11 @@
if (_config.type === 'user') {
_config.action = _config.action.map(item => {
let uuid = Utils.getuuid()
+
+ if (item.linkTab) {
+ item.linkTab = ''
+ }
+
if (item.OpenType === 'pop') { // 鍚湁瀛愰厤缃」鐨勬寜閽�
_oriActions.push({
prebtn: fromJS(item).toJS(),
@@ -550,6 +555,7 @@
let curBtn = config.action.filter(cell => item.curuuid === cell.uuid)[0] // 鏌ョ湅鍒濆鍖栨寜閽槸鍚﹀瓨鍦�
if (!curBtn) return
if (curBtn.OpenType !== item.prebtn.OpenType) return
+ if (curBtn.OpenType === 'funcbutton' && curBtn.execMode !== 'pop') return
oriActions.push({
prebtn: item.prebtn,
@@ -666,10 +672,10 @@
let _view = ''
let _subtab = editSubTab
- if (btn.OpenType === 'pop') {
- _view = 'Modal' // 琛ㄥ崟椤甸潰
+ if (btn.OpenType === 'pop' || btn.execMode === 'pop') {
+ _view = 'Modal' // 琛ㄥ崟椤甸潰
} else if (btn.OpenType === 'popview') {
- _view = btn.tabType || 'SubTable' // 鏂板脊绐楁爣绛炬ā鏉� tabType 灞炴�у凡鍘婚櫎
+ _view = 'SubTable' // 鏂板脊绐楁爣绛炬ā鏉� tabType 灞炴�у凡鍘婚櫎
_subtab = btn
if (editSubTab) {
@@ -935,7 +941,7 @@
render () {
const { activeKey, config, chartview } = this.state
- const confActions = config.action.filter(_action => !_action.origin && ['pop', 'popview', 'blank'].includes(_action.OpenType))
+ const confActions = config.action.filter(_action => !_action.origin && (['pop', 'popview'].includes(_action.OpenType) || (_action.OpenType === 'funcbutton' && _action.execMode === 'pop')))
return (
<div className="model-subtable-board">
--
Gitblit v1.8.0