From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/card/cardcellcomponent/formconfig.jsx | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/formconfig.jsx b/src/menu/components/card/cardcellcomponent/formconfig.jsx
index 656a1ab..2e65cfb 100644
--- a/src/menu/components/card/cardcellcomponent/formconfig.jsx
+++ b/src/menu/components/card/cardcellcomponent/formconfig.jsx
@@ -90,13 +90,14 @@
min: 0,
label: '鍐呭',
initVal: card.value || '',
- tooltip: '鏂囨湰绫诲瀷锛屼細鏇挎崲鍐呭涓殑@username@銆丂fullName@銆丂login_city@銆�',
+ tooltip: '鏂囨湰绫诲瀷锛屼細鏇挎崲鍐呭涓殑@username@銆丂fullName@銆丂mk_city@銆丂appname@銆�',
required: true
},
{
type: 'file',
key: 'url',
label: '鍥剧墖/鏂囦欢',
+ tooltip: '浣跨敤闈欐�佸浘鐗囨椂锛孈icon@浠ｈ〃澶村儚銆�',
initVal: card.url || '',
maxfile: 1,
required: true
@@ -172,6 +173,8 @@
{ value: 'thdSeparator', text: '鍗冨垎浣�' },
{ value: 'abs', text: '缁濆鍊�' },
{ value: 'YYYY-MM-DD', text: 'YYYY-MM-DD' },
+ { value: 'YYYY-MM-DD HH:mm', text: 'YYYY-MM-DD HH:mm' },
+ { value: 'YYYY-MM-DD HH:mm:ss', text: 'YYYY-MM-DD HH:mm:ss' },
{ value: 'MM鏈圖D鏃�', text: 'MM鏈圖D鏃�' },
{ value: 'YYYY骞碝M鏈圖D鏃�', text: 'YYYY骞碝M鏈圖D鏃�' },
{ value: 'HH:mm', text: '鏃跺垎锛堜緥锛�16:57锛�' },
@@ -342,7 +345,7 @@
min: 1,
max: 10,
label: '楂樺害(琛�)',
- initVal: card.height,
+ initVal: card.height !== undefined ? card.height : 1,
tooltip: '鍐呭鏄剧ず琛屾暟锛屽�间负绌烘椂楂樺害鑷�傚簲锛屾敞锛氳嚜閫傚簲楂樺害浠呭湪璁剧疆鍗＄墖楂樺害鍚庢湁鏁堛��',
required: false
},
@@ -588,6 +591,18 @@
]
},
{
+ type: 'radio',
+ key: 'copyable',
+ label: '鍙鍒�',
+ initVal: card.copyable || 'false',
+ tooltip: '鍏冪礌鏄惁鍙鍒讹紝澶嶅埗鍐呭涓嶅寘鎷墠缂�涓庡悗缂�銆�',
+ required: false,
+ options: [
+ { value: 'true', text: '鏄�' },
+ { value: 'false', text: '鍚�' }
+ ]
+ },
+ {
type: 'number',
key: 'fixSize',
min: 10,
--
Gitblit v1.8.0