From fb3ec146a9e1444ece749d0bcf232a554e933fb0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 17 五月 2022 22:56:16 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/menuconfig/editthdmenu/index.jsx | 43 +++++++++++++++++++++----------------------
1 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/src/templates/menuconfig/editthdmenu/index.jsx b/src/templates/menuconfig/editthdmenu/index.jsx
index 1c9c99f..e66a6d3 100644
--- a/src/templates/menuconfig/editthdmenu/index.jsx
+++ b/src/templates/menuconfig/editthdmenu/index.jsx
@@ -407,6 +407,7 @@
}
previewPicture = (template) => {
+ if (template.disabled) return
// 鍥剧墖棰勮
this.setState({
preview: template.url,
@@ -555,31 +556,29 @@
Api.getSystemConfig({func: 'sPC_Get_UserTemp', TypeCharTwo: 'menu'}).then(res => {
let _templates = []
- let hasRolePermission = false
res.UserTemp.forEach(temp => {
- if (temp.Template === 'NewPage') {
- return
- } else if (temp.Template === 'RolePermission') {
- hasRolePermission = true
+ if (temp.Template === 'NewPage' || temp.Template === 'RolePermission') {
return
} else if (temp.Template === 'CustomPage' && memberLevel < 20) {
- return
+ temp.disabled = true
+ temp.disTitle = '浼氬憳绛夌骇涓嶅锛屾棤寮�鍙戞潈闄愩��'
}
_templates.push({
uuid: temp.MenuID,
title: temp.MenuName,
type: temp.Template,
- url: illust[temp.Template]
+ url: illust[temp.Template],
+ disabled: temp.disabled || false,
+ disTitle: temp.disTitle || ''
})
})
sysTemplates = sysTemplates.map(temp => {
- if (temp.type === 'RolePermission' && !hasRolePermission) {
- temp.hidden = false
- } else if (temp.type === 'CustomPage' && memberLevel < 20) {
- temp.hidden = true
+ if (temp.type === 'CustomPage' && memberLevel < 20) {
+ temp.disabled = true
+ temp.disTitle = '浼氬憳绛夌骇涓嶅锛屾棤寮�鍙戞潈闄愩��'
}
return temp
@@ -618,15 +617,15 @@
let sysTemplates = fromJS(this.state.sysTemplates).toJS()
// 瑙掕壊鏉冮檺鍒嗛厤妯℃澘锛屽彧鍙互娣诲姞涓�娆�
- if (sysMenu.isSystem && (sysMenu.Template === 'RolePermission')) {
- sysTemplates = sysTemplates.map(temp => {
- if (temp.type === sysMenu.type) {
- temp.hidden = true
- }
+ // if (sysMenu.isSystem && (sysMenu.Template === 'RolePermission')) {
+ // sysTemplates = sysTemplates.map(temp => {
+ // if (temp.type === sysMenu.type) {
+ // temp.hidden = true
+ // }
- return temp
- })
- }
+ // return temp
+ // })
+ // }
this.menuFormRef.handleConfirm().then(res => {
let PageParam = {
@@ -827,10 +826,10 @@
<TabPane tab="绯荤粺妯℃澘" key="1">
<Row>
{this.state.sysTemplates.map((template, index) => {
- if (template.hidden) return null
+ // if (template.hidden) return null
return (
- <Col key={`${index}`} span={8}>
+ <Col key={`${index}`} className={template.disabled ? 'disabled' : ''} title={template.disTitle || ''} span={8}>
<Card
title={template.title}>
<img onClick={() => {this.previewPicture(template)}} src={template.url} alt=""/>
@@ -853,7 +852,7 @@
{this.state.usedTemplates && this.state.usedTemplates.map((template, index) => {
if (template.title.toLowerCase().indexOf(this.state.tempSearchKey.toLowerCase()) >= 0) {
return (
- <Col key={template.type + index} span={8}>
+ <Col key={template.type + index} className={template.disabled ? 'disabled' : ''} title={template.disTitle || ''} span={8}>
<Card
title={template.title}>
<img onClick={() => {this.previewPicture(template)}} src={template.url} alt=""/>
--
Gitblit v1.8.0