mirror of
https://github.com/alibaba/lowcode-engine.git
synced 2026-01-20 15:38:32 +00:00
Merge commit '88bbc65d0643bb2ce9d09d20c1678e7d5f2966e4' into feat/supportPropsInLowCodeComponent
# Conflicts: # packages/react-simulator-renderer/src/renderer.ts
This commit is contained in:
commit
cd7f353133
@ -285,4 +285,9 @@ export class NodeChildren {
|
|||||||
this.purged = true;
|
this.purged = true;
|
||||||
this.children.forEach(child => child.purge());
|
this.children.forEach(child => child.purge());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get [Symbol.toStringTag]() {
|
||||||
|
// 保证向前兼容性
|
||||||
|
return "Array";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,7 +1 @@
|
|||||||
export enum TransformStage {
|
export { TransformStage } from '@ali/lowcode-types';
|
||||||
Render = 1,
|
|
||||||
Serilize = 2,
|
|
||||||
Save = 3,
|
|
||||||
Clone = 4,
|
|
||||||
Init = 5,
|
|
||||||
}
|
|
||||||
|
|||||||
@ -23,7 +23,7 @@ const ENGINE_COMPS = {
|
|||||||
BlockEngine,
|
BlockEngine,
|
||||||
AddonEngine,
|
AddonEngine,
|
||||||
TempEngine,
|
TempEngine,
|
||||||
// DivEngine: BlockEngine,
|
DivEngine: BlockEngine,
|
||||||
};
|
};
|
||||||
|
|
||||||
class FaultComponent extends PureComponent {
|
class FaultComponent extends PureComponent {
|
||||||
@ -157,7 +157,8 @@ export default class Engine extends PureComponent {
|
|||||||
if (isEmpty(schema)) {
|
if (isEmpty(schema)) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
if (!isFileSchema(schema)) {
|
// 兼容乐高区块模板
|
||||||
|
if (schema.componentName !== 'Div' && !isFileSchema(schema)) {
|
||||||
return '模型结构异常';
|
return '模型结构异常';
|
||||||
}
|
}
|
||||||
debug('entry.render');
|
debug('entry.render');
|
||||||
|
|||||||
@ -8,7 +8,7 @@ import { getClientRects } from './utils/get-client-rects';
|
|||||||
import loader from './utils/loader';
|
import loader from './utils/loader';
|
||||||
import { reactFindDOMNodes, FIBER_KEY } from './utils/react-find-dom-nodes';
|
import { reactFindDOMNodes, FIBER_KEY } from './utils/react-find-dom-nodes';
|
||||||
import { isESModule, isElement, cursor, setNativeSelection } from '@ali/lowcode-utils';
|
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
|
// just use types
|
||||||
import { BuiltinSimulatorRenderer, NodeInstance, Component } from '@ali/lowcode-designer';
|
import { BuiltinSimulatorRenderer, NodeInstance, Component } from '@ali/lowcode-designer';
|
||||||
import Slot from './builtin-components/slot';
|
import Slot from './builtin-components/slot';
|
||||||
@ -246,8 +246,10 @@ export class SimulatorRenderer implements BuiltinSimulatorRenderer {
|
|||||||
children = schema.children.map((item: any) => getElement(componentsMap, item, propsMap));
|
children = schema.children.map((item: any) => getElement(componentsMap, item, propsMap));
|
||||||
}
|
}
|
||||||
const _leaf = host.document.designer.currentDocument?.createNode(schema);
|
const _leaf = host.document.designer.currentDocument?.createNode(schema);
|
||||||
|
const node = host.document.createNode(schema);
|
||||||
let props = processPropsSchema(schema.props, propsMap);
|
let props = processPropsSchema(schema.props, propsMap);
|
||||||
props = host.document.designer.transformProps(props, host.document.createNode(schema), 1 /*TransformStage.Render*/);
|
props = host.document.designer.transformProps(props, node, TransformStage.Init);
|
||||||
|
props = host.document.designer.transformProps(props, node, TransformStage.Render);
|
||||||
return createElement(Com, {...props, _leaf}, children);
|
return createElement(Com, {...props, _leaf}, children);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -14,3 +14,4 @@ export * from './value-type';
|
|||||||
export * from './setter-config';
|
export * from './setter-config';
|
||||||
export * from './setting-target';
|
export * from './setting-target';
|
||||||
export * from './node';
|
export * from './node';
|
||||||
|
export * from './transform-stage';
|
||||||
|
|||||||
7
packages/types/src/transform-stage.ts
Normal file
7
packages/types/src/transform-stage.ts
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
export enum TransformStage {
|
||||||
|
Render = 1,
|
||||||
|
Serilize = 2,
|
||||||
|
Save = 3,
|
||||||
|
Clone = 4,
|
||||||
|
Init = 5,
|
||||||
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user