From c0e017668d780c40f85230f227ea0160b5d22d4d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 20 二月 2024 14:13:00 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/menu/components/group/normal-group/options.jsx |  114 ++++++++++++++++++++++++++++-----------------------------
 1 files changed, 56 insertions(+), 58 deletions(-)

diff --git a/src/menu/components/group/normal-group/options.jsx b/src/menu/components/group/normal-group/options.jsx
index 168bc3b..8b4c290 100644
--- a/src/menu/components/group/normal-group/options.jsx
+++ b/src/menu/components/group/normal-group/options.jsx
@@ -42,63 +42,61 @@
       precision: 0,
       required: true
     },
-    {
-      type: 'radio',
-      field: 'print',
-      label: '鎵撳嵃鎸夐挳',
-      initval: setting.print || 'false',
-      required: false,
-      options: [
-        {value: 'true', label: '鏄剧ず'},
-        {value: 'false', label: '闅愯棌'},
-      ],
-      controlFields: [
-        {field: 'pageSize', values: ['true']},
-        {field: 'pageLayout', values: ['true']},
-        {field: 'syncModule', values: ['true']},
-        {field: 'checkAll', values: ['true']},
-        {field: 'hide', values: ['true']},
-      ],
-      forbid: appType === 'mob'
-    },
-    {
-      type: 'radio',
-      field: 'pageSize',
-      label: '鎵撳嵃灏哄',
-      initval: setting.pageSize || 'A4',
-      required: true,
-      options: [
-        {value: 'A3', label: 'A3'},
-        {value: 'A4', label: 'A4'},
-        {value: 'A5', label: 'A5'},
-      ],
-      forbid: appType === 'mob'
-    },
-    {
-      type: 'radio',
-      field: 'pageLayout',
-      label: '鎵撳嵃甯冨眬',
-      initval: setting.pageLayout || 'vertical',
-      required: true,
-      options: [
-        {value: 'vertical', label: '绾靛悜'},
-        {value: 'horizontal', label: '妯悜'},
-      ],
-      forbid: appType === 'mob'
-    },
-    {
-      type: 'checkbox',
-      field: 'hide',
-      label: '闅愯棌鍏冪礌',
-      initval: setting.hide || [],
-      tooltip: '鎵ц鎵撳嵃鏃堕渶瑕侀殣钘忕殑椤甸潰鍏冪礌銆�',
-      required: false,
-      options: [
-        {value: 'search', label: '鎼滅储'},
-        {value: 'button', label: '鎸夐挳'},
-      ],
-      forbid: appType === 'mob'
-    },
+    // {
+    //   type: 'radio',
+    //   field: 'print',
+    //   label: '鎵撳嵃鎸夐挳',
+    //   initval: setting.print || 'false',
+    //   required: false,
+    //   options: [
+    //     {value: 'true', label: '鏄剧ず'},
+    //     {value: 'false', label: '闅愯棌'},
+    //   ],
+    //   controlFields: [
+    //     {field: 'pageSize', values: ['true']},
+    //     {field: 'pageLayout', values: ['true']},
+    //     {field: 'hide', values: ['true']},
+    //   ],
+    //   forbid: appType === 'mob'
+    // },
+    // {
+    //   type: 'radio',
+    //   field: 'pageSize',
+    //   label: '鎵撳嵃灏哄',
+    //   initval: setting.pageSize || 'A4',
+    //   required: true,
+    //   options: [
+    //     {value: 'A3', label: 'A3'},
+    //     {value: 'A4', label: 'A4'},
+    //     {value: 'A5', label: 'A5'},
+    //   ],
+    //   forbid: appType === 'mob'
+    // },
+    // {
+    //   type: 'radio',
+    //   field: 'pageLayout',
+    //   label: '鎵撳嵃甯冨眬',
+    //   initval: setting.pageLayout || 'vertical',
+    //   required: true,
+    //   options: [
+    //     {value: 'vertical', label: '绾靛悜'},
+    //     {value: 'horizontal', label: '妯悜'},
+    //   ],
+    //   forbid: appType === 'mob'
+    // },
+    // {
+    //   type: 'checkbox',
+    //   field: 'hide',
+    //   label: '闅愯棌鍏冪礌',
+    //   initval: setting.hide || [],
+    //   tooltip: '鎵ц鎵撳嵃鏃堕渶瑕侀殣钘忕殑椤甸潰鍏冪礌銆�',
+    //   required: false,
+    //   options: [
+    //     {value: 'search', label: '鎼滅储'},
+    //     {value: 'button', label: '鎸夐挳'},
+    //   ],
+    //   forbid: appType === 'mob'
+    // },
     {
       type: 'radio',
       field: 'permission',
@@ -109,7 +107,7 @@
         {value: 'true', label: '鍚敤'},
         {value: 'false', label: '绂佺敤'},
       ],
-      forbid: !appType
+      forbid: !appType || sessionStorage.getItem('editMenuType') === 'popview'
     },
     {
       type: 'radio',

--
Gitblit v1.8.0