From 24842b40de5cd60700bf69dfd38a0332f5431e36 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 23 五月 2025 10:55:07 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/card/data-card/index.jsx | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/tabviews/custom/components/card/data-card/index.jsx b/src/tabviews/custom/components/card/data-card/index.jsx
index 2682bca..8861386 100644
--- a/src/tabviews/custom/components/card/data-card/index.jsx
+++ b/src/tabviews/custom/components/card/data-card/index.jsx
@@ -123,12 +123,12 @@
_config.wrap.selected = 'false'
}
- _config.wrap.selStyle = _config.wrap.selStyle || 'active'
+ _config.wrap.selStyle = _config.wrap.selStyle || 'none'
_config.wrap.pagestyle = _config.wrap.pagestyle || 'page'
_config.wrap.scale = _config.wrap.scale === 'true' ? 'scale' : ''
_config.wrap.layout = (_config.wrap.layout || 'grid') + '-layout float-' + (_config.wrap.cardFloat || 'left')
- _config.wrap.wrapClass = `${_config.wrap.selStyle} ${_config.wrap.cardType || ''} ${_config.wrap.scale} ${config.wrap.hover === 'true' ? 'mk-hover' : ''}`
+ _config.wrap.wrapClass = `${_config.wrap.selStyle} ${_config.wrap.cardType || ''} ${_config.wrap.scale} ${config.wrap.hover === 'true' ? 'mk-hover' : ''} ${config.wrap.empSign === 'hidden' ? 'mk-empty-hide' : ''}`
if (_config.wrap.shifting === 'true') {
_config.wrap.shifting = 'shifting'
@@ -186,15 +186,21 @@
window.GLOB.SyncData.delete(_config.dataName)
}
+ } else if (_config.setting.supModule && !BID && _config.wrap.supKey !== 'false') {
+ _config.setting.onload = 'false'
}
if (_config.wrap.zHeight) {
+ _config.wrap.zoomStyle = {}
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'
}
if (_config.style) {
@@ -202,7 +208,7 @@
}
_config.wrap.layout += ' fix-height'
} else {
- _config.wrap.zHeight = 'none'
+ _config.wrap.zoomStyle = null
}
this.setState({
@@ -1085,7 +1091,7 @@
if (config.setting.supModule && !BID && config.wrap.supKey !== 'false') {
notification.warning({
top: 92,
- message: window.GLOB.dict['sup_key_req'] || '闇�瑕佷笂绾т富閿�硷紒',
+ message: config.setting.supModTip || window.GLOB.dict['sup_key_req'] || '闇�瑕佷笂绾т富閿�硷紒',
duration: 5
})
this.setState({
@@ -1232,7 +1238,7 @@
{config.wrap.pickup === 'true' && this.state.data.length > 0 ? <div className="pickup-wrap"><Switch title="鏀惰捣" checkedChildren={window.GLOB.dict['open'] || '寮�'} unCheckedChildren={window.GLOB.dict['shut'] || '鍏�'} checked={pickup} onChange={this.pickupChange} /></div> : null}
<div className={`data-zoom ${config.wrap.wrapClass}`}>
{switchable ? <div className={'prev-page ' + (pageIndex === 1 ? 'disabled' : '')} onClick={this.prevPage}><div><div><img src={preImg} alt=""/></div></div></div> : null}
- <Row className={'card-row-list ' + config.wrap.layout} style={{maxHeight: config.wrap.zHeight}}>
+ <Row className={'card-row-list ' + config.wrap.layout} style={config.wrap.zoomStyle}>
{precards.map((item, index) => (
<Col key={'pre' + index} className="extend-card" style={item.wStyle} span={item.setting.width || 6}>
{item.setting.cardRole === 'header' ? <TableHeader card={item} data={extendData} refresh={this.refreshByHeader}>
--
Gitblit v1.8.0