From e3d44b5694b87e8b32d468d8b97fdd409da10b52 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 29 六月 2023 09:23:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/zshare/formconfig.jsx | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index 0984554..2dea436 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -3476,6 +3476,22 @@
},
{
type: 'radio',
+ key: 'checkAll',
+ label: '鍏ㄩ��',
+ initVal: card.checkAll || 'hide',
+ tooltip: '鍙閫夌殑閫夐」鍗℃槸鍚︽樉绀哄叏閫夊紑鍏筹紝娉細褰撻�夐」澶т簬3涓椂鏈夋晥銆�',
+ required: false,
+ forbid: appType !== '',
+ options: [{
+ value: 'hide',
+ text: '闅愯棌'
+ }, {
+ value: 'show',
+ text: '鏄剧ず'
+ }]
+ },
+ {
+ type: 'radio',
key: 'selectStyle',
label: '閫変腑鏁堟灉',
tooltip: '鑳屾櫙鍙婃枃瀛楀彉鍖栨椂浼氫娇鐢ㄧ郴缁熻壊銆�',
@@ -4135,8 +4151,7 @@
key: 'icon',
label: '鍥炬爣',
initVal: card.icon || '',
- required: false,
- forbid: type === 'CalendarPage'
+ required: false
},
{
type: 'select',
@@ -4144,8 +4159,7 @@
label: '涓婄骇鏍囩',
initVal: supMenu,
required: false,
- options: menus,
- forbid: type === 'CalendarPage'
+ options: menus
},
{
type: 'mutilselect',
@@ -4154,8 +4168,7 @@
tooltip: '濡傛灉瀛愭爣绛句腑鍚湁鍒锋柊鍚岀骇鏍囩鐨勬寜閽紝鍦ㄦ澶勬坊鍔犻渶瑕佸埛鏂扮殑鏍囩銆�',
initVal: equalTab,
required: false,
- options: equalTabs,
- forbid: type === 'CalendarPage'
+ options: equalTabs
},
{
type: 'text',
@@ -4163,8 +4176,7 @@
label: '澶栭敭',
tooltip: '澶栭敭鏃ㄥ湪鏍囩椤典腑鎵ц榛樿鍑芥暟锛堟坊鍔狅級鏃讹紝鏇挎崲BID瀛楁',
initVal: card.foreignKey || '',
- required: false,
- forbid: type === 'CalendarPage'
+ required: false
},
{
type: 'number',
@@ -4184,7 +4196,7 @@
initVal: card.searchPass || 'false',
tooltip: '浣跨敤涓昏〃鎼滅储鏉′欢鏃讹紝涓昏〃鐨勬悳绱㈡潯浠朵細浼犲叆瀛愯〃涓��',
required: false,
- forbid: type !== 'CommonTable' && type !== 'CalendarPage',
+ forbid: type !== 'CommonTable',
options: [{
value: 'true',
text: '浣跨敤'
--
Gitblit v1.8.0