From a02fc6a77fa1b35c6516b2d37108d80e260c6c85 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 07 十一月 2024 22:05:08 +0800
Subject: [PATCH] 2024-11-07

---
 src/tabviews/custom/components/card/double-data-card/index.jsx |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/tabviews/custom/components/card/double-data-card/index.jsx b/src/tabviews/custom/components/card/double-data-card/index.jsx
index da1f7b4..90b5ea2 100644
--- a/src/tabviews/custom/components/card/double-data-card/index.jsx
+++ b/src/tabviews/custom/components/card/double-data-card/index.jsx
@@ -130,20 +130,23 @@
     _config.wrap.wrapClass =  `${_config.wrap.selStyle} ${_config.wrap.cardType || ''}`
 
     if (_config.wrap.zHeight || _config.wrap.minWidth) {
+      _config.wrap.zoomStyle = {
+        maxHeight: 'none',
+        '--mk-data-zoom-width': _config.wrap.minWidth ? _config.wrap.minWidth + 'px' : '100%'
+      }
+
       if (_config.wrap.zHeight) {
         if (_config.wrap.zHeight <= 100) {
           if (_config.wrap.zHeight < 0) {
-            _config.wrap.zHeight = `calc(100vh - ${-_config.wrap.zHeight}px)`
+            _config.wrap.zoomStyle.maxHeight = `calc(100vh - ${-_config.wrap.zHeight}px)`
+            _config.wrap.zoomStyle.minHeight = '100px'
           } else {
-            _config.wrap.zHeight = _config.wrap.zHeight + 'vh'
+            _config.wrap.zoomStyle.maxHeight = _config.wrap.zHeight + 'vh'
           }
+        } else {
+          _config.wrap.zoomStyle.maxHeight = _config.wrap.zHeight + 'px'
         }
         _config.wrap.wrapClass += ' fix-height'
-      }
-      _config.wrap.minWidth = _config.wrap.minWidth ? _config.wrap.minWidth + 'px' : '100%'
-      _config.wrap.zoomStyle = {
-        maxHeight: _config.wrap.zHeight || 'none',
-        '--mk-data-zoom-width': _config.wrap.minWidth
       }
     } else {
       _config.wrap.zoomStyle = null

--
Gitblit v1.8.0