From 977e6195d7d6a48769563cf90bfc307fb2ef6f2d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 14 十一月 2023 22:29:32 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/card/data-card/index.jsx | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/tabviews/custom/components/card/data-card/index.jsx b/src/tabviews/custom/components/card/data-card/index.jsx
index 55ada26..1e3d074 100644
--- a/src/tabviews/custom/components/card/data-card/index.jsx
+++ b/src/tabviews/custom/components/card/data-card/index.jsx
@@ -38,7 +38,7 @@
loading: false,
card: null,
data: [],
- total: null,
+ total: 0,
precards: [],
nextcards: [],
selected: 'false',
@@ -135,6 +135,12 @@
_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}`
+
+ if (_config.wrap.shifting === 'true') {
+ _config.wrap.shifting = 'shifting'
+ } else {
+ _config.wrap.shifting = ''
+ }
let pageOptions = ['10', '25', '50', '100', '500', '1000']
@@ -1178,7 +1184,7 @@
}
return (
- <div className="custom-data-card-box" id={'anchor' + config.uuid} style={config.style}>
+ <div className={'custom-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