An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作
TypeScript agentic-aiai-agentknowledge-baselocal-firstmarkdownmcpmindmapnote-takingself-hostedsiyuanworkspace
:art: Align unplaced map menu with calendar layout https://github.com/siyuan-note/siyuan/issues/20129
Daniel21f9838caabe
diff --git a/app/src/assets/scss/business/_av.scss b/app/src/assets/scss/business/_av.scssindex ef45223088..26306e4b35 100644--- a/app/src/assets/scss/business/_av.scss+++ b/app/src/assets/scss/business/_av.scss@@ -1,3 +1,5 @@+@use "../component/record-inbox";+.av__map {width: 100%;min-width: 0;@@ -35,10 +37,20 @@gap: 4px 12px;}-.av__map-unplaced-search {- width: min(320px, 75vw);- max-width: 100%;- margin: 4px 0;+.av__map-unplaced-menu {+ @include record-inbox.header-search("av__map-unplaced", 8px);++ &:not(.b3-menu--fullscreen) {+ width: min(320px, 75vw);+ }++ &.b3-menu--fullscreen {+ .av__map-unplaced-head,+ .av__map-unplaced-search {+ padding-left: 0;+ padding-right: 0;+ }+ }}.av__map-status:empty,diff --git a/app/src/assets/scss/component/_record-inbox.scss b/app/src/assets/scss/component/_record-inbox.scssindex ded24ab5fc..4e47ba04ce 100644--- a/app/src/assets/scss/component/_record-inbox.scss+++ b/app/src/assets/scss/component/_record-inbox.scss@@ -1,9 +1,9 @@-// 日历无日期列表和可信地图菜单共享同一组内容布局。-@mixin content($prefix, $list-max-height: min(45vh, 360px)) {+// 日历和地图条目列表共享标题与搜索布局,内边距可适配外层菜单。+@mixin header-search($prefix, $inset: 16px) {.#{$prefix}-head {display: flex;align-items: center;- padding: 0 16px 8px;+ padding: 0 $inset 8px;.b3-menu__label {min-width: 0;@@ -16,13 +16,18 @@display: flex;min-width: 0;margin-bottom: 8px;- padding: 0 16px;+ padding: 0 $inset;.b3-text-field {flex: 1;min-width: 0;}}+}++// 日历无日期列表和可信地图菜单共享同一组内容布局。+@mixin content($prefix, $list-max-height: min(45vh, 360px)) {+ @include header-search($prefix);.#{$prefix}-hint {padding: 0 16px;diff --git a/app/src/protyle/render/av/map/unplaced.test.ts b/app/src/protyle/render/av/map/unplaced.test.tsindex db0841a352..c1429169a9 100644--- a/app/src/protyle/render/av/map/unplaced.test.ts+++ b/app/src/protyle/render/av/map/unplaced.test.ts@@ -73,7 +73,7 @@ const setup = (mobile = false, nativeReady = false) => {const menus: MenuStub[] = [];class MenuStub {items: Array<{option: IMenu; element: ElementStub}> = [];- element = {querySelector: () => count};+ element = Object.assign(new ElementStub(), {querySelector: () => count});position: IPosition;closed = false;constructor(_id?: string, private closeCB?: () => void) { menus.push(this); }@@ -397,6 +397,26 @@ test("mobile unplaced menu uses shared menu placement without forcing a softwarescenario.destroy();});+test("DOM inbox layout belongs to the open menu and preserves the flat search and row keyboard structure", async () => {+ for (const mobile of [false, true]) {+ const scenario = setup(mobile);+ scenario.click();+ await scenario.respond(1, [row("entry")]);+ const menu = scenario.menus[0];+ assert.ok(menu.element.classes.has("av__map-unplaced-menu"));+ const header = menu.active()[0];+ assert.equal(header.option.type, "empty");+ assert.ok(header.option.label.includes("av__map-unplaced-head"));+ assert.ok(header.option.label.includes("av__map-unplaced-search"));+ assert.ok(header.option.label.includes(mobile ? "counter--compact" : "counter--bg"));+ assert.equal(menu.active()[1].option.label, "<Title entry>");+ scenario.enter("<Title entry>");+ assert.equal(scenario.opens[0].row.id, "entry");+ assert.equal(menu.element.classes.has("av__map-unplaced-menu"), false);+ scenario.destroy();+ }+});+test("ready desktop host uses the real unplaced API and sends only the current page of text to the native menu", async () => {const scenario = setup(false, true);scenario.click();diff --git a/app/src/protyle/render/av/map/unplaced.ts b/app/src/protyle/render/av/map/unplaced.tsindex d63d884975..c2b46df59a 100644--- a/app/src/protyle/render/av/map/unplaced.ts+++ b/app/src/protyle/render/av/map/unplaced.ts@@ -90,7 +90,10 @@ export const bindMapUnplaced = (options: {};const addItem = (item: IMenu) => {const element = menu.addItem(item);- if (element) elements.push(element);+ if (element) {+ element.querySelector(".b3-menu__label")?.classList.add("fn__ellipsis");+ elements.push(element);+ }};const resetPosition = () => window.siyuan.menus.menu.resetPosition();const renderRows = (more = true) => {@@ -264,20 +267,22 @@ export const bindMapUnplaced = (options: {request?.abort();releaseMenu?.();releaseMenu = undefined;+ menu.element.classList.remove("av__map-unplaced-menu");menu = undefined;toggle.setAttribute("aria-expanded", "false");});+ menu.element.classList.add("av__map-unplaced-menu");if (!isMobile() && canvas) releaseMenu = registerMapUnplacedMenu(menu.element, canvas);rows = [];page = 0;total = 0;search = "";elements = [];- menu.addItem({type: "readonly", iconHTML: "", label: `${escapeHtml(window.siyuan.languages.mapUnplaced)} <span class="counter fn__none" data-map-unplaced-count></span>`});- count = menu.element.querySelector<HTMLElement>("[data-map-unplaced-count]");let input: HTMLInputElement;- menu.addItem({type: "empty", label: `<div class="av__map-unplaced-search"><input type="search" ${Constants.ATTRIBUTE_MENU_KEYMAP}="true" class="b3-text-field fn__block" aria-label="${escapeAttr(window.siyuan.languages.search)}" placeholder="${escapeAttr(window.siyuan.languages.searchPlaceholder)}"></div>`,+ menu.addItem({type: "empty", label: `<div class="av__map-unplaced-head"><span class="b3-menu__label">${escapeHtml(window.siyuan.languages.mapUnplaced)}</span><span class="counter ${isMobile() ? "counter--compact" : "counter--bg"} fn__none" data-map-unplaced-count></span></div>+<div class="av__map-unplaced-search"><input type="search" ${Constants.ATTRIBUTE_MENU_KEYMAP}="true" class="b3-text-field" aria-label="${escapeAttr(window.siyuan.languages.search)}" placeholder="${escapeAttr(window.siyuan.languages.searchPlaceholder)}"></div>`,bind: element => { input = element.querySelector("input"); }});+ count = menu.element.querySelector<HTMLElement>("[data-map-unplaced-count]");const searchRows = () => {request?.abort();clearTimeout(searchTimer);