From ef8acbf3859bd13e759fbb9b8ba726039c1fb2c5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 14 十一月 2023 15:51:59 +0800
Subject: [PATCH] 2023-11-14
---
src/menu/components/share/actioncomponent/index.jsx | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/index.jsx b/src/menu/components/share/actioncomponent/index.jsx
index 3599e68..0109542 100644
--- a/src/menu/components/share/actioncomponent/index.jsx
+++ b/src/menu/components/share/actioncomponent/index.jsx
@@ -136,7 +136,7 @@
changeBtnStyle = (element) => {
let _style = element.style ? fromJS(element.style).toJS() : {}
- let options = ['font', 'border', 'background', 'margin', 'padding']
+ let options = ['font', 'border', 'background', 'margin', 'padding', 'minHeight']
this.setState({
card: element
@@ -207,7 +207,7 @@
}
}
- let modules = MenuUtils.getSubModules(window.GLOB.customMenu.components, config.uuid, supId)
+ let modules = MenuUtils.getSubModules(window.GLOB.customMenu.components, config.uuid, supId, config.subtype !== 'basetable')
if (config.subtype === 'basetable') {
delete card.eleType // 鍖哄垎鎸夐挳浣嶇疆
@@ -407,10 +407,11 @@
btn.style = item.style || {}
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') {
+ // if (btn.show === 'icon') {
+ // btn.style.color = color[btn.class]
+ // btn.style.backgroundColor = 'transparent'
+ // }
+ if (btn.class === 'default') {
btn.style.color = 'rgba(0, 0, 0, 0.65)'
btn.style.backgroundColor = '#fff'
btn.style.borderColor = '#d9d9d9'
@@ -419,6 +420,7 @@
btn.style.color = color[_c]
btn.style.backgroundColor = '#fff'
btn.style.borderColor = color[_c]
+ btn.style.borderWidth = '1px'
} else if (btn.class === 'gray') {
btn.style.color = 'rgba(0, 0, 0, 0.65)'
btn.style.backgroundColor = color[btn.class]
--
Gitblit v1.8.0