Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: cursor postion #813 #838

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 39 additions & 4 deletions src/editor/core/position/Position.ts
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,8 @@ export class Position {
let x = startX
let y = startY
let index = startIndex
const ctx = this.draw.getCtx()
ctx.save()
for (let i = 0; i < rowList.length; i++) {
const curRow = rowList[i]
// 行存在环绕的可能性均不设置行布局
Expand All @@ -145,6 +147,38 @@ export class Position {
// 当前td所在位置
const tablePreX = x
const tablePreY = y
let sameText = ''
let xList: number[] = [] // 存储每个元素的x轴偏移量
let baseLeft = x
for (let j = 0; j < curRow.elementList.length; j++) {
let element = curRow.elementList[j]
const preElement = curRow.elementList[j - 1]
const metrics = element.metrics
ctx.font = preElement && preElement.style
let preTextWidth = ctx.measureText(sameText).width
// 图片处理 style,value 以免影响后续逻辑
if (element.type === ElementType.IMAGE) {
element = JSON.parse(JSON.stringify(element))
element.style = ''
element.value = ''
}
let moveX = baseLeft + preTextWidth
// 偏移量
if (element.left) {
moveX += element.left
}
xList.push(moveX)
if (element.style === (preElement && preElement.style)) {
sameText += element.value
} else {
sameText = element.value
baseLeft = moveX
}
// 单选框,复选框,图片
if (!element.value) {
baseLeft += metrics.width
}
}
for (let j = 0; j < curRow.elementList.length; j++) {
const element = curRow.elementList[j]
const metrics = element.metrics
Expand All @@ -171,10 +205,10 @@ export class Position {
isFirstLetter: j === 0,
isLastLetter: j === curRow.elementList.length - 1,
coordinate: {
leftTop: [x, y],
leftBottom: [x, y + curRow.height],
rightTop: [x + metrics.width, y],
rightBottom: [x + metrics.width, y + curRow.height]
leftTop: [xList[j], y],
leftBottom: [xList[j], y + curRow.height],
rightTop: [xList[j] + metrics.width, y],
rightBottom: [xList[j] + metrics.width, y + curRow.height]
}
}
// 缓存浮动元素信息
Expand Down Expand Up @@ -276,6 +310,7 @@ export class Position {
x = startX
y += curRow.height
}
ctx.restore()
return { x, y, index }
}

Expand Down