From 07c005cf28acf74e3afde82122e4c53e1000d70c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 12 六月 2023 12:06:18 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/share/actioncomponent/index.jsx | 118 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 92 insertions(+), 26 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/index.jsx b/src/menu/components/share/actioncomponent/index.jsx
index e4be98c..71fd65a 100644
--- a/src/menu/components/share/actioncomponent/index.jsx
+++ b/src/menu/components/share/actioncomponent/index.jsx
@@ -60,7 +60,7 @@
}
componentDidMount () {
- MKEmitter.addListener('revert', this.revert)
+ MKEmitter.addListener('revertBtn', this.revertBtn)
MKEmitter.addListener('addButton', this.addButton)
MKEmitter.addListener('submitModal', this.handleSave)
}
@@ -76,12 +76,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({
@@ -257,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: 'rgba(0, 0, 0, 0.65)' }
+ let color = { primary: '#1890ff', yellow: '#c49f47', orange: 'orange', danger: '#ff4d4f', green: '#26C281', dgreen: '#32c5d2', purple: '#8E44AD', cyan: '#13c2c2', gray: '#E7E7EF', default: 'rgba(0, 0, 0, 0.65)' }
let _actionlist = fromJS(this.state.actionlist).toJS()
this.actionFormRef.handleConfirm().then(btn => {
@@ -266,6 +266,12 @@
if ((btn.OpenType === 'excelIn' || btn.OpenType === 'excelOut') && (!btn.verify || !btn.verify.columns) && (config.subtype === 'basetable' || config.subtype === 'normaltable')) {
let columns = []
let maps = []
+ let labels = {}
+ if (config.subtype === 'normaltable') {
+ config.columns.forEach(col => {
+ labels[col.field] = col.label
+ })
+ }
if (btn.OpenType === 'excelOut') {
let pushcol = (item) => {
@@ -289,16 +295,27 @@
}
config.cols.forEach(item => {
- if (item.type === 'colspan' && config.subtype === 'normaltable') {
- item.subcols.forEach(cell => {
- if (!cell.field || cell.Hide === 'true' || maps.includes(cell.field)) return
- maps.push(cell.field)
+ if (item.Hide === 'true') return
- pushcol(cell)
- })
+ if (config.subtype === 'normaltable') {
+ if (item.type === 'colspan') {
+ item.subcols.forEach(cell => {
+ if (!cell.field || cell.Hide === 'true' || maps.includes(cell.field)) return
+ maps.push(cell.field)
+
+ pushcol(cell)
+ })
+ } else if (item.type === 'custom') {
+ item.elements.forEach(cell => {
+ if (!cell.field || maps.includes(cell.field)) return
+ maps.push(cell.field)
+
+ pushcol({...cell, label: labels[cell.field]})
+ })
+ }
}
- if (!item.field || item.Hide === 'true' || maps.includes(item.field)) return
+ if (!item.field || maps.includes(item.field)) return
maps.push(item.field)
pushcol(item)
@@ -337,16 +354,27 @@
}
config.cols.forEach(item => {
- if (item.type === 'colspan' && config.subtype === 'normaltable') {
- item.subcols.forEach(cell => {
- if (!cell.field || cell.Hide === 'true' || maps.includes(cell.field)) return
- maps.push(cell.field)
+ if (item.Hide === 'true') return
- pushcol(cell)
- })
+ if (config.subtype === 'normaltable') {
+ if (item.type === 'colspan') {
+ item.subcols.forEach(cell => {
+ if (!cell.field || cell.Hide === 'true' || maps.includes(cell.field)) return
+ maps.push(cell.field)
+
+ pushcol(cell)
+ })
+ } else if (item.type === 'custom') {
+ item.elements.forEach(cell => {
+ if (!cell.field || maps.includes(cell.field)) return
+ maps.push(cell.field)
+
+ pushcol({...cell, label: labels[cell.field]})
+ })
+ }
}
- if (!item.field || item.Hide === 'true' || maps.includes(item.field)) return
+ if (!item.field || maps.includes(item.field)) return
maps.push(item.field)
pushcol(item)
@@ -370,19 +398,39 @@
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 if (btn.class === 'gray') {
+ btn.style = {color: 'rgba(0, 0, 0, 0.65)', backgroundColor: color[_c], borderColor: color[_c], marginRight: '15px'}
} else {
btn.style = {color: '#fff', backgroundColor: color[_c], borderColor: color[_c], marginRight: '15px'}
}
} else {
btn.style = item.style || {}
- if (btn.class !== item.class || btn.show !== item.show || !btn.style.color || item.focus) {
- if (btn.show === 'icon') {
- btn.style.color = color[btn.class]
- btn.style.backgroundColor = 'transparent'
- } else {
- btn.style.color = '#ffffff'
- btn.style.backgroundColor = color[btn.class]
+ if (btn.class) {
+ 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'
+ } else if (btn.class === 'default') {
+ btn.style.color = 'rgba(0, 0, 0, 0.65)'
+ btn.style.backgroundColor = '#fff'
+ btn.style.borderColor = '#d9d9d9'
+ } else if (btn.class.indexOf('border') > -1) {
+ let _c = btn.class.replace('border-', '')
+ btn.style.color = color[_c]
+ btn.style.backgroundColor = '#fff'
+ btn.style.borderColor = color[_c]
+ } else if (btn.class === 'gray') {
+ btn.style.color = 'rgba(0, 0, 0, 0.65)'
+ btn.style.backgroundColor = color[btn.class]
+ btn.style.borderColor = color[btn.class]
+ } else {
+ btn.style.color = '#ffffff'
+ btn.style.backgroundColor = color[btn.class]
+ btn.style.borderColor = color[btn.class]
+ }
}
+ } else if (btn.color) {
+ btn.style = {}
}
}
return btn
@@ -551,7 +599,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) {
@@ -561,6 +609,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