From 33a4192e2c786a0dae170744c31d15ef3bbe3ced Mon Sep 17 00:00:00 2001 From: liujuping Date: Fri, 24 Feb 2023 14:49:32 +0800 Subject: [PATCH] fix: fix slot id is automatically generated every time --- packages/designer/src/document/node/props/prop.ts | 2 +- packages/designer/tests/document/node/props/prop.test.ts | 2 ++ packages/react-simulator-renderer/src/renderer-view.tsx | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/designer/src/document/node/props/prop.ts b/packages/designer/src/document/node/props/prop.ts index f16f24c84..81675aa57 100644 --- a/packages/designer/src/document/node/props/prop.ts +++ b/packages/designer/src/document/node/props/prop.ts @@ -401,7 +401,7 @@ export class Prop implements IProp, IPropParent { slotSchema = { componentName: 'Slot', title: value.title || value.props?.slotTitle, - id: data.id, + id: value.id, name: value.name || value.props?.slotName, params: value.params || value.props?.slotParams, children: value.children, diff --git a/packages/designer/tests/document/node/props/prop.test.ts b/packages/designer/tests/document/node/props/prop.test.ts index 787b6bc9b..932733b1a 100644 --- a/packages/designer/tests/document/node/props/prop.test.ts +++ b/packages/designer/tests/document/node/props/prop.test.ts @@ -518,6 +518,7 @@ describe('Prop 类测试', () => { type: 'JSSlot', value: { componentName: 'Slot', + id: 'node_oclei5rv2e2', props: { slotName: "content", slotTitle: "主内容" @@ -534,6 +535,7 @@ describe('Prop 类测试', () => { expect(slotProp.slotNode?.title).toBe('主内容'); expect(slotProp.slotNode?.getExtraProp('name')?.getValue()).toBe('content'); + expect(slotProp.slotNode?.export()?.id).toBe('node_oclei5rv2e2'); slotProp.export(); diff --git a/packages/react-simulator-renderer/src/renderer-view.tsx b/packages/react-simulator-renderer/src/renderer-view.tsx index 68e66fc02..e8c7ce52e 100644 --- a/packages/react-simulator-renderer/src/renderer-view.tsx +++ b/packages/react-simulator-renderer/src/renderer-view.tsx @@ -170,7 +170,9 @@ class Renderer extends Component<{ this.startTime = Date.now(); this.schemaChangedSymbol = false; - if (!container.autoRender || isRendererDetached()) return null; + if (!container.autoRender || isRendererDetached()) { + return null; + } const { intl } = createIntl(locale);