From 78eed586f6a0d15162c89878c53a301e7b142a8a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 10 十月 2022 00:07:06 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/carousel/prop-card/index.jsx | 98 +++++--------------------------------------------
1 files changed, 10 insertions(+), 88 deletions(-)
diff --git a/src/menu/components/carousel/prop-card/index.jsx b/src/menu/components/carousel/prop-card/index.jsx
index 685c304..2c55db0 100644
--- a/src/menu/components/carousel/prop-card/index.jsx
+++ b/src/menu/components/carousel/prop-card/index.jsx
@@ -2,11 +2,11 @@
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'
-import { resetStyle } from '@/utils/utils-custom.js'
+import { resetStyle, getTables } from '@/utils/utils-custom.js'
import MKEmitter from '@/utils/events.js'
import Utils from '@/utils/utils.js'
import getWrapForm from '../data-card/options'
@@ -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({
@@ -167,18 +151,13 @@
}
if (card.wrap.datatype === 'static') {
+ card.$tables = getTables(card)
card.subcards.forEach(item => {
item.elements.forEach(cell => {
if (cell.eleType === 'button') {
if (cell.OpenType === 'pop' || (cell.OpenType === 'funcbutton' && cell.execMode === 'pop')) {
if (!cell.modal || cell.modal.fields.length === 0) {
card.errors.push({ level: 1, detail: `鎸夐挳鈥�${cell.label}鈥濅腑琛ㄥ崟灏氭湭娣诲姞`})
- // } else {
- // cell.modal.fields.forEach(m => {
- // if (m.type === 'linkMain') {
- // card.errors.push({ level: 1, detail: `鎸夐挳鈥�${cell.label}鈥濅腑鍏宠仈涓昏〃琛ㄥ崟鈥�${m.label}鈥濇棤鏁坄})
- // }
- // })
}
}
} else if (cell.datatype === 'dynamic' && cell.field) {
@@ -187,12 +166,7 @@
})
})
} else {
- // let supModule = card.setting.supModule ? card.setting.supModule[card.setting.supModule.length - 1] || '' : ''
- // if (supModule === 'empty') {
- // supModule = ''
- // }
let columns = card.columns.map(c => c.field)
- // let lowcols = card.columns.map(c => c.field.toLowerCase())
if (card.setting.interType === 'system' && card.setting.execute !== 'false' && !card.setting.dataresource) {
card.errors.push({ level: 0, detail: '鏈缃暟鎹簮锛�'})
@@ -206,20 +180,16 @@
card.errors.push({ level: 0, detail: '鏈缃笂绾х粍浠讹紒'})
}
+ if (card.errors.length === 0) {
+ card.$tables = getTables(card)
+ }
+
card.subcards.forEach((item, i) => {
item.elements.forEach(cell => {
if (cell.eleType === 'button') {
if (cell.OpenType === 'pop' || (cell.OpenType === 'funcbutton' && cell.execMode === 'pop')) {
if (!cell.modal || cell.modal.fields.length === 0) {
card.errors.push({ level: 1, detail: `鎸夐挳鈥�${cell.label}鈥濅腑琛ㄥ崟灏氭湭娣诲姞`})
- // } else {
- // cell.modal.fields.forEach(m => {
- // if (m.type === 'linkMain' && !supModule) {
- // card.errors.push({ level: 1, detail: `鎸夐挳鈥�${cell.label}鈥濅腑鍏宠仈涓昏〃琛ㄥ崟鈥�${m.label}鈥濇棤鏁坄})
- // } else if (m.field && !columns.includes(m.field) && lowcols.includes(m.field.toLowerCase())) {
- // card.errors.push({ level: 1, detail: `鎸夐挳鈥�${cell.label}鈥濅腑琛ㄥ崟鈥�${m.label}鈥濆ぇ灏忓啓涓庡瓧娈甸泦涓嶄竴鑷碻})
- // }
- // })
}
}
} else if (cell.datatype === 'dynamic' && cell.field && !columns.includes(cell.field)) {
@@ -262,10 +232,6 @@
content: '纭畾鍒犻櫎鍗＄墖鍚楋紵',
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)
@@ -323,49 +289,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 +342,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