Skip to content

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

:lipstick: Align relation field visibility with database settings https://github.com/siyuan-note/siyuan/issues/19904

Danielbd947674a792
diff --git a/app/src/assets/scss/business/_av.scss b/app/src/assets/scss/business/_av.scss
index 5d557e9e96..e30366c2cd 100644
--- a/app/src/assets/scss/business/_av.scss
+++ b/app/src/assets/scss/business/_av.scss
@@ -2569,22 +2569,6 @@ img.av__cellassetimg {
padding: 8px;
}
- .av__relation-field {
- display: flex;
- align-items: center;
- gap: 8px;
- margin-bottom: 8px;
-
- label {
- min-width: 0;
- align-items: center;
- }
-
- .b3-text-field {
- width: 80px;
- }
- }
-
.av__relation-table {
border-radius: 0 0 var(--b3-border-radius-b) var(--b3-border-radius-b);
overflow: auto;
diff --git a/app/src/protyle/render/av/relationLayout.ts b/app/src/protyle/render/av/relationLayout.ts
index a4b875fb00..e63e8bfc19 100644
--- a/app/src/protyle/render/av/relationLayout.ts
+++ b/app/src/protyle/render/av/relationLayout.ts
@@ -1,5 +1,7 @@
import {escapeAttr, escapeHtml} from "../../../util/escape";
import {setStorageVal} from "../../util/compatibility";
+import {getColIconByType} from "./col";
+import {unicode2Emoji} from "../../../emoji";
const STORAGE_KEY = "local-av-relation-layout";
@@ -15,6 +17,7 @@ export const bindRelationLayout = (root: HTMLElement, databaseID: string, onResi
const button = root.querySelector<HTMLButtonElement>('[data-type="relationFields"]');
let columns: IAVColumn[] = [];
let defaultWidths: string[] = [];
+ let initialized = !!saved;
const widthOf = (index: number) => {
const width = layout.widths[columns[index].id];
return Number.isFinite(width) ? `${Math.max(64, Math.min(800, width))}px` : defaultWidths[index];
@@ -37,13 +40,23 @@ export const bindRelationLayout = (root: HTMLElement, databaseID: string, onResi
setStorageVal(STORAGE_KEY, value);
};
const renderFields = () => {
- fields.innerHTML = columns.map((column, index) => `<div class="av__relation-field">
-<label class="fn__flex fn__flex-1"><input type="checkbox" class="b3-switch" data-column="${escapeAttr(column.id)}"
-${index === 0 ? "checked disabled" : layout.hidden.includes(column.id) ? "" : "checked"}>
-<span class="fn__space"></span><span class="fn__ellipsis">${escapeHtml(column.name)}</span></label>
-<input type="number" class="b3-text-field" min="64" max="800" step="1" value="${parseFloat(widthOf(index))}"
-data-width="${escapeAttr(column.id)}" aria-label="${escapeAttr(column.name + " " + window.siyuan.languages.width)}">
-</div>`).join("");
+ fields.innerHTML = [false, true].map(hidden => {
+ const group = columns.filter((column, index) => (index > 0 && layout.hidden.includes(column.id)) === hidden);
+ if (group.length === 0) {
+ return "";
+ }
+ return `${hidden ? '<button class="b3-menu__separator"></button>' : ""}
+<button class="b3-menu__item" data-type="nobg" data-all="${hidden ? "show" : "hide"}">
+ <span class="b3-menu__label">${window.siyuan.languages[hidden ? "hideCol" : "showCol"]}</span>
+ <span class="block__icon">${window.siyuan.languages[hidden ? "showAll" : "hideAll"]}
+ <span class="fn__space"></span><svg><use xlink:href="#${hidden ? "iconEye" : "iconEyeoff"}"></use></svg>
+ </span>
+</button>${group.map(column => `<button class="b3-menu__item" data-column="${escapeAttr(column.id)}" ${column === columns[0] ? 'data-type="nobg" aria-disabled="true"' : ""}>
+ ${column.icon ? unicode2Emoji(column.icon, "b3-menu__icon", true) : `<svg class="b3-menu__icon"><use xlink:href="#${getColIconByType(column.type)}"></use></svg>`}
+ <span class="b3-menu__label">${escapeHtml(column.name) || "&nbsp;"}</span>
+ <svg class="b3-menu__action b3-menu__action--show${column === columns[0] ? " fn__none" : ""}"><use xlink:href="#${hidden ? "iconEye" : "iconEyeoff"}"></use></svg>
+</button>`).join("")}`;
+ }).join("");
};
button.addEventListener("click", event => {
event.stopPropagation();
@@ -52,32 +65,31 @@ data-width="${escapeAttr(column.id)}" aria-label="${escapeAttr(column.name + " "
renderFields();
onResize();
});
- fields.addEventListener("click", event => event.stopPropagation());
- fields.addEventListener("keydown", event => {
- if (event.key !== "Escape") {
- event.stopPropagation();
- }
- });
- fields.addEventListener("change", event => {
+ fields.addEventListener("click", event => {
event.stopPropagation();
- const input = event.target as HTMLInputElement;
- if (input.dataset.column) {
- layout.hidden = layout.hidden.filter(id => id !== input.dataset.column);
- if (!input.checked) {
- layout.hidden.push(input.dataset.column);
- }
- } else if (input.dataset.width) {
- if (!Number.isFinite(input.valueAsNumber)) {
- renderFields();
+ const target = (event.target as HTMLElement).closest<HTMLElement>("[data-column], [data-all]");
+ if (!target) {
+ return;
+ }
+ if (target.dataset.all) {
+ layout.hidden = target.dataset.all === "hide" ? columns.slice(1).map(column => column.id) : [];
+ } else {
+ const id = target.dataset.column;
+ if (id === columns[0]?.id) {
return;
}
- layout.widths[input.dataset.width] = Math.max(64, Math.min(800, Math.round(input.valueAsNumber)));
- input.value = String(layout.widths[input.dataset.width]);
+ layout.hidden = layout.hidden.includes(id) ? layout.hidden.filter(item => item !== id) : [...layout.hidden, id];
}
apply();
save();
+ renderFields();
onResize();
});
+ fields.addEventListener("keydown", event => {
+ if (event.key !== "Escape") {
+ event.stopPropagation();
+ }
+ });
root.addEventListener("pointerdown", event => {
const handle = (event.target as HTMLElement).closest<HTMLElement>(".av__widthdrag");
if (!handle || event.button !== 0) {
@@ -108,6 +120,10 @@ data-width="${escapeAttr(column.id)}" aria-label="${escapeAttr(column.name + " "
});
return (nextColumns: IAVColumn[], gridTemplate: string) => {
columns = nextColumns;
+ if (!initialized && columns.length > 0) {
+ layout.hidden = columns.slice(4).map(column => column.id);
+ initialized = true;
+ }
defaultWidths = gridTemplate.split(" ").slice(1);
apply();
if (!fields.classList.contains("fn__none")) {
diff --git a/app/tests/avRelationTemplate.test.js b/app/tests/avRelationTemplate.test.js
index 0caf7c9ddb..9510f76402 100644
--- a/app/tests/avRelationTemplate.test.js
+++ b/app/tests/avRelationTemplate.test.js
@@ -15,6 +15,8 @@ const runCases = sources => {
return content;
}};
const dependencies = {
+ "./col": {getColIconByType: () => "iconText"},
+ "../../../emoji": {unicode2Emoji: () => ""},
"../../util/compatibility": {setStorageVal: () => {}},
"../../../util/escape": {escapeAttr: escape, escapeHtml: escape},
"../../../emoji/fileTreeIcon": {getFileTreeIconHTML: () => ""},
@@ -82,18 +84,15 @@ const runCases = sources => {
}
assert.deepEqual(bubbledKeys, ["Escape"]);
root.querySelector("button").click();
- assert.equal(root.querySelector('[data-column="primary"]').disabled, true);
+ assert.equal(root.querySelector('[data-column="primary"]').getAttribute("aria-disabled"), "true");
const other = root.querySelector('[data-column="other"]');
- other.checked = false;
- other.dispatchEvent(new Event("change", {bubbles: true}));
+ other.click();
assert.equal(root.querySelectorAll('[data-relation-column="other"].fn__none').length, 2);
- const width = root.querySelector('[data-width="primary"]');
- width.value = "360";
- width.dispatchEvent(new Event("change", {bubbles: true}));
- assert.equal(window.siyuan.storage["local-av-relation-layout"].database.widths.primary, 360);
+ assert.equal(root.querySelector("input"), null);
+ assert.equal(root.querySelector('[data-column="other"] .b3-menu__action use').getAttribute("xlink:href"), "#iconEye");
assert.deepEqual(window.siyuan.storage["local-av-relation-layout"].database.hidden, ["other"]);
update(columns, "32px 240px 160px");
- assert.match(root.querySelector(".av__relation-table-row").style.gridTemplateColumns, /360px/);
+ window.siyuan.storage["local-av-relation-layout"].database.widths.primary = 360;
const reopened = root.cloneNode(true);
bindRelationLayout(reopened, "database", () => {})(columns, "32px 240px 160px");
assert.equal(reopened.querySelectorAll('[data-relation-column="other"].fn__none').length, 2);
@@ -101,6 +100,20 @@ const runCases = sources => {
const independent = root.cloneNode(true);
bindRelationLayout(independent, "another", () => {})(columns, "32px 240px 160px");
assert.equal(independent.querySelectorAll('[data-relation-column="other"].fn__none').length, 0);
+ const many = [...columns, {id: "third", name: "Third"}, {id: "fourth", name: "Fourth"}, {id: "fifth", name: "Fifth"}];
+ const defaults = root.cloneNode(true);
+ const updateDefaults = bindRelationLayout(defaults, "defaults", () => {});
+ updateDefaults(many, "32px 240px 160px 160px 160px 160px");
+ assert.equal(defaults.querySelector('[data-column="fourth"] .b3-menu__action use').getAttribute("xlink:href"), "#iconEyeoff");
+ assert.equal(defaults.querySelector('[data-column="fifth"] .b3-menu__action use').getAttribute("xlink:href"), "#iconEye");
+ defaults.querySelector('[data-column="fifth"]').click();
+ assert.deepEqual(window.siyuan.storage["local-av-relation-layout"].defaults.hidden, []);
+ updateDefaults(many, "32px 240px 160px 160px 160px 160px");
+ assert.equal(defaults.querySelector('[data-column="fifth"] .b3-menu__action use').getAttribute("xlink:href"), "#iconEyeoff");
+ defaults.querySelector('[data-all="hide"]').click();
+ assert.deepEqual(window.siyuan.storage["local-av-relation-layout"].defaults.hidden, ["other", "third", "fourth", "fifth"]);
+ defaults.querySelector('[data-all="show"]').click();
+ assert.deepEqual(window.siyuan.storage["local-av-relation-layout"].defaults.hidden, []);
};
const runElectron = async () => {