From 6781ba45775af16872ac68f7e459b1072b16c4cc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 18 十月 2023 17:33:47 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/share/actioncomponent/index.jsx | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/index.jsx b/src/menu/components/share/actioncomponent/index.jsx
index 3599e68..a66f2fa 100644
--- a/src/menu/components/share/actioncomponent/index.jsx
+++ b/src/menu/components/share/actioncomponent/index.jsx
@@ -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