From 0da0262bc236cfce928429fc4c48e1666eab3402 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 07 一月 2021 17:12:04 +0800
Subject: [PATCH] 2021-01-07
---
src/menu/components/group/normal-group/index.jsx | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/menu/components/group/normal-group/index.jsx b/src/menu/components/group/normal-group/index.jsx
index 698c884..460e3a2 100644
--- a/src/menu/components/group/normal-group/index.jsx
+++ b/src/menu/components/group/normal-group/index.jsx
@@ -80,17 +80,22 @@
MKEmitter.removeListener('submitComponentStyle', this.updateComponentStyle)
}
- updateComponentStyle = (item) => {
+ updateComponentStyle = (parentId, keys, style) => {
const { group } = this.state
- if (group.uuid !== item.uuid) return
+ if (group.uuid !== parentId) return
+
+ let components = group.components.map(item => {
+ if (keys.includes(item.uuid)) {
+ item.style = {...item.style, ...style}
+ }
+ return item
+ })
this.setState({
group: {...group, components: []}
}, () => {
- this.setState({
- group: {...group, components: item.components}
- })
+ this.updateComponent({...group, components: components})
})
}
@@ -125,8 +130,8 @@
updateComponent = (component) => {
const { group } = this.state
- if (!is(fromJS(group.setting), fromJS(component.setting))) {
- // 娉ㄥ唽浜嬩欢-鏍囩鍙樺寲锛岄�氱煡鏍囩鍐呭厓绱�
+ if (!is(fromJS(group.setting), fromJS(component.setting)) || !is(fromJS(group.style), fromJS(component.style))) {
+ // 娉ㄥ唽浜嬩欢-鏍囩鍙樺寲锛岄�氱煡缁勫唴鍏冪礌
MKEmitter.emit('tabsChange', group.uuid)
}
@@ -149,7 +154,7 @@
}
clickComponent = (e) => {
- if (sessionStorage.getItem('style-control') === 'true') {
+ if (sessionStorage.getItem('style-control') === 'true' || sessionStorage.getItem('style-control') === 'component') {
e.stopPropagation()
MKEmitter.emit('clickComponent', this.state.group)
}
--
Gitblit v1.8.0