From f5130f2469384b423043a111223b518e78f43075 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 05 四月 2024 22:53:56 +0800
Subject: [PATCH] 2024-04-05
---
src/menu/components/share/actioncomponent/actionform/index.jsx | 69 +++++++++++++++++++++++++++-------
1 files changed, 54 insertions(+), 15 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index 2d3dba1..b3be041 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -215,7 +215,7 @@
shows.push('exInterface', 'exProInterface')
}
} else if (intertype === 'inner') {
- shows.push('innerFunc', 'output', 'recordUser')
+ shows.push('innerFunc', 'output', 'extraParam')
if (Ot === 'requiredOnce') { // 鍓嶇疆鍑芥暟
shows.push('preFunc')
}
@@ -296,7 +296,7 @@
shows.push('exInterface', 'exProInterface')
}
} else if (intertype === 'inner') {
- shows.push('innerFunc', 'recordUser')
+ shows.push('innerFunc', 'extraParam')
reRequired.innerFunc = true
} else {
shows.push('sql', 'sqlType')
@@ -347,7 +347,7 @@
shows.push('exInterface', 'exProInterface')
}
} else if (this.record.intertype === 'inner') {
- shows.push('innerFunc', 'recordUser')
+ shows.push('innerFunc', 'extraParam')
reRequired.innerFunc = true
}
if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
@@ -382,7 +382,7 @@
shows.push('exInterface', 'exProInterface')
}
} else if (this.record.intertype === 'inner') {
- shows.push('innerFunc', 'recordUser')
+ shows.push('innerFunc', 'extraParam')
reRequired.innerFunc = true
}
if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
@@ -408,6 +408,16 @@
}
} else if (openType === 'tab') {
reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredSgl', 'requiredOnce'].includes(op.value))
+
+ if (Ot === 'notRequired') {
+ shows.push('sysId')
+ }
+
+ if (shows.includes('linkmenu') && this.record.linkmenu[0] === 'multiMenu') {
+ shows.push('multiMenus')
+ } else if (this.record.sysId === 'js') {
+ shows.push('sign')
+ }
reRequired.linkmenu = true
reTooltip.linkmenu = ''
@@ -463,7 +473,7 @@
shows.push('exInterface', 'exProInterface')
}
} else if (this.record.intertype === 'inner') {
- shows.push('innerFunc', 'recordUser')
+ shows.push('innerFunc', 'extraParam')
reRequired.innerFunc = true
}
if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
@@ -558,11 +568,14 @@
shows.push('reason')
}
}
-
+
if (shows.includes('syncComponent') && this.record.syncComponent[0] === 'multiComponent') {
shows.push('syncComponents')
}
-
+
+ if (this.record.hidden !== 'true') {
+ shows.push('permission')
+ }
if (this.record.show === 'icon') {
reRequired.icon = true
} else {
@@ -1111,14 +1124,32 @@
let id = values.linkmenu[values.linkmenu.length - 1]
- list.forEach(item => {
- if (item.MenuID === id) {
- values.MenuID = id
- values.MenuName = item.MenuName
- values.MenuNo = item.MenuNo
- values.tabType = item.type
- }
- })
+ if (id !== 'multiMenu') {
+ list.forEach(item => {
+ if (item.MenuID === id) {
+ values.MenuID = id
+ values.MenuName = item.MenuName
+ values.MenuNo = item.MenuNo
+ values.tabType = item.type
+ }
+ })
+ delete values.multiMenus
+ } else {
+ values.multiMenus.forEach(menu => {
+ menu.sign = menu.sign || ''
+
+ let _id = menu.menuId[menu.menuId.length - 1]
+
+ list.forEach(item => {
+ if (item.MenuID === _id) {
+ menu.MenuID = _id
+ menu.MenuName = item.MenuName
+ menu.MenuNo = item.MenuNo
+ menu.tabType = item.type
+ }
+ })
+ })
+ }
}
} else if (values.OpenType === 'funcbutton' && values.funcType === 'expPdf') {
values.Ot = 'notRequired'
@@ -1148,6 +1179,14 @@
})
}
+ if (values.extraParam) {
+ values.extraParam.forEach(n => {
+ values[n] = 'true'
+ })
+
+ delete values.extraParam
+ }
+
resolve(values)
} else {
reject(err)
--
Gitblit v1.8.0