From 1e93e9bacce4ec52c96b82c9af1433b6e1f17195 Mon Sep 17 00:00:00 2001 From: roymondchen Date: Thu, 4 Jul 2024 14:41:34 +0800 Subject: [PATCH] =?UTF-8?q?fix(data-source):=20=E6=8C=89=E9=9C=80=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=E6=95=B0=E6=8D=AE=E6=BA=90=E6=97=B6=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=88=86=E4=BA=AB=E6=95=B0=E6=8D=AE=E6=BA=90=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/data-source/src/utils.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/data-source/src/utils.ts b/packages/data-source/src/utils.ts index c3f8f48d..2ea52126 100644 --- a/packages/data-source/src/utils.ts +++ b/packages/data-source/src/utils.ts @@ -242,11 +242,14 @@ export const compliedIteratorItems = ( }); }; +/** + * 按需加载数据源 + */ export const registerDataSourceOnDemand = async ( dsl: MApp, dataSourceModules: Record Promise>, ) => { - const { dataSourceCondDeps = {}, dataSourceDeps = {}, dataSources = [] } = dsl; + const { dataSourceMethodsDeps = {}, dataSourceCondDeps = {}, dataSourceDeps = {}, dataSources = [] } = dsl; const dsModuleMap: Record Promise> = {}; @@ -257,6 +260,10 @@ export const registerDataSourceOnDemand = async ( dep = dataSourceDeps[ds.id] || {}; } + if (!Object.keys(dep).length) { + dep = dataSourceMethodsDeps[ds.id] || {}; + } + if (Object.keys(dep).length && dataSourceModules[ds.type]) { dsModuleMap[ds.type] = dataSourceModules[ds.type]; }