From a37828c3cd7b3014911323a1e86c2cf2b1e51597 Mon Sep 17 00:00:00 2001 From: gchust Date: Mon, 30 Jun 2025 21:15:25 +0800 Subject: [PATCH] fix: title translate --- packages/core/client/src/flow/models/base/BlockModel.tsx | 2 +- .../core/flow-engine/src/models/__tests__/flowModel.test.ts | 4 ++-- packages/core/flow-engine/src/models/flowModel.tsx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/core/client/src/flow/models/base/BlockModel.tsx b/packages/core/client/src/flow/models/base/BlockModel.tsx index 16b912ce44..122f5832d7 100644 --- a/packages/core/client/src/flow/models/base/BlockModel.tsx +++ b/packages/core/client/src/flow/models/base/BlockModel.tsx @@ -36,7 +36,7 @@ export class DataBlockModel extends BlockModel { get title() { return ( - this._title || + this.translate(this._title) || ` ${this.collection.title} > ${this.collection.dataSource.displayName} > diff --git a/packages/core/flow-engine/src/models/__tests__/flowModel.test.ts b/packages/core/flow-engine/src/models/__tests__/flowModel.test.ts index a1ac985c90..d0f68fa15c 100644 --- a/packages/core/flow-engine/src/models/__tests__/flowModel.test.ts +++ b/packages/core/flow-engine/src/models/__tests__/flowModel.test.ts @@ -912,8 +912,8 @@ describe('FlowModel', () => { describe('subModels serialization', () => { test('should serialize subModels in model data', () => { - const child1 = new FlowModel({ uid: 'child1', flowEngine, props: { name: 'first' } }); - const child2 = new FlowModel({ uid: 'child2', flowEngine, props: { name: 'second' } }); + const child1 = new FlowModel({ uid: 'child1', flowEngine }); + const child2 = new FlowModel({ uid: 'child2', flowEngine }); parentModel.setSubModel('singleChild', child1); parentModel.addSubModel('multipleChildren', child2); diff --git a/packages/core/flow-engine/src/models/flowModel.tsx b/packages/core/flow-engine/src/models/flowModel.tsx index 0137b58960..b1d835089e 100644 --- a/packages/core/flow-engine/src/models/flowModel.tsx +++ b/packages/core/flow-engine/src/models/flowModel.tsx @@ -138,7 +138,7 @@ export class FlowModel { get title() { // model 可以通过 setTitle 来自定义title, 具有更高的优先级 - return this._title || this.translate(this.constructor['meta']?.title); + return this.translate(this._title) || this.translate(this.constructor['meta']?.title); } setTitle(value: string) {