From fd41b3b50f54d7011ed3552388c5a445d08cdd2b Mon Sep 17 00:00:00 2001 From: Vanessa Date: Tue, 16 Jan 2024 10:56:55 +0800 Subject: [PATCH] :rotating_light: --- app/src/protyle/render/av/cell.ts | 14 +++++++------- app/src/protyle/render/av/keydown.ts | 2 +- app/src/protyle/wysiwyg/index.ts | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/src/protyle/render/av/cell.ts b/app/src/protyle/render/av/cell.ts index cfe008db1..48381bc58 100644 --- a/app/src/protyle/render/av/cell.ts +++ b/app/src/protyle/render/av/cell.ts @@ -692,23 +692,23 @@ export const dragFillCellsValue = (protyle: IProtyle, nodeElement: HTMLElement, const value: IAVCellValue & { colId?: string, element?: HTMLElement - } = genCellValueByElement(getTypeByCellElement(item), item) + } = genCellValueByElement(getTypeByCellElement(item), item); value.colId = item.dataset.colId; value.element = item; newData[rowElement.dataset.id].push(value); - }) + }); const doOperations: IOperation[] = []; const undoOperations: IOperation[] = []; - const avID = nodeElement.dataset.avId + const avID = nodeElement.dataset.avId; const originKeys = Object.keys(originData); Object.keys(newData).forEach((rowID, index) => { newData[rowID].forEach((item, cellIndex) => { if (["rollup", "template", "created", "updated"].includes(item.type)) { return; } - const data = originData[originKeys[index % originKeys.length]][cellIndex] + const data = originData[originKeys[index % originKeys.length]][cellIndex]; data.id = item.id; - const keyID = item.colId + const keyID = item.colId; if (data.type === "block") { data.isDetached = true; delete data.block.id; @@ -732,10 +732,10 @@ export const dragFillCellsValue = (protyle: IProtyle, nodeElement: HTMLElement, rowID, data: item }); - }) + }); }); focusBlock(nodeElement); if (doOperations.length > 0) { transaction(protyle, doOperations, undoOperations); } -} +}; diff --git a/app/src/protyle/render/av/keydown.ts b/app/src/protyle/render/av/keydown.ts index debd607ac..a9dee131f 100644 --- a/app/src/protyle/render/av/keydown.ts +++ b/app/src/protyle/render/av/keydown.ts @@ -26,7 +26,7 @@ export const avKeydown = (event: KeyboardEvent, nodeElement: HTMLElement, protyl nodeElement.querySelectorAll(".av__cell--active").forEach(item => { item.classList.remove("av__cell--active"); item.querySelector(".av__drag-fill")?.remove(); - }) + }); if (event.key === "Escape") { selectCellElement.classList.remove("av__cell--select"); selectRow(rowElement.querySelector(".av__firstcol"), "select"); diff --git a/app/src/protyle/wysiwyg/index.ts b/app/src/protyle/wysiwyg/index.ts index 8cf74d8b6..00a00c53e 100644 --- a/app/src/protyle/wysiwyg/index.ts +++ b/app/src/protyle/wysiwyg/index.ts @@ -452,18 +452,18 @@ export class WYSIWYG { if (!nodeElement) { return; } - const originData: { [key: string]: IAVCellValue[] } = {} - let lastOriginCellElement - const originCellIds: string[] = [] - nodeElement.querySelectorAll(".av__cell--active").forEach((item: HTMLElement, index: number) => { + const originData: { [key: string]: IAVCellValue[] } = {}; + let lastOriginCellElement; + const originCellIds: string[] = []; + nodeElement.querySelectorAll(".av__cell--active").forEach((item: HTMLElement) => { const rowElement = hasClosestByClassName(item, "av__row"); if (rowElement) { if (!originData[rowElement.dataset.id]) { originData[rowElement.dataset.id] = []; } originData[rowElement.dataset.id].push(genCellValueByElement(getTypeByCellElement(item), item)); - lastOriginCellElement = item - originCellIds.push(item.dataset.id) + lastOriginCellElement = item; + originCellIds.push(item.dataset.id); } }); const dragFillCellIndex = getPositionByCellElement(lastOriginCellElement); @@ -484,7 +484,7 @@ export class WYSIWYG { } }); if (newIndex.celIndex !== dragFillCellIndex.celIndex || dragFillCellIndex.rowIndex >= newIndex.rowIndex) { - lastCellElement = undefined + lastCellElement = undefined; return; } nodeElement.querySelectorAll(".av__row").forEach((rowElement: HTMLElement, index: number) => {