From da64ab0923bf8817fc8599a6e37b953ce38f64c8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 27 八月 2023 18:37:36 +0800
Subject: [PATCH] 2023-08-27
---
src/menu/components/card/data-card/index.jsx | 44 ++++++--------------------------------------
1 files changed, 6 insertions(+), 38 deletions(-)
diff --git a/src/menu/components/card/data-card/index.jsx b/src/menu/components/card/data-card/index.jsx
index 3b75676..5822912 100644
--- a/src/menu/components/card/data-card/index.jsx
+++ b/src/menu/components/card/data-card/index.jsx
@@ -17,7 +17,6 @@
const CardComponent = asyncComponent(() => import('../cardcomponent'))
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'))
@@ -78,40 +77,6 @@
backElements: [],
menus: []
}]
- }
-
- 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)
@@ -313,8 +278,12 @@
}
}
MKEmitter.emit('changeModal', card, btn)
- } else if (btn.OpenType === 'popview' && appType !== 'mob') {
- MKEmitter.emit('changePopview', card, btn)
+ } else if (btn.OpenType === 'popview') {
+ if (appType === 'mob') {
+ message.warning('婊戝姩鎸夐挳涓嶆敮鎸佸脊绐楅〉闈紒')
+ } else {
+ MKEmitter.emit('changePopview', card, btn)
+ }
}
}
@@ -554,7 +523,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>
--
Gitblit v1.8.0