From 1d6729f347857b47e03eadc5989aff76fbd3c7ad Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 06 四月 2023 10:25:35 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/card/cardcellcomponent/formconfig.jsx | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/formconfig.jsx b/src/menu/components/card/cardcellcomponent/formconfig.jsx
index 859dc58..76739c9 100644
--- a/src/menu/components/card/cardcellcomponent/formconfig.jsx
+++ b/src/menu/components/card/cardcellcomponent/formconfig.jsx
@@ -43,6 +43,11 @@
tooltip = '鍦ㄦ墿灞曞崱鐗囦腑锛屽姩鎬佹暟鎹樉绀哄�间负鑾峰彇鍒扮殑绗竴琛屾暟鎹��'
}
+ let width = card.width || 12
+ if (/x/.test(card.width)) {
+ width = +width.replace(/x/, '.5')
+ }
+
let forms = [
{
type: 'select',
@@ -85,7 +90,7 @@
min: 0,
label: '鍐呭',
initVal: card.value || '',
- tooltip: '鏂囨湰绫诲瀷锛屼細鏇挎崲鍐呭涓殑@username@銆丂fullName@銆丂mk_city@銆丂appname@銆丂bid@銆�',
+ tooltip: '鏂囨湰绫诲瀷锛屼細鏇挎崲鍐呭涓殑@username@銆丂fullName@銆丂mk_city@銆丂appname@銆丂bid@銆丂month@銆丂week@銆丂day@',
required: true
},
{
@@ -328,12 +333,12 @@
{
type: 'number',
key: 'width',
- min: 1,
+ min: 0.5,
max: 24,
- precision: 0,
+ precision: 1,
label: '鍏冪礌瀹藉害',
- initVal: card.width || 12,
- tooltip: '鏍呮牸甯冨眬锛屾瘡琛岀瓑鍒嗕负24鍒椼��',
+ initVal: width,
+ tooltip: '鏍呮牸甯冨眬锛屾瘡琛岀瓑鍒嗕负24鍒楋紝鍙缃崐鍒楀嵆.5銆�',
required: true
},
{
@@ -536,7 +541,7 @@
type: 'radio',
key: 'eval',
label: '瑙ｆ瀽',
- initVal: card.eval || 'true',
+ initVal: card.eval || 'false',
tooltip: '褰撳叕寮忓唴瀹规秹鍙婅绠楁椂璇烽�夋嫨鈥滄槸鈥濓紝褰撳叕寮忓唴瀹逛负瀛楁鎷兼帴鏃惰閫夋嫨鈥滃惁鈥濄��',
required: false,
options: [{
@@ -570,6 +575,19 @@
},
{
type: 'radio',
+ key: 'alignItems',
+ label: '鍨傜洿瀵归綈',
+ initVal: card.alignItems || '',
+ tooltip: '鍨傜洿鏂瑰悜鐨勫榻愭柟寮忋��',
+ required: false,
+ options: [
+ { value: '', text: '灞呬笂' },
+ { value: 'center', text: '灞呬腑' },
+ { value: 'end', text: '灞呬笅' }
+ ]
+ },
+ {
+ type: 'radio',
key: 'fixStyle',
label: '鍓嶅悗缂�',
initVal: card.fixStyle || '',
--
Gitblit v1.8.0