From 80e0c5eb7648e77cae844e4628b433704e0fb865 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 22 二月 2023 00:21:07 +0800
Subject: [PATCH] 2023-02-22
---
src/tabviews/custom/components/card/double-data-card/index.jsx | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 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 8bb925b..9431a8d 100644
--- a/src/tabviews/custom/components/card/double-data-card/index.jsx
+++ b/src/tabviews/custom/components/card/double-data-card/index.jsx
@@ -859,12 +859,15 @@
if (selectedData.length > 0) {
checkAll = selectedData.length < data.length ? ' half' : ' whole'
}
+ if (card.setting.controlIcon === 'left') {
+ checkAll += ' mk-extend-icon'
+ }
} else if (card.setting.display !== 'default' && card.setting.controlIcon === 'left') {
mainBox = 'flex-card '
}
return (
- <div className="custom-data-card-box" id={'anchor' + config.uuid} style={config.style}>
+ <div className="double-data-card-box" id={'anchor' + config.uuid} style={config.style}>
{loading ?
<div className="loading-mask">
{data ? <div className="ant-spin-blur"></div> : null}
@@ -896,11 +899,7 @@
let className = 'card-item-wrap mk-card ' + mainBox
let subClass = 'mk-unfold'
let unfold = true
- if (config.wrap.parity === 'true') {
- if (index % 2 === 1) {
- className += 'mk-parity-bg '
- }
- }
+
if (item.$disabled) {
className = 'mk-disabled ' + mainBox
} else if (activeKey === index) {
@@ -924,10 +923,10 @@
<div className={className} style={wrapStyle}>
<CardItem card={card} cards={config} data={item} onDoubleClick={() => this.onDoubleClick(index, subClass)} onClick={() => {this.changeCard(index, item, subClass)}}>
<span className="circle-select"></span>
- {card.setting.display !== 'default' && card.setting.controlIcon === 'left' ? (!unfold ? <PlusSquareOutlined className={subClass} onClick={(e) => this.changeUnfold(e, index, subClass)}/> : <MinusSquareOutlined className={subClass} onClick={(e) => this.changeUnfold(e, index, subClass)}/>) : null}
- {card.setting.display !== 'default' && card.setting.controlIcon !== 'left' ? <UpOutlined className={subClass} onClick={(e) => this.changeUnfold(e, index, subClass)}/> : null}
+ {card.setting.controlIcon === 'left' ? (!unfold ? <PlusSquareOutlined className={subClass} onClick={(e) => this.changeUnfold(e, index, subClass)}/> : <MinusSquareOutlined className={subClass} onClick={(e) => this.changeUnfold(e, index, subClass)}/>) : null}
+ {card.setting.controlIcon === 'right' ? <UpOutlined className={subClass} onClick={(e) => this.changeUnfold(e, index, subClass)}/> : null}
</CardItem>
- <div className={'sub-card-wrap ' + subClass}>
+ <div className={'sub-card-wrap ' + subClass + (config.wrap.parity === 'true' ? ' mk-parity-bg' : '')}>
{item.children.map((cell, index) => <Col key={'sub' + index} span={subcard.setting.width || 24}>
<CardItem card={subcard} cards={subconfig} data={cell} />
</Col>)}
--
Gitblit v1.8.0