From 4ef8dd730e7450d96f0445e146a0c76360a3a1d1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 31 八月 2023 11:19:16 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/menu/components/card/balcony/options.jsx |   27 ++++++++++++++++-----------
 1 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/menu/components/card/balcony/options.jsx b/src/menu/components/card/balcony/options.jsx
index 1f90cc9..cfd50f8 100644
--- a/src/menu/components/card/balcony/options.jsx
+++ b/src/menu/components/card/balcony/options.jsx
@@ -6,7 +6,8 @@
  */
 export default function (wrap, buttons, columns) {
   let menu = window.GLOB.customMenu
-  let MenuType = sessionStorage.getItem('MenuType') || 'custom'
+  let isprint = sessionStorage.getItem('MenuType') === 'billPrint'
+  let ispop = sessionStorage.getItem('editMenuType') === 'popview'
 
   let modules = MenuUtils.getLinkModules(menu.components) || []
   let supmodules = MenuUtils.getSupModules(menu.components, '', menu.interfaces)
@@ -124,7 +125,7 @@
         {field: 'syncModule', values: ['sync']},
         {field: 'checkAll', values: ['sync']},
       ],
-      forbid: MenuType === 'billPrint'
+      forbid: isprint
     },
     {
       type: 'cascader',
@@ -133,7 +134,8 @@
       initval: wrap.supModule || [],
       // tooltip: '褰撲笂绾х粍浠朵笉瀛樺湪鎴栨病鏈夋潈闄愭椂锛屽綋鍓嶇粍浠朵笉鏄剧ず銆�',
       required: true,
-      options: supmodules
+      options: supmodules,
+      forbid: isprint
     },
     {
       type: 'radio',
@@ -145,7 +147,8 @@
       options: [
         {value: 'hidden', label: '閫夎'},
         {value: 'show', label: '濮嬬粓'},
-      ]
+      ],
+      forbid: isprint
     },
     {
       type: 'cascader',
@@ -154,7 +157,8 @@
       initval: wrap.syncModule || '',
       tooltip: '褰撳悓姝ョ粍浠朵笉瀛樺湪鎴栨病鏈夋潈闄愭椂锛屽綋鍓嶇粍浠朵笉鏄剧ず銆�',
       required: true,
-      options: modules
+      options: modules,
+      forbid: isprint
     },
     {
       type: 'radio',
@@ -166,7 +170,8 @@
       options: [
         {value: 'hidden', label: '闅愯棌'},
         {value: 'show', label: '鏄剧ず'},
-      ]
+      ],
+      forbid: isprint
     },
     {
       type: 'radio',
@@ -201,7 +206,7 @@
         {value: 'content', label: '娴姩鍗�'},
         {value: 'headerOrfooter', label: '椤电湁/椤佃剼'},
       ],
-      forbid: MenuType !== 'billPrint'
+      forbid: !isprint
     },
     {
       type: 'radio',
@@ -213,7 +218,7 @@
         {value: 'true', label: !appType ? '缁ф壙鑿滃崟' : '鍚敤'},
         {value: 'false', label: '绂佺敤'},
       ],
-      forbid: sessionStorage.getItem('editMenuType') === 'popview'
+      forbid: ispop || isprint
     },
     {
       type: 'radio',
@@ -225,7 +230,7 @@
         {value: 'true', label: '缁ф壙鑿滃崟'},
         {value: 'false', label: '绂佺敤'},
       ],
-      forbid: sessionStorage.getItem('editMenuType') === 'popview'
+      forbid: ispop || isprint
     },
     {
       type: 'select',
@@ -234,7 +239,7 @@
       initval: wrap.linkbtn || '',
       required: false,
       options: buttons,
-      forbid: MenuType === 'billPrint'
+      forbid: isprint
     },
     {
       type: 'multiselect',
@@ -243,7 +248,7 @@
       initval: wrap.blacklist || [],
       required: false,
       options: roleList,
-      forbid: !!appType
+      forbid: !!appType || isprint
     },
   ]
 

--
Gitblit v1.8.0