From d712ae0a0d338bdc96c463c9ffe42f8c844f3c37 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 02 三月 2023 12:46:57 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/pastecontroller/index.jsx | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/menu/pastecontroller/index.jsx b/src/menu/pastecontroller/index.jsx
index 7a49bf2..d816e9d 100644
--- a/src/menu/pastecontroller/index.jsx
+++ b/src/menu/pastecontroller/index.jsx
@@ -18,40 +18,37 @@
visible: false
}
- resetconfig = (item, uuids = {}) => {
+ resetconfig = (item) => {
let appType = sessionStorage.getItem('appType')
if (item.type === 'tabs') {
- uuids[item.uuid] = MenuUtils.getuuid()
- item.uuid = uuids[item.uuid]
+ item.uuid = MenuUtils.getuuid()
item.setting.name = item.setting.name + MenuUtils.getSignName()
item.name = item.setting.name
item.subtabs.forEach(tab => {
- uuids[tab.uuid] = MenuUtils.getuuid()
- tab.uuid = uuids[tab.uuid]
+ tab.uuid = MenuUtils.getuuid()
if (appType !== 'mob') {
tab.components = tab.components.filter(cell => cell.type !== 'menubar')
}
tab.components = tab.components.map(cell => {
- cell = this.resetconfig(cell, uuids)
+ cell = this.resetconfig(cell)
return cell
})
})
} else if (item.type === 'group') {
- uuids[item.uuid] = MenuUtils.getuuid()
- item.uuid = uuids[item.uuid]
+ item.uuid = MenuUtils.getuuid()
item.setting.name = item.setting.name + MenuUtils.getSignName()
item.name = item.setting.name
item.components = item.components.map(cell => {
- cell = MenuUtils.resetComponentConfig(cell, uuids)
+ cell = MenuUtils.resetComponentConfig(cell)
return cell
})
} else {
- item = MenuUtils.resetComponentConfig(item, uuids)
+ item = MenuUtils.resetComponentConfig(item)
}
return item
--
Gitblit v1.8.0