From bbcb3f45ad0ef4c808bf5a68ec10c0464c094e2f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 27 十月 2021 11:51:40 +0800
Subject: [PATCH] Merge branch 'master' into bms
---
src/mob/components/menubar/normal-menubar/menucomponent/options.jsx | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/mob/components/menubar/normal-menubar/menucomponent/options.jsx b/src/mob/components/menubar/normal-menubar/menucomponent/options.jsx
index a035065..79de0e1 100644
--- a/src/mob/components/menubar/normal-menubar/menucomponent/options.jsx
+++ b/src/mob/components/menubar/normal-menubar/menucomponent/options.jsx
@@ -7,7 +7,7 @@
if (menulist) {
try {
menulist = JSON.parse(menulist)
- } catch {
+ } catch (e) {
menulist = []
}
} else {
@@ -142,6 +142,13 @@
required: true
},
{
+ type: 'styleInput',
+ field: 'borderRadius',
+ label: '鍦嗚',
+ initval: setting.borderRadius || '15%',
+ required: false
+ },
+ {
type: 'color',
field: 'color',
label: '瀛椾綋棰滆壊',
--
Gitblit v1.8.0