From 49f09cc6f8ff8c30a75ed1a9d6f510b69b73962a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 12 十二月 2023 21:05:37 +0800
Subject: [PATCH] 2023-12-12
---
src/menu/components/card/double-data-card/index.jsx | 38 +-------------------------------------
1 files changed, 1 insertions(+), 37 deletions(-)
diff --git a/src/menu/components/card/double-data-card/index.jsx b/src/menu/components/card/double-data-card/index.jsx
index 1a47d2b..81cf755 100644
--- a/src/menu/components/card/double-data-card/index.jsx
+++ b/src/menu/components/card/double-data-card/index.jsx
@@ -18,7 +18,6 @@
const DoubleCardComponent = asyncComponent(() => import('../doublecardcomponent'))
const MobPagination = asyncIconComponent(() => import('@/menu/components/share/mobPagination'))
const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
-const UserComponent = asyncIconComponent(() => import('@/menu/components/share/usercomponent'))
const PasteComponent = asyncIconComponent(() => import('@/components/paste'))
const NormalHeader = asyncComponent(() => import('@/menu/components/share/normalheader'))
const ClockComponent = asyncIconComponent(() => import('@/menu/components/share/clockcomponent'))
@@ -92,40 +91,6 @@
value: '瀛愯〃鍖哄煙'
}]
}]
- }
-
- if (card.config) {
- let config = fromJS(card.config).toJS()
-
- _card.wrap = config.wrap
- _card.wrap.name = card.name
- _card.style = config.style
- _card.headerStyle = config.headerStyle
-
- _card.setting = config.setting
- _card.columns = config.columns
- _card.scripts = config.scripts
-
- _card.subcards = config.subcards.map(scard => {
- scard.uuid = Utils.getuuid()
- scard.elements = scard.elements.map(elem => {
- elem.uuid = Utils.getuuid()
- return elem
- })
- scard.backElements = scard.backElements.map(elem => {
- elem.uuid = Utils.getuuid()
- return elem
- })
- return scard
- })
- _card.action = config.action.map(col => {
- col.uuid = Utils.getuuid()
- return col
- })
- _card.search = config.search.map(col => {
- col.uuid = Utils.getuuid()
- return col
- })
}
this.updateComponent(_card)
@@ -540,7 +505,6 @@
<PasteComponent options={['action', 'search', 'form', 'cardcell']} updateConfig={this.pasteComponent} />
<FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
<ClockComponent config={card} updateConfig={this.updateComponent}/>
- <UserComponent config={card}/>
<DeleteOutlined className="close" title="鍒犻櫎缁勪欢" onClick={() => this.props.deletecomponent(card.uuid)} />
<SettingComponent config={card} updateConfig={this.updateComponent} />
</div>
@@ -548,7 +512,7 @@
<ToolOutlined />
</Popover>
<ActionComponent config={card} setSubConfig={this.setSubConfig} updateaction={this.updateComponent}/>
- <div className={'select-' + card.wrap.selStyle + extraName}>
+ <div className={`select-${card.wrap.selStyle || ''} ${extraName}`}>
{card.subcards.map(subcard => {
if (subcard.$cardType === 'extendCard') {
return (<CardComponent key={subcard.uuid} cards={card} card={subcard} move={this.move} updateElement={this.updateCard} deleteElement={this.deleteCard}/>)
--
Gitblit v1.8.0