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 |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/menu/components/card/cardcellcomponent/formconfig.jsx b/src/menu/components/card/cardcellcomponent/formconfig.jsx
index a97d103..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
@@ -344,7 +345,7 @@
       min: 1,
       max: 10,
       label: '楂樺害(琛�)',
-      initVal: card.height,
+      initVal: card.height !== undefined ? card.height : 1,
       tooltip: '鍐呭鏄剧ず琛屾暟锛屽�间负绌烘椂楂樺害鑷�傚簲锛屾敞锛氳嚜閫傚簲楂樺害浠呭湪璁剧疆鍗＄墖楂樺害鍚庢湁鏁堛��',
       required: false
     },
@@ -594,7 +595,7 @@
       key: 'copyable',
       label: '鍙鍒�',
       initVal: card.copyable || 'false',
-      tooltip: '鍏冪礌鏄惁鍙鍒讹紝澶嶅埗鍐呭鍖呮嫭鍓嶇紑涓庡悗缂�銆�',
+      tooltip: '鍏冪礌鏄惁鍙鍒讹紝澶嶅埗鍐呭涓嶅寘鎷墠缂�涓庡悗缂�銆�',
       required: false,
       options: [
         { value: 'true', text: '鏄�' },

--
Gitblit v1.8.0