From 59db6fab9c1ed1fa5559d423d439e14ea33b1598 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 27 四月 2023 11:18:24 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/share/actioncomponent/index.jsx | 46 +++++++++++++++++++++++++---------------------
1 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/index.jsx b/src/menu/components/share/actioncomponent/index.jsx
index 1d43e47..93e5bd9 100644
--- a/src/menu/components/share/actioncomponent/index.jsx
+++ b/src/menu/components/share/actioncomponent/index.jsx
@@ -405,28 +405,32 @@
}
} 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 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]
+ if (btn.class) {
+ 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 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
--
Gitblit v1.8.0