An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作
TypeScript agentic-aiai-agentknowledge-baselocal-firstmarkdownmcpmindmapnote-takingself-hostedsiyuanworkspace
:sparkles: Use default templates for relation item creation https://github.com/siyuan-note/siyuan/issues/20114
Danielfd6fe4a8ffc7
diff --git a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20240208172514-9dsv6na.sy b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20240208172514-9dsv6na.syindex 97b9e91317..6aeab0ed39 100644--- a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20240208172514-9dsv6na.sy+++ b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20240208172514-9dsv6na.sy@@ -7,7 +7,7 @@"id": "20240208172514-9dsv6na","title": "Database","type": "doc",- "updated": "20261004032313"+ "updated": "20261007101857"},"Children": [{@@ -2992,6 +2992,20 @@}]},+ {+ "ID": "20261007101857-8yrn5q5",+ "Type": "NodeParagraph",+ "Properties": {+ "id": "20261007101857-8yrn5q5",+ "updated": "20261007101857"+ },+ "Children": [+ {+ "Type": "NodeText",+ "Data": "The relation selection panel always provides an entry creation button at the bottom, including when the search box is empty. New entries use the target database's default item template, including its fields, icon, document content and save location. If a primary key template is configured, its generated name takes precedence over the search text; otherwise the search text is used as the name. Without a default template, an unbound entry is created using the search text. The creation button previews the name before confirmation. Creating the entry and adding its relations can be undone together, on desktop and mobile."+ }+ ]+ },{"ID": "20240208172555-la22eum","Type": "NodeParagraph",diff --git a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20240208113259-nykkvaq.sy b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20240208113259-nykkvaq.syindex 28b08fae19..7cfde116ee 100644--- a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20240208113259-nykkvaq.sy+++ b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20240208113259-nykkvaq.sy@@ -7,7 +7,7 @@"id": "20240208113259-nykkvaq","title": "数据库","type": "doc",- "updated": "20261004032313"+ "updated": "20261007101857"},"Children": [{@@ -2992,6 +2992,20 @@}]},+ {+ "ID": "20261007101857-61awmsy",+ "Type": "NodeParagraph",+ "Properties": {+ "id": "20261007101857-61awmsy",+ "updated": "20261007101857"+ },+ "Children": [+ {+ "Type": "NodeText",+ "Data": "关联选择面板底部始终提供新建条目入口,搜索框为空时也可直接创建。新条目使用目标数据库的默认条目模板,包括字段、图标、文档内容和保存位置。配置了主键模板时,使用模板生成的名称,搜索文本不会覆盖它;未配置主键模板时,使用搜索文本作为名称。没有默认模板时,按搜索文本创建游离条目。新建入口会在确认前预览名称。创建条目与添加关联可以一起撤销,桌面端和移动端行为一致。"+ }+ ]+ },{"ID": "20240208120943-f2nyglj","Type": "NodeParagraph",diff --git a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20240208171522-y7dxcno.sy b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20240208171522-y7dxcno.syindex f50e42d947..325fd2cb86 100644--- a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20240208171522-y7dxcno.sy+++ b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20240208171522-y7dxcno.sy@@ -7,7 +7,7 @@"id": "20240208171522-y7dxcno","title": "資料庫","type": "doc",- "updated": "20261004032313"+ "updated": "20261007101857"},"Children": [{@@ -2992,6 +2992,20 @@}]},+ {+ "ID": "20261007101857-ij3301g",+ "Type": "NodeParagraph",+ "Properties": {+ "id": "20261007101857-ij3301g",+ "updated": "20261007101857"+ },+ "Children": [+ {+ "Type": "NodeText",+ "Data": "關聯選擇面板底部始終提供建立條目的入口,搜尋框為空時也可直接建立。新條目使用目標資料庫的預設條目範本,包括欄位、圖示、文件內容和儲存位置。設定了主鍵範本時,使用範本產生的名稱,搜尋文字不會覆寫它;未設定主鍵範本時,使用搜尋文字作為名稱。沒有預設範本時,依搜尋文字建立游離條目。建立入口會在確認前預覽名稱。建立條目與新增關聯可以一起復原,桌面版和行動版行為一致。"+ }+ ]+ },{"ID": "20240208171620-h5pdt3a","Type": "NodeParagraph",diff --git a/app/guide/20240530133126-axarxgx/20240530101000-4qitucx/20240530101000-g3ugxml/20240530101000-3eaevtp.sy b/app/guide/20240530133126-axarxgx/20240530101000-4qitucx/20240530101000-g3ugxml/20240530101000-3eaevtp.syindex cac3d4f92e..75ebb25c5a 100644--- a/app/guide/20240530133126-axarxgx/20240530101000-4qitucx/20240530101000-g3ugxml/20240530101000-3eaevtp.sy+++ b/app/guide/20240530133126-axarxgx/20240530101000-4qitucx/20240530101000-g3ugxml/20240530101000-3eaevtp.sy@@ -8,7 +8,7 @@"id": "20240530101000-3eaevtp","title": "データベース","type": "doc",- "updated": "20261004032313"+ "updated": "20261007101857"},"Children": [{@@ -2996,6 +2996,20 @@}]},+ {+ "ID": "20261007101857-pxb1ynm",+ "Type": "NodeParagraph",+ "Properties": {+ "id": "20261007101857-pxb1ynm",+ "updated": "20261007101857"+ },+ "Children": [+ {+ "Type": "NodeText",+ "Data": "リレーション選択パネルの下部には常に新規エントリの作成ボタンが表示され、検索欄が空でも作成できます。新しいエントリには、対象データベースのデフォルトエントリテンプレートのフィールド、アイコン、ドキュメント内容、保存先が適用されます。主キーテンプレートが設定されている場合は、検索テキストよりもテンプレートが生成した名前を優先します。主キーテンプレートがない場合は検索テキストを名前に使います。デフォルトテンプレートがない場合は、検索テキストを使って未バインドのエントリを作成します。作成ボタンには確定前の名前のプレビューが表示されます。エントリの作成とリレーションの追加はまとめて元に戻せます。デスクトップ版とモバイル版で同じように動作します。"+ }+ ]+ },{"ID": "20240530101000-ug0d39v","Type": "NodeParagraph",diff --git a/app/src/protyle/render/av/cell.ts b/app/src/protyle/render/av/cell.tsindex 4404ff0ade..b5eb2b9fa3 100644--- a/app/src/protyle/render/av/cell.ts+++ b/app/src/protyle/render/av/cell.ts@@ -1236,7 +1236,7 @@ export const updateCellsValue = async (protyle: IProtyle, nodeElement: HTMLEleme}}}- if (nextBatchDisplayValue) {+ if (nextBatchDisplayValue && updateElements) {setAVBatchDisplayValue(cellElements as HTMLElement[], nextBatchDisplayValue);}if (getOperations) {diff --git a/app/src/protyle/render/av/relation.ts b/app/src/protyle/render/av/relation.tsindex 0919057e82..9f804fe610 100644--- a/app/src/protyle/render/av/relation.ts+++ b/app/src/protyle/render/av/relation.ts@@ -2,7 +2,8 @@ import {isTableLikeView} from "./viewType";import {Menu} from "../../../plugin/Menu";import {hasClosestByAttribute, hasClosestByClassName, hasTopClosestByClassName} from "../../util/hasClosest";import {UDLRHint, upDownHint} from "../../../util/upDownHint";-import {fetchPost} from "../../../util/fetch";+import {fetchPost, fetchSyncPost} from "../../../util/fetch";+import type {AVRelationItemPreview, AVRelationItemCellInput} from "../../../types/api";import {escapeAttr, escapeHtml, escapeLessThans, escapeHtmlTextAndAttr} from "../../../util/escape";import {transaction} from "../../wysiwyg/transaction";import {genCellValueByElement, getCellValueText, renderCell, updateCellsValue} from "./cell";@@ -51,6 +52,7 @@ interface IOpenSearchAVOptions {}const RELATION_PAGE_SIZE = 16;+const relationItemPreviews = new WeakMap<HTMLElement, {keyword: string, preview: AVRelationItemPreview}>();const SEARCH_AV_LOADING_HTML = '<img style="margin: 0 auto;display: block;width: 64px;height: 64px" src="/stage/loading-pure.svg">';@@ -497,20 +499,18 @@ const genRelationRowsHTML = (rows: IAVRow[], columns: IAVColumn[], type: "selectreturn html;};-const genRelationFooterHTML = (menuElement: HTMLElement, keyword: string, hasCandidates: boolean, hasMore: boolean) => {- if (keyword) {- const refElement = menuElement.querySelector(".popover__block");- const databaseName = `<span style="color: var(--b3-protyle-inline-blockref-color);" class="popover__block"+const genRelationFooterHTML = (menuElement: HTMLElement, keyword: string) => {+ const preview = relationItemPreviews.get(menuElement)?.preview;+ const creating = menuElement.querySelector<HTMLElement>(".av__relation")?.dataset.creating === "true";+ const content = preview ? preview.primaryKey : keyword;+ const refElement = menuElement.querySelector(".popover__block");+ const databaseName = `<span style="color: var(--b3-protyle-inline-blockref-color);" class="popover__block"data-id="${escapeAttr(refElement?.getAttribute("data-id") || "")}">${escapeHtml(refElement?.textContent || "")}</span>`;- return `<button class="b3-menu__item av__relation-table-footer" data-type="setRelationCell" data-relation-type="create">+ return `<button class="b3-menu__item av__relation-table-footer" data-type="setRelationCell" data-relation-type="create"+${!preview || preview.error || creating ? "disabled" : ""} title="${escapeAttr(preview?.error || "")}"><span class="b3-menu__label fn__ellipsis">${window.siyuan.languages.newRowInRelation.replace("${x}", databaseName).- replace("${y}", escapeHtmlTextAndAttr(keyword))}</span>+ replace("${y}", escapeHtmlTextAndAttr(content || window.siyuan.languages.untitled))}</span></button>`;- }- if (!hasCandidates && !hasMore) {- return `<div class="b3-list--empty av__relation-table-footer" data-relation-type="empty">${window.siyuan.languages.noMoreItems}</div>`;- }- return "";};const genRelationLoaderHTML = (loading: boolean, visible = loading) => {@@ -678,11 +678,11 @@ export const bindRelationEvent = (options: {};});};- const renderFooter = (hasCandidates: boolean) => {+ const renderFooter = () => {listElement.querySelector('[data-relation-type="create"], [data-relation-type="empty"]')?.remove();const more = hasMore();listElement.dataset.hasMore = more.toString();- const footerHTML = genRelationFooterHTML(options.menuElement, state.keyword, hasCandidates, more);+ const footerHTML = genRelationFooterHTML(options.menuElement, state.keyword);if (footerHTML) {listElement.querySelector('[data-relation-type="loader"]').insertAdjacentHTML("beforebegin", footerHTML);}@@ -726,7 +726,7 @@ ${genRelationLoaderHTML(false)}`;Array.from(listElement.querySelectorAll<HTMLElement>('[role="columnheader"]')).find(header => header.dataset.relationColumn === focusedColumn)?.focus();}- renderFooter(!!listElement.querySelector('[data-relation-type="candidate"]'));+ renderFooter();if (!listElement.querySelector(".b3-menu__item--current")) {listElement.querySelector('[data-type="setRelationCell"]')?.classList.add("b3-menu__item--current");}@@ -753,6 +753,8 @@ ${genRelationLoaderHTML(false)}`;setLoading(initialLoad || !reset, initialLoad && reset, controller);let succeeded = false;fetchPost("/api/av/getAttributeViewRelationCandidates", {+ includeNewItemPreview: true,+ blockID: options.blockElement.getAttribute("data-node-id"),avID: relationElement.getAttribute("data-source-av-id"),keyID: relationElement.getAttribute("data-key-id"),keyword,@@ -773,6 +775,11 @@ ${genRelationLoaderHTML(false)}`;databaseName.setAttribute("data-id", response.data.blockIDs?.[0] || "");relationElement.dataset.databaseBlockId = response.data.blockIDs?.[0] || "";relationElement.dataset.notebookId = response.data.notebookID || "";+ if (response.data.newItemPreview) {+ relationItemPreviews.set(options.menuElement, {keyword, preview: response.data.newItemPreview});+ } else {+ relationItemPreviews.delete(options.menuElement);+ }const columns = response.data.columns as IAVColumn[] || [];const selectedRowsByID = new Map<string, IAVRow>((response.data.selectedRows as IAVRow[] || []).map((row) => [row.id, row]));@@ -853,6 +860,8 @@ ${genRelationLoaderHTML(false)}`;});const search = () => {state.keyword = inputElement.value;+ relationItemPreviews.delete(options.menuElement);+ renderFooter();state.controller?.abort();state.controller = undefined;state.loading = false;@@ -1008,13 +1017,13 @@ const getRelationValue = (menuElement: HTMLElement) => {return value;};-const genCreatedRelationRowHTML = (menuElement: HTMLElement, rowID: string, content: string) => {+const genCreatedRelationRowHTML = (menuElement: HTMLElement, rowID: string, content: string, blockID = "", isDetached = true) => {const headerElement = menuElement.querySelector('[data-relation-type="header"]') as HTMLElement;const columns = headerElement?.querySelectorAll<HTMLElement>(".av__relation-table-cell");let cellsHTML = `<span data-relation-column="${escapeAttr(columns?.[0]?.dataset.relationColumn || "")}" class="av__relation-table-cell av__relation-table-primary" data-row-id="${rowID}"><svg class="b3-menu__icon fn__grab"><use xlink:href="#iconDrag"></use></svg>- <span class="av__relation-row-icon">${getAVBlockIconHTML({isDetached: true})}</span>- <span class="b3-menu__label fn__ellipsis" data-id="">${escapeHtmlTextAndAttr(content)}</span>+ <span class="av__relation-row-icon">${getAVBlockIconHTML({isDetached})}</span>+ <span class="b3-menu__label fn__ellipsis${isDetached ? "" : " popover__block"}" data-id="${escapeAttr(isDetached ? "" : blockID)}">${escapeHtmlTextAndAttr(content)}</span></span>`;for (let i = 1; i < (columns?.length || 1); i++) {cellsHTML += `<span data-relation-column="${escapeAttr(columns[i].dataset.relationColumn)}" class="av__relation-table-cell${columns[i].classList.contains("fn__none") ? " fn__none" : ""}"></span>`;@@ -1068,32 +1077,62 @@ export const setRelationCell = async (protyle: IProtyle, nodeElement: HTMLElemenupdateCellsValue(protyle, nodeElement, getRelationValue(menuElement), cellElements);menuElement.dispatchEvent(new CustomEvent("relationrefresh"));} else {- const blockID = target.querySelector(".popover__block").getAttribute("data-id");- const content = target.querySelector("b").textContent;- const rowId = Lute.NewNodeID();- const bodyElement = hasClosestByClassName(cellElements[0], "av__body");- menuElement.querySelector('[data-relation-type="selectedRows"]').insertAdjacentHTML(- "beforeend", genCreatedRelationRowHTML(menuElement, rowId, content));- const newValue = getRelationValue(menuElement);- const updateOptions = await updateCellsValue(protyle, nodeElement, newValue, cellElements, null, null, true);- const doOperations: IOperation[] = [{- action: "insertAttrViewBlock",- ignoreDefaultFill: true,- avID: relationElement.getAttribute("data-av-id"),- srcs: [{- itemID: rowId,- id: Lute.NewNodeID(),- isDetached: true,- content- }],- blockID,- groupID: bodyElement ? bodyElement.getAttribute("data-group-id") : "",- }, {- action: "doUpdateUpdated",- id: blockID,- data: dayjs().format("YYYYMMDDHHmmss"),- }];- transaction(protyle, doOperations.concat(updateOptions.doOperations));+ const entry = relationItemPreviews.get(menuElement);+ if (target.hasAttribute("disabled") || relationElement.dataset.creating === "true" ||+ !entry || entry.preview.error || entry.keyword !== menuElement.querySelector("input").value) {+ return;+ }+ relationElement.dataset.creating = "true";+ target.setAttribute("disabled", "");+ try {+ // 用临时 ID 计算批量关系合并结果,仅成功创建后更新面板。+ const pendingID = Lute.NewNodeID();+ const value = getRelationValue(menuElement);+ value.blockIDs.push(pendingID);+ value.contents.push({type: "block", block: {content: entry.preview.primaryKey}, isDetached: true});+ const operations = await updateCellsValue(protyle, nodeElement, value, cellElements,+ null, null, true, false, false, undefined, false);+ const cells: AVRelationItemCellInput[] = [];+ operations.doOperations.forEach(operation => {+ if (operation.action === "updateAttrViewCell" && operation.data.relation) {+ cells.push({itemID: operation.rowID,+ relatedItemIDs: operation.data.relation.blockIDs.filter(id => id !== pendingID)});+ }+ });+ if (!cells.length) {+ return;+ }+ const response = await fetchSyncPost("/api/av/createAttributeViewRelationItem", {+ avID: nodeElement.dataset.avId,+ blockID: nodeElement.dataset.nodeId,+ keyID: relationElement.dataset.keyId,+ keyword: entry.keyword,+ cells,+ preview: entry.preview,+ app: protyle.app.appId,+ session: protyle.id,+ });+ if (response.code !== 0 || !response.data || !("itemID" in response.data)) {+ if (response.code === 1 && response.data && "unavailableNotebook" in response.data && response.data.unavailableNotebook) {+ showMessage(window.siyuan.languages.newItemTemplateUnavailableNotebookTip, 6000, "error");+ }+ return;+ }+ if (response.data.warnings?.length) {+ showMessage(response.data.warnings.map(item => escapeHtml(item)).join("<br>"));+ }+ if (menuElement.isConnected && !menuElement.querySelector(`[data-relation-type="selected"][data-row-id="${response.data.itemID}"]`)) {+ menuElement.querySelector('[data-relation-type="selectedRows"]').insertAdjacentHTML("beforeend",+ genCreatedRelationRowHTML(menuElement, response.data.itemID, response.data.content,+ response.data.blockID, response.data.isDetached));+ }+ } catch (error) {+ showMessage(escapeHtml(error.message), 6000, "error");+ } finally {+ delete relationElement.dataset.creating;+ target.removeAttribute("disabled");+ menuElement.dispatchEvent(new CustomEvent("relationrefresh"));+ }}}updateCopyRelatedItems(menuElement);diff --git a/app/src/protyle/render/av/relationItem.test.ts b/app/src/protyle/render/av/relationItem.test.tsnew file mode 100644index 0000000000..9176c617f9--- /dev/null+++ b/app/src/protyle/render/av/relationItem.test.ts@@ -0,0 +1,144 @@+import * as assert from "node:assert/strict";+import {it} from "node:test";+import {readFileSync} from "node:fs";+import {join} from "node:path";+import {createSourceFile, isVariableStatement, ScriptTarget, transpileModule} from "typescript";+import {escapeAttr, escapeHtml, escapeHtmlTextAndAttr} from "../../../util/escape";++const source = createSourceFile("relation.ts", readFileSync(join(__dirname, "relation.ts"), "utf8"), ScriptTarget.ES2021, true);+const load = (names: string[], dependencies: Record<string, unknown>) => {+ const declarations = source.statements.filter(statement => isVariableStatement(statement) &&+ statement.declarationList.declarations.some(declaration => names.includes(declaration.name.getText(source))));+ assert.equal(declarations.length, names.length);+ const code = declarations.map(statement => statement.getText(source).replace(/^export /, "")).join("\n");+ return new Function(...Object.keys(dependencies), transpileModule(code, {+ compilerOptions: {target: ScriptTarget.ES2021},+ }).outputText + `\nreturn {${names.join(",")}};`)(...Object.values(dependencies));+};++const languages = {+ newRowInRelation: "Create in ${x} <b>${y}</b>", untitled: "Untitled",+ newItemTemplateUnavailableNotebookTip: "Notebook unavailable",+};++it("always offers creation, previews the template name, and escapes database names and titles", () => {+ const previews = new WeakMap();+ const menu = {querySelector: (selector: string) => selector === ".av__relation" ? {dataset: {}} :+ {getAttribute: () => "database-id", textContent: "<Database>"}};+ const {genRelationFooterHTML} = load(["genRelationFooterHTML"], {+ relationItemPreviews: previews, escapeAttr, escapeHtml, escapeHtmlTextAndAttr, window: {siyuan: {languages}},+ });+ assert.match(genRelationFooterHTML(menu, ""), /data-relation-type="create"/);+ assert.match(genRelationFooterHTML(menu, ""), /disabled/);+ previews.set(menu, {keyword: "Task A", preview: {primaryKey: "<Template name>"}});+ const html = genRelationFooterHTML(menu, "Task A");+ assert.match(html, /<Database>/);+ assert.match(html, /<Template name>/);+ assert.doesNotMatch(html, /Task A|disabled/);+ previews.set(menu, {keyword: "Task A", preview: {primaryKey: ""}});+ assert.match(genRelationFooterHTML(menu, "Task A"), /Untitled/);+ assert.doesNotMatch(genRelationFooterHTML(menu, "Task A"), /Task A/);+ previews.set(menu, {keyword: "", preview: {primaryKey: "", error: "Invalid template"}});+ assert.match(genRelationFooterHTML(menu, ""), /disabled.*title="Invalid template"/);+});++const creationFixture = (mobile: boolean, response: Promise<unknown>) => {+ const attributes = new Set<string>();+ const target = {+ dataset: {relationType: "create"}, classList: {contains: () => true}, getAttribute: (): string | null => null,+ hasAttribute: (name: string) => attributes.has(name),+ setAttribute: (name: string) => attributes.add(name), removeAttribute: (name: string) => attributes.delete(name),+ };+ const relation = {dataset: {keyId: "relation-key"}};+ const html: string[] = [];+ const events: string[] = [];+ const messages: unknown[] = [];+ const requests: unknown[] = [];+ const preview = {templateID: "default-template", primaryKey: "Template name", createdAt: 123};+ const menu = {+ firstElementChild: mobile ? {className: "mobile-header"} : relation,+ isConnected: true,+ querySelector: (selector: string) => {+ if (selector === ".av__relation") { return relation; }+ if (selector === "input") { return {value: "Task A"}; }+ if (selector.includes("selectedRows")) { return {insertAdjacentHTML: (_: string, value: string) => html.push(value)}; }+ return undefined;+ },+ dispatchEvent: (event: {type: string}) => events.push(event.type),+ };+ const node = {dataset: {avId: "source", nodeId: "source-carrier"}, contains: () => true};+ const protyle = {app: {appId: "app"}, id: "editor"};+ const previews = new WeakMap([[menu, {keyword: "Task A", preview}]]);+ const {setRelationCell} = load(["genCreatedRelationRowHTML", "setRelationCell"], {+ relationItemPreviews: previews,+ hasClosestByClassName: () => menu,+ getRelationValue: () => ({blockIDs: ["existing"], contents: [{type: "block", block: {content: "Existing"}}]}),+ updateCellsValue: async (_protyle: unknown, _node: unknown, value: {blockIDs: string[]}, ...args: unknown[]) => {+ assert.deepEqual(value.blockIDs, ["existing", "pending"]);+ assert.equal(args[3], true);+ assert.equal(args[7], false);+ assert.equal(html.length, 0);+ return {doOperations: [+ {action: "updateAttrViewCell", rowID: "source-row-1", data: {relation: {blockIDs: ["existing", "pending"]}}},+ {action: "updateAttrViewCell", rowID: "source-row-2", data: {relation: {blockIDs: ["hidden-existing", "pending"]}}},+ ]};+ },+ fetchSyncPost: (url: string, data: unknown) => {+ assert.equal(url, "/api/av/createAttributeViewRelationItem");+ requests.push(data);+ return response;+ },+ Lute: {NewNodeID: () => "pending"},+ getAVBlockIconHTML: ({isDetached}: {isDetached: boolean}) => isDetached ? "detached-icon" : "document-icon",+ escapeAttr, escapeHtml, escapeHtmlTextAndAttr,+ showMessage: (...values: unknown[]) => messages.push(values),+ updateCopyRelatedItems: () => {},+ CustomEvent: class { constructor(public type: string) {} },+ window: {siyuan: {languages}},+ });+ return {run: () => setRelationCell(protyle, node, target, [{}]), html, events, messages, requests, attributes};+};++for (const mobile of [false, true]) {+ it(`creates a document relation once and preserves batch relations on ${mobile ? "mobile" : "desktop"}`, async () => {+ let finish: (value: unknown) => void;+ const fixture = creationFixture(mobile, new Promise(resolve => { finish = resolve; }));+ const pending = fixture.run();+ await Promise.resolve();+ await fixture.run();+ assert.equal(fixture.requests.length, 1);+ assert.equal(fixture.html.length, 0);+ const request = fixture.requests[0] as {cells: unknown[], preview: {primaryKey: string}, keyword: string};+ assert.deepEqual(request.cells, [+ {itemID: "source-row-1", relatedItemIDs: ["existing"]},+ {itemID: "source-row-2", relatedItemIDs: ["hidden-existing"]},+ ]);+ assert.equal(request.keyword, "Task A");+ assert.equal(request.preview.primaryKey, "Template name");+ finish({code: 0, data: {itemID: "created", blockID: "document", content: "Template name", isDetached: false}});+ await pending;+ assert.equal(fixture.html.length, 1);+ assert.match(fixture.html[0], /popover__block.*data-id="document"/);+ assert.match(fixture.html[0], /document-icon/);+ assert.equal(fixture.attributes.size, 0);+ assert.ok(fixture.events.includes("relationrefresh"));+ });+}++it("keeps failed creations out of the panel and permits retry", async () => {+ for (const result of [+ {code: -1, data: null}, {code: 1, data: {unavailableNotebook: true}},+ ]) {+ const fixture = creationFixture(false, Promise.resolve(result));+ await fixture.run();+ assert.equal(fixture.html.length, 0);+ assert.equal(fixture.attributes.size, 0);+ assert.ok(fixture.events.includes("relationrefresh"));+ if (result.code === 1) { assert.equal(fixture.messages.length, 1); }+ }+ const networkFailure = creationFixture(false, Promise.reject(new Error("Network unavailable")));+ await networkFailure.run();+ assert.equal(networkFailure.html.length, 0);+ assert.equal(networkFailure.messages.length, 1);+ assert.equal(networkFailure.attributes.size, 0);+});diff --git a/app/src/protyle/render/av/relationSort.test.ts b/app/src/protyle/render/av/relationSort.test.tsindex 8533bd6b63..822a61a3a3 100644--- a/app/src/protyle/render/av/relationSort.test.ts+++ b/app/src/protyle/render/av/relationSort.test.ts@@ -19,6 +19,7 @@ it("keeps the footer loader hidden while refreshing existing candidates", () =>getSelectedItems: (): {id: string}[] => [],setLoading: (show: boolean) => loading.push(show),relationElement: {getAttribute: () => "database"},+ options: {blockElement: {getAttribute: () => "carrier"}},RELATION_PAGE_SIZE: 16,fetchPost: () => ({finally() {}}),};diff --git a/app/src/types/api/index.d.ts b/app/src/types/api/index.d.tsindex 1ab0f5fd32..6a600b97f5 100644--- a/app/src/types/api/index.d.ts+++ b/app/src/types/api/index.d.ts@@ -380,7 +380,13 @@ export type AVRelation = { "avID": string; "backKeyID": string; "candidateFilterexport type AVRelationCandidateSortInput = { "column": string; "order": string; };-export type AVRelationCandidatesData = { "blockIDs": Array<string> | null; "columns": Array<AVTableColumn | null> | null; "customColors": Array<AVAttributeViewCustomColor | null> | null; "name": string; "notebookID": string; "rows": Array<AVTableRow | null> | null; "selectedRows": Array<AVTableRow | null> | null; "total": number; };+export type AVRelationCandidatesData = { "blockIDs": Array<string> | null; "columns": Array<AVTableColumn | null> | null; "customColors": Array<AVAttributeViewCustomColor | null> | null; "name": string; "newItemPreview"?: AVRelationItemPreview; "notebookID": string; "rows": Array<AVTableRow | null> | null; "selectedRows": Array<AVTableRow | null> | null; "total": number; };++export type AVRelationItemCellInput = { "itemID": string; "relatedItemIDs": Array<string>; };++export type AVRelationItemPreview = { "createdAt": number; "error"?: string; "primaryKey": string; "templateID": string; };++export type AVRelationItemPreviewInput = { "createdAt": number; "error"?: string | null; "primaryKey": string; "templateID": string; };export type AVRelativeDate = { "count": number; "direction": number; "unit": number; };@@ -846,6 +852,8 @@ export type CreateAttributeViewItemRequestInput = { "app"?: string | null; "avIDexport type CreateAttributeViewItemWithMarkdownRequestInput = { "app"?: string | null; "avID": string; "blockID": string; "clippingHref"?: string | null; "groupID"?: string | null; "listDocTree"?: boolean | null; "markdown": string; "previousID"?: string | null; "session"?: string | null; "tags"?: string | null; "templateID": string; "title": string; "viewID"?: string | null; "withMath"?: boolean | null; };+export type CreateAttributeViewRelationItemRequestInput = { "app"?: string | null; "avID": string; "blockID": string; "cells": Array<AVRelationItemCellInput | null>; "keyID": string; "keyword"?: string | null; "preview": AVRelationItemPreviewInput | null; "session"?: string | null; };+export type CreateDocHistoryRequestInput = { "id": string; };export type CreateEncryptedNotebookRequestInput = { "name": string; "password": string; };@@ -1132,7 +1140,7 @@ export type GetAttributeViewPasteRowsRequestInput = { "avID": string; "blockID":export type GetAttributeViewPrimaryKeyValuesRequestInput = { "blockIDs"?: Array<string> | null; "id": string; "keyword"?: string | null; "page"?: number | null; "pageSize"?: number | null; };-export type GetAttributeViewRelationCandidatesRequestInput = { "avID"?: string | null; "id"?: string | null; "keyID"?: string | null; "keyword"?: string | null; "page"?: number | null; "pageSize"?: number | null; "selectedBlockIDs"?: Array<string> | null; "sort"?: AVRelationCandidateSortInput | null; };+export type GetAttributeViewRelationCandidatesRequestInput = { "avID"?: string | null; "blockID"?: string | null; "id"?: string | null; "includeNewItemPreview"?: boolean | null; "keyID"?: string | null; "keyword"?: string | null; "page"?: number | null; "pageSize"?: number | null; "selectedBlockIDs"?: Array<string> | null; "sort"?: AVRelationCandidateSortInput | null; };export type GetAttributeViewRequestInput = { "id": string; };@@ -3101,6 +3109,11 @@ export interface APIPOSTRoutes {response: { "code": 0; "data": AVCreateItemResult; "msg": string; } | { "code": -1 | 1; "data": { "closeTimeout": number; } | null | AVCreateItemResult; "msg": string; };body: "json";};+ "/api/av/createAttributeViewRelationItem": {+ request: CreateAttributeViewRelationItemRequestInput;+ response: { "code": 0; "data": AVCreateItemResult; "msg": string; } | { "code": -1 | 1; "data": { "closeTimeout": number; } | null | AVCreateItemResult; "msg": string; };+ body: "json";+ };"/api/av/duplicateAttributeViewBlock": {request: DuplicateAttributeViewBlockRequestInput;response: { "code": 0; "data": AVDuplicateData; "msg": string; } | { "code": -1; "data": { "closeTimeout": number; } | null; "msg": string; };diff --git a/app/src/types/index.d.ts b/app/src/types/index.d.tsindex 7f99141908..f0e167296d 100644--- a/app/src/types/index.d.ts+++ b/app/src/types/index.d.ts@@ -1149,6 +1149,7 @@ interface IAV {views: IAVView[];isMirror?: boolean;newItemTemplates?: IAVNewItemTemplate[];+ /** 关联选择面板新建也使用此默认模板,主键模板优先于搜索文本;未配置主键模板时使用搜索文本。 */defaultTemplateID?: string;customColors?: IAVCustomColor[];colorOrder?: string[];diff --git a/kernel/api/av.go b/kernel/api/av.goindex 65158dac85..c9994d4fba 100644--- a/kernel/api/av.go+++ b/kernel/api/av.go@@ -212,11 +212,16 @@ var getAttributeViewRelationCandidates = contractHandler(apicontract.GetAttributif avID == "" {avID = request.ID}+ if request.IncludeNewItemPreview || request.BlockID != "" {+ if err := holdAttributeViewRequest(c, request.BlockID, avID); err != nil {+ return apicontract.Failure[apicontract.AVRelationCandidatesData](-1, err.Error())+ }+ }var candidateSort *av.ViewSortif request.Sort != nil {candidateSort = &av.ViewSort{Column: request.Sort.Column, Order: av.SortOrder(request.Sort.Order)}}- name, blockIDs, colors, columns, selectedRows, rows, total, err := model.GetAttributeViewRelationCandidates(avID, request.KeyID, request.Keyword, avNonemptyStrings(request.SelectedBlockIDs), avPage(request.Page, 1), avPage(request.PageSize, -1), candidateSort)+ name, blockIDs, colors, columns, selectedRows, rows, total, err := model.GetAttributeViewRelationCandidates(avID, request.KeyID, request.Keyword, avNonemptyStrings(request.SelectedBlockIDs), avPage(request.Page, 1), avPage(request.PageSize, -1), candidateSort, request.BlockID)if err != nil {return apicontract.Failure[apicontract.AVRelationCandidatesData](-1, err.Error())}@@ -226,7 +231,13 @@ var getAttributeViewRelationCandidates = contractHandler(apicontract.GetAttributnotebookID = tree.BoxID}}- return apicontract.Success(apicontract.AVRelationCandidatesData{Name: name, BlockIDs: blockIDs, CustomColors: avContractSlice(colors, toContractAVAttributeViewCustomColor), NotebookID: notebookID, Columns: avContractSlice(columns, toContractAVTableColumn), SelectedRows: avContractSlice(selectedRows, toContractAVTableRow), Rows: avContractSlice(rows, toContractAVTableRow), Total: total})+ data := apicontract.AVRelationCandidatesData{Name: name, BlockIDs: blockIDs, CustomColors: avContractSlice(colors, toContractAVAttributeViewCustomColor), NotebookID: notebookID, Columns: avContractSlice(columns, toContractAVTableColumn), SelectedRows: avContractSlice(selectedRows, toContractAVTableRow), Rows: avContractSlice(rows, toContractAVTableRow), Total: total}+ if request.IncludeNewItemPreview {+ preview := model.PreviewAttributeViewRelationItem(avID, request.BlockID, request.KeyID, request.Keyword)+ data.NewItemPreview = &apicontract.AVRelationItemPreview{TemplateID: preview.TemplateID,+ PrimaryKey: preview.PrimaryKey, CreatedAt: preview.CreatedAt, Error: preview.Error}+ }+ return apicontract.Success(data)})var appendAttributeViewDetachedBlocksWithValues = contractHandler(apicontract.AppendAttributeViewDetachedBlocksWithValues, func(c *gin.Context, request apicontract.AppendAttributeViewDetachedBlocksWithValuesRequest) apicontract.Response[apicontract.Null] {@@ -358,6 +369,36 @@ var createAttributeViewItem = contractHandler(apicontract.CreateAttributeViewItereturn createAVItemResponse(value, err, request.App, request.Session)})+var createAttributeViewRelationItem = contractHandler(apicontract.CreateAttributeViewRelationItem, func(c *gin.Context, request apicontract.CreateAttributeViewRelationItemRequest) apicontract.Response[apicontract.AVCreateItemResult] {+ if err := holdEncryptedBlockRequests(c, "", []string{request.BlockID}, false); err != nil {+ return apicontract.Failure[apicontract.AVCreateItemResult](-1, err.Error())+ }+ if err := holdAttributeViewRequest(c, request.BlockID, request.AvID); err != nil {+ return apicontract.Failure[apicontract.AVCreateItemResult](-1, err.Error())+ }+ var preview *model.AttributeViewRelationItemPreview+ if request.Preview != nil {+ preview = &model.AttributeViewRelationItemPreview{TemplateID: request.Preview.TemplateID,+ PrimaryKey: request.Preview.PrimaryKey, CreatedAt: request.Preview.CreatedAt, Error: request.Preview.Error}+ }+ var cells []*model.AttributeViewRelationItemCell+ for _, cell := range request.Cells {+ if cell == nil {+ return apicontract.Failure[apicontract.AVCreateItemResult](-1, "invalid relation item cell")+ }+ cells = append(cells, &model.AttributeViewRelationItemCell{ItemID: cell.ItemID, RelatedItemIDs: cell.RelatedItemIDs})+ }+ result, err := model.CreateAttributeViewRelationItem(request.AvID, request.BlockID, request.KeyID, request.Keyword, cells, preview)+ if err != nil {+ if errors.Is(err, model.ErrBoxNotFound) {+ return apicontract.CreateAttributeViewRelationItem.FailureWithData(1, "", apicontract.NewAVCreateItemResultError(apicontract.AVUnavailableNotebook{UnavailableNotebook: true}))+ }+ return apicontract.Failure[apicontract.AVCreateItemResult](-1, err.Error())+ }+ pushTransactions(request.App, request.Session, []*model.Transaction{result.Transaction})+ return apicontract.Success(apicontract.NewAVCreateItemResult(*toContractAVCreateAttributeViewItemResult(result)))+})+var createAttributeViewItemWithMarkdown = contractHandler(apicontract.CreateAttributeViewItemWithMarkdown, func(c *gin.Context, request apicontract.CreateAttributeViewItemWithMarkdownRequest) apicontract.Response[apicontract.AVCreateItemResult] {value, err := model.CreateAttributeViewItemWithMarkdown(request.AvID, request.BlockID, request.ViewID, request.TemplateID, request.PreviousID, request.GroupID, &model.CreateAttributeViewItemMarkdown{Title: request.Title, Markdown: request.Markdown, Tags: request.Tags, WithMath: request.WithMath, ClippingHref: request.ClippingHref, ListDocTree: request.ListDocTree})return createAVItemResponse(value, err, request.App, request.Session)diff --git a/kernel/api/contract_av_relation_item_test.go b/kernel/api/contract_av_relation_item_test.gonew file mode 100644index 0000000000..3e1d6147e3--- /dev/null+++ b/kernel/api/contract_av_relation_item_test.go@@ -0,0 +1,79 @@+package api++import (+ "encoding/json"+ "net/http"+ "testing"++ "github.com/88250/lute/ast"+ "github.com/siyuan-note/siyuan/kernel/apicontract"+ "github.com/siyuan-note/siyuan/kernel/av"+)++func TestAVRelationItemContract(t *testing.T) {+ fixture := setupAttributeViewContextFilterAPITest(t)+ av.BatchUpsertBlockRel([]*ast.Node{{ID: fixture.databaseID, Type: ast.NodeAttributeView, AttributeViewID: fixture.attrView.ID}})+ const candidatesPath = "/api/av/getAttributeViewRelationCandidates"+ for _, include := range []bool{false, true} {+ response := callAttributeViewContextFilterAPI(t, candidatesPath, map[string]any{+ "avID": fixture.attrView.ID, "blockID": fixture.databaseID, "keyID": fixture.relationKeyID,+ "keyword": "Task A", "includeNewItemPreview": include,+ }, getAttributeViewRelationCandidates)+ requireAPIContract(t, http.MethodPost, candidatesPath, response)+ var result struct {+ Code int `json:"code"`+ Data apicontract.AVRelationCandidatesData `json:"data"`+ }+ if err := json.Unmarshal(response.Body.Bytes(), &result); err != nil || result.Code != 0 {+ t.Fatalf("candidate preview: %s %v", response.Body.String(), err)+ }+ if include {+ if p := result.Data.NewItemPreview; p == nil || p.Error != "" || p.PrimaryKey != "Task A" || p.TemplateID != "" {+ t.Fatalf("unexpected blank-template preview: %+v", p)+ }+ } else if result.Data.NewItemPreview != nil {+ t.Fatal("legacy candidate query unexpectedly returned a preview")+ }+ }+ fixture.attrView.NewItemTemplates = []*av.NewItemTemplate{{ID: ast.NewNodeID(), Name: "Default",+ TargetType: av.NewItemTargetDetached, PrimaryKeyTemplate: "Task from template"}}+ fixture.attrView.DefaultTemplateID = fixture.attrView.NewItemTemplates[0].ID+ if err := av.SaveAttributeView(fixture.attrView); err != nil {+ t.Fatal(err)+ }+ response := callAttributeViewContextFilterAPI(t, candidatesPath, map[string]any{+ "avID": fixture.attrView.ID, "blockID": fixture.databaseID, "keyID": fixture.relationKeyID,+ "keyword": "Task A", "includeNewItemPreview": true,+ }, getAttributeViewRelationCandidates)+ requireAPIContract(t, http.MethodPost, candidatesPath, response)+ var result struct {+ Data apicontract.AVRelationCandidatesData `json:"data"`+ }+ decodeAttributeViewContextFilterAPIResponse(t, response, &result)+ if p := result.Data.NewItemPreview; p == nil || p.PrimaryKey != "Task from template" || p.Error != "" {+ t.Fatalf("template did not take precedence: %+v", p)+ }+ const createPath = "/api/av/createAttributeViewRelationItem"+ before, _ := json.Marshal(fixture.attrView)+ response = callAttributeViewContextFilterAPI(t, createPath, map[string]any{+ "avID": fixture.attrView.ID, "blockID": fixture.databaseID, "keyID": fixture.relationKeyID,+ "keyword": "Task A", "preview": result.Data.NewItemPreview,+ "cells": []map[string]any{{"itemID": "missing", "relatedItemIDs": []string{}}},+ }, createAttributeViewRelationItem)+ requireAPIContract(t, http.MethodPost, createPath, response)+ var failure struct {+ Code int `json:"code"`+ }+ decodeAttributeViewContextFilterAPIResponse(t, response, &failure)+ if failure.Code != -1 {+ t.Fatalf("invalid creation accepted: %s", response.Body.String())+ }+ stored, err := av.ParseAttributeView(fixture.attrView.ID)+ if err != nil {+ t.Fatal(err)+ }+ after, _ := json.Marshal(stored)+ if string(before) != string(after) {+ t.Fatal("failed creation changed the database")+ }+}diff --git a/kernel/api/router.go b/kernel/api/router.goindex 03d4fb13b2..03334294ee 100644--- a/kernel/api/router.go+++ b/kernel/api/router.go@@ -662,6 +662,7 @@ func ServeAPI(ginServer *gin.Engine) {ginServer.Handle("POST", "/api/av/getAttributeViewItemIDsByBoundIDs", model.CheckAuth, model.CheckAdminRole, getAttributeViewItemIDsByBoundIDs)ginServer.Handle("POST", "/api/av/getUnusedAttributeViews", model.CheckAuth, model.CheckAdminRole, getUnusedAttributeViews)ginServer.Handle("POST", "/api/av/createAttributeViewItem", model.CheckAuth, model.CheckAdminRole, model.CheckReadonly, createAttributeViewItem)+ ginServer.Handle("POST", "/api/av/createAttributeViewRelationItem", model.CheckAuth, model.CheckAdminRole, model.CheckReadonly, createAttributeViewRelationItem)ginServer.Handle("POST", "/api/av/createAttributeViewItemWithMarkdown", model.CheckAuth, model.CheckAdminRole, model.CheckReadonly, createAttributeViewItemWithMarkdown)ginServer.Handle("POST", "/api/av/createAttributeViewItemDocs", model.CheckAuth, model.CheckAdminRole, model.CheckReadonly, createAttributeViewItemDocs)ginServer.Handle("POST", "/api/av/removeUnusedAttributeViews", model.CheckAuth, model.CheckAdminRole, model.CheckReadonly, removeUnusedAttributeViews)diff --git a/kernel/apicontract/av_requests.go b/kernel/apicontract/av_requests.goindex f64baf9cec..6b2adc7b48 100644--- a/kernel/apicontract/av_requests.go+++ b/kernel/apicontract/av_requests.go@@ -104,13 +104,17 @@ type GetAttributeViewPrimaryKeyValuesRequest struct {}type GetAttributeViewRelationCandidatesRequest struct {- AvID string `json:"avID" api:"optional,nullable,ignoretype"`- KeyID string `json:"keyID" api:"optional,nullable,ignoretype"`- ID string `json:"id" api:"optional,nullable,ignoretype"`- Keyword string `json:"keyword" api:"optional,nullable"`- Page *float64 `json:"page" api:"optional,nullable"`- PageSize *float64 `json:"pageSize" api:"optional,nullable"`- SelectedBlockIDs []string `json:"selectedBlockIDs" api:"optional,nullable,filterstrings"`+ // 按需返回目标数据库默认条目的名称预览;省略时保持候选查询响应。+ // BlockID 指定来源载体并限定候选读取的加密边界;省略时保留原有全局查询行为。+ IncludeNewItemPreview bool `json:"includeNewItemPreview" api:"optional,nullable"`+ BlockID string `json:"blockID" api:"optional,nullable"`+ AvID string `json:"avID" api:"optional,nullable,ignoretype"`+ KeyID string `json:"keyID" api:"optional,nullable,ignoretype"`+ ID string `json:"id" api:"optional,nullable,ignoretype"`+ Keyword string `json:"keyword" api:"optional,nullable"`+ Page *float64 `json:"page" api:"optional,nullable"`+ PageSize *float64 `json:"pageSize" api:"optional,nullable"`+ SelectedBlockIDs []string `json:"selectedBlockIDs" api:"optional,nullable,filterstrings"`// Sort 仅对本次候选查询排序,在搜索过滤后、分页前应用;不修改数据库视图或已选条目的顺序。// 省略时按创建时间倒序;指定时 column 必须属于关联数据库,order 为 ASC 或 DESC。Sort *AVRelationCandidateSort `json:"sort" api:"optional,nullable"`@@ -220,6 +224,34 @@ type CreateAttributeViewItemRequest struct {Session string `json:"session" api:"optional,nullable"`}+// 关联新建使用目标数据库的默认模板;未配置主键模板时以 keyword 作为名称。+// cells 保留已有条目的顺序及批量编辑结果,新条目追加到每个来源单元格;创建和关联共用一次撤销。+// preview 来自 includeNewItemPreview 候选查询,解析时间最多保留五分钟;默认模板 ID 或名称变化时拒绝写入。+// 不可用保存笔记本返回 code 1 和 unavailableNotebook;其他失败返回 code -1,保留原数据。+type CreateAttributeViewRelationItemRequest struct {+ AvID string `json:"avID" api:"trim"`+ BlockID string `json:"blockID" api:"trim"`+ KeyID string `json:"keyID" api:"trim"`+ Keyword string `json:"keyword" api:"optional,nullable"`+ Cells []*AVRelationItemCell `json:"cells"`+ Preview *AVRelationItemPreview `json:"preview"`+ App string `json:"app" api:"optional,nullable"`+ Session string `json:"session" api:"optional,nullable"`+}++type AVRelationItemCell struct {+ ItemID string `json:"itemID"`+ RelatedItemIDs []string `json:"relatedItemIDs"`+}++// 默认模板 ID、解析后的主键和解析时间;error 非空时只能选择已有条目,不能确认新建。+type AVRelationItemPreview struct {+ TemplateID string `json:"templateID"`+ PrimaryKey string `json:"primaryKey"`+ CreatedAt int64 `json:"createdAt"`+ Error string `json:"error,omitempty" api:"optional,nullable"`+}+type CreateAttributeViewItemWithMarkdownRequest struct {AvID string `json:"avID" api:"trim"`BlockID string `json:"blockID" api:"trim"`diff --git a/kernel/apicontract/av_response.go b/kernel/apicontract/av_response.goindex 1a67c93dc9..3dbb84c578 100644--- a/kernel/apicontract/av_response.go+++ b/kernel/apicontract/av_response.go@@ -26,14 +26,15 @@ type AVPrimaryValuesData struct {Total int `json:"total"`}type AVRelationCandidatesData struct {- Name string `json:"name"`- BlockIDs []string `json:"blockIDs"`- CustomColors []*AVAttributeViewCustomColor `json:"customColors"`- NotebookID string `json:"notebookID"`- Columns []*AVTableColumn `json:"columns"`- SelectedRows []*AVTableRow `json:"selectedRows"`- Rows []*AVTableRow `json:"rows"`- Total int `json:"total"`+ NewItemPreview *AVRelationItemPreview `json:"newItemPreview,omitempty"`+ Name string `json:"name"`+ BlockIDs []string `json:"blockIDs"`+ CustomColors []*AVAttributeViewCustomColor `json:"customColors"`+ NotebookID string `json:"notebookID"`+ Columns []*AVTableColumn `json:"columns"`+ SelectedRows []*AVTableRow `json:"selectedRows"`+ Rows []*AVTableRow `json:"rows"`+ Total int `json:"total"`}type AVFilterSortData struct {Filters []*AVViewFilter `json:"filters"`diff --git a/kernel/apicontract/av_test.go b/kernel/apicontract/av_test.goindex bb2f527f67..fa2068bc09 100644--- a/kernel/apicontract/av_test.go+++ b/kernel/apicontract/av_test.go@@ -75,6 +75,7 @@ func TestAVResponseSchemas(t *testing.T) {{"/api/av/getAttributeViewAddingBlockDefaultValues", `{"code":0,"msg":"","data":{"values":null}}`},{"/api/av/renderAttributeView", `{"code":-1,"msg":"missing","data":{"error":"viewNotFound"}}`},{"/api/av/createAttributeViewItem", `{"code":1,"msg":"","data":{"unavailableNotebook":true}}`},+ {"/api/av/createAttributeViewRelationItem", `{"code":1,"msg":"","data":{"unavailableNotebook":true}}`},{"/api/av/createAttributeViewItemDocs", `{"code":1,"msg":"","data":{"unavailableNotebook":true}}`},{"/api/av/getAttributeViewRowSort", `{"code":0,"msg":"","data":{"conflict":false,"doOperations":[],"undoOperations":[]}}`},} {@@ -87,6 +88,23 @@ func TestAVResponseSchemas(t *testing.T) {}}+func TestAVRelationItemInputContract(t *testing.T) {+ valid := `{"avID":" av ","blockID":"block","keyID":"key","cells":[{"itemID":"item","relatedItemIDs":[]}],"preview":{"templateID":"","primaryKey":"Task","createdAt":123}}`+ request, err := CreateAttributeViewRelationItem.Decode(strings.NewReader(valid))+ if err != nil || request.AvID != "av" || request.Keyword != "" || request.Preview.PrimaryKey != "Task" {+ t.Fatalf("relation creation input: %+v %v", request, err)+ }+ for _, invalid := range []string{+ strings.Replace(valid, `"createdAt":123`, `"createdAt":"123"`, 1),+ strings.Replace(valid, `"relatedItemIDs":[]`, `"relatedItemIDs":[null]`, 1),+ strings.Replace(valid, `"cells":[{"itemID":"item","relatedItemIDs":[]}]`, `"cells":null`, 1),+ } {+ if _, err = CreateAttributeViewRelationItem.Decode(strings.NewReader(invalid)); err == nil {+ t.Fatalf("invalid relation input accepted: %s", invalid)+ }+ }+}+func TestAVParsedRequestErrors(t *testing.T) {for _, test := range []struct{ body, message string }{{`{"avID":null}`, "Field [avID] is required"},diff --git a/kernel/apicontract/contracts.go b/kernel/apicontract/contracts.goindex ce752e8e5d..f8d19e1680 100644--- a/kernel/apicontract/contracts.go+++ b/kernel/apicontract/contracts.go@@ -982,6 +982,7 @@ var GetAttributeView = define[GetAttributeViewRequest, AVData]("getAttributeViewvar GetAttributeViewPasteRows = define[GetAttributeViewPasteRowsRequest, AVPasteRowsData]("getAttributeViewPasteRows", "/api/av/getAttributeViewPasteRows", JSONBody, ResponseOptions{}, "POST")var GetAttributeViewFieldViews = define[GetAttributeViewFieldViewsRequest, AVFieldViewsData]("getAttributeViewFieldViews", "/api/av/getAttributeViewFieldViews", JSONBody, ResponseOptions{}, "POST")var CreateAttributeViewItem = define[CreateAttributeViewItemRequest, AVCreateItemResult]("createAttributeViewItem", "/api/av/createAttributeViewItem", JSONBody, ResponseOptions{DataOnError: true, AdditionalCodes: []int{1}}, "POST")+var CreateAttributeViewRelationItem = define[CreateAttributeViewRelationItemRequest, AVCreateItemResult]("createAttributeViewRelationItem", "/api/av/createAttributeViewRelationItem", JSONBody, ResponseOptions{DataOnError: true, AdditionalCodes: []int{1}}, "POST")var CreateAttributeViewItemWithMarkdown = define[CreateAttributeViewItemWithMarkdownRequest, AVCreateItemResult]("createAttributeViewItemWithMarkdown", "/api/av/createAttributeViewItemWithMarkdown", JSONBody, ResponseOptions{DataOnError: true, AdditionalCodes: []int{1}}, "POST")var CreateAttributeViewItemDocs = define[CreateAttributeViewItemDocsRequest, AVCreateItemDocsResult]("createAttributeViewItemDocs", "/api/av/createAttributeViewItemDocs", JSONBody, ResponseOptions{DataOnError: true, AdditionalCodes: []int{1}}, "POST")var SearchAttributeView = define[SearchAttributeViewRequest, AVSearchData]("searchAttributeView", "/api/av/searchAttributeView", JSONBody, ResponseOptions{}, "POST")diff --git a/kernel/apicontract/schema.json b/kernel/apicontract/schema.jsonindex 2c131937dc..9b2a43aa2f 100644--- a/kernel/apicontract/schema.json+++ b/kernel/apicontract/schema.json@@ -10229,6 +10229,9 @@"name": {"type": "string"},+ "newItemPreview": {+ "$ref": "#/$defs/AVRelationItemPreview"+ },"notebookID": {"type": "string"},@@ -10288,6 +10291,78 @@],"additionalProperties": false},+ "AVRelationItemCellInput": {+ "type": "object",+ "properties": {+ "itemID": {+ "type": "string"+ },+ "relatedItemIDs": {+ "type": "array",+ "items": {+ "type": "string"+ }+ }+ },+ "required": [+ "itemID",+ "relatedItemIDs"+ ],+ "additionalProperties": false+ },+ "AVRelationItemPreview": {+ "type": "object",+ "properties": {+ "createdAt": {+ "type": "integer"+ },+ "error": {+ "type": "string"+ },+ "primaryKey": {+ "type": "string"+ },+ "templateID": {+ "type": "string"+ }+ },+ "required": [+ "createdAt",+ "primaryKey",+ "templateID"+ ],+ "additionalProperties": false+ },+ "AVRelationItemPreviewInput": {+ "type": "object",+ "properties": {+ "createdAt": {+ "type": "integer"+ },+ "error": {+ "anyOf": [+ {+ "type": "string"+ },+ {+ "type": "null"+ }+ ]+ },+ "primaryKey": {+ "type": "string"+ },+ "templateID": {+ "type": "string"+ }+ },+ "required": [+ "createdAt",+ "primaryKey",+ "templateID"+ ],+ "additionalProperties": false+ },"AVRelativeDate": {"type": "object","properties": {@@ -20814,6 +20889,81 @@],"additionalProperties": false},+ "CreateAttributeViewRelationItemRequestInput": {+ "type": "object",+ "properties": {+ "app": {+ "anyOf": [+ {+ "type": "string"+ },+ {+ "type": "null"+ }+ ]+ },+ "avID": {+ "type": "string"+ },+ "blockID": {+ "type": "string"+ },+ "cells": {+ "type": "array",+ "items": {+ "anyOf": [+ {+ "$ref": "#/$defs/AVRelationItemCellInput"+ },+ {+ "type": "null"+ }+ ]+ }+ },+ "keyID": {+ "type": "string"+ },+ "keyword": {+ "anyOf": [+ {+ "type": "string"+ },+ {+ "type": "null"+ }+ ]+ },+ "preview": {+ "anyOf": [+ {+ "$ref": "#/$defs/AVRelationItemPreviewInput"+ },+ {+ "type": "null"+ }+ ]+ },+ "session": {+ "anyOf": [+ {+ "type": "string"+ },+ {+ "type": "null"+ }+ ]+ }+ },+ "required": [+ "avID",+ "blockID",+ "cells",+ "keyID",+ "preview"+ ],+ "additionalProperties": false+ },"CreateDocHistoryRequestInput": {"type": "object","properties": {@@ -26530,6 +26680,16 @@}]},+ "blockID": {+ "anyOf": [+ {+ "type": "string"+ },+ {+ "type": "null"+ }+ ]+ },"id": {"anyOf": [{@@ -26540,6 +26700,16 @@}]},+ "includeNewItemPreview": {+ "anyOf": [+ {+ "type": "boolean"+ },+ {+ "type": "null"+ }+ ]+ },"keyID": {"anyOf": [{@@ -124670,6 +124840,85 @@]}},+ {+ "method": "POST",+ "path": "/api/av/createAttributeViewRelationItem",+ "handler": "createAttributeViewRelationItem",+ "body": "json",+ "request": {+ "$ref": "#/$defs/CreateAttributeViewRelationItemRequestInput"+ },+ "response": {+ "anyOf": [+ {+ "type": "object",+ "properties": {+ "code": {+ "type": "integer",+ "enum": [+ 0+ ]+ },+ "data": {+ "$ref": "#/$defs/AVCreateItemResult"+ },+ "msg": {+ "type": "string"+ }+ },+ "required": [+ "code",+ "msg",+ "data"+ ],+ "additionalProperties": false+ },+ {+ "type": "object",+ "properties": {+ "code": {+ "type": "integer",+ "enum": [+ -1,+ 1+ ]+ },+ "data": {+ "anyOf": [+ {+ "type": "object",+ "properties": {+ "closeTimeout": {+ "type": "number"+ }+ },+ "required": [+ "closeTimeout"+ ],+ "additionalProperties": false+ },+ {+ "type": "null"+ },+ {+ "$ref": "#/$defs/AVCreateItemResult"+ }+ ]+ },+ "msg": {+ "type": "string"+ }+ },+ "required": [+ "code",+ "msg",+ "data"+ ],+ "additionalProperties": true+ }+ ]+ }+ },{"method": "POST","path": "/api/av/duplicateAttributeViewBlock",diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.goindex 8080ca165b..a1511f69a5 100644--- a/kernel/model/attribute_view.go+++ b/kernel/model/attribute_view.go@@ -2644,14 +2644,19 @@ func GetAttributeViewPrimaryKeyValues(avID, keyword string, blockIDs []string, preturn}-func GetAttributeViewRelationCandidates(srcAvID, relationKeyID, keyword string, selectedBlockIDs []string, page, pageSize int, candidateSort *av.ViewSort) (+func GetAttributeViewRelationCandidates(srcAvID, relationKeyID, keyword string, selectedBlockIDs []string, page, pageSize int, candidateSort *av.ViewSort, blockIDs ...string) (attributeViewName string, databaseBlockIDs []string, customColors []*av.AttributeViewCustomColor,columns []*av.TableColumn, selectedRows, rows []*av.TableRow,total int, err error,) {waitForSyncingStorages()- srcAttrView, err := av.ParseAttributeView(srcAvID)+ var srcAttrView *av.AttributeView+ if len(blockIDs) > 0 && blockIDs[0] != "" {+ srcAttrView, err = avParseView(srcAvID, blockIDs[0])+ } else {+ srcAttrView, err = av.ParseAttributeView(srcAvID)+ }if err != nil {logging.LogErrorf("parse attribute view [%s] failed: %s", srcAvID, err)return@@ -2665,7 +2670,12 @@ func GetAttributeViewRelationCandidates(srcAvID, relationKeyID, keyword string,return}if relationKey.Relation.AvID != srcAvID {- attrView, err = av.ParseAttributeView(relationKey.Relation.AvID)+ if len(blockIDs) > 0 && blockIDs[0] != "" {+ _, boxID := av.FindAttributeViewPath(srcAvID)+ attrView, err = av.ParseAttributeViewInBox(relationKey.Relation.AvID, boxID)+ } else {+ attrView, err = av.ParseAttributeView(relationKey.Relation.AvID)+ }}if err != nil {logging.LogErrorf("parse attribute view [%s] failed: %s", relationKey.Relation.AvID, err)diff --git a/kernel/model/attribute_view_automation.go b/kernel/model/attribute_view_automation.goindex ecc60bba05..550c40bd78 100644--- a/kernel/model/attribute_view_automation.go+++ b/kernel/model/attribute_view_automation.go@@ -97,7 +97,7 @@ func (tx *Transaction) prepareAttributeViewAutomations() error {}func (tx *Transaction) rememberAutomationView(view *av.AttributeView, blockID string) error {- if tx == nil || tx.attributeViewAutomations == nil {+ if tx == nil || (tx.attributeViewAutomations == nil && !tx.attributeViewItemCreation) {return nil}if view == nil {@@ -134,7 +134,7 @@ func (tx *Transaction) rememberAutomationView(view *av.AttributeView, blockID st// 文档仍由原事务提交;预先保存磁盘快照以补偿后续数据库动作或提交失败。func (tx *Transaction) rememberAutomationTree(tree *parse.Tree) error {- if tx.attributeViewAutomations == nil || tx.attributeViewRollback == nil ||+ if (tx.attributeViewAutomations == nil && !tx.attributeViewItemCreation) || tx.attributeViewRollback == nil ||tx.attributeViewRollback.trees[tree.ID] != nil {return nil}diff --git a/kernel/model/attribute_view_new_item.go b/kernel/model/attribute_view_new_item.goindex 4e2e4075a2..0cc42a549b 100644--- a/kernel/model/attribute_view_new_item.go+++ b/kernel/model/attribute_view_new_item.go@@ -79,7 +79,7 @@ type CreateAttributeViewItemDocsResult struct {// CreateAttributeViewItem 按指定模板创建一个数据库条目。templateID 为空时创建空白游离条目。func CreateAttributeViewItem(avID, blockID, viewID, templateID, previousID, groupID string, calendarDates ...*int64) (*CreateAttributeViewItemResult, error) {- return createAttributeViewItem(avID, blockID, viewID, templateID, previousID, groupID, nil, calendarDates...)+ return createAttributeViewItem(avID, blockID, viewID, templateID, previousID, groupID, nil, nil, calendarDates...)}// CreateAttributeViewItemWithMarkdown 按指定的文档类型模板创建数据库条目,并使用传入的 Markdown 创建绑定文档。@@ -88,16 +88,27 @@ func CreateAttributeViewItemWithMarkdown(avID, blockID, viewID, templateID, previf nil == document {return nil, errors.New("attribute view item markdown is nil")}- return createAttributeViewItem(avID, blockID, viewID, templateID, previousID, groupID, document)+ return createAttributeViewItem(avID, blockID, viewID, templateID, previousID, groupID, document, nil)+}++type attributeViewItemCreationOptions struct {+ templateTime time.Time+ primaryFallback string+ expectedPrimary string+ operations func(string) (do, undo []*Operation)}func createAttributeViewItem(avID, blockID, viewID, templateID, previousID, groupID string,- document *CreateAttributeViewItemMarkdown, calendarDates ...*int64) (*CreateAttributeViewItemResult, error) {+ document *CreateAttributeViewItemMarkdown, options *attributeViewItemCreationOptions, calendarDates ...*int64) (*CreateAttributeViewItemResult, error) {attrView, err := avParseView(avID, blockID)if nil != err {return nil, err}createdAt := time.Now()+ renderAt := createdAt+ if options != nil {+ renderAt = options.templateTime+ }itemTemplate := attrView.GetNewItemTemplate(templateID)var prunedOptions []*av.PrunedNewItemTemplateOptionif "" != templateID && nil == itemTemplate {@@ -118,13 +129,19 @@ func createAttributeViewItem(avID, blockID, viewID, templateID, previousID, groureturn nil, fmt.Errorf("new item template [%s] does not create a bound block", templateID)}primaryFallback := ""+ if options != nil {+ primaryFallback = options.primaryFallback+ }if nil != document {primaryFallback = document.Title}- preview, err := resolveAttributeViewNewItemTemplateWithFallback(blockID, itemTemplate, createdAt, primaryFallback)+ preview, err := resolveAttributeViewNewItemTemplateWithFallback(blockID, itemTemplate, renderAt, primaryFallback)if nil != err {return nil, err}+ if options != nil && preview.PrimaryKey != options.expectedPrimary {+ return nil, errors.New("new item template preview changed")+ }for _, prunedOption := range prunedOptions {if templateID == prunedOption.TemplateID {preview.Warnings = append(preview.Warnings, fmt.Sprintf(Conf.Language(353),@@ -141,7 +158,11 @@ func createAttributeViewItem(avID, blockID, viewID, templateID, previousID, groureturn nil, ErrBlockNotFound}itemID := ast.NewNodeID()- fieldValues, err := resolveNewItemFieldValues(attrView, itemTemplate, createdAt, dbTree.Box)+ var additionalDo, additionalUndo []*Operation+ if options != nil {+ additionalDo, additionalUndo = options.operations(itemID)+ }+ fieldValues, err := resolveNewItemFieldValues(attrView, itemTemplate, renderAt, dbTree.Box)if nil != err {return nil, err}@@ -186,17 +207,24 @@ func createAttributeViewItem(avID, blockID, viewID, templateID, previousID, grou})fieldOperations := buildNewItemFieldValueOperations(attrView, fieldValues, itemID, blockID)doOperations = append(doOperations, fieldOperations...)+ doOperations = append(doOperations, additionalDo...)doOperations = append(doOperations, &Operation{Action: "doUpdateUpdated", ID: blockID, Data: util.CurrentTimeSecondsStr()})- undoOperations := []*Operation{{Action: "removeAttrViewBlock", AvID: avID, BlockID: blockID, SrcIDs: []string{itemID}}}+ undoOperations := append(additionalUndo, &Operation{Action: "removeAttrViewBlock", AvID: avID, BlockID: blockID, SrcIDs: []string{itemID}})if nil != createdTree {undoOperations = append(undoOperations, &Operation{Action: "removeCreatedDoc", ID: boundBlockID, Tree: createdTree})}undoOperations = append(undoOperations, &Operation{Action: "doUpdateUpdated", ID: blockID, Data: dbNode.IALAttr("updated")})tx := &Transaction{DoOperations: doOperations, UndoOperations: undoOperations, Timestamp: createdAt.UnixMilli()}+ // 关联新建在没有启用自动化时也保留数据库和载体快照,覆盖联合写入失败后的恢复。+ tx.attributeViewItemCreation = options != niltx.MarkFromAPI()if err = PerformTxSync(tx); nil != err {- cleanupErr := removeAttributeViewBlock([]string{itemID}, avID, blockID, nil)+ // 事务回滚可能已经移除新条目,只有仍存在时才清理,避免再次改动恢复后的关联。+ current, cleanupErr := avParseView(avID, blockID)+ if cleanupErr == nil && current.GetBlockValue(itemID) != nil {+ cleanupErr = removeAttributeViewBlock([]string{itemID}, avID, blockID, nil)+ }if nil != createdTree {cleanupErr = errors.Join(cleanupErr, removeCreatedNewItemDoc(boundBlockID))}diff --git a/kernel/model/attribute_view_relation_item.go b/kernel/model/attribute_view_relation_item.gonew file mode 100644index 0000000000..52ba2a9b8c--- /dev/null+++ b/kernel/model/attribute_view_relation_item.go@@ -0,0 +1,150 @@+package model++import (+ "errors"+ "fmt"+ "slices"+ "time"++ "github.com/siyuan-note/siyuan/kernel/av"+ "github.com/siyuan-note/siyuan/kernel/treenode"+ "github.com/siyuan-note/siyuan/kernel/util"+)++// AttributeViewRelationItemPreview 固定本次模板解析时间,供关联面板预览并确认新条目名称。+type AttributeViewRelationItemPreview struct {+ TemplateID string+ PrimaryKey string+ CreatedAt int64+ Error string+}++// AttributeViewRelationItemCell 保留前端批量编辑合并后的已有关系,新条目在事务内追加。+type AttributeViewRelationItemCell struct {+ ItemID string+ RelatedItemIDs []string+}++func attributeViewRelationItemTarget(avID, blockID, keyID string) (source, target *av.AttributeView, targetBlockID string, err error) {+ source, err = avParseView(avID, blockID)+ if err != nil {+ return+ }+ key, _ := source.GetKey(keyID)+ if key == nil || key.Type != av.KeyTypeRelation || key.Relation == nil || key.Relation.AvID == "" {+ err = av.ErrKeyNotFound+ return+ }+ _, sourceBoxID := av.FindAttributeViewPath(avID)+ target, err = av.ParseAttributeViewInBox(key.Relation.AvID, sourceBoxID)+ if err != nil {+ return+ }+ _, targetBoxID := av.FindAttributeViewPath(target.ID)+ if !IsSameCryptoBoundary(sourceBoxID, targetBoxID) {+ err = errors.New(Conf.Language(381))+ return+ }+ for _, id := range treenode.GetMirrorAttrViewBlockIDs(target.ID) {+ node, tree, loadErr := getNodeByBlockID(nil, id)+ if loadErr == nil && node != nil && node.AttributeViewID == target.ID && IsSameCryptoBoundary(sourceBoxID, tree.Box) {+ targetBlockID = id+ return+ }+ }+ err = ErrBlockNotFound+ return+}++// PreviewAttributeViewRelationItem 仅解析目标数据库的默认模板,解析失败不阻断已有条目的选择。+func PreviewAttributeViewRelationItem(avID, blockID, keyID, keyword string) *AttributeViewRelationItemPreview {+ ret := &AttributeViewRelationItemPreview{CreatedAt: time.Now().UnixMilli()}+ _, target, targetBlockID, err := attributeViewRelationItemTarget(avID, blockID, keyID)+ if err == nil {+ ret.TemplateID = target.DefaultTemplateID+ itemTemplate := target.GetNewItemTemplate(ret.TemplateID)+ if ret.TemplateID != "" && itemTemplate == nil {+ err = fmt.Errorf("new item template [%s] not found", ret.TemplateID)+ } else {+ if itemTemplate == nil {+ itemTemplate = &av.NewItemTemplate{TargetType: av.NewItemTargetDetached}+ }+ var preview *NewItemTemplatePreview+ preview, err = resolveAttributeViewNewItemTemplateWithFallback(targetBlockID, itemTemplate,+ time.UnixMilli(ret.CreatedAt), keyword)+ if err == nil {+ ret.PrimaryKey = preview.PrimaryKey+ }+ }+ }+ if err != nil {+ ret.Error = err.Error()+ }+ return ret+}++// CreateAttributeViewRelationItem 将模板创建、来源单元格更新和双向关联放入同一个可撤销事务。+func CreateAttributeViewRelationItem(avID, blockID, keyID, keyword string, cells []*AttributeViewRelationItemCell,+ preview *AttributeViewRelationItemPreview) (*CreateAttributeViewItemResult, error) {+ if preview == nil || preview.Error != "" || len(cells) == 0 {+ return nil, errors.New("invalid relation item creation request")+ }+ createdAt := time.UnixMilli(preview.CreatedAt)+ if age := time.Since(createdAt); age < -time.Second || age > 5*time.Minute {+ return nil, errors.New("new item template preview expired")+ }+ source, target, targetBlockID, err := attributeViewRelationItemTarget(avID, blockID, keyID)+ if err != nil {+ return nil, err+ }+ if target.DefaultTemplateID != preview.TemplateID {+ return nil, errors.New("new item template preview changed")+ }+ sourceTree, err := LoadTreeByBlockID(blockID)+ if err != nil {+ return nil, err+ }+ if err = validateAttributeViewBinding(source.ID, sourceTree); err != nil {+ return nil, err+ }+ sourceNode := treenode.GetNodeInTree(sourceTree, blockID)+ if sourceNode == nil {+ return nil, ErrBlockNotFound+ }+ seen := map[string]bool{}+ var oldValues []*av.Value+ for _, cell := range cells {+ if cell == nil || source.GetBlockValue(cell.ItemID) == nil || seen[cell.ItemID] {+ return nil, av.ErrItemNotFound+ }+ seen[cell.ItemID] = true+ for _, id := range cell.RelatedItemIDs {+ if target.GetBlockValue(id) == nil {+ return nil, av.ErrItemNotFound+ }+ }+ oldValue := source.GetValue(keyID, cell.ItemID)+ if oldValue == nil {+ oldValue = &av.Value{Type: av.KeyTypeRelation, Relation: &av.ValueRelation{BlockIDs: []string{}}}+ }+ oldValues = append(oldValues, oldValue.Clone())+ }+ options := &attributeViewItemCreationOptions{+ templateTime: createdAt, primaryFallback: keyword, expectedPrimary: preview.PrimaryKey,+ operations: func(itemID string) (do, undo []*Operation) {+ for i, cell := range cells {+ value := &av.Value{Type: av.KeyTypeRelation, Relation: &av.ValueRelation{+ BlockIDs: append(slices.Clone(cell.RelatedItemIDs), itemID),+ }}+ do = append(do, &Operation{Action: "updateAttrViewCell", AvID: avID, BlockID: blockID,+ KeyID: keyID, RowID: cell.ItemID, Data: value})+ undo = append(undo, &Operation{Action: "updateAttrViewCell", AvID: avID, BlockID: blockID,+ KeyID: keyID, RowID: cell.ItemID, Data: oldValues[i]})+ }+ do = append(do, &Operation{Action: "doUpdateUpdated", ID: blockID, Data: util.CurrentTimeSecondsStr()})+ undo = append(undo, &Operation{Action: "doUpdateUpdated", ID: blockID, Data: sourceNode.IALAttr("updated")})+ return+ },+ }+ return createAttributeViewItem(target.ID, targetBlockID, "", preview.TemplateID, "", "", nil, options)+}diff --git a/kernel/model/attribute_view_relation_item_fts5_test.go b/kernel/model/attribute_view_relation_item_fts5_test.gonew file mode 100644index 0000000000..6ba9f833c6--- /dev/null+++ b/kernel/model/attribute_view_relation_item_fts5_test.go@@ -0,0 +1,239 @@+//go:build fts5++package model++import (+ "encoding/json"+ "slices"+ "testing"+ "time"++ "github.com/88250/lute/ast"+ "github.com/siyuan-note/siyuan/kernel/av"+ "github.com/siyuan-note/siyuan/kernel/filesys"+ "github.com/siyuan-note/siyuan/kernel/treenode"+)++type relationItemTestFixture struct {+ files *fileOperationTestFixture+ source, target *av.AttributeView+ sourceBlockID, targetBlockID, keyID, backKeyID, textKeyID string+ itemIDs []string+}++func setupRelationItemTest(t *testing.T, itemTemplate *av.NewItemTemplate) *relationItemTestFixture {+ t.Helper()+ files := setupTemplateDocTreeTransactionTest(t)+ database := addTemplateAttributeViewTestFixture(t, files, ast.NewNodeID())+ source, target := database.attrView, av.NewAttributeView(ast.NewNodeID())+ keyID, backKeyID, textKeyID := ast.NewNodeID(), ast.NewNodeID(), ast.NewNodeID()+ source.KeyValues = append(source.KeyValues, &av.KeyValues{Key: &av.Key{ID: keyID, Name: "Related", Type: av.KeyTypeRelation,+ Relation: &av.Relation{AvID: target.ID, IsTwoWay: true, BackKeyID: backKeyID}}})+ target.KeyValues = append(target.KeyValues,+ &av.KeyValues{Key: &av.Key{ID: backKeyID, Name: "Back", Type: av.KeyTypeRelation,+ Relation: &av.Relation{AvID: source.ID, IsTwoWay: true, BackKeyID: keyID}}},+ &av.KeyValues{Key: av.NewKey(textKeyID, "Default text", "", av.KeyTypeText)})+ itemIDs := []string{source.GetBlockKeyValues().Values[0].BlockID, ast.NewNodeID()}+ source.GetBlockKeyValues().Values = append(source.GetBlockKeyValues().Values, &av.Value{+ ID: ast.NewNodeID(), KeyID: source.GetBlockKey().ID, BlockID: itemIDs[1], Type: av.KeyTypeBlock,+ IsDetached: true, Block: &av.ValueBlock{Content: "Second source"}})+ for _, view := range source.Views {+ view.ItemIDs = append(view.ItemIDs, itemIDs[1])+ }+ if itemTemplate != nil {+ itemTemplate.ID = ast.NewNodeID()+ itemTemplate.Name = "Default"+ itemTemplate.FieldValues = map[string]*av.NewItemFieldValue{+ textKeyID: {Mode: av.NewItemFieldValueStatic, Value: &av.Value{Type: av.KeyTypeText, Text: &av.ValueText{Content: "Preset"}}},+ backKeyID: {Mode: av.NewItemFieldValueStatic, Value: &av.Value{Type: av.KeyTypeRelation,+ Relation: &av.ValueRelation{BlockIDs: []string{itemIDs[0]}}}},+ }+ if err := target.SetNewItemTemplates(&av.NewItemTemplatesConfig{Templates: []*av.NewItemTemplate{itemTemplate}, DefaultTemplateID: itemTemplate.ID}); err != nil {+ t.Fatal(err)+ }+ }+ for _, view := range []*av.AttributeView{source, target} {+ if err := av.SaveAttributeView(view); err != nil {+ t.Fatal(err)+ }+ }+ tree, err := LoadTreeByBlockID(files.targetID)+ if err != nil {+ t.Fatal(err)+ }+ for tree.Root.FirstChild != nil {+ tree.Root.FirstChild.Unlink()+ }+ node := &ast.Node{Type: ast.NodeAttributeView, ID: ast.NewNodeID(), AttributeViewID: target.ID,+ AttributeViewType: "table"}+ node.SetIALAttr("id", node.ID)+ node.SetIALAttr(av.NodeAttrView, target.Views[0].ID)+ tree.Root.AppendChild(node)+ if _, err = filesys.WriteTree(tree); err != nil {+ t.Fatal(err)+ }+ treenode.UpsertBlockTree(tree)+ av.BatchUpsertBlockRel([]*ast.Node{node})+ return &relationItemTestFixture{files: files, source: source, target: target,+ sourceBlockID: database.nodes[0].ID, targetBlockID: node.ID, keyID: keyID,+ backKeyID: backKeyID, textKeyID: textKeyID, itemIDs: itemIDs}+}++func TestAttributeViewRelationItemCreation(t *testing.T) {+ for _, test := range []struct {+ name, primary, keyword, want string+ target av.NewItemTargetType+ }{+ {"without template", "", "Task A", "Task A", ""},+ {"fallback", "", "Task A", "Task A", av.NewItemTargetDetached},+ {"primary takes precedence", "Task from template", "Task A", "Task from template", av.NewItemTargetDetached},+ {"empty search", "Task from template", "", "Task from template", av.NewItemTargetDetached},+ {"blank item", "", "", "", ""},+ {"document", "Task document", "Task A", "Task document", av.NewItemTargetDocument},+ } {+ t.Run(test.name, func(t *testing.T) {+ var template *av.NewItemTemplate+ if test.target != "" {+ template = &av.NewItemTemplate{TargetType: test.target, PrimaryKeyTemplate: test.primary, Icon: "1f600"}+ }+ fixture := setupRelationItemTest(t, template)+ preview := PreviewAttributeViewRelationItem(fixture.source.ID, fixture.sourceBlockID, fixture.keyID, test.keyword)+ if preview.Error != "" || preview.PrimaryKey != test.want {+ t.Fatalf("unexpected preview: %+v", preview)+ }+ cells := []*AttributeViewRelationItemCell{{ItemID: fixture.itemIDs[0]}, {ItemID: fixture.itemIDs[1]}}+ created, err := CreateAttributeViewRelationItem(fixture.source.ID, fixture.sourceBlockID, fixture.keyID, test.keyword, cells, preview)+ if err != nil || created.Content != test.want || created.IsDetached != (test.target != av.NewItemTargetDocument) {+ t.Fatalf("creation: %+v, %v", created, err)+ }+ assertCreated := func() {+ target := readAttributeViewItemsTest(t, fixture.target.ID)+ value := target.GetBlockValue(created.ItemID)+ if value == nil || value.Block.Content != test.want {+ t.Fatalf("missing created item: %+v", value)+ }+ if template != nil {+ if value.Block.Icon != "1f600" || target.GetValue(fixture.textKeyID, created.ItemID).Text.Content != "Preset" {+ t.Fatal("default template fields or icon were lost")+ }+ }+ source := readAttributeViewItemsTest(t, fixture.source.ID)+ for _, id := range fixture.itemIDs {+ assertContextFilterRelationIDs(t, source.GetValue(fixture.keyID, id), created.ItemID)+ }+ assertContextFilterRelationIDs(t, target.GetValue(fixture.backKeyID, created.ItemID), fixture.itemIDs...)+ }+ assertCreated()+ entry := GlobalUndoLog.Peek(fixture.files.sourceID)+ if entry == nil || len(entry.UndoOperationsForReplay()) == 0 {+ t.Fatal("relation creation is missing from the source document undo log")+ }+ if !created.IsDetached {+ block := treenode.GetBlockTree(created.BlockID)+ if block == nil || block.HPath != "/Target/"+test.want {+ t.Fatalf("document did not use the target database location: %+v", block)+ }+ }+ if err = PerformTxSync(&Transaction{DoOperations: entry.UndoOperationsForReplay(), isReplay: true}); err != nil {+ t.Fatal(err)+ }+ if readAttributeViewItemsTest(t, fixture.target.ID).GetBlockValue(created.ItemID) != nil {+ t.Fatal("undo retained created item")+ }+ for _, id := range fixture.itemIDs {+ value := readAttributeViewItemsTest(t, fixture.source.ID).GetValue(fixture.keyID, id)+ if value != nil && value.Relation != nil && len(value.Relation.BlockIDs) != 0 {+ t.Fatal("undo retained relation")+ }+ }+ if err = PerformTxSync(&Transaction{DoOperations: cloneOperations(created.Transaction.DoOperations), isReplay: true}); err != nil {+ t.Fatal(err)+ }+ assertCreated()+ })+ }+}++func TestAttributeViewRelationItemPreviewValidation(t *testing.T) {+ fixture := setupRelationItemTest(t, &av.NewItemTemplate{TargetType: av.NewItemTargetDetached,+ PrimaryKeyTemplate: `Task {{now | date "150405.000"}}`})+ preview := PreviewAttributeViewRelationItem(fixture.source.ID, fixture.sourceBlockID, fixture.keyID, "Search")+ preview.CreatedAt -= 1200+ preview.PrimaryKey = "Task " + time.UnixMilli(preview.CreatedAt).Format("150405.000")+ cells := []*AttributeViewRelationItemCell{{ItemID: fixture.itemIDs[0]}}+ before, _ := json.Marshal(fixture.target)+ for _, test := range []struct {+ name string+ change func(*AttributeViewRelationItemPreview)+ }{+ {"expired", func(p *AttributeViewRelationItemPreview) { p.CreatedAt -= int64((6 * time.Minute) / time.Millisecond) }},+ {"future", func(p *AttributeViewRelationItemPreview) { p.CreatedAt += int64(time.Minute / time.Millisecond) }},+ {"changed name", func(p *AttributeViewRelationItemPreview) { p.PrimaryKey = "Wrong" }},+ {"changed template", func(p *AttributeViewRelationItemPreview) { p.TemplateID = "missing" }},+ } {+ t.Run(test.name, func(t *testing.T) {+ p := *preview+ test.change(&p)+ if _, err := CreateAttributeViewRelationItem(fixture.source.ID, fixture.sourceBlockID, fixture.keyID, "Search", cells, &p); err == nil {+ t.Fatal("invalid preview accepted")+ }+ after, _ := json.Marshal(readAttributeViewItemsTest(t, fixture.target.ID))+ if string(before) != string(after) {+ t.Fatal("invalid preview changed target")+ }+ })+ }+ for _, invalid := range []*AttributeViewRelationItemCell{{ItemID: "missing"}, {ItemID: fixture.itemIDs[0], RelatedItemIDs: []string{"missing"}}} {+ if _, err := CreateAttributeViewRelationItem(fixture.source.ID, fixture.sourceBlockID, fixture.keyID, "Search", []*AttributeViewRelationItemCell{invalid}, preview); err == nil {+ t.Fatal("invalid source or related item accepted")+ }+ }+ created, err := CreateAttributeViewRelationItem(fixture.source.ID, fixture.sourceBlockID, fixture.keyID, "Search", cells, preview)+ if err != nil || created.Content != preview.PrimaryKey {+ t.Fatalf("preview time changed during creation: %+v %v", created, err)+ }+ if ids := readAttributeViewItemsTest(t, fixture.source.ID).GetValue(fixture.keyID, cells[0].ItemID).Relation.BlockIDs; !slices.Equal(ids, []string{created.ItemID}) {+ t.Fatalf("unexpected relation: %v", ids)+ }+}++func TestAttributeViewRelationItemPreservesExistingAndRollsBack(t *testing.T) {+ fixture := setupRelationItemTest(t, nil)+ cells := []*AttributeViewRelationItemCell{{ItemID: fixture.itemIDs[0]}}+ create := func(name string) *CreateAttributeViewItemResult {+ preview := PreviewAttributeViewRelationItem(fixture.source.ID, fixture.sourceBlockID, fixture.keyID, name)+ result, err := CreateAttributeViewRelationItem(fixture.source.ID, fixture.sourceBlockID, fixture.keyID, name, cells, preview)+ if err != nil {+ t.Fatal(err)+ }+ return result+ }+ first := create("Existing")+ cells[0].RelatedItemIDs = []string{first.ItemID}+ second := create("Another")+ assertContextFilterRelationIDs(t, readAttributeViewItemsTest(t, fixture.source.ID).GetValue(fixture.keyID, cells[0].ItemID), first.ItemID, second.ItemID)+ if err := PerformTxSync(&Transaction{DoOperations: cloneOperations(second.Transaction.UndoOperations), isReplay: true}); err != nil {+ t.Fatal(err)+ }+ assertContextFilterRelationIDs(t, readAttributeViewItemsTest(t, fixture.source.ID).GetValue(fixture.keyID, cells[0].ItemID), first.ItemID)+ sourceBefore, _ := json.Marshal(readAttributeViewItemsTest(t, fixture.source.ID))+ targetBefore, _ := json.Marshal(readAttributeViewItemsTest(t, fixture.target.ID))+ options := &attributeViewItemCreationOptions{templateTime: time.Now(), primaryFallback: "Failed", expectedPrimary: "Failed",+ operations: func(id string) (do, undo []*Operation) {+ return []*Operation{+ {Action: "updateAttrViewCell", AvID: fixture.source.ID, BlockID: fixture.sourceBlockID,+ KeyID: fixture.keyID, RowID: cells[0].ItemID, Data: &av.Value{Relation: &av.ValueRelation{BlockIDs: []string{id}}}},+ {Action: "updateAttrViewCell", AvID: fixture.source.ID, BlockID: fixture.sourceBlockID,+ KeyID: "missing", RowID: cells[0].ItemID, Data: &av.Value{}},+ }, nil+ },+ }+ if _, err := createAttributeViewItem(fixture.target.ID, fixture.targetBlockID, "", "", "", "", nil, options); err == nil {+ t.Fatal("injected transaction failure was accepted")+ }+ sourceAfter, _ := json.Marshal(readAttributeViewItemsTest(t, fixture.source.ID))+ targetAfter, _ := json.Marshal(readAttributeViewItemsTest(t, fixture.target.ID))+ if string(sourceBefore) != string(sourceAfter) || string(targetBefore) != string(targetAfter) {+ t.Fatalf("failed creation did not restore databases\nsource before=%s\nsource after=%s\ntarget before=%s\ntarget after=%s", sourceBefore, sourceAfter, targetBefore, targetAfter)+ }+}diff --git a/kernel/model/attribute_view_relation_item_sqlcipher_test.go b/kernel/model/attribute_view_relation_item_sqlcipher_test.gonew file mode 100644index 0000000000..3bbeb9ee56--- /dev/null+++ b/kernel/model/attribute_view_relation_item_sqlcipher_test.go@@ -0,0 +1,177 @@+//go:build fts5 && (sqlcipher || libsqlcipher)++package model++import (+ "bytes"+ "encoding/json"+ "os"+ "path/filepath"+ "testing"++ "github.com/88250/lute/ast"+ "github.com/88250/lute/parse"+ "github.com/siyuan-note/siyuan/kernel/av"+ "github.com/siyuan-note/siyuan/kernel/cache"+ "github.com/siyuan-note/siyuan/kernel/conf"+ "github.com/siyuan-note/siyuan/kernel/filesys"+ "github.com/siyuan-note/siyuan/kernel/sql"+ "github.com/siyuan-note/siyuan/kernel/treenode"+ "github.com/siyuan-note/siyuan/kernel/util"+)++func TestAttributeViewRelationItemEncrypted(t *testing.T) {+ fixture := setupRelationItemTest(t, &av.NewItemTemplate{TargetType: av.NewItemTargetDetached, PrimaryKeyTemplate: "Encrypted task"})+ boxID := fixture.files.box.ID+ var trees []*parse.Tree+ for _, id := range []string{fixture.files.sourceID, fixture.files.targetID} {+ tree, err := LoadTreeByBlockID(id)+ if err != nil {+ t.Fatal(err)+ }+ trees = append(trees, tree)+ }+ markRuntimeEncryptedBox(boxID)+ key := bytes.Repeat([]byte{0x64}, 32)+ setDEKForTest(boxID, key)+ boxConf := conf.NewBoxConf()+ boxConf.Encrypted = true+ boxConf.BoxCrypt = &conf.BoxEncryption{Spec: boxEncryptionSpec}+ if err := encryptBoxMetadata(boxID, boxConf, key); err != nil {+ t.Fatal(err)+ }+ config, err := json.Marshal(boxConf)+ if err != nil {+ t.Fatal(err)+ }+ if err = os.WriteFile(filepath.Join(util.DataDir, boxID, ".siyuan", "conf.json"), config, 0600); err != nil {+ t.Fatal(err)+ }+ mountedEncryptedBoxes.Store(boxID, true)+ if err = treenode.OpenEncryptedBlockTreeDB(boxID, key); err != nil {+ t.Fatal(err)+ }+ if err = sql.OpenEncryptedDB(boxID, key); err != nil {+ t.Fatal(err)+ }+ t.Cleanup(func() {+ sql.CloseEncryptedDB(boxID)+ treenode.CloseEncryptedBlockTreeDB(boxID)+ mountedEncryptedBoxes.Delete(boxID)+ forgetRuntimeEncryptedBox(boxID)+ encryptedBoxLifecycles.Delete(boxID)+ cachedDEKsLock.Lock()+ delete(cachedDEKs, boxID)+ cachedDEKsLock.Unlock()+ for _, view := range []*av.AttributeView{fixture.source, fixture.target} {+ av.SetAVBoxID(view.ID, "")+ }+ })+ for _, view := range []*av.AttributeView{fixture.source, fixture.target} {+ av.SetAVBoxID(view.ID, boxID)+ }+ for _, tree := range trees {+ if _, err = filesys.WriteTree(tree); err != nil {+ t.Fatal(err)+ }+ treenode.UpsertBlockTree(tree)+ var nodes []*ast.Node+ for child := tree.Root.FirstChild; child != nil; child = child.Next {+ if child.Type == ast.NodeAttributeView {+ nodes = append(nodes, child)+ }+ }+ av.BatchUpsertBlockRel(nodes)+ }+ for _, view := range []*av.AttributeView{fixture.source, fixture.target} {+ av.SetAVBoxID(view.ID, boxID)+ if err = av.SaveAttributeView(view); err != nil {+ t.Fatal(err)+ }+ if err = os.Remove(filepath.Join(util.DataDir, "storage", "av", view.ID+".json")); err != nil {+ t.Fatal(err)+ }+ }+ preview := PreviewAttributeViewRelationItem(fixture.source.ID, fixture.sourceBlockID, fixture.keyID, "Input")+ if preview.Error != "" || preview.PrimaryKey != "Encrypted task" {+ t.Fatalf("encrypted preview: %+v", preview)+ }+ cells := []*AttributeViewRelationItemCell{{ItemID: fixture.itemIDs[0]}}+ created, err := CreateAttributeViewRelationItem(fixture.source.ID, fixture.sourceBlockID, fixture.keyID, "Input", cells, preview)+ if err != nil {+ t.Fatal(err)+ }+ for _, operations := range [][]*Operation{created.Transaction.UndoOperations, created.Transaction.DoOperations} {+ if err = PerformTxSync(&Transaction{DoOperations: cloneOperations(operations), isReplay: true}); err != nil {+ t.Fatal(err)+ }+ }+ _, _, _, _, _, candidates, total, err := GetAttributeViewRelationCandidates(fixture.source.ID, fixture.keyID, "", nil, 1, 16, nil, fixture.sourceBlockID)+ if err != nil || total != 1 || len(candidates) != 1 || candidates[0].ID != created.ItemID {+ t.Fatalf("encrypted candidates lost source context: total=%d, err=%v", total, err)+ }+ paths := map[string][]byte{}+ for _, view := range []*av.AttributeView{fixture.source, fixture.target} {+ path := filepath.Join(util.DataDir, boxID, "storage", "av", view.ID+".json")+ ciphertext, err := os.ReadFile(path)+ if err != nil || !util.IsCiphertext(ciphertext) {+ t.Fatalf("plaintext relation item: %v", err)+ }+ paths[path] = ciphertext+ if _, err = os.Stat(filepath.Join(util.DataDir, "storage", "av", view.ID+".json")); !os.IsNotExist(err) {+ t.Fatal("encrypted relation created a plaintext database")+ }+ }+ // 普通载体不得借助已解锁笔记本的全局映射读取加密数据库。+ plainBoxID, plainDocID := ast.NewNodeID(), ast.NewNodeID()+ if err = os.MkdirAll(filepath.Join(util.DataDir, plainBoxID, ".siyuan"), 0755); err != nil {+ t.Fatal(err)+ }+ if err = os.WriteFile(filepath.Join(util.DataDir, plainBoxID, ".siyuan", "conf.json"), []byte(`{}`), 0600); err != nil {+ t.Fatal(err)+ }+ plain := treenode.NewTree(plainBoxID, "/"+plainDocID+".sy", "/Plain", "Plain")+ if _, err = filesys.WriteTree(plain); err != nil {+ t.Fatal(err)+ }+ treenode.UpsertBlockTree(plain)+ if _, _, _, _, _, _, _, err = GetAttributeViewRelationCandidates(fixture.source.ID, fixture.keyID, "", nil, 1, 16, nil, plainDocID); err == nil {+ t.Fatal("ordinary carrier exposed encrypted candidates")+ }+ av.SetAVBoxID(fixture.source.ID, boxID)+ for path, before := range paths {+ after, readErr := os.ReadFile(path)+ if readErr != nil || !bytes.Equal(before, after) {+ t.Fatal("rejected carrier changed ciphertext")+ }+ }+ for _, failure := range []string{"locked", "corrupted"} {+ t.Run(failure, func(t *testing.T) {+ if failure == "locked" {+ cachedDEKsLock.Lock()+ delete(cachedDEKs, boxID)+ cachedDEKsLock.Unlock()+ defer setDEKForTest(boxID, key)+ } else {+ path := filepath.Join(util.DataDir, boxID, "storage", "av", fixture.target.ID+".json")+ paths[path][len(paths[path])-1] ^= 1+ if err = os.WriteFile(path, paths[path], 0600); err != nil {+ t.Fatal(err)+ }+ }+ cache.ClearAVCache()+ if p := PreviewAttributeViewRelationItem(fixture.source.ID, fixture.sourceBlockID, fixture.keyID, "Input"); p.Error == "" {+ t.Fatal("inaccessible encrypted preview succeeded")+ }+ if _, err = CreateAttributeViewRelationItem(fixture.source.ID, fixture.sourceBlockID, fixture.keyID, "Input", cells, preview); err == nil {+ t.Fatal("inaccessible encrypted creation succeeded")+ }+ for path, before := range paths {+ after, readErr := os.ReadFile(path)+ if readErr != nil || !bytes.Equal(before, after) {+ t.Fatal("failed encrypted creation changed ciphertext")+ }+ }+ })+ }+}diff --git a/kernel/model/transaction.go b/kernel/model/transaction.goindex 4a1bee4b4b..57c7a08ff3 100644--- a/kernel/model/transaction.go+++ b/kernel/model/transaction.go@@ -2712,6 +2712,7 @@ type Transaction struct {blockSwapOriginalTrees []*parse.TreeattributeViewRollback *attributeViewRollbackattributeViewAutomations *attributeViewAutomationState+ attributeViewItemCreation boolinvalidatedAvHistory map[string]boolfromAPI bool // 是否来自 /api/transactions HTTP 入口(用于撤销日志捕获判别)@@ -3029,6 +3030,7 @@ func (tx *Transaction) releaseCommittedResources() {tx.removeCreatedDoc, tx.writeTransactionTree = nil, niltx.luteEngine = niltx.attributeViewAutomations = nil+ tx.attributeViewItemCreation = false}func (tx *Transaction) rollback() {