github/tmagic-editor
1
0
Fork 0
mirror of https://github.com/Tencent/tmagic-editor.git synced 2026-01-11 05:08:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(editor): 切换固定定位后坐标转换仅支持left,top为数字的情况

Browse Source
This commit is contained in:
roymondchen 2025-12-31 16:33:06 +08:00
parent c1b12e6f40
commit 3cfec95612
2 changed files with 62 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
packages/editor/src/utils/editor.ts
View File

@ -177,21 +177,45 @@ export const setLayout = (node: MNode, layout: Layout) => {
};
export const change2Fixed = (node: MNode, root: MApp) => {
const style = {
...(node.style || {}),
};
const path = getNodePath(node.id, root.items);
const offset = {
left: 0,
top: 0,
};
path.forEach((value) => {
offset.left = offset.left + globalThis.parseFloat(value.style?.left || 0);
offset.top = offset.top + globalThis.parseFloat(value.style?.top || 0);
});
if (!node.style?.right && isNumber(node.style?.left || 0)) {
for (const value of path) {
if (value.style?.right || !isNumber(value.style?.left || 0)) {
offset.left = 0;
break;
}
offset.left = offset.left + Number(value.style?.left || 0);
}
}
return {
...(node.style || {}),
...offset,
};
if (!node.style?.bottom && isNumber(node.style?.top || 0)) {
for (const value of path) {
if (value.style?.bottom || !isNumber(value.style?.top || 0)) {
offset.top = 0;
break;
}
offset.top = offset.top + Number(value.style?.top || 0);
}
}
if (offset.left) {
style.left = offset.left;
}
if (offset.top) {
style.top = offset.top;
}
return style;
};
export const Fixed2Other = async (
@ -204,14 +228,28 @@ export const Fixed2Other = async (
const offset = {
left: cur?.style?.left || 0,
top: cur?.style?.top || 0,
right: '',
bottom: '',
};
path.forEach((value) => {
offset.left = offset.left - globalThis.parseFloat(value.style?.left || 0);
offset.top = offset.top - globalThis.parseFloat(value.style?.top || 0);
});
if (!node.style?.right && isNumber(node.style?.left || 0)) {
for (const value of path) {
if (value.style?.right || !isNumber(value.style?.left || 0)) {
offset.left = 0;
break;
}
offset.left = offset.left - Number(value.style?.left || 0);
}
}
if (!node.style?.bottom && isNumber(node.style?.top || 0)) {
for (const value of path) {
if (value.style?.bottom || !isNumber(value.style?.top || 0)) {
offset.top = 0;
break;
}
offset.top = offset.top - Number(value.style?.top || 0);
}
}
const style = node.style || {};
const parent = path.pop();
@ -221,9 +259,16 @@ export const Fixed2Other = async (
const layout = await getLayout(parent);
if (layout !== Layout.RELATIVE) {
if (offset.left) {
style.left = offset.left;
}
if (offset.top) {
style.top = offset.top;
}
return {
...style,
...offset,
position: 'absolute',
};
}

3
packages/utils/src/index.ts
View File

@ -270,7 +270,8 @@ export const isPageFragment = (node?: MComponent | null): boolean => {
return Boolean(node.type?.toLowerCase() === NodeType.PAGE_FRAGMENT);
};
export const isNumber = (value: string) => /^(-?\d+)(\.\d+)?$/.test(value);
export const isNumber = (value: any) =>
(typeof value === 'number' && !isNaN(value)) || /^(-?\d+)(\.\d+)?$/.test(`${value}`);
export const getHost = (targetUrl: string) => targetUrl.match(/\/\/([^/]+)/)?.[1];