`
+ let html = "";
+ response.data.results.forEach((item: {
+ avID: string
+ avName: string
+ blockID: string
+ hPath: string
+ }, index: number) => {
+ html += `
+
`
});
- element.lastElementChild.innerHTML = html;
+ element.innerHTML = html;
+ if (cb) {
+ cb()
+ }
})
}
-export const openSearchAV = () => {
+const setDatabase = (element: HTMLElement, item: HTMLElement) => {
+ element.dataset.avId = item.dataset.avId;
+ element.dataset.blockId = item.dataset.blockId;
+ element.querySelector(".b3-menu__accelerator").textContent = item.querySelector(".b3-list-item__hinticon").classList.contains("fn__none") ? item.querySelector(".b3-list-item__text").textContent : window.siyuan.languages.thisDatabase
+}
+
+export const openSearchAV = (avId: string, target: HTMLElement) => {
window.siyuan.menus.menu.remove();
const menu = new Menu();
menu.addItem({
iconHTML: "",
- type: "readonly",
+ type: "empty",
label: `
+
+
+
+ ${escapeHtml(item.avName || window.siyuan.languages.title)}
+
+
+
-
-
- type?: "separator" | "submenu" | "readonly",
+ type?: "separator" | "submenu" | "readonly" | "empty",
accelerator?: string,
action?: string,
id?: string,
diff --git a/app/src/util/escape.ts b/app/src/util/escape.ts
index b1a413ebb..c8e52b575 100644
--- a/app/src/util/escape.ts
+++ b/app/src/util/escape.ts
@@ -1,4 +1,7 @@
export const escapeHtml = (html: string) => {
+ if (!html) {
+ return html;
+ }
return html.replace(/&/g, "&").replace(/
+
+
+
`,
@@ -36,54 +57,56 @@ export const openSearchAV = () => {
if (event.isComposing) {
return;
}
- const isEmpty = element.querySelector(".b3-list--empty");
- if (!isEmpty) {
- const currentElement = upDownHint(listElement, event);
- if (currentElement) {
- event.stopPropagation();
- }
+ const currentElement = upDownHint(listElement, event);
+ if (currentElement) {
+ event.stopPropagation();
}
-
if (event.key === "Enter") {
- if (!isEmpty) {
- const currentURL = element.querySelector(".b3-list-item--focus").getAttribute("data-value");
-
- } else {
- window.siyuan.menus.menu.remove();
- // focusByRange(protyle.toolbar.range);
- }
- // 空行处插入 mp3 会多一个空的 mp3 块
event.preventDefault();
event.stopPropagation();
+ setDatabase(target, listElement.querySelector(".b3-list-item--focus"));
+ window.siyuan.menus.menu.remove();
}
});
inputElement.addEventListener("input", (event) => {
event.stopPropagation();
- genSearchList(element, inputElement.value);
+ genSearchList(listElement, inputElement.value, avId);
});
element.lastElementChild.addEventListener("click", (event) => {
- const target = event.target as HTMLElement;
- const previousElement = hasClosestByAttribute(target, "data-type", "previous");
- if (previousElement) {
- inputElement.dispatchEvent(new KeyboardEvent("keydown", {key: "ArrowUp"}));
- event.stopPropagation();
- return;
- }
- const nextElement = hasClosestByAttribute(target, "data-type", "next");
- if (nextElement) {
- inputElement.dispatchEvent(new KeyboardEvent("keydown", {key: "ArrowDown"}));
- event.stopPropagation();
- return;
- }
- const listItemElement = hasClosestByClassName(target, "b3-list-item");
+ const listItemElement = hasClosestByClassName(event.target as HTMLElement, "b3-list-item");
if (listItemElement) {
event.stopPropagation();
- const currentURL = listItemElement.getAttribute("data-value");
- // hintRenderAssets(currentURL, protyle);
+ setDatabase(target, listItemElement)
window.siyuan.menus.menu.remove();
}
});
- genSearchList(element, "");
+ genSearchList(listElement, "", avId, () => {
+ const rect = target.getBoundingClientRect();
+ menu.open({
+ x: rect.left,
+ y: rect.bottom,
+ h: rect.height,
+ })
+ element.querySelector("input").focus();
+ });
}
});
+ menu.element.querySelector(".b3-menu__items").setAttribute("style", "overflow: initial");
+}
+
+export const updateRelation = (options: {
+ protyle: IProtyle,
+ avID: string,
+ avElement: Element
+}) => {
+ transaction(options.protyle, [{
+ action: "updateAttrViewColRelation",
+ avID: options.avID,
+ id: options.avElement.querySelector('.b3-menu__item[data-type="goSearchAV"]').getAttribute("data-av-id"),
+ keyID: options.avElement.querySelector(".b3-menu__item").getAttribute("data-col-id"), // 源 av 关联列 ID
+ backRelationKeyID: Lute.NewNodeID(), // 双向关联的目标关联列 ID
+ isTwoWay: (options.avElement.querySelector(".b3-switch") as HTMLInputElement).checked,
+ name: (options.avElement.querySelector('input[data-type="colName"]') as HTMLInputElement).value,
+ }], []);
+ options.avElement.remove();
}
diff --git a/app/src/protyle/wysiwyg/transaction.ts b/app/src/protyle/wysiwyg/transaction.ts
index ed92196af..8c1ac0fd1 100644
--- a/app/src/protyle/wysiwyg/transaction.ts
+++ b/app/src/protyle/wysiwyg/transaction.ts
@@ -724,7 +724,7 @@ export const onTransaction = (protyle: IProtyle, operation: IOperation, isUndo:
"setAttrViewSorts", "setAttrViewColCalc", "removeAttrViewCol", "updateAttrViewColNumberFormat", "removeAttrViewBlock",
"replaceAttrViewBlock", "updateAttrViewColTemplate", "setAttrViewColPin", "addAttrViewView",
"removeAttrViewView", "setAttrViewViewName", "setAttrViewViewIcon", "duplicateAttrViewView", "sortAttrViewView",
- "setAttrViewPageSize"].includes(operation.action)) {
+ "updateAttrViewColRelation", "setAttrViewPageSize"].includes(operation.action)) {
refreshAV(protyle, operation, isUndo);
} else if (operation.action === "doUpdateUpdated") {
updateElements.forEach(item => {
diff --git a/app/src/types/index.d.ts b/app/src/types/index.d.ts
index ce7e3a76a..473b64482 100644
--- a/app/src/types/index.d.ts
+++ b/app/src/types/index.d.ts
@@ -49,6 +49,7 @@ type TOperation =
| "duplicateAttrViewView"
| "sortAttrViewView"
| "setAttrViewPageSize"
+ | "updateAttrViewColRelation"
type TBazaarType = "templates" | "icons" | "widgets" | "themes" | "plugins"
type TCardType = "doc" | "notebook" | "all"
type TEventBus = "ws-main" | "sync-start" | "sync-end" | "sync-fail" |
@@ -439,6 +440,8 @@ interface IScrollAttr {
interface IOperation {
action: TOperation, // move， delete 不需要传 data
id?: string,
+ isTwoWay?: boolean, // 是否双向关联
+ backRelationKeyID?: string, // 双向关联的目标关联列 ID
avID?: string, // av
format?: string // updateAttrViewColNumberFormat 专享
keyID?: string // updateAttrViewCell 专享
@@ -981,7 +984,7 @@ interface IMenu {
iconClass?: string,
label?: string,
click?: (element: HTMLElement, event: MouseEvent) => boolean | void | Promise