From 50d288f04ad66a18d3ebe80db3ca7c6e68aa65fe Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 08 一月 2025 15:52:31 +0800
Subject: [PATCH] 2025-01-08

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

diff --git a/src/menu/components/card/cardcellcomponent/index.jsx b/src/menu/components/card/cardcellcomponent/index.jsx
index 89008dd..193be32 100644
--- a/src/menu/components/card/cardcellcomponent/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/index.jsx
@@ -151,6 +151,9 @@
         options = ['margin', 'float']
       } else {
         options.push('width', 'minHeight', 'float')
+        if (element.OpenType !== 'form') {
+          options.push('display')
+        }
         _style.minHeight = _style.minHeight || '28px'
         _style.textAlign = _style.textAlign || 'center'
       }
@@ -255,6 +258,10 @@
       _card.innerHeight = _card.barHeight + (_card.displayValue === 'true' ? fontSize + 2 : 0)
     } else if (_card.eleType === 'button') { // 鎷嗗垎style
       _card.style = fromJS(style).toJS()
+
+      if (_card.OpenType === 'form') {
+        delete _card.style.display
+      }
 
       if (style.float) {
         _card.wrapStyle = {textAlign: style.float}
@@ -511,6 +518,10 @@
             if (cell.OpenType !== 'form') {
               res.style = {}
             }
+
+            if (res.style) {
+              delete res.style.display
+            }
           // } else if (res.class !== cell.class || res.show !== cell.show || !res.style) {
           } else if (res.class !== cell.class || !res.style) {
             if (res.class) {

--
Gitblit v1.8.0