From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/tabs/antv-tabs/options.jsx | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/src/menu/components/tabs/antv-tabs/options.jsx b/src/menu/components/tabs/antv-tabs/options.jsx
index 8bfc2a9..c0430ab 100644
--- a/src/menu/components/tabs/antv-tabs/options.jsx
+++ b/src/menu/components/tabs/antv-tabs/options.jsx
@@ -25,7 +25,6 @@
initval: tab.label || '',
required: true,
focus: true,
- span: 22
},
{
type: 'mkicon',
@@ -34,7 +33,6 @@
initval: tab.icon || '',
required: false,
allowClear: true,
- span: 22
},
// {
// type: 'radio',
@@ -56,16 +54,14 @@
initval: tab.controlVal || '',
tooltip: '褰撶鐢ㄥ瓧娈靛�间笌闅愯棌鏍囪鐩哥瓑鏃讹紝鏍囩椤典細闅愯棌銆�',
required: false,
- forbid: appType === 'mob',
- span: 22
+ // forbid: appType === 'mob',
},
{
type: 'color',
field: 'backgroundColor',
- label: '鑳屾櫙鑹�',
+ label: '鑳屾櫙(鍐呭鍖�)',
initval: tab.backgroundColor || 'transparent',
required: false,
- span: 22
},
{
type: 'radio',
@@ -77,7 +73,6 @@
{value: 'false', label: '鍚�'},
{value: 'true', label: '鏄�'},
],
- span: 22
},
{
type: 'multiselect',
@@ -87,7 +82,6 @@
required: false,
options: roleList,
forbid: !!appType,
- span: 22
},
]
@@ -210,7 +204,7 @@
controlFields: [
{field: 'controlField', notNull: true},
],
- forbid: appType === 'mob',
+ // forbid: appType === 'mob',
},
{
type: 'text',
@@ -219,7 +213,26 @@
initval: setting.controlField || '',
tooltip: '鐢ㄤ簬鎺у埗鏍囩闅愯棌鐨勫瓧娈碉紝鍦ㄦ爣绛句腑濉叆闅愯棌鏍囪銆�',
required: true,
- forbid: appType === 'mob',
+ // forbid: appType === 'mob',
+ },
+ {
+ type: 'color',
+ field: 'backgroundColor',
+ label: '鑳屾櫙(鏍囬鏍�)',
+ initval: setting.backgroundColor || 'transparent',
+ required: false
+ },
+ {
+ type: 'radio',
+ field: 'permission',
+ label: '鏉冮檺楠岃瘉',
+ initval: setting.permission || 'false',
+ required: false,
+ options: [
+ {value: 'true', label: '鍚敤'},
+ {value: 'false', label: '绂佺敤'},
+ ],
+ forbid: !appType
},
{
type: 'multiselect',
--
Gitblit v1.8.0