From fb6f48cafdf9cb7c9eb585f7dc10193c66838eb1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 13 九月 2024 15:38:48 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/views/rolemanage/index.jsx | 4 ++++
src/views/design/header/index.jsx | 3 +++
src/views/pcdesign/index.jsx | 6 ++++--
src/views/mobdesign/index.jsx | 6 ++++--
4 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/views/design/header/index.jsx b/src/views/design/header/index.jsx
index 5687095..20ba503 100644
--- a/src/views/design/header/index.jsx
+++ b/src/views/design/header/index.jsx
@@ -158,6 +158,9 @@
} catch (e) {
trdItem.PageParam = {OpenType: 'newtab'}
}
+ if (trdItem.PageParam.Template === 'RolePermission' || trdItem.PageParam.Template === 'NewPage') {
+ trdItem.PageParam.backend = 'level1'
+ }
if (trdItem.type === 'CustomPage' && window.GLOB.memberLevel < 20) { // 浼氬憳绛夌骇澶т簬绛変簬20鏃讹紝鏈夌紪杈戞潈闄�
trdItem.forbidden = true
diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx
index 0769d8b..f104666 100644
--- a/src/views/mobdesign/index.jsx
+++ b/src/views/mobdesign/index.jsx
@@ -1625,6 +1625,8 @@
let interfaces = getFuncsAndInters(config)
let msg = getOutMessage(config)
roleParam.interfaces = interfaces
+ roleParam.msg = msg
+ roleParam.backend = 'level1'
let langSql = getLangTrans(config)
let param = {
@@ -1639,7 +1641,7 @@
TypeCharOne: sessionStorage.getItem('kei_no'),
Typename: sessionStorage.getItem('typename'),
MenuName: config.MenuName || '',
- PageParam: JSON.stringify({Template: 'webPage', interfaces, msg, backend: 'level1'}),
+ PageParam: JSON.stringify({Template: 'webPage', interfaces, msg}),
open_edition: config.open_edition,
menus_rolelist: window.btoa(window.encodeURIComponent(JSON.stringify(roleParam))),
long_data: long_data,
@@ -1713,7 +1715,7 @@
TypeCharOne: sessionStorage.getItem('kei_no'),
Typename: sessionStorage.getItem('typename'),
MenuName: NavBar.name || '',
- PageParam: JSON.stringify({Template: NavBar.type, backend: 'level1'}),
+ PageParam: JSON.stringify({Template: NavBar.type}),
open_edition: _item ? (_item.open_edition || '') : '',
menus_rolelist: window.btoa(window.encodeURIComponent(JSON.stringify(roles))),
// LText: '',
diff --git a/src/views/pcdesign/index.jsx b/src/views/pcdesign/index.jsx
index 5e95e77..345f2da 100644
--- a/src/views/pcdesign/index.jsx
+++ b/src/views/pcdesign/index.jsx
@@ -1306,6 +1306,8 @@
let interfaces = getFuncsAndInters(config)
let msg = getOutMessage(config)
roleParam.interfaces = interfaces
+ roleParam.msg = msg
+ roleParam.backend = 'level1'
let langSql = getLangTrans(config)
let param = {
@@ -1320,7 +1322,7 @@
TypeCharOne: sessionStorage.getItem('kei_no'),
Typename: 'pc',
MenuName: config.MenuName || '',
- PageParam: JSON.stringify({Template: 'webPage', interfaces, msg, backend: 'level1'}),
+ PageParam: JSON.stringify({Template: 'webPage', interfaces, msg}),
menus_rolelist: window.btoa(window.encodeURIComponent(JSON.stringify(roleParam))),
open_edition: config.open_edition,
long_data: long_data,
@@ -1411,7 +1413,7 @@
TypeCharOne: sessionStorage.getItem('kei_no'),
Typename: 'pc',
MenuName: NavBar.name || '',
- PageParam: JSON.stringify({Template: NavBar.type, backend: 'level1'}),
+ PageParam: JSON.stringify({Template: NavBar.type}),
menus_rolelist: window.btoa(window.encodeURIComponent(JSON.stringify(roles))),
open_edition: NavBar.open_edition,
// LText: '',
diff --git a/src/views/rolemanage/index.jsx b/src/views/rolemanage/index.jsx
index 26a71c5..54cced7 100644
--- a/src/views/rolemanage/index.jsx
+++ b/src/views/rolemanage/index.jsx
@@ -165,6 +165,10 @@
item.type = pageParam.type
}
+ if (item.type === 'navbar') {
+ item.backend = 'level1'
+ }
+
if (pageParam.version !== '1.0') {
item.nodes = ''
} else if (pageParam.login || pageParam.pass) {
--
Gitblit v1.8.0