From 72419e2f826031a158173f46d723a672064e37cd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 31 八月 2021 22:42:51 +0800
Subject: [PATCH] 2021-08-31
---
src/menu/components/group/normal-group/index.jsx | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/menu/components/group/normal-group/index.jsx b/src/menu/components/group/normal-group/index.jsx
index c6021fa..ac34bbd 100644
--- a/src/menu/components/group/normal-group/index.jsx
+++ b/src/menu/components/group/normal-group/index.jsx
@@ -6,7 +6,7 @@
import MKEmitter from '@/utils/events.js'
import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
-
+import { resetStyle } from '@/utils/utils-custom.js'
import zhCN from '@/locales/zh-CN/model.js'
import enUS from '@/locales/en-US/model.js'
import './index.scss'
@@ -101,7 +101,7 @@
changeStyle = () => {
const { group } = this.state
- MKEmitter.emit('changeStyle', [group.uuid], ['background', 'border', 'padding', 'margin'], group.style)
+ MKEmitter.emit('changeStyle', [group.uuid], ['background', 'border', 'padding', 'margin', 'shadow'], group.style)
}
getStyle = (comIds, style) => {
@@ -161,9 +161,15 @@
render() {
const { group } = this.state
+ let _style = resetStyle(group.style)
+
+ let paddingTop = true
+ if (group.style.paddingTop && parseInt(group.style.paddingTop) >= 28) {
+ paddingTop = false
+ }
return (
- <div className="menu-group-edit-box" style={group.style} onClick={this.clickComponent} id={group.uuid}>
+ <div className={'menu-group-edit-box' + (paddingTop ? ' padding' : '')} style={_style} onClick={this.clickComponent} id={group.uuid}>
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
<SettingComponent config={group} updateConfig={this.updateComponent} />
--
Gitblit v1.8.0