From c5b925431860e7d4194bfe550e86866b11e4f7a4 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 31 八月 2023 11:40:42 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/menu/components/card/double-data-card/options.jsx | 26 ++++++--------------------
1 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/src/menu/components/card/double-data-card/options.jsx b/src/menu/components/card/double-data-card/options.jsx
index 778fe4c..82a6258 100644
--- a/src/menu/components/card/double-data-card/options.jsx
+++ b/src/menu/components/card/double-data-card/options.jsx
@@ -3,15 +3,10 @@
*/
export default function (wrap, columns = [], setting) {
let appType = sessionStorage.getItem('appType')
- // let MenuType = ''
- // let menu = window.GLOB.customMenu
let laypage = setting && setting.laypage !== 'false'
-
- // if (menu.parentId === 'BillPrintTemp') {
- // MenuType = 'billPrint'
- // }
-
let roleList = sessionStorage.getItem('sysRoles')
+ let isprint = sessionStorage.getItem('MenuType') === 'billPrint'
+ let ispop = sessionStorage.getItem('editMenuType') === 'popview'
if (roleList) {
try {
@@ -91,7 +86,7 @@
disabled: !laypage,
options: [
{value: 'page', label: '椤电爜'},
- {value: 'slide', label: '婊戝姩鍔犺浇', forbid: appType !== 'mob' || sessionStorage.getItem('editMenuType') === 'popview'},
+ {value: 'slide', label: '婊戝姩鍔犺浇', forbid: appType !== 'mob' || ispop},
{value: 'more', label: '鏌ョ湅鏇村'},
],
controlFields: [
@@ -156,15 +151,6 @@
{value: 'true', label: '鏈�'},
],
},
- // {
- // type: 'number',
- // field: 'printHeight',
- // label: '鎹㈢畻楂樺害',
- // initval: wrap.printHeight || '',
- // tooltip: '褰撳墠鏁版嵁鍗￠珮搴︾浉褰撲簬鍑犳潯鏁版嵁銆�',
- // required: false,
- // forbid: MenuType !== 'billPrint'
- // },
{
type: 'radio',
field: 'empty',
@@ -239,7 +225,7 @@
{value: 'true', label: !appType ? '缁ф壙鑿滃崟' : '鍚敤'},
{value: 'false', label: '绂佺敤'},
],
- forbid: sessionStorage.getItem('editMenuType') === 'popview'
+ forbid: ispop || isprint
},
{
type: 'radio',
@@ -251,7 +237,7 @@
{value: 'true', label: '缁ф壙鑿滃崟'},
{value: 'false', label: '绂佺敤'},
],
- forbid: sessionStorage.getItem('editMenuType') === 'popview'
+ forbid: ispop || isprint
},
{
type: 'multiselect',
@@ -260,7 +246,7 @@
initval: wrap.blacklist || [],
required: false,
options: roleList,
- forbid: !!appType
+ forbid: !!appType || isprint
},
{
type: 'text',
--
Gitblit v1.8.0