Skip to content

An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作

:bug: Account for database item icons in auto-fit widths and clarify compact layout https://github.com/siyuan-note/siyuan/issues/19913

Daniele132964542b6
diff --git a/app/appearance/langs/ar.json b/app/appearance/langs/ar.json
index 639d65e9a3..6810d01822 100644
--- a/app/appearance/langs/ar.json
+++ b/app/appearance/langs/ar.json
@@ -1,4 +1,5 @@
{
+ "cardFullRowTip": "يشغل الحقل الأساسي صفًا كاملًا دائمًا؛ أوقف عرض أسماء الحقول لترتيب الحقول الأخرى بشكل مضغوط",
"searchFileOrSnapshot": "ابحث باسم الملف أو معرّف اللقطة",
"calendarWeekLabel": "أ",
"conditionalColors": "ألوان شرطية",
diff --git a/app/appearance/langs/de.json b/app/appearance/langs/de.json
index f9c236f604..8461732a67 100644
--- a/app/appearance/langs/de.json
+++ b/app/appearance/langs/de.json
@@ -1,4 +1,5 @@
{
+ "cardFullRowTip": "Das Primärfeld belegt immer eine ganze Zeile; blende die Feldnamen aus, um andere Felder kompakt anzuordnen",
"searchFileOrSnapshot": "Dateiname oder Snapshot-ID suchen",
"calendarWeekLabel": "KW",
"conditionalColors": "Bedingte Farben",
diff --git a/app/appearance/langs/en.json b/app/appearance/langs/en.json
index 2a5221faea..b2e21367da 100644
--- a/app/appearance/langs/en.json
+++ b/app/appearance/langs/en.json
@@ -1,4 +1,5 @@
{
+ "cardFullRowTip": "The primary field always occupies a full row; hide field names to arrange other fields compactly",
"searchFileOrSnapshot": "Search file name or snapshot ID",
"calendarWeekLabel": "W",
"conditionalColors": "Conditional colors",
diff --git a/app/appearance/langs/es.json b/app/appearance/langs/es.json
index 5191080bb5..6bc0be4894 100644
--- a/app/appearance/langs/es.json
+++ b/app/appearance/langs/es.json
@@ -1,4 +1,5 @@
{
+ "cardFullRowTip": "El campo principal siempre ocupa una fila completa; oculta los nombres de los campos para distribuir los demás de forma compacta",
"searchFileOrSnapshot": "Buscar nombre de archivo o ID de instantánea",
"calendarWeekLabel": "S",
"conditionalColors": "Colores condicionales",
diff --git a/app/appearance/langs/fr.json b/app/appearance/langs/fr.json
index b6d8f7ab4e..f5d01cb8ed 100644
--- a/app/appearance/langs/fr.json
+++ b/app/appearance/langs/fr.json
@@ -1,4 +1,5 @@
{
+ "cardFullRowTip": "Le champ principal occupe toujours une ligne entière ; masquez les noms des champs pour disposer les autres de façon compacte",
"searchFileOrSnapshot": "Rechercher un nom de fichier ou un ID d’instantané",
"calendarWeekLabel": "S",
"conditionalColors": "Couleurs conditionnelles",
diff --git a/app/appearance/langs/he.json b/app/appearance/langs/he.json
index 4b6d7ab263..25279d8778 100644
--- a/app/appearance/langs/he.json
+++ b/app/appearance/langs/he.json
@@ -1,4 +1,5 @@
{
+ "cardFullRowTip": "השדה הראשי תמיד תופס שורה שלמה; יש להסתיר את שמות השדות כדי לסדר את שאר השדות בצפיפות",
"searchFileOrSnapshot": "חיפוש שם קובץ או מזהה תמונת מצב",
"calendarWeekLabel": "ש",
"conditionalColors": "צבעים מותנים",
diff --git a/app/appearance/langs/hi.json b/app/appearance/langs/hi.json
index bad8e6fd76..ba7ed71b86 100644
--- a/app/appearance/langs/hi.json
+++ b/app/appearance/langs/hi.json
@@ -1,4 +1,5 @@
{
+ "cardFullRowTip": "मुख्य फ़ील्ड हमेशा पूरी पंक्ति घेरता है; अन्य फ़ील्ड को सघन रूप से व्यवस्थित करने के लिए फ़ील्ड के नाम छिपाएँ",
"searchFileOrSnapshot": "फ़ाइल नाम या स्नैपशॉट ID खोजें",
"calendarWeekLabel": "स.",
"conditionalColors": "सशर्त रंग",
diff --git a/app/appearance/langs/id.json b/app/appearance/langs/id.json
index a83593f039..a277c93bd1 100644
--- a/app/appearance/langs/id.json
+++ b/app/appearance/langs/id.json
@@ -1,4 +1,5 @@
{
+ "cardFullRowTip": "Kolom utama selalu menempati satu baris penuh; sembunyikan nama kolom untuk menata kolom lain secara ringkas",
"searchFileOrSnapshot": "Cari nama berkas atau ID snapshot",
"calendarWeekLabel": "M",
"conditionalColors": "Warna bersyarat",
diff --git a/app/appearance/langs/it.json b/app/appearance/langs/it.json
index 978dcb026e..f1a4e77edd 100644
--- a/app/appearance/langs/it.json
+++ b/app/appearance/langs/it.json
@@ -1,4 +1,5 @@
{
+ "cardFullRowTip": "Il campo principale occupa sempre un'intera riga; nascondi i nomi dei campi per disporre gli altri in modo compatto",
"searchFileOrSnapshot": "Cerca nome file o ID snapshot",
"calendarWeekLabel": "S",
"conditionalColors": "Colori condizionali",
diff --git a/app/appearance/langs/ja.json b/app/appearance/langs/ja.json
index 294e7f26fa..e0b78bfb93 100644
--- a/app/appearance/langs/ja.json
+++ b/app/appearance/langs/ja.json
@@ -1,4 +1,5 @@
{
+ "cardFullRowTip": "主キーフィールドは常に行全体を占有します。他のフィールドをコンパクトに配置するには、フィールド名の表示をオフにしてください",
"searchFileOrSnapshot": "ファイル名またはスナップショット ID を検索",
"calendarWeekLabel": "週",
"conditionalColors": "条件付きの色",
diff --git a/app/appearance/langs/ko.json b/app/appearance/langs/ko.json
index 8eade775ec..27928752f4 100644
--- a/app/appearance/langs/ko.json
+++ b/app/appearance/langs/ko.json
@@ -1,4 +1,5 @@
{
+ "cardFullRowTip": "기본 필드는 항상 한 행 전체를 차지합니다. 다른 필드를 조밀하게 배치하려면 필드 이름을 숨기세요",
"searchFileOrSnapshot": "파일 이름 또는 스냅샷 ID 검색",
"calendarWeekLabel": "주",
"conditionalColors": "조건부 색상",
diff --git a/app/appearance/langs/nl.json b/app/appearance/langs/nl.json
index 51cc21f49b..d333284918 100644
--- a/app/appearance/langs/nl.json
+++ b/app/appearance/langs/nl.json
@@ -1,4 +1,5 @@
{
+ "cardFullRowTip": "Het primaire veld neemt altijd een volledige rij in beslag; verberg veldnamen om andere velden compact te rangschikken",
"searchFileOrSnapshot": "Bestandsnaam of snapshot-ID zoeken",
"calendarWeekLabel": "W",
"conditionalColors": "Voorwaardelijke kleuren",
diff --git a/app/appearance/langs/pl.json b/app/appearance/langs/pl.json
index ac6111fa6e..a6deadcfea 100644
--- a/app/appearance/langs/pl.json
+++ b/app/appearance/langs/pl.json
@@ -1,4 +1,5 @@
{
+ "cardFullRowTip": "Pole główne zawsze zajmuje cały wiersz; ukryj nazwy pól, aby rozmieścić pozostałe pola w sposób zwarty",
"searchFileOrSnapshot": "Szukaj nazwy pliku lub ID migawki",
"calendarWeekLabel": "T",
"conditionalColors": "Kolory warunkowe",
diff --git a/app/appearance/langs/pt-BR.json b/app/appearance/langs/pt-BR.json
index d0c5045b3b..dadf8d6fbc 100644
--- a/app/appearance/langs/pt-BR.json
+++ b/app/appearance/langs/pt-BR.json
@@ -1,4 +1,5 @@
{
+ "cardFullRowTip": "O campo principal sempre ocupa uma linha inteira; oculte os nomes dos campos para organizar os demais de forma compacta",
"searchFileOrSnapshot": "Pesquisar nome de arquivo ou ID do instantâneo",
"calendarWeekLabel": "S",
"conditionalColors": "Cores condicionais",
diff --git a/app/appearance/langs/ru.json b/app/appearance/langs/ru.json
index 41ce0852b6..389e4f7c16 100644
--- a/app/appearance/langs/ru.json
+++ b/app/appearance/langs/ru.json
@@ -1,4 +1,5 @@
{
+ "cardFullRowTip": "Основное поле всегда занимает всю строку; скройте названия полей, чтобы расположить остальные поля компактно",
"searchFileOrSnapshot": "Поиск по имени файла или ID снимка",
"calendarWeekLabel": "Н",
"conditionalColors": "Условные цвета",
diff --git a/app/appearance/langs/sk.json b/app/appearance/langs/sk.json
index 44febb2790..17c797500b 100644
--- a/app/appearance/langs/sk.json
+++ b/app/appearance/langs/sk.json
@@ -1,4 +1,5 @@
{
+ "cardFullRowTip": "Primárne pole vždy zaberá celý riadok; skryte názvy polí, aby sa ostatné polia usporiadali kompaktne",
"searchFileOrSnapshot": "Hľadať názov súboru alebo ID snímky",
"calendarWeekLabel": "T",
"conditionalColors": "Podmienené farby",
diff --git a/app/appearance/langs/sr.json b/app/appearance/langs/sr.json
index c198ebe303..06b765f57d 100644
--- a/app/appearance/langs/sr.json
+++ b/app/appearance/langs/sr.json
@@ -1,4 +1,5 @@
{
+ "cardFullRowTip": "Примарно поље увек заузима цео ред; сакријте називе поља да бисте остала поља распоредили компактно",
"searchFileOrSnapshot": "Претражи назив датотеке или ID снимка",
"calendarWeekLabel": "Н",
"conditionalColors": "Условне боје",
diff --git a/app/appearance/langs/th.json b/app/appearance/langs/th.json
index aa51e620dd..56bc28a66d 100644
--- a/app/appearance/langs/th.json
+++ b/app/appearance/langs/th.json
@@ -1,4 +1,5 @@
{
+ "cardFullRowTip": "ฟิลด์หลักจะใช้พื้นที่เต็มแถวเสมอ ซ่อนชื่อฟิลด์เพื่อจัดเรียงฟิลด์อื่นให้กระชับ",
"searchFileOrSnapshot": "ค้นหาชื่อไฟล์หรือ ID สแนปช็อต",
"calendarWeekLabel": "สัป.",
"conditionalColors": "สีตามเงื่อนไข",
diff --git a/app/appearance/langs/tr.json b/app/appearance/langs/tr.json
index f911716992..682b36580f 100644
--- a/app/appearance/langs/tr.json
+++ b/app/appearance/langs/tr.json
@@ -1,4 +1,5 @@
{
+ "cardFullRowTip": "Birincil alan her zaman tam bir satır kaplar; diğer alanları sıkışık yerleştirmek için alan adlarını gizleyin",
"searchFileOrSnapshot": "Dosya adı veya anlık görüntü kimliği ara",
"calendarWeekLabel": "H",
"conditionalColors": "Koşullu renkler",
diff --git a/app/appearance/langs/uk.json b/app/appearance/langs/uk.json
index c6d30d9bb8..94ce646da0 100644
--- a/app/appearance/langs/uk.json
+++ b/app/appearance/langs/uk.json
@@ -1,4 +1,5 @@
{
+ "cardFullRowTip": "Основне поле завжди займає весь рядок; приховайте назви полів, щоб розташувати інші поля компактно",
"searchFileOrSnapshot": "Пошук за назвою файлу або ID знімка",
"calendarWeekLabel": "Т",
"conditionalColors": "Умовні кольори",
diff --git a/app/appearance/langs/zh-CN.json b/app/appearance/langs/zh-CN.json
index 0147b3d0ee..b138b46c20 100644
--- a/app/appearance/langs/zh-CN.json
+++ b/app/appearance/langs/zh-CN.json
@@ -1,4 +1,5 @@
{
+ "cardFullRowTip": "主键字段始终独占整行;关闭「显示字段名称」后,其他字段才能紧凑排列",
"searchFileOrSnapshot": "搜索文件名或快照 ID",
"calendarWeekLabel": "周",
"conditionalColors": "条件颜色",
diff --git a/app/appearance/langs/zh-TW.json b/app/appearance/langs/zh-TW.json
index f82fdb0c8c..9b826fa1be 100644
--- a/app/appearance/langs/zh-TW.json
+++ b/app/appearance/langs/zh-TW.json
@@ -1,4 +1,5 @@
{
+ "cardFullRowTip": "主鍵欄位始終獨佔整列;關閉「顯示欄位名稱」後,其他欄位才能緊湊排列",
"searchFileOrSnapshot": "搜尋檔案名稱或快照 ID",
"calendarWeekLabel": "週",
"conditionalColors": "條件顏色",
diff --git a/app/src/protyle/render/av/col.ts b/app/src/protyle/render/av/col.ts
index 83c9261343..d37aeeb55b 100644
--- a/app/src/protyle/render/av/col.ts
+++ b/app/src/protyle/render/av/col.ts
@@ -23,7 +23,7 @@ import {getFieldsByData} from "./view";
import {hasClosestByClassName} from "../../util/hasClosest";
import {openFieldVisibility} from "./fieldVisibility";
import {createEmptyAVValue, genAVAttributeRowHTML} from "./attributeValue";
-import {getAVColumnTextMeasurer, getAVDistributedColumnWidth, getAVTableFitWidths} from "./columnWidth";
+import {getAVColumnIconWidth, getAVColumnTextMeasurer, getAVDistributedColumnWidth, getAVTableFitWidths} from "./columnWidth";
import {getAVData} from "./virtualScroll";
import {getAVColorStyle, getNextAVOptionColor} from "./color";
/// #if MOBILE
@@ -857,6 +857,7 @@ export const autoFitAVColumns = (protyle: IProtyle, blockElement: HTMLElement, c
getCellValueText,
getAVColumnTextMeasurer(blockElement),
columnIDs,
+ getAVColumnIconWidth(blockElement),
));
};
diff --git a/app/src/protyle/render/av/columnWidth.test.ts b/app/src/protyle/render/av/columnWidth.test.ts
index 34182ea0e4..1af584ec5d 100644
--- a/app/src/protyle/render/av/columnWidth.test.ts
+++ b/app/src/protyle/render/av/columnWidth.test.ts
@@ -42,6 +42,39 @@ describe("getAVRelationColumnWidth", () => {
});
describe("getAVTableFitWidths", () => {
+ it("reserves icon space only for bound primary values with visible icons", () => {
+ const view = {
+ columns: [{id: "title", name: "T", type: "block"}],
+ rows: [{cells: [{value: {
+ keyID: "title", type: "block", isDetached: false, block: {content: "1234567890"},
+ }}]}],
+ showIcon: true,
+ rowCount: 1,
+ } as IAVTable;
+ const fit = () => getAVTableFitWidths(view, value => value.block.content, measureText, undefined, 26.5);
+ assert.equal(fit().title, "147px");
+ view.showIcon = false;
+ assert.equal(fit().title, "120px");
+ view.showIcon = true;
+ const value = view.rows[0].cells[0].value;
+ value.isDetached = true;
+ assert.equal(fit().title, "120px");
+ value.isDetached = false;
+ value.renderedContent = "1234567890";
+ assert.equal(fit().title, "120px");
+ delete value.renderedContent;
+ view.columns[0].renderTemplate = "template";
+ assert.equal(fit().title, "120px");
+ delete view.columns[0].renderTemplate;
+ view.rows.push({id: "detached", cells: [{value: {
+ keyID: "title", type: "block", isDetached: true, block: {content: "123456789012345"},
+ }}]} as IAVRow);
+ assert.equal(fit().title, "170px");
+ view.groups = [{...view, groups: [], groupHidden: 0}] as IAVTable[];
+ view.rows = [];
+ assert.equal(fit().title, "170px");
+ });
+
it("uses visible groups, field IDs and total line counts", () => {
const columns = [
{id: "title", name: "Title", type: "text", hidden: false},
diff --git a/app/src/protyle/render/av/columnWidth.ts b/app/src/protyle/render/av/columnWidth.ts
index fe64eac48a..b04075ce53 100644
--- a/app/src/protyle/render/av/columnWidth.ts
+++ b/app/src/protyle/render/av/columnWidth.ts
@@ -1,3 +1,5 @@
+import {hasAVRenderTemplateResult} from "./cellValue";
+
const getEstimatedTextWidth = (value: string) => {
return Array.from(value.trim().replace(/[\r\n]+/g, " ")).reduce((width, character) => {
if (/[\u2E80-\u9FFF\uAC00-\uD7AF]/u.test(character)) {
@@ -26,13 +28,28 @@ export const getAVColumnTextMeasurer = (blockElement: HTMLElement) => {
};
export const getAVColumnFitWidth = (name: string, type: TAVCol, values: string[],
- measureText = getEstimatedTextWidth) => {
+ measureText = getEstimatedTextWidth, extraWidths: number[] = []) => {
const headerWidth = measureText(name) + 42;
const contentPadding = ["select", "mSelect"].includes(type) ? 32 : 20;
- const contentWidth = values.reduce((width, value) => Math.max(width, measureText(value) + contentPadding), 0);
+ const contentWidth = values.reduce((width, value, index) =>
+ Math.max(width, measureText(value) + contentPadding + (extraWidths[index] || 0)), 0);
return `${Math.ceil(Math.min(480, Math.max(64, headerWidth, contentWidth)))}px`;
};
+export const getAVColumnIconWidth = (blockElement: HTMLElement) => {
+ const icon = blockElement.querySelector<HTMLElement>(".av__cell .b3-menu__avemoji:not(.fn__none)");
+ if (icon) {
+ const style = getComputedStyle(icon);
+ const width = icon.getBoundingClientRect().width +
+ (parseFloat(style.marginLeft) || 0) + (parseFloat(style.marginRight) || 0);
+ if (width > 0) {
+ return width;
+ }
+ }
+ // 虚拟滚动可能尚未渲染带图标的行,为默认图标及其间距预留空间。
+ return 28;
+};
+
export const getAVRelationColumnWidth = (fitWidth: string, type: TAVCol, primary: boolean, nameWidth = 0) => {
// 表头为字段图标、排序箭头和内边距预留空间。
const width = Math.max(parseFloat(fitWidth) || 64, nameWidth + 62);
@@ -64,11 +81,13 @@ export const getAVTableFitWidths = (
getValueText: (value: IAVCellValue, column: IAVColumn, rowIndex: number) => string,
measureText = getEstimatedTextWidth,
columnIDs?: string[],
+ iconWidth = 28,
) => {
const targetColumnIDs = columnIDs ? new Set(columnIDs) : undefined;
const visibleColumns = view.columns.filter(column =>
!column.hidden && (!targetColumnIDs || targetColumnIDs.has(column.id)));
const values = new Map(visibleColumns.map(column => [column.id, [] as string[]]));
+ const extraWidths = new Map(visibleColumns.map(column => [column.id, [] as number[]]));
const collect = (table: IAVTable) => {
if (table.groups?.length > 0) {
(table.groups as IAVTable[]).forEach(group => {
@@ -97,6 +116,10 @@ export const getAVTableFitWidths = (
(typeof columnIndex === "number" && columnIndex > -1 ? row.cells[columnIndex] : undefined);
if (cell) {
values.get(column.id)?.push(getValueText(cell.value, column, rowIndex));
+ // 逐行计入实际显示的主键图标,未绑定项及模板渲染结果不占用图标空间。
+ extraWidths.get(column.id)?.push(view.showIcon && column.type === "block" &&
+ cell.value?.block && !cell.value.isDetached &&
+ !hasAVRenderTemplateResult(cell.value, column.renderTemplate) ? iconWidth : 0);
}
});
});
@@ -104,6 +127,7 @@ export const getAVTableFitWidths = (
collect(view);
return Object.fromEntries(visibleColumns.map(column => [
column.id,
- getAVColumnFitWidth(column.name, column.type, values.get(column.id) || [], measureText),
+ getAVColumnFitWidth(column.name, column.type, values.get(column.id) || [], measureText,
+ extraWidths.get(column.id)),
]));
};
diff --git a/app/src/protyle/render/av/layout.ts b/app/src/protyle/render/av/layout.ts
index 1525dad803..38fea07f6e 100644
--- a/app/src/protyle/render/av/layout.ts
+++ b/app/src/protyle/render/av/layout.ts
@@ -50,6 +50,9 @@ const getCardFullRowHTML = (view: IAVGallery | IAVKanban) => {
<span class="b3-menu__label ft__center">${window.siyuan.languages.fullRow}</span>
</button>
<button class="b3-menu__separator"></button>
+ <div class="b3-menu__item b3-menu__item--readonly">
+ <span class="b3-menu__label ft__on-surface fn__flex"><span class="fn__flex-center">${window.siyuan.languages.cardFullRowTip}</span></span>
+ </div>
${fieldsHTML}
</div>`;
};