From 50ef894c297c70a943f6f6a1db37cd57ad310991 Mon Sep 17 00:00:00 2001 From: yy-wow Date: Thu, 9 Jan 2025 00:21:10 -0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/canvas/container/src/CanvasContainer.vue | 2 +- packages/common/js/preview.js | 2 +- packages/plugins/materials/src/composable/useMaterial.js | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/canvas/container/src/CanvasContainer.vue b/packages/canvas/container/src/CanvasContainer.vue index 5c9f40280..323b709d8 100644 --- a/packages/canvas/container/src/CanvasContainer.vue +++ b/packages/canvas/container/src/CanvasContainer.vue @@ -113,7 +113,7 @@ export default { const beforeCanvasReady = () => { if (iframe.value) { const win = iframe.value.contentWindow - win.componentsDeps = useResource().resState.canvasDeps.scripts.filter((item) => item.components) + win.componentsDeps = useResource().appSchemaState.canvasDeps.scripts.filter((item) => item.components) const { subscribe, unsubscribe } = useMessage() const { getSchemaDiff, patchLatestSchema, getSchema, getNode } = useCanvas() diff --git a/packages/common/js/preview.js b/packages/common/js/preview.js index 11b02313b..0ce4c2348 100644 --- a/packages/common/js/preview.js +++ b/packages/common/js/preview.js @@ -26,7 +26,7 @@ const open = (params = {}) => { params.app = paramsMap.get('id') params.tenant = paramsMap.get('tenant') - const { scripts, styles } = useResource().resState.canvasDeps + const { scripts, styles } = useResource().appSchemaState.canvasDeps params.scripts = {} scripts diff --git a/packages/plugins/materials/src/composable/useMaterial.js b/packages/plugins/materials/src/composable/useMaterial.js index 76f421a9b..69c76a76c 100644 --- a/packages/plugins/materials/src/composable/useMaterial.js +++ b/packages/plugins/materials/src/composable/useMaterial.js @@ -283,7 +283,7 @@ const addComponentSnippets = (componentSnippets, snippetsData) => { * @returns */ const getUtilsDependencies = () => { - const { utils } = useResource().resState + const { utils } = useResource().appSchemaState return utils .filter((item) => item.type === 'npm' && item.content.cdnLink) @@ -302,7 +302,7 @@ const getUtilsDependencies = () => { * 组装画布的依赖,通知画布初始化或更新importmap */ const setCanvasDeps = () => { - const { scripts, styles } = useResource().resState.canvasDeps + const { scripts, styles } = useResource().appSchemaState.canvasDeps // 将utils依赖添加到canvasDeps中 getUtilsDependencies().forEach((util) => { @@ -323,7 +323,7 @@ const setCanvasDeps = () => { const parseMaterialsDependencies = (materialBundle) => { const { packages, components } = materialBundle - const { scripts: scriptsDeps, styles: stylesDeps } = useResource().resState.canvasDeps + const { scripts: scriptsDeps, styles: stylesDeps } = useResource().appSchemaState.canvasDeps packages?.forEach((pkg) => { if (scriptsDeps.find((item) => item.package === pkg.package)) {