From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/chart/antv-G6/chartcompile/formconfig.jsx | 22 ++++++----------------
1 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/src/menu/components/chart/antv-G6/chartcompile/formconfig.jsx b/src/menu/components/chart/antv-G6/chartcompile/formconfig.jsx
index 970e06e..3c67d5d 100644
--- a/src/menu/components/chart/antv-G6/chartcompile/formconfig.jsx
+++ b/src/menu/components/chart/antv-G6/chartcompile/formconfig.jsx
@@ -5,6 +5,8 @@
export function getBaseForm (card, columns) {
let appType = sessionStorage.getItem('appType')
let roleList = sessionStorage.getItem('sysRoles')
+ let isprint = sessionStorage.getItem('MenuType') === 'billPrint'
+ let ispop = sessionStorage.getItem('editMenuType') === 'popview'
if (roleList) {
try {
roleList = JSON.parse(roleList)
@@ -87,7 +89,7 @@
{value: 'true', label: '鍚敤'},
{value: 'false', label: '绂佺敤'},
],
- forbid: !appType || sessionStorage.getItem('editMenuType') === 'popview'
+ forbid: !appType || ispop || isprint
},
{
type: 'radio',
@@ -99,7 +101,7 @@
{value: 'true', label: '缁ф壙鑿滃崟'},
{value: 'false', label: '绂佺敤'},
],
- forbid: sessionStorage.getItem('editMenuType') === 'popview'
+ forbid: ispop || isprint
},
{
type: 'multiselect',
@@ -108,7 +110,7 @@
initval: card.blacklist || [],
required: false,
options: roleList,
- forbid: !!appType
+ forbid: !!appType || isprint
},
{
type: 'radio',
@@ -127,7 +129,6 @@
{field: 'menus', values: ['menus']},
{field: 'menuType', values: ['menus']},
{field: 'open', values: ['menu', 'menus']},
- {field: 'joint', values: ['menu', 'menus']},
]
},
{
@@ -160,24 +161,13 @@
forbid: appType !== 'pc'
},
{
- type: 'radio',
- field: 'joint',
- label: '鍙傛暟鎷兼帴',
- initval: card.joint || 'true',
- required: false,
- options: [
- {value: 'true', label: '鏄�'},
- {value: 'false', label: '鍚�'},
- ],
- },
- {
type: 'table',
field: 'menus',
label: '鑿滃崟缁�',
initval: card.menus || [],
required: true,
span: 24,
- actions: appType === 'pc' ? ['view'] : [],
+ actions: ['edit', 'del', 'add', 'move', 'view'],
columns: [
{
title: '鏍囪瘑',
--
Gitblit v1.8.0