From f2b6db6afa76ff6fe1b13c605c89e0b201a79177 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 20 六月 2023 15:42:09 +0800
Subject: [PATCH] 2023-06-20

---
 src/menu/components/card/cardcellcomponent/index.jsx |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/menu/components/card/cardcellcomponent/index.jsx b/src/menu/components/card/cardcellcomponent/index.jsx
index 756e8a2..2fb2157 100644
--- a/src/menu/components/card/cardcellcomponent/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/index.jsx
@@ -160,6 +160,8 @@
       options = ['background', 'border', 'margin']
     } else if (element.eleType === 'color') {
       options = ['border', 'margin', 'padding']
+    } else if (element.eleType === 'number' || element.eleType === 'icon') {
+      options.push('display')
     } else if (element.eleType === 'text') {
       options[0] = 'font2'
       options.push('display')
@@ -202,7 +204,7 @@
       _card.style = style
       let line = _card.height || null
 
-      if (['currentDate', 'sequence', 'icon'].includes(_card.eleType)) {
+      if (['currentDate', 'sequence'].includes(_card.eleType) || (_card.eleType === 'icon' && _card.tipType !== 'text')) {
         line = 1
       }
 
@@ -367,7 +369,7 @@
         if (cell.uuid === res.uuid) {
           res.style = cell.style || {}
 
-          if (res.eleType !== 'text') {
+          if (!['text', 'number', 'icon'].includes(res.eleType)) {
             delete res.style.display
           }
           
@@ -377,7 +379,7 @@
           } else if (['text', 'number', 'formula', 'currentDate', 'sequence', 'icon'].includes(res.eleType)) {
             let line = res.height || null
 
-            if (['currentDate', 'sequence', 'icon'].includes(res.eleType)) {
+            if (['currentDate', 'sequence'].includes(res.eleType) || (res.eleType === 'icon' && res.tipType !== 'text')) {
               line = 1
             }
 

--
Gitblit v1.8.0