From f05ce61d55d421926229e50136c3b18c0dd9c262 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 18 十一月 2022 15:04:54 +0800
Subject: [PATCH] 2022-11-18
---
src/templates/comtableconfig/updatetable/index.jsx | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/src/templates/comtableconfig/updatetable/index.jsx b/src/templates/comtableconfig/updatetable/index.jsx
index 54e8072..d947713 100644
--- a/src/templates/comtableconfig/updatetable/index.jsx
+++ b/src/templates/comtableconfig/updatetable/index.jsx
@@ -984,6 +984,15 @@
delete _btn.position
delete _btn.linkTab
+ if (_btn.intertype === 'inner' && !_btn.innerFunc) {
+ _btn.intertype = 'system'
+ }
+ if (_btn.funcType === 'print' && _btn.execMode) {
+ _btn.OpenType = 'funcbutton'
+ } else if (_btn.OpenType === 'blank') {
+ _btn.OpenType = 'tab'
+ }
+
this.delButtons.push(btn.uuid)
_btn.show = 'button'
@@ -1016,14 +1025,14 @@
_btn.popClose = 'mainline'
}
- if (btn.OpenType === 'pop' || (btn.OpenType === 'funcbutton' && btn.funcType === 'print' && btn.execMode === 'pop')) {
+ if (_btn.OpenType === 'pop' || (_btn.OpenType === 'funcbutton' && _btn.funcType === 'print' && _btn.execMode === 'pop')) {
formActions.push({origin: btn.uuid, uuid: _btn.uuid, name: newCon.name, label: btn.label})
- } else if (btn.OpenType === 'popview') {
+ } else if (_btn.OpenType === 'popview') {
if (!popActions) return
popActions.push({origin: btn.uuid, linkTab: btn.linkTab || '', uuid: _btn.uuid, name: newCon.name, label: btn.label})
- } else if (btn.OpenType === 'tab') {
+ } else if (_btn.OpenType === 'tab') {
if (btn.tabTemplate === 'FormTab' || !btn.linkmenu || btn.linkmenu.length !== 3) {
errors.push(newCon.name + '涓寜閽��' + btn.label + '銆嬩笉鍦ㄦ敮鎸�')
@@ -1074,8 +1083,14 @@
_card.scripts = config.setting.scripts || []
sets.forEach(n => {
- if (n === 'interType' && !['system', 'inner', 'outer'].includes(config.setting.interType)) {
- _card.setting.interType = 'system'
+ if (n === 'interType') {
+ if (!['system', 'inner', 'outer'].includes(config.setting.interType)) {
+ _card.setting.interType = 'system'
+ } else if (config.setting.interType === 'inner' && !config.setting.innerFunc) {
+ _card.setting.interType = 'system'
+ } else {
+ _card.setting.interType = config.setting.interType
+ }
} else if (typeof(n) === 'string') {
_card.setting[n] = config.setting[n] || ''
} else {
@@ -1090,7 +1105,8 @@
}
})
- if (config.setting.doubleClick && !uuids[config.setting.doubleClick]) {
+ _card.wrap.doubleClick = config.setting.doubleClick || ''
+ if (_card.wrap.doubleClick && !uuids[_card.wrap.doubleClick]) {
_card.wrap.doubleClick = ''
}
--
Gitblit v1.8.0