From db4ef847383cf2bb24fd242ff46a211ee0459e7a Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 20 六月 2023 00:09:31 +0800 Subject: [PATCH] Merge branch 'develop' --- src/templates/zshare/formconfig.jsx | 41 ++++++++++++++++++++++++++++++++++------- 1 files changed, 34 insertions(+), 7 deletions(-) diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx index d3ee589..0984554 100644 --- a/src/templates/zshare/formconfig.jsx +++ b/src/templates/zshare/formconfig.jsx @@ -386,6 +386,30 @@ }) } + let muloptions = [{ + value: 'false', + text: '鍗曢��' + }, { + value: 'true', + text: '澶氶��' + }, { + value: 'dropdown', + text: '涓嬫媺鑿滃崟' + }] + + if (appType !== '') { + muloptions = [{ + value: 'false', + text: '鍗曢��' + }, { + value: 'true', + text: '澶氶��' + }] + if (card.multiple === 'dropdown') { + card.multiple = 'false' + } + } + return [ { type: 'text', @@ -573,14 +597,9 @@ key: 'multiple', label: '閫夋嫨褰㈠紡', initVal: card.multiple || 'false', + tooltip: appType === '' ? '浣跨敤涓嬫媺鑿滃崟鏃讹紝閫夐」浼氫緷鎹� pid 缁勭粐鏁版嵁鐨勪笂涓嬬骇鍏崇郴锛屼簩绾ч�夐」浼氫笅鎷夊睍绀恒�傛敞锛�1銆佹樉绀轰负鏂囨湰鏃舵湁鏁堬紱2銆佷娇鐢ㄦ暟鎹簮璇疯繑鍥� pid 瀛楁銆�' : '', required: true, - options: [{ - value: 'false', - text: '鍗曢��' - }, { - value: 'true', - text: '澶氶��' - }] + options: muloptions }, { type: 'select', @@ -900,6 +919,14 @@ required: true }, { + type: 'text', + key: 'mark', + label: '椤剁骇鏍囪瘑', + initVal: card.mark || '', + tooltip: 'pid涓庨《绾ф爣璇嗙浉鍚屾椂锛岃涓洪《绾ц妭鐐广��', + required: false + }, + { type: 'multiselect', key: 'blacklist', label: '榛戝悕鍗�', -- Gitblit v1.8.0