From ecfaff2e0d4a14e41cf7fe4f2cc51377da401f52 Mon Sep 17 00:00:00 2001 From: roymondchen Date: Tue, 2 Jul 2024 16:14:33 +0800 Subject: [PATCH] =?UTF-8?q?feat(data-source):=20=E8=BF=AD=E4=BB=A3?= =?UTF-8?q?=E5=99=A8=E5=AE=B9=E5=99=A8=E5=86=85=E5=AE=B9=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=9D=A1=E4=BB=B6=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/data-source/src/DataSourceManager.ts | 2 +- packages/data-source/src/utils.ts | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/data-source/src/DataSourceManager.ts b/packages/data-source/src/DataSourceManager.ts index 0420e40e..0fad0b47 100644 --- a/packages/data-source/src/DataSourceManager.ts +++ b/packages/data-source/src/DataSourceManager.ts @@ -222,7 +222,7 @@ class DataSourceManager extends EventEmitter { const [dsId, ...keys] = dataSourceField; const ds = this.get(dsId); if (!ds) return items; - return compliedIteratorItems(itemData, items, dsId, keys, this.app.platform !== 'editor'); + return compliedIteratorItems(itemData, items, dsId, keys, this.app.platform === 'editor'); } public destroy() { diff --git a/packages/data-source/src/utils.ts b/packages/data-source/src/utils.ts index 3111fed2..c3f8f48d 100644 --- a/packages/data-source/src/utils.ts +++ b/packages/data-source/src/utils.ts @@ -223,7 +223,7 @@ export const compliedIteratorItems = ( return items.map((item) => { const ctxData = createIteratorContentData(itemData, dsId, keys); - if (condDeps[item.id]?.keys.length) { + if (condDeps[item.id]?.keys.length && !inEditor) { item.condResult = compliedConditions(item, ctxData); } @@ -231,10 +231,6 @@ export const compliedIteratorItems = ( return item; } - if (!inEditor) { - item.condResult = compliedConditions(item, itemData); - } - return compiledNode( (value: any) => compiledNodeField(value, ctxData), cloneDeep(item),