From 76a4300654a18d228838c3f27455dc8e7a8cd616 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 15 一月 2021 17:04:42 +0800
Subject: [PATCH] Merge branch 'master' into bms
---
src/menu/components/share/actioncomponent/index.jsx | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/index.jsx b/src/menu/components/share/actioncomponent/index.jsx
index 5b45d27..3c62910 100644
--- a/src/menu/components/share/actioncomponent/index.jsx
+++ b/src/menu/components/share/actioncomponent/index.jsx
@@ -229,10 +229,10 @@
if (btn.class !== item.class || btn.show !== item.show || !btn.btnstyle.color) {
if (btn.show === 'link' || btn.show === 'icon') {
btn.btnstyle.color = color[btn.class]
- btn.btnstyle.background = 'transparent'
+ btn.btnstyle.backgroundColor = 'transparent'
} else {
btn.btnstyle.color = '#ffffff'
- btn.btnstyle.background = color[btn.class]
+ btn.btnstyle.backgroundColor = color[btn.class]
}
}
return btn
@@ -404,6 +404,8 @@
* @description 鎸夐挳鍙屽嚮瑙﹀彂瀛愰厤缃�
*/
btnDoubleClick = (element) => {
+ if (sessionStorage.getItem('style-control') && sessionStorage.getItem('style-control') !== 'false') return
+
if (element.OpenType === 'pop' || element.OpenType === 'popview') {
this.props.setSubConfig(element)
} else {
--
Gitblit v1.8.0