An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作
TypeScript agentic-aiai-agentknowledge-baselocal-firstmarkdownmcpmindmapnote-takingself-hostedsiyuanworkspace
:bug: Keep database columns accessible when frozen columns exceed the viewport
Daniela4a4072140f5
diff --git a/app/src/assets/scss/business/_av.scss b/app/src/assets/scss/business/_av.scssindex a9f5d07b19..28e9ea271e 100644--- a/app/src/assets/scss/business/_av.scss+++ b/app/src/assets/scss/business/_av.scss@@ -1592,6 +1592,10 @@}}+ &__body--unfreeze .av__colsticky--freeze {+ position: relative;+ }+&__colsticky {position: sticky;left: 0;diff --git a/app/src/protyle/render/av/backlinkSticky.test.ts b/app/src/protyle/render/av/backlinkSticky.test.tsindex b11686ea54..c7fed2ee77 100644--- a/app/src/protyle/render/av/backlinkSticky.test.ts+++ b/app/src/protyle/render/av/backlinkSticky.test.ts@@ -12,7 +12,7 @@ test("sticky views follow breadcrumbs and keep wrapped height in sync when resizconst exports: {stickyRow?: (block: unknown, scroll: unknown, status: string) => void} = {};runInNewContext(compiled, {exports,- require: () => ({hasTopClosestByAttribute: () => false}),+ require: () => ({hasTopClosestByAttribute: () => false, updateFrozenColumns: () => {}}),window: {innerHeight: 800},});let paneBottom = 800;@@ -96,7 +96,7 @@ test("sticky views follow breadcrumbs and keep wrapped height in sync when resiztest("backlink scrolling clears fixed rows and their spacers without calculating window positions", () => {const exports: {stickyRow?: (block: unknown, scroll: unknown, status: string) => void} = {};- runInNewContext(compiled, {exports, require: () => ({})});+ runInNewContext(compiled, {exports, require: () => ({updateFrozenColumns: () => {}})});const makeRow = (fixedClass: string, placeholderClass: string) => {const classes = new Set([fixedClass]);const placeholder = {diff --git a/app/src/protyle/render/av/cell.ts b/app/src/protyle/render/av/cell.tsindex 4c6c9591d2..38e1c7d364 100644--- a/app/src/protyle/render/av/cell.ts+++ b/app/src/protyle/render/av/cell.ts@@ -377,9 +377,10 @@ export const cellScrollIntoView = (blockElement: HTMLElement, cellElement: Elemeconst rowElement = hasClosestByClassName(cellElement, "av__row");if (avScrollElement && rowElement) {const stickyElement = rowElement.querySelector(".av__colsticky");- if (!stickyElement.contains(cellElement)) { // https://github.com/siyuan-note/siyuan/issues/12162- const stickyRight = stickyElement.getBoundingClientRect().right;+ const unfreeze = rowElement.parentElement.classList.contains("av__body--unfreeze");+ if (unfreeze || !stickyElement.contains(cellElement)) { // https://github.com/siyuan-note/siyuan/issues/12162const avScrollRect = avScrollElement.getBoundingClientRect();+ const stickyRight = unfreeze ? avScrollRect.left : stickyElement.getBoundingClientRect().right;if (stickyRight > cellRect.left || avScrollRect.right < cellRect.left) {avScrollElement.scrollLeft = avScrollElement.scrollLeft + cellRect.left - stickyRight;} else if (stickyRight < cellRect.left && avScrollRect.right < cellRect.right) {diff --git a/app/src/protyle/render/av/frozenColumns.test.ts b/app/src/protyle/render/av/frozenColumns.test.tsnew file mode 100644index 0000000000..61cbeaf0d3--- /dev/null+++ b/app/src/protyle/render/av/frozenColumns.test.ts@@ -0,0 +1,63 @@+import * as assert from "node:assert/strict";+import {test} from "node:test";+import {updateFrozenColumns} from "./frozenColumns";+import {readFileSync} from "node:fs";+import {runInNewContext} from "node:vm";+import {ModuleKind, transpileModule} from "typescript";++test("frozen columns adapt to available width without changing the saved boundary", () => {+ let viewportWidth = 352;+ let frozenWidth = 623;+ const groups = [true, false].map(hasFrozen => ({+ disabled: false,+ querySelector: () => hasFrozen ? {getBoundingClientRect: () => ({width: frozenWidth})} : null,+ classList: {toggle(name: string, value: boolean) {+ assert.equal(name, "av__body--unfreeze");+ groups[hasFrozen ? 0 : 1].disabled = value;+ }},+ }));+ const block = {+ dataset: {avType: "table"},+ querySelector: () => ({get clientWidth() {return viewportWidth;}}),+ querySelectorAll: () => groups,+ } as unknown as HTMLElement;+ updateFrozenColumns(block);+ assert.equal(groups[0].disabled, true);+ assert.equal(groups[1].disabled, false);+ viewportWidth = 703;+ updateFrozenColumns(block);+ assert.equal(groups[0].disabled, false);+ frozenWidth = 624;+ updateFrozenColumns(block);+ assert.equal(groups[0].disabled, true);+ frozenWidth = 200;+ updateFrozenColumns(block);+ assert.equal(groups[0].disabled, false);+ viewportWidth = 0;+ updateFrozenColumns(block);+ assert.equal(groups[0].disabled, false);+});++test("cell navigation reveals previously frozen cells when freezing is suspended", () => {+ const compiled = transpileModule(readFileSync("src/protyle/render/av/cell.ts", "utf8"), {+ compilerOptions: {module: ModuleKind.CommonJS},+ }).outputText;+ let suspended = true;+ const scroll = {scrollLeft: 600, getBoundingClientRect: () => ({left: 16, right: 368})};+ const row = {+ parentElement: {classList: {contains: () => suspended}},+ querySelector: () => ({contains: () => true}),+ };+ const exports: {cellScrollIntoView?: (block: unknown, cell: unknown, onlyHeight: boolean) => void} = {};+ runInNewContext(compiled, {+ exports,+ require: () => ({hasClosestByClassName: (_element: unknown, name: string) => name === "av__row" ? row : null}),+ });+ const block = {querySelector: (name: string) => name === ".av__scroll" ? scroll : null};+ const cell = {getBoundingClientRect: () => ({left: -184, right: 16, width: 200})};+ exports.cellScrollIntoView(block, cell, false);+ assert.equal(scroll.scrollLeft, 400);+ suspended = false;+ exports.cellScrollIntoView(block, cell, false);+ assert.equal(scroll.scrollLeft, 400);+});diff --git a/app/src/protyle/render/av/frozenColumns.ts b/app/src/protyle/render/av/frozenColumns.tsnew file mode 100644index 0000000000..9f301d9ec9--- /dev/null+++ b/app/src/protyle/render/av/frozenColumns.ts@@ -0,0 +1,15 @@+export const updateFrozenColumns = (blockElement: HTMLElement) => {+ if (blockElement.dataset.avType !== "table") {+ return;+ }+ const scrollElement = blockElement.querySelector<HTMLElement>(".av__scroll");+ if (!scrollElement || scrollElement.clientWidth === 0) {+ return;+ }+ // 为未固定列保留至少 80 像素,宽度不足时仅暂停当前视图的固定定位。+ blockElement.querySelectorAll<HTMLElement>(".av__body").forEach(body => {+ const frozen = body.querySelector<HTMLElement>(".av__row--header .av__colsticky--freeze");+ body.classList.toggle("av__body--unfreeze", !!frozen &&+ frozen.getBoundingClientRect().width + 80 > scrollElement.clientWidth);+ });+};diff --git a/app/src/protyle/render/av/render.ts b/app/src/protyle/render/av/render.tsindex 92c80bc34c..a1e99a1869 100644--- a/app/src/protyle/render/av/render.ts+++ b/app/src/protyle/render/av/render.ts@@ -64,6 +64,7 @@ import {getAVColorStyle} from "./color";import {getContextFilterKeyID} from "./contextFilterState";import {isAVCellPanelForBlock} from "./panelTarget";import {replaceAVContainer} from "./container";+import {updateFrozenColumns} from "./frozenColumns";interface IIds {groupId: string,@@ -419,11 +420,13 @@ export const initUnfoldedGroupTables = (blockElement: HTMLElement, protyle: IPrototalLoadedRows > GROUP_TABLE_INITIAL_ROW_BUDGET || bodies.some(bodyElement =>bodyElement.querySelector(".av__spacer")));renderAVRichTextElements(blockElement);+ updateFrozenColumns(blockElement);initVirtualScroll({protyle, blockElement, data, selectedItemPoints});restoreAVCellSelection(blockElement);};const afterRenderTable = (options: ITableOptions) => {+ updateFrozenColumns(options.blockElement);setAVData(options.blockElement, options.data);renderAVRichTextElements(options.blockElement);if (!refreshAVCellSelection(options.blockElement, options.data)) {@@ -933,6 +936,7 @@ export const refreshAV = (protyle: IProtyle, operation: IOperation) => {columnElement.style.width = operation.data;}});+ updateFrozenColumns(item);});return;}@@ -946,6 +950,7 @@ export const refreshAV = (protyle: IProtyle, operation: IOperation) => {}});});+ updateFrozenColumns(item);});return;}diff --git a/app/src/protyle/render/av/row.ts b/app/src/protyle/render/av/row.tsindex 67b4cf2ae5..d56309c091 100644--- a/app/src/protyle/render/av/row.ts+++ b/app/src/protyle/render/av/row.ts@@ -1,4 +1,5 @@import {isTableLikeView} from "./viewType";+import {updateFrozenColumns} from "./frozenColumns";import {hasClosestBlock, hasClosestByClassName, hasTopClosestByAttribute} from "../../util/hasClosest";import {focusBlock} from "../../util/selection";import {Menu} from "../../../plugin/Menu";@@ -592,6 +593,7 @@ const syncFixedRowPos = (item: HTMLElement, bodyRect: DOMRect, scrollLeft: numbe};export const stickyRow = (blockElement: HTMLElement, scrollElement: HTMLElement, status: "top" | "bottom" | "all") => {+ updateFrozenColumns(blockElement);// 内部滚动的反链数据库不使用相对窗口固定的表头,避免占位和固定坐标干扰内部布局。const skipFixed = blockElement.classList.contains("av--backlink") || hasTopClosestByAttribute(blockElement, "fold", "1");if (skipFixed) {