From 34e7681fd12b1c4e4994d3bea1a553870e10bc50 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 11 三月 2023 17:58:54 +0800
Subject: [PATCH] 2023-03-11
---
src/menu/components/card/cardcomponent/index.jsx | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/menu/components/card/cardcomponent/index.jsx b/src/menu/components/card/cardcomponent/index.jsx
index 6bd283e..a7efb6a 100644
--- a/src/menu/components/card/cardcomponent/index.jsx
+++ b/src/menu/components/card/cardcomponent/index.jsx
@@ -13,7 +13,7 @@
import './index.scss'
const NormalForm = asyncIconComponent(() => import('@/components/normalform'))
-const CardCellComponent = asyncComponent(() => import('../cardcellcomponent'))
+const CardCellComponent = asyncComponent(() => import('@/menu/components/card/cardcellcomponent'))
const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
const PasteController = asyncIconComponent(() => import('@/components/paste'))
@@ -311,9 +311,24 @@
}
_style = resetStyle(_style)
+ let checkAll = ''
+ if ((cards.subtype === 'datacard' || cards.subtype === 'dualdatacard') && card.$cardType === 'extendCard') {
+ checkAll = card.setting.checkAll === 'show' ? ' mk-checkable mk-extend-card' : ''
+ if (checkAll && cards.wrap.selStyle === 'check square') {
+ checkAll = ' mk-checkable square mk-extend-card'
+ }
+ } else if (cards.subtype === 'datacard') {
+ if (cards.wrap.selStyle === 'check') {
+ checkAll = ' mk-checkable'
+ } else if (cards.wrap.selStyle === 'check square') {
+ checkAll = ' mk-checkable square'
+ }
+ }
+
return (
<Col span={card.setting.width || 6}>
- <div className={'card-item ' + (card.setting.btnControl || '')} style={_style} onDoubleClick={(e) => {e.stopPropagation(); this.doubleClickCard()}} id={card.uuid}>
+ <div className={'card-item ' + (card.setting.btnControl || '') + checkAll} style={_style} onDoubleClick={(e) => {e.stopPropagation(); this.doubleClickCard()}} id={card.uuid}>
+ <span className="circle-select"></span>
<CardCellComponent cards={cards} cardCell={card} side={side} elements={elements} updateElement={this.updateCard}/>
<div className="card-control" onDoubleClick={(e) => e.stopPropagation()}>
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
--
Gitblit v1.8.0