From e6e7a9db4fa302639ac263ffd848a95e5ff52cf4 Mon Sep 17 00:00:00 2001 From: STATICHIT <2394412110@qq.com> Date: Thu, 29 Aug 2024 00:34:20 +0800 Subject: [PATCH] optimize: Deal with comments --- packages/controller/src/useLayout.js | 6 ++++-- packages/design-core/config/addons.js | 2 +- packages/design-core/src/App.vue | 8 ++++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/packages/controller/src/useLayout.js b/packages/controller/src/useLayout.js index 20a9ffc62..9f43a7465 100644 --- a/packages/controller/src/useLayout.js +++ b/packages/controller/src/useLayout.js @@ -173,7 +173,7 @@ export default () => { //获取某个布局(左上/左下/右上)的插件名称列表 const getPluginLayout = (layout) => { - const targetLayout = [] + const targetLayout = layout ? [] : null // 遍历对象并将 align 值分类到不同的数组中 for (const key in pluginStorageReactive.value) { if (pluginStorageReactive.value[key].align === layout || layout === 'all') { @@ -185,7 +185,9 @@ export default () => { //修改某个插件的布局 const changePluginLayout = (name, layout) => { - pluginStorageReactive.value[name].align = layout + if (pluginStorageReactive.value[name]) { + pluginStorageReactive.value[name].align = layout + } } return { diff --git a/packages/design-core/config/addons.js b/packages/design-core/config/addons.js index 2a35a965d..aa37eedcd 100644 --- a/packages/design-core/config/addons.js +++ b/packages/design-core/config/addons.js @@ -74,7 +74,7 @@ addons.settings.forEach((item) => { }) export const getPlugin = (pluginName) => { - return plugin[pluginName] + return plugin[pluginName] || null } export default addons diff --git a/packages/design-core/src/App.vue b/packages/design-core/src/App.vue index 2b39b989f..d8266be74 100644 --- a/packages/design-core/src/App.vue +++ b/packages/design-core/src/App.vue @@ -77,10 +77,14 @@ export default { const plugin = {} addons.plugins.forEach((item) => { - plugin[item.id] = { width: item.options?.width || 300, align: item.options?.align || 'leftTop' } + if (item.id) { + plugin[item.id] = { width: item.options?.width || 300, align: item.options?.align || 'leftTop' } + } }) addons.settings.forEach((item) => { - plugin[item.id] = { width: item.options?.width || 320, align: item.options?.align || 'leftTop' } + if (item.id) { + plugin[item.id] = { width: item.options?.width || 320, align: item.options?.align || 'leftTop' } + } }) localStorage.setItem('plugin', JSON.stringify(plugin))