JLNTV_IPD/tmagic-editor
4
0
Fork 0
mirror of https://github.com/Tencent/tmagic-editor.git synced 2025-06-18 19:49:25 +08:00
Code Issues Projects Releases Wiki Activity

fix(editor): 修复pad大屏模式下粘贴位置计算错误偏移问题 (#612)

Browse Source 
* fix: 修复moveable中custom able旋转中心错误问题

* fix: 修复修复pad大屏模式下粘贴位置偏差问题
This commit is contained in:
Evan Wu 2024-05-29 20:01:51 +08:00 committed by GitHub
parent a66da8de9e
commit d98029d5e7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/editor/src/services/editor.ts
View File

@ -734,7 +734,8 @@ class Editor extends BaseService {
public async doPaste(config: MNode[], position: PastePosition = {}): Promise<MNode[]> { public async doPaste(config: MNode[], position: PastePosition = {}): Promise<MNode[]> {
propsService.clearRelateId(); propsService.clearRelateId();
const pasteConfigs = beforePaste(position, cloneDeep(config)); const doc = this.get('stage')?.renderer.contentWindow?.document;
const pasteConfigs = beforePaste(position, cloneDeep(config), doc);
return pasteConfigs; return pasteConfigs;
} }

12
packages/editor/src/utils/operator.ts
View File

@ -2,7 +2,7 @@ import { toRaw } from 'vue';
import { isEmpty } from 'lodash-es'; import { isEmpty } from 'lodash-es';
import { Id, MContainer, MNode, NodeType } from '@tmagic/schema'; import { Id, MContainer, MNode, NodeType } from '@tmagic/schema';
import { isPage, isPageFragment } from '@tmagic/utils'; import { calcValueByFontsize, isPage, isPageFragment } from '@tmagic/utils';
import editorService from '@editor/services/editor'; import editorService from '@editor/services/editor';
import propsService from '@editor/services/props'; import propsService from '@editor/services/props';
@ -15,7 +15,7 @@ import { generatePageNameByApp, getInitPositionStyle } from '@editor/utils/edito
* @param config 待粘贴的元素配置(复制时保存的那份配置) * @param config 待粘贴的元素配置(复制时保存的那份配置)
* @returns * @returns
*/ */
export const beforePaste = (position: PastePosition, config: MNode[]): MNode[] => { export const beforePaste = (position: PastePosition, config: MNode[], doc?: Document): MNode[] => {
if (!config[0]?.style) return config; if (!config[0]?.style) return config;
const curNode = editorService.get('node'); const curNode = editorService.get('node');
// 将数组中第一个元素的坐标作为参照点 // 将数组中第一个元素的坐标作为参照点
@ -29,7 +29,7 @@ export const beforePaste = (position: PastePosition, config: MNode[]): MNode[] =
if (!isEmpty(pastePosition) && curNode?.items) { if (!isEmpty(pastePosition) && curNode?.items) {
// 如果没有传入粘贴坐标则可能为键盘操作，不再转换 // 如果没有传入粘贴坐标则可能为键盘操作，不再转换
// 如果粘贴时选中了容器，则将元素粘贴到容器内，坐标需要转换为相对于容器的坐标 // 如果粘贴时选中了容器，则将元素粘贴到容器内，坐标需要转换为相对于容器的坐标
pastePosition = getPositionInContainer(pastePosition, curNode.id); pastePosition = getPositionInContainer(pastePosition, curNode.id, doc);
} }
// 将所有待粘贴元素坐标相对于多选第一个元素坐标重新计算，以保证多选粘贴后元素间距不变 // 将所有待粘贴元素坐标相对于多选第一个元素坐标重新计算，以保证多选粘贴后元素间距不变
@ -71,12 +71,12 @@ export const beforePaste = (position: PastePosition, config: MNode[]): MNode[] =
* @param id 元素id * @param id 元素id
* @returns PastePosition 转换后的坐标 * @returns PastePosition 转换后的坐标
*/ */
export const getPositionInContainer = (position: PastePosition = {}, id: Id) => { export const getPositionInContainer = (position: PastePosition = {}, id: Id, doc?: Document) => {
let { left = 0, top = 0 } = position; let { left = 0, top = 0 } = position;
const parentEl = editorService.get('stage')?.renderer?.contentWindow?.document.getElementById(`${id}`); const parentEl = editorService.get('stage')?.renderer?.contentWindow?.document.getElementById(`${id}`);
const parentElRect = parentEl?.getBoundingClientRect(); const parentElRect = parentEl?.getBoundingClientRect();
left = left - (parentElRect?.left || 0); left = left - calcValueByFontsize(doc, parentElRect?.left || 0);
top = top - (parentElRect?.top || 0); top = top - calcValueByFontsize(doc, parentElRect?.top || 0);
return { return {
left, left,
top, top,