From 79e4981aa6cc9354276fc54cdf6d14eb08ab7fee Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 22 六月 2023 15:59:04 +0800
Subject: [PATCH] Merge branch 'develop' of ssh://121.36.20.145:29418/~jinfei/pc-plat into develop
---
src/menu/components/card/cardcellcomponent/formconfig.jsx | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/formconfig.jsx b/src/menu/components/card/cardcellcomponent/formconfig.jsx
index 603aeaf..2e494ac 100644
--- a/src/menu/components/card/cardcellcomponent/formconfig.jsx
+++ b/src/menu/components/card/cardcellcomponent/formconfig.jsx
@@ -6,12 +6,14 @@
* @param {*} type
*/
export function getCardCellForm (card, cards, cardCell) {
+ let appType = sessionStorage.getItem('appType')
+
let _options = [
{ value: 'text', text: '鏂囨湰'},
{ value: 'number', text: '鏁板��'},
{ value: 'picture', text: '鍥剧墖'},
{ value: 'video', text: '瑙嗛'},
- { value: 'icon', text: '鍥炬爣'},
+ { value: 'icon', text: '鎻愮ず锛堝浘鏍囷級'},
{ value: 'slider', text: '杩涘害鏉�'},
{ value: 'splitline', text: '鍒嗗壊绾�'},
{ value: 'barcode', text: '鏉″舰鐮�'},
@@ -36,7 +38,6 @@
if (card.eleType === 'icon' && card.datatype === 'dynamic' && !card.field) { // 鎷栨嫿娣诲姞绫诲瀷杞崲
card.datatype = 'static'
}
- let appType = sessionStorage.getItem('appType')
let tooltip = ''
if (cardCell.$cardType === 'extendCard') {
@@ -127,6 +128,17 @@
options: [
{ value: 'dynamic', text: '鍔ㄦ��' },
{ value: 'static', text: '闈欐��' }
+ ]
+ },
+ {
+ type: 'radio',
+ key: 'tipType',
+ label: '鎻愮ず鍐呭',
+ initVal: card.tipType || 'icon',
+ required: false,
+ options: [
+ { value: 'icon', text: '鍥炬爣' },
+ { value: 'text', text: '鏂囨湰' }
]
},
{
@@ -603,6 +615,7 @@
key: 'linkurl',
label: '閾炬帴鍦板潃',
initVal: card.linkurl || '',
+ tooltip: ['pc', 'mob'].includes(appType) ? '褰撻摼鎺ョ被鍨嬩负鈥滃叾浠栤�濓紝涓旈摼鎺ュ湴鍧�浠menuid@寮�澶存椂锛屽叾鍚庡唴瀹瑰皢琚涓鸿彍鍗旾D銆�' : '',
required: true,
options: []
},
@@ -611,7 +624,7 @@
key: 'open',
label: '鎵撳紑鏂瑰紡',
initVal: card.open || 'blank',
- tooltip: '鑿滃崟鎵撳紑鏂瑰紡銆�',
+ tooltip: '鑿滃崟鎵撳紑鏂瑰紡锛岄摼鎺ユ棤鏁堛��',
required: true,
forbid: !['pc', 'mob'].includes(appType),
options: [
--
Gitblit v1.8.0