From 116498ee77ae9b8fad963319cb6964557e8e19a5 Mon Sep 17 00:00:00 2001 From: "mario.gk" Date: Sun, 28 Jun 2020 17:27:32 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BD=8E=E4=BB=A3=E7=A0=81=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=20props=20=E6=98=BE=E7=A4=BA=20object=20=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/designer/src/document/node/transform-stage.ts | 8 +------- packages/react-simulator-renderer/src/renderer.ts | 6 ++++-- packages/types/src/index.ts | 1 + packages/types/src/transform-stage.ts | 7 +++++++ 4 files changed, 13 insertions(+), 9 deletions(-) create mode 100644 packages/types/src/transform-stage.ts diff --git a/packages/designer/src/document/node/transform-stage.ts b/packages/designer/src/document/node/transform-stage.ts index e415d44ae..5dc3269e2 100644 --- a/packages/designer/src/document/node/transform-stage.ts +++ b/packages/designer/src/document/node/transform-stage.ts @@ -1,7 +1 @@ -export enum TransformStage { - Render = 1, - Serilize = 2, - Save = 3, - Clone = 4, - Init = 5, -} +export { TransformStage } from '@ali/lowcode-types'; diff --git a/packages/react-simulator-renderer/src/renderer.ts b/packages/react-simulator-renderer/src/renderer.ts index df316b5ce..f6efefa08 100644 --- a/packages/react-simulator-renderer/src/renderer.ts +++ b/packages/react-simulator-renderer/src/renderer.ts @@ -8,7 +8,7 @@ import { getClientRects } from './utils/get-client-rects'; import loader from './utils/loader'; import { reactFindDOMNodes, FIBER_KEY } from './utils/react-find-dom-nodes'; import { isESModule, isElement, cursor, setNativeSelection } from '@ali/lowcode-utils'; -import { RootSchema, NpmInfo, ComponentSchema } from '@ali/lowcode-types'; +import { RootSchema, NpmInfo, ComponentSchema, TransformStage } from '@ali/lowcode-types'; // just use types import { BuiltinSimulatorRenderer, NodeInstance, Component } from '@ali/lowcode-designer'; import Slot from './builtin-components/slot'; @@ -226,7 +226,9 @@ export class SimulatorRenderer implements BuiltinSimulatorRenderer { children = schema.children.map((item: any) => getElement(componentsMap, item)); } const _leaf = host.document.designer.currentDocument?.createNode(schema); - const props = host.document.designer.transformProps(schema.props || {}, host.document.createNode(schema), 1 /*TransformStage.Render*/); + const node = host.document.createNode(schema); + let props = host.document.designer.transformProps(schema.props || {}, node, TransformStage.Init); + props = host.document.designer.transformProps(props, node, TransformStage.Render); return createElement(Com, {...props, _leaf}, children); } diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts index 4129097f2..d8f66a46c 100644 --- a/packages/types/src/index.ts +++ b/packages/types/src/index.ts @@ -14,3 +14,4 @@ export * from './value-type'; export * from './setter-config'; export * from './setting-target'; export * from './node'; +export * from './transform-stage'; diff --git a/packages/types/src/transform-stage.ts b/packages/types/src/transform-stage.ts new file mode 100644 index 000000000..e415d44ae --- /dev/null +++ b/packages/types/src/transform-stage.ts @@ -0,0 +1,7 @@ +export enum TransformStage { + Render = 1, + Serilize = 2, + Save = 3, + Clone = 4, + Init = 5, +}