From badeb38c57b3f5f3c7d6ea016af5eea401ae1e2c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 14 十一月 2023 22:29:07 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/card/double-data-card/index.jsx | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 a7f73d6..e65fe19 100644
--- a/src/tabviews/custom/components/card/double-data-card/index.jsx
+++ b/src/tabviews/custom/components/card/double-data-card/index.jsx
@@ -36,7 +36,7 @@
loading: false, // 鏁版嵁鍔犺浇鐘舵��
card: null, // 鍗＄墖璁剧疆
data: [], // 鏁版嵁
- total: null,
+ total: 0,
precards: [],
nextcards: [],
selected: 'false',
@@ -129,6 +129,12 @@
_config.wrap.wrapClass = `${_config.wrap.selStyle} ${_config.wrap.cardType || ''}`
+ if (_config.wrap.shifting === 'true') {
+ _config.wrap.shifting = 'shifting'
+ } else {
+ _config.wrap.shifting = ''
+ }
+
let wrapStyle = null
let subcard = fromJS(_card).toJS()
let subconfig = fromJS(_config).toJS()
@@ -1135,7 +1141,7 @@
}
return (
- <div className="double-data-card-box" id={'anchor' + config.uuid} style={config.style}>
+ <div className={'double-data-card-box ' + config.wrap.shifting} id={'anchor' + config.uuid} style={config.style}>
{loading ?
<div className="loading-mask">
{data.length ? <div className="ant-spin-blur"></div> : null}
--
Gitblit v1.8.0