github/lowcode-engine
1
0
Fork 0
mirror of https://github.com/alibaba/lowcode-engine.git synced 2026-01-20 23:52:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 🐛 解决点击组件时无法聚焦到点中的组件上的问题

Browse Source
This commit is contained in:
荣彬 2020-07-28 21:44:36 +08:00
parent 5e8ef87798
commit 852d8822ee
2 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/editor-preset-vision/src/editor.ts
View File

@ -56,7 +56,7 @@ function upgradePropsReducer(props: any) {
type: 'JSSlot', type: 'JSSlot',
title: (val.value.props as any)?.slotTitle, title: (val.value.props as any)?.slotTitle,
name: (val.value.props as any)?.slotName, name: (val.value.props as any)?.slotName,
value: val.value.children value: val.value.children,
}; };
} else { } else {
val = val.value; val = val.value;
@ -126,7 +126,6 @@ designer.addPropsReducer((props, node) => {
return props; return props;
}, TransformStage.Init); }, TransformStage.Init);
function filterReducer(props: any, node: Node): any { function filterReducer(props: any, node: Node): any {
const filters = node.componentMeta.getMetadata().experimental?.filters; const filters = node.componentMeta.getMetadata().experimental?.filters;
if (filters && filters.length) { if (filters && filters.length) {
@ -169,7 +168,7 @@ function compatiableReducer(props: any) {
slotName: val.name, slotName: val.name,
}, },
}, },
} };
} }
// 为了能降级到老版本，建议在后期版本去掉以下代码 // 为了能降级到老版本，建议在后期版本去掉以下代码
// if (isJSExpression(val) && !val.events) { // if (isJSExpression(val) && !val.events) {
@ -264,7 +263,7 @@ skeleton.add({
props: { props: {
condition: () => { condition: () => {
return designer.dragon.dragging && !getTreeMaster(designer).hasVisibleTreeBoard(); return designer.dragon.dragging && !getTreeMaster(designer).hasVisibleTreeBoard();
} },
}, },
content: OutlineBackupPane, content: OutlineBackupPane,
}); });

37
packages/rax-simulator-renderer/src/renderer.ts
View File

@ -386,36 +386,35 @@ function getClosestNodeInstance(from: any, specId?: string): NodeInstance<any> |
return null; return null;
} }
function matcher(parent: any) { function isValidDesignModeRaxComponentInstance(
return parent.__isReactiveComponent && parent.props.componentId; raxComponentInst: any,
): raxComponentInst is {
props: {
_leaf: Exclude<NodeInstance<any>['node'], null | undefined>;
};
} {
const leaf = raxComponentInst?.props?._leaf;
return leaf && typeof leaf === 'object' && leaf.isNode;
} }
function getNodeInstance(dom: HTMLElement): NodeInstance<any> | null { function getNodeInstance(dom: HTMLElement): NodeInstance<any> | null {
const INTERNAL = '_internal'; const INTERNAL = '_internal';
let instance = Instance.get(dom); let instance = Instance.get(dom);
let node;
while (instance && instance[INTERNAL]) { while (instance && instance[INTERNAL]) {
if (matcher(instance)) { if (isValidDesignModeRaxComponentInstance(instance)) {
node = instance; return {
break; nodeId: instance.props._leaf.getId(),
instance: instance,
node: instance.props._leaf,
};
} }
instance = instance[INTERNAL].__parentInstance; instance = instance[INTERNAL].__parentInstance;
} }
if (!node) {
return null; return null;
} }
return {
nodeId: node.props.componentId,
instance: node,
};
// return parent;
// const instance = fiberNode.stateNode;
// if (instance) {
// console.log(instance);
// }
// return getNodeInstance(fiberNode.return);
// return instance;
}
function checkInstanceMounted(instance: any): boolean { function checkInstanceMounted(instance: any): boolean {
if (isElement(instance)) { if (isElement(instance)) {