From b883ae5d7d46fc7a3503236f16a250c2264ea7c7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 29 九月 2022 17:45:25 +0800
Subject: [PATCH] 2022-09-29
---
src/menu/components/carousel/prop-card/index.jsx | 72 ++----------------------------------
1 files changed, 4 insertions(+), 68 deletions(-)
diff --git a/src/menu/components/carousel/prop-card/index.jsx b/src/menu/components/carousel/prop-card/index.jsx
index 685c304..7941f46 100644
--- a/src/menu/components/carousel/prop-card/index.jsx
+++ b/src/menu/components/carousel/prop-card/index.jsx
@@ -2,7 +2,7 @@
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
import { Popover, Modal, Carousel } from 'antd'
-import { PlusOutlined, SettingOutlined, EditOutlined, ToolOutlined, DeleteOutlined, FontColorsOutlined } from '@ant-design/icons'
+import { PlusOutlined, SettingOutlined, EditOutlined, ToolOutlined, DeleteOutlined, FontColorsOutlined, ClockCircleOutlined } from '@ant-design/icons'
import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
@@ -17,7 +17,6 @@
const CardSimpleComponent = asyncComponent(() => import('@/menu/components/card/cardsimplecomponent'))
const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
const PasteComponent = asyncIconComponent(() => import('@/menu/components/share/pastecomponent'))
-// const LogComponent = asyncIconComponent(() => import('@/menu/components/share/logcomponent'))
const ClockComponent = asyncIconComponent(() => import('@/menu/components/share/clockcomponent'))
const UserComponent = asyncIconComponent(() => import('@/menu/components/share/usercomponent'))
@@ -62,8 +61,7 @@
setting: {},
style: {},
elements: [],
- }],
- btnlog: [],
+ }]
}
if (card.config) {
@@ -96,7 +94,6 @@
}
componentDidMount () {
- // MKEmitter.addListener('logButton', this.logButton)
MKEmitter.addListener('submitComponentStyle', this.updateComponentStyle)
}
@@ -111,7 +108,6 @@
this.setState = () => {
return
}
- // MKEmitter.removeListener('logButton', this.logButton)
MKEmitter.removeListener('submitComponentStyle', this.updateComponentStyle)
}
@@ -132,24 +128,12 @@
})
}
- // logButton = (id, item) => {
- // const { card } = this.state
-
- // if (id !== card.uuid) return
-
- // let btnlog = card.btnlog || []
- // btnlog.push(item)
-
- // this.updateComponent({...card, btnlog})
- // }
-
/**
* @description 鍗＄墖琛屽灞備俊鎭洿鏂帮紙鏁版嵁婧愶紝鏍峰紡绛夛級
*/
updateComponent = (card) => {
card.width = card.wrap.width
card.name = card.wrap.name
- card.btnlog = []
if (window.GLOB.styling && card.errors) { // 鏍峰紡淇敼鏃朵笉鍋氱瓫鏌�
this.setState({
@@ -263,10 +247,6 @@
onOk() {
card.subcards = card.subcards.filter(item => item.uuid !== cell.uuid)
- // if (card.btnlog) {
- // card.btnlog = card.btnlog.filter(c => c.$parentId !== cell.uuid)
- // }
-
_this.updateComponent(card)
if (appType === 'mob') return
@@ -323,49 +303,6 @@
this.updateComponent(card)
}
- // handleLog = (type, logs, item) => {
- // let card = fromJS(this.state.card).toJS()
-
- // if (type === 'revert') {
- // let done = false
- // if (item.$parentId) {
- // card.subcards.forEach(col => {
- // if (item.$parentId === col.uuid) {
- // col.elements = [...col.elements, item]
- // done = true
- // }
- // })
- // }
-
- // card.btnlog = logs
-
- // this.setState({ card: {...card, subcards: []} }, () => {
- // this.updateComponent(card)
- // })
- // if (!done) {
- // notification.warning({
- // top: 92,
- // message: '闄勫睘鍗＄墖宸插垹闄わ紒',
- // duration: 2
- // })
- // } else {
- // notification.success({
- // top: 92,
- // message: '鎭㈠鎴愬姛锛�',
- // duration: 2
- // })
- // }
- // } else {
- // card.btnlog = logs
- // this.updateComponent(card)
- // notification.success({
- // top: 92,
- // message: '娓呴櫎鎴愬姛锛�',
- // duration: 2
- // })
- // }
- // }
-
move = (item, direction) => {
let card = fromJS(this.state.card).toJS()
@@ -419,12 +356,11 @@
<CopyComponent type="propcard" card={card}/>
<PasteComponent config={card} options={['cardcell']} updateConfig={this.updateComponent} />
<FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
- {/* <LogComponent btnlog={card.btnlog || []} handlelog={this.handleLog} /> */}
<ClockComponent config={card} updateConfig={this.updateComponent}/>
+ {card.wrap.datatype === 'dynamic' ? <ClockComponent config={card} updateConfig={this.updateComponent}/> : <ClockCircleOutlined style={{color: '#eeeeee', cursor: 'not-allowed'}}/>}
<UserComponent config={card}/>
<DeleteOutlined className="close" title="鍒犻櫎缁勪欢" onClick={() => this.props.deletecomponent(card.uuid)} />
- {card.wrap.datatype !== 'static' ? <SettingComponent config={card} updateConfig={this.updateComponent} /> : null}
- {card.wrap.datatype === 'static' ? <SettingOutlined style={{color: '#eeeeee', cursor: 'not-allowed'}}/> : null}
+ {card.wrap.datatype === 'dynamic' ? <SettingComponent config={card} updateConfig={this.updateComponent} /> : <SettingOutlined style={{color: '#eeeeee', cursor: 'not-allowed'}}/>}
</div>
} trigger="hover">
<ToolOutlined/>
--
Gitblit v1.8.0