From b91c28df2f734b680198e755b7828666e238cea0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 21 六月 2024 16:43:44 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/zshare/formconfig.jsx | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index 621dd29..286fddb 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -261,7 +261,7 @@
label: '鏁版嵁婧�',
initVal: card.dataSource || '',
tooltip: '鏁版嵁鏉冮檺鏇挎崲绗� $@ -> /* 鎴� \'\'銆� @$ -> */ 鎴� \'\'',
- placeholder: '绯荤粺鍙橀噺锛歮k_departmentcode銆乵k_organization銆乵k_user_type銆�',
+ placeholder: '绯荤粺鍙橀噺锛歮k_departmentcode銆乵k_organization銆乵k_user_type銆傚叕鍏卞�硷細@BID@銆丂Appkey@銆丂UserID@銆丂SessionUid@銆丂LoginUID@銆丂lang@銆�',
required: true
},
{
@@ -444,7 +444,7 @@
text: '鏈湴'
}, {
value: 'sso',
- text: '绯荤粺'
+ text: '鍗曠偣'
}]
},
{
@@ -1012,12 +1012,20 @@
let options = card.options || []
if (['select', 'radio', 'link'].includes(card.type) && card.setAll === 'true') { // 鍏煎
- options.unshift({
+ let cell = {
key: 'empty',
Value: '',
Text: card.emptyText || '绌�',
ParentID: ''
- })
+ }
+
+ if (card.linkSubField) {
+ card.linkSubField.forEach(m => {
+ cell[m] = ''
+ })
+ }
+
+ options.unshift(cell)
}
let initval = card.initval || ''
@@ -1199,7 +1207,7 @@
label: '鏁版嵁婧�',
initVal: card.dataSource || '',
tooltip: '鏁版嵁鏉冮檺鏇挎崲绗� $@ -> /* 鎴� \'\'銆� @$ -> */ 鎴� \'\'',
- placeholder: '绯荤粺鍙橀噺锛歮k_departmentcode銆乵k_organization銆乵k_user_type銆傚叕鍏卞�硷細@ID@銆丂BID@銆�',
+ placeholder: '绯荤粺鍙橀噺锛歮k_departmentcode銆乵k_organization銆乵k_user_type銆傚叕鍏卞�硷細@ID@銆丂BID@銆丂Appkey@銆丂UserID@銆丂SessionUid@銆丂LoginUID@銆丂lang@銆�',
required: true,
readonly: false
},
@@ -1869,7 +1877,7 @@
text: '鏈湴'
}, {
value: 'sso',
- text: '绯荤粺'
+ text: '鍗曠偣'
}]
},
{
--
Gitblit v1.8.0