From f6626b05f1275cc2f8ca77f773d4f6a6af1b0a89 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 十一月 2022 16:11:55 +0800
Subject: [PATCH] 2022-11-21
---
src/menu/components/share/actioncomponent/index.jsx | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/index.jsx b/src/menu/components/share/actioncomponent/index.jsx
index 2bee4a7..1234964 100644
--- a/src/menu/components/share/actioncomponent/index.jsx
+++ b/src/menu/components/share/actioncomponent/index.jsx
@@ -81,7 +81,9 @@
MKEmitter.removeListener('submitModal', this.handleSave)
}
- revert = () => {
+ revert = (id) => {
+ if (id && id !== this.props.config.uuid) return
+
this.setState({
actionlist: fromJS(this.props.config.action).toJS()
})
@@ -255,7 +257,7 @@
*/
handleSubmit = () => {
const { config } = this.props
- let color = { primary: '#1890ff', yellow: '#c49f47', orange: 'orange', danger: '#ff4d4f', green: '#26C281', dgreen: '#32c5d2', purple: '#8E44AD', cyan: '#13c2c2', gray: '#666666', default: '#333333' }
+ let color = { primary: '#1890ff', yellow: '#c49f47', orange: 'orange', danger: '#ff4d4f', green: '#26C281', dgreen: '#32c5d2', purple: '#8E44AD', cyan: '#13c2c2', gray: '#666666', default: 'rgba(0, 0, 0, 0.65)' }
let _actionlist = fromJS(this.state.actionlist).toJS()
this.actionFormRef.handleConfirm().then(btn => {
@@ -270,7 +272,9 @@
if (item.uuid === btn.uuid) {
if (config.subtype === 'basetable') {
let _c = btn.class.replace('border-', '')
- if (btn.class.indexOf('border') > -1 || btn.class === 'default') {
+ if (btn.class === 'default') {
+ btn.style = {color: 'rgba(0, 0, 0, 0.65)', backgroundColor: '#fff', borderColor: '#d9d9d9', marginRight: '15px'}
+ } else if (btn.class.indexOf('border') > -1) {
btn.style = {color: color[_c], backgroundColor: '#fff', borderColor: color[_c], marginRight: '15px'}
} else {
btn.style = {color: '#fff', backgroundColor: color[_c], borderColor: color[_c], marginRight: '15px'}
@@ -316,7 +320,6 @@
*/
deleteElement = (card) => {
const { config } = this.props
- const { appType } = this.state
let _this = this
confirm({
@@ -331,11 +334,6 @@
}, () => {
_this.props.updateaction({...config, action: _actionlist})
})
-
- if (card.origin || appType === 'mob') return
- if (appType === 'pc' && card.OpenType !== 'popview') return
-
- MKEmitter.emit('delButtons', [card.uuid])
},
onCancel() {}
})
@@ -461,7 +459,7 @@
let btn = null
let _col = null
- if (config.subtype === 'normaltable' || config.subtype === 'editable' || config.subtype === 'basetable') {
+ if (config.type === 'table') {
config.cols.forEach(col => {
if (col.type !== 'action') return
--
Gitblit v1.8.0