From aee1d7249efd3e7978cafc6540b4458da6f9e60c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 20 六月 2023 16:41:13 +0800
Subject: [PATCH] 2023-06-20
---
src/menu/components/share/actioncomponent/index.jsx | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/index.jsx b/src/menu/components/share/actioncomponent/index.jsx
index 93e5bd9..5746ac8 100644
--- a/src/menu/components/share/actioncomponent/index.jsx
+++ b/src/menu/components/share/actioncomponent/index.jsx
@@ -2,6 +2,7 @@
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
import { Modal, notification, Button } from 'antd'
+import moment from 'moment'
import Utils, { FuncUtils } from '@/utils/utils.js'
import { getActionForm, getBaseTableActionForm } from './formconfig'
@@ -60,7 +61,7 @@
}
componentDidMount () {
- MKEmitter.addListener('revert', this.revert)
+ MKEmitter.addListener('revertBtn', this.revertBtn)
MKEmitter.addListener('addButton', this.addButton)
MKEmitter.addListener('submitModal', this.handleSave)
}
@@ -76,12 +77,12 @@
this.setState = () => {
return
}
- MKEmitter.removeListener('revert', this.revert)
+ MKEmitter.removeListener('revertBtn', this.revertBtn)
MKEmitter.removeListener('addButton', this.addButton)
MKEmitter.removeListener('submitModal', this.handleSave)
}
- revert = (id) => {
+ revertBtn = (id) => {
if (id && id !== this.props.config.uuid) return
this.setState({
@@ -406,7 +407,7 @@
} else {
btn.style = item.style || {}
if (btn.class) {
- if (btn.class !== item.class || btn.show !== item.show || !btn.style.color || item.focus) {
+ if (btn.class !== item.class || btn.show !== item.show || !btn.style.color || (item.focus && !btn.style.color)) {
if (btn.show === 'icon') {
btn.style.color = color[btn.class]
btn.style.backgroundColor = 'transparent'
@@ -433,6 +434,8 @@
btn.style = {}
}
}
+
+ btn.updateTime = moment().format('YYYY-MM-DD HH:mm')
return btn
} else {
return item
@@ -505,6 +508,7 @@
_actionlist = _actionlist.map(item => {
if (item.uuid === card.uuid) {
item.verify = res
+ item.updateTime = moment().format('YYYY-MM-DD HH:mm')
}
return item
@@ -599,7 +603,7 @@
let _col = null
if (config.type === 'table') {
config.cols.forEach(col => {
- if (col.type !== 'action') return
+ if (col.type !== 'custom') return
col.elements = col.elements.filter(item => {
if (item.uuid === id) {
@@ -609,6 +613,24 @@
return item.uuid !== id
})
})
+ } else if (config.type === 'card' && config.subcards) {
+ config.subcards.forEach(scard => {
+ scard.elements = scard.elements.filter(item => {
+ if (item.uuid === id) {
+ btn = item
+ _col = scard
+ }
+ return item.uuid !== id
+ })
+ scard.backElements = scard.backElements.filter(item => {
+ if (item.uuid === id) {
+ btn = item
+ _col = scard
+ }
+ return item.uuid !== id
+ })
+ return scard
+ })
}
if (!btn) return
--
Gitblit v1.8.0