From 32973f90869ff466401759c23681fc06fa65c71a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 10 六月 2025 23:06:50 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/mob/components/menubar/normal-menubar/options.jsx |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/mob/components/menubar/normal-menubar/options.jsx b/src/mob/components/menubar/normal-menubar/options.jsx
index fc8d7f2..6415abb 100644
--- a/src/mob/components/menubar/normal-menubar/options.jsx
+++ b/src/mob/components/menubar/normal-menubar/options.jsx
@@ -48,8 +48,9 @@
       initval: wrap.layout || 'grid',
       required: false,
       options: [
-        {value: 'grid', label: '鏍呮牸甯冨眬'},
-        {value: 'vertical', label: '涓婁笅甯冨眬'},
+        {value: 'grid', label: '鏍呮牸'},
+        {value: 'vertical', label: '涓婁笅'},
+        {value: 'flex', label: '寮规��'},
       ]
     },
     {
@@ -73,7 +74,8 @@
       options: [
         {value: 'true', label: '鍚敤'},
         {value: 'false', label: '绂佺敤'},
-      ]
+      ],
+      forbid: sessionStorage.getItem('editMenuType') === 'popview'
     },
   ]
 

--
Gitblit v1.8.0