From 2ae980243b7ad705dea575eadcfc4cf4e24073bd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 17 五月 2022 22:57:19 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/card/cardcellcomponent/formconfig.jsx | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/formconfig.jsx b/src/menu/components/card/cardcellcomponent/formconfig.jsx
index c664528..863b7e1 100644
--- a/src/menu/components/card/cardcellcomponent/formconfig.jsx
+++ b/src/menu/components/card/cardcellcomponent/formconfig.jsx
@@ -8,7 +8,7 @@
* @param {*} card
* @param {*} type
*/
-export function getCardCellForm (card, type, subtype, cardCell) {
+export function getCardCellForm (card, type, subtype, cardCell, anchors) {
let _options = [
{ value: 'text', text: '鏂囨湰'},
{ value: 'number', text: '鏁板��'},
@@ -326,6 +326,14 @@
options: []
},
{
+ type: 'cascader',
+ key: 'anchors',
+ label: '璺宠浆閿氱偣',
+ initVal: card.anchors || [],
+ required: false,
+ options: anchors
+ },
+ {
type: 'number',
key: 'barHeight',
min: 5,
@@ -406,6 +414,7 @@
label: '鏈�澶у搴�',
initVal: card.maxWidth || '',
tooltip: '鍥剧墖瀹藉害鐨勬渶澶у�笺��',
+ help: '娉細姝ゅ�煎瓨鍦ㄦ椂锛屽乏鍙冲杈硅窛涓�0灞呬腑鏄剧ず銆�',
required: false,
},
{
@@ -426,7 +435,6 @@
initVal: card.link || '',
tooltip: '鍔ㄦ�佸湴鍧�涓虹粦瀹氬瓧娈靛�笺��',
required: false,
- // forbid: isApp,
options: [
{ value: '', text: '鏃�' },
{ value: 'dynamic', text: '鍔ㄦ��' },
@@ -439,7 +447,6 @@
label: '閾炬帴绫诲瀷',
initVal: card.linkType || 'other',
required: false,
- // forbid: isApp,
options: [
{ value: 'tel', text: '鐢佃瘽' },
{ value: 'email', text: '閭' },
@@ -552,7 +559,7 @@
type: 'number',
key: 'fixSize',
min: 10,
- max: 100,
+ max: 300,
label: '瀛椾綋澶у皬',
initVal: card.fixSize || 14,
tooltip: '鍓嶇紑銆佸悗缂�鐨勫瓧浣撳ぇ灏忋��',
--
Gitblit v1.8.0