From 861a6fc45008ceec36587bf52911f3db3f914f77 Mon Sep 17 00:00:00 2001 From: yy-wow Date: Mon, 13 Jan 2025 00:01:49 -0800 Subject: [PATCH] fix: review --- .../materials/src/composable/useMaterial.js | 2 +- .../materials/src/composable/useResource.js | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/packages/plugins/materials/src/composable/useMaterial.js b/packages/plugins/materials/src/composable/useMaterial.js index 9a416b3b3..89fd1feb0 100644 --- a/packages/plugins/materials/src/composable/useMaterial.js +++ b/packages/plugins/materials/src/composable/useMaterial.js @@ -304,7 +304,7 @@ const parseMaterialsDependencies = (materialBundle) => { const { scripts: scriptsDeps, styles: stylesDeps } = useResource().appSchemaState.materialsDeps packages?.forEach((pkg) => { - if (!pkg.script || scriptsDeps.find((item) => item.package === pkg.package)) { + if (!pkg.script || !pkg.package || scriptsDeps.find((item) => item.package === pkg.package)) { return } diff --git a/packages/plugins/materials/src/composable/useResource.js b/packages/plugins/materials/src/composable/useResource.js index dfcafc5c7..fbacd1345 100644 --- a/packages/plugins/materials/src/composable/useResource.js +++ b/packages/plugins/materials/src/composable/useResource.js @@ -177,13 +177,15 @@ const fetchResource = async ({ isInit = true } = {}) => { // 获取工具类的依赖,用于预览加载。格式和物料依赖一致,便于处理 const getUtilsDeps = () => { - return appSchemaState.utils.map((item) => { - return { - ...item, - package: item.content.package, - script: item.content.cdnLink - } - }) + return appSchemaState.utils + .filter((item) => item.type === 'npm') + .map((item) => { + return { + ...item, + package: item.content?.package, + script: item.content?.cdnLink + } + }) } export default function () {