An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作
TypeScript agentic-aiai-agentknowledge-baselocal-firstmarkdownmcpmindmapnote-takingself-hostedsiyuanworkspace
:bug: Fix database filter layout and dropdown dismissal
Daniel7cc1be4bb9fc
diff --git a/app/src/assets/scss/business/_av.scss b/app/src/assets/scss/business/_av.scssindex 794e9c1c63..8f2ccb782c 100644--- a/app/src/assets/scss/business/_av.scss+++ b/app/src/assets/scss/business/_av.scss@@ -3056,6 +3056,18 @@ img.av__cellassetimg {display: contents;}+ .av__field-wrapper {+ width: 128px;+ max-width: 100%;+ min-width: 0;+ }++ .b3-select {+ max-width: 100%;+ }+}++.av__panel .av__conditional-colors {.av__filter-date-config {order: 1;flex-basis: 100%;@@ -3066,15 +3078,15 @@ img.av__cellassetimg {flex-basis: 100%;min-width: 0;}+}- .av__field-wrapper {- width: 128px;- max-width: 100%;- min-width: 0;- }+.av__panel .av__automation-filter {+ flex: 0 1 auto;+ min-width: 0;- .b3-select {- max-width: 100%;+ .av__filter-value {+ flex-basis: auto;+ min-width: 0;}}@@ -3118,6 +3130,16 @@ img.av__cellassetimg {min-width: 0;}+ [data-conditions] {+ display: flex;+ flex-direction: column;+ gap: 12px;+ }++ [data-conditions]:not(:empty) + [data-add-condition] {+ margin-top: 12px;+ }+&-row {display: flex;align-items: center;@@ -3131,6 +3153,16 @@ img.av__cellassetimg {}}+ &-row[data-condition] {+ flex-wrap: nowrap;+ align-items: flex-start;++ > .b3-menu__action {+ align-self: flex-start;+ margin-top: 3px;+ }+ }+&-action,&-field {display: flex;diff --git a/app/src/protyle/render/av/automation.test.ts b/app/src/protyle/render/av/automation.test.tsindex e6ac37cf9d..d1488fd63c 100644--- a/app/src/protyle/render/av/automation.test.ts+++ b/app/src/protyle/render/av/automation.test.ts@@ -1,4 +1,5 @@import * as capabilities from "./capabilities";+import * as filterDropdown from "./filterDropdown";import * as assert from "node:assert/strict";import {readFileSync} from "node:fs";import {test} from "node:test";@@ -43,10 +44,10 @@ test("automation settings autosave changes with independent undo snapshots and klet returned = 0;let resized = 0;let menuVisible = false;- let captureClick: () => void;+ let captureClick: (event: {target: {closest: () => HTMLElement}}) => void;const classes = new Set(["b3-menu--fullscreen", "b3-menu--sheet"]);const menu = {innerHTML: "", classList: {add: (name: string) => classes.add(name), remove: (name: string) => classes.delete(name)},- addEventListener: (_type: string, listener: () => void, capture: boolean) => {+ addEventListener: (_type: string, listener: typeof captureClick, capture: boolean) => {assert.equal(capture, true);captureClick = listener;},@@ -71,6 +72,7 @@ test("automation settings autosave changes with independent undo snapshots and kaddItem() {}open() { menuVisible = true; }}},+ "./filterDropdown": filterDropdown,"../../../util/escape": {escapeAttr: String, escapeHtml: String},"../../../util/fetch": {fetchSyncPost: async (_path: string, request: {id: string}) => ({code: 0, data: {av: request.id === "source" ? database : destination}})},"../../wysiwyg/transaction": {transaction: (_protyle: IProtyle, perform: IOperation[], undo: IOperation[]) => {@@ -89,10 +91,10 @@ test("automation settings autosave changes with independent undo snapshots and kassert.ok(resized >= 2);const addField = {dataset: {action: "add-field"}, closest: () => ({dataset: {index: "0"}}),getBoundingClientRect: () => ({left: 0, bottom: 0, height: 20})};- captureClick();+ captureClick({target: {closest: () => null}});listeners.get("click")({target: {closest: () => addField}});assert.equal(menuVisible, true);- captureClick();+ captureClick({target: {closest: () => null}});listeners.get("click")({target: {closest: (): HTMLElement => null}});assert.equal(menuVisible, false);assert.equal(transactions.length, 0);@@ -123,7 +125,7 @@ test("automation settings autosave changes with independent undo snapshots and kassert.deepEqual(JSON.parse(JSON.stringify(transactions[3].perform[0].data)).rules[1], otherRule);panel.isConnected = false;menuVisible = true;- captureClick();+ captureClick({target: {closest: () => null}});assert.equal(menuVisible, true);assert.equal(returned, 0);});diff --git a/app/src/protyle/render/av/automation.ts b/app/src/protyle/render/av/automation.tsindex 30dfb95b0f..3b6cd45ee4 100644--- a/app/src/protyle/render/av/automation.ts+++ b/app/src/protyle/render/av/automation.ts@@ -5,6 +5,7 @@ import {escapeAttr, escapeHtml} from "../../../util/escape";import {fetchSyncPost} from "../../../util/fetch";import {transaction} from "../../wysiwyg/transaction";import {bindInlineFilterEvents, genEmptyFilterValue, getFiltersHTML} from "./filter";+import {closeInlineFilterDropdowns} from "./filterDropdown";import {bindFieldLunarDates, genFieldValue, getRelationOptions, getSelectedOptionsHTML, getValueInputHTML, openFieldRelationMenu, openFieldSelectMenu, renderRelationFieldValue, openFieldLocationEditor} from "./fieldValueEditor";import {createAVLocationReplacement} from "./locationValue";import {openSearchAV} from "./relation";@@ -70,12 +71,13 @@ export const openAutomationMenu = async (options: {const panel = menuElement.querySelector<HTMLElement>(".av__automation");const body = panel.querySelector<HTMLElement>("[data-body]");// 先收起已打开的选项菜单,再由本次点击打开新菜单,避免冒泡被面板拦截后菜单滞留。- const closeMenu = () => {+ const closeMenu = (event: MouseEvent) => {if (!panel.isConnected) {menuElement.removeEventListener("click", closeMenu, true);return;}window.siyuan.menus.menu.remove();+ closeInlineFilterDropdowns(body, event.target as HTMLElement);};menuElement.addEventListener("click", closeMenu, true);const goBack = () => {diff --git a/app/src/protyle/render/av/conditionalColorMenu.test.ts b/app/src/protyle/render/av/conditionalColorMenu.test.tsindex 9e5398c27f..8b0f8c716c 100644--- a/app/src/protyle/render/av/conditionalColorMenu.test.ts+++ b/app/src/protyle/render/av/conditionalColorMenu.test.ts@@ -5,6 +5,7 @@ import {test} from "node:test";import {runInNewContext} from "node:vm";import {ModuleKind, ScriptTarget, transpileModule} from "typescript";import {moveConditionalColorRule} from "./conditionalColor";+import * as filterDropdown from "./filterDropdown";test("returning from the color menu during field loading does not restore or bind a detached panel", async () => {let finishLoading: () => void;@@ -51,7 +52,7 @@ test("rule menus dismiss outside dropdowns, preserve selections, and support draconst target = {dataset: {ruleId: "c"}, getBoundingClientRect: () => ({top: 100, height: 40})};const filterRoot = {};const option = {};- const dropdown = {style: {display: "block"}, contains: (element: unknown) => element === option,+ const dropdown = {dataset: {path: "0"}, style: {display: "block"}, contains: (element: unknown) => element === option,closest: () => filterRoot};const root = {innerHTML: "", contains: (element: unknown) => element === source || element === target,@@ -70,6 +71,7 @@ test("rule menus dismiss outside dropdowns, preserve selections, and support draexports: methods, window,require: (name: string) => name === "./capabilities" || name === "../capabilities" ? capabilities : (({"./filter": {prepareFilterColumns: async () => {}},+ "./filterDropdown": filterDropdown,"./view": {getFieldsByData: () => [{id: "text", type: "text"}]},"../../../util/escape": {escapeAttr: String},"./conditionalColor": {getConditionalBackground: () => "", moveConditionalColorRule},@@ -100,9 +102,9 @@ test("rule menus dismiss outside dropdowns, preserve selections, and support draObject.assign(option, {closest: (): HTMLElement => null});dismiss({target: option});assert.equal(dropdown.style.display, "block");- dismiss({target: {closest: () => ({closest: () => filterRoot})}});+ dismiss({target: {closest: () => ({dataset: {path: "0"}, closest: () => filterRoot})}});assert.equal(dropdown.style.display, "block");- dismiss({target: {closest: () => ({closest: () => ({})})}});+ dismiss({target: {closest: () => ({dataset: {path: "0"}, closest: () => ({})})}});assert.equal(dropdown.style.display, "none");const event = {target: {closest: () => target}, clientY: 139, preventDefault() {}, stopPropagation() {}};listeners.get("drop")(event);diff --git a/app/src/protyle/render/av/conditionalColorMenu.ts b/app/src/protyle/render/av/conditionalColorMenu.tsindex 7f7b7285b4..f62b59e8fb 100644--- a/app/src/protyle/render/av/conditionalColorMenu.ts+++ b/app/src/protyle/render/av/conditionalColorMenu.ts@@ -4,6 +4,7 @@ import {escapeAttr, escapeHtml} from "../../../util/escape";import {transaction} from "../../wysiwyg/transaction";import {getFieldsByData} from "./view";import {bindInlineFilterEvents, genEmptyFilterValue, getFiltersHTML, prepareFilterColumns} from "./filter";+import {closeInlineFilterDropdowns} from "./filterDropdown";import {AV_MANAGE_CUSTOM_COLORS_TYPE, getAVColorGridHTML, getAVColorOrder, getAVCustomColors} from "./color";import {getConditionalBackground, moveConditionalColorRule} from "./conditionalColor";import {openAVCustomColorDialog} from "./colorDialog";@@ -103,21 +104,7 @@ ${data.viewType === "table" || rule.target === "property" ? `<select class="b3-smenuElement.removeEventListener("click", closeDropdowns, true);return;}- const target = event.target as HTMLElement;- const dropdownTypes = [- ["selectDropdown", '[data-type="selectTrigger"]'],- ["relationFilterDropdown", '[data-type="relationFilterTrigger"]'],- ["relList", '[data-type-rel="relation"]'],- ];- dropdownTypes.forEach(([type, triggerSelector]) => {- const trigger = target.closest(triggerSelector);- root.querySelectorAll<HTMLElement>(`[data-type="${type}"]`).forEach(dropdown => {- if (!dropdown.contains(target) &&- (!trigger || trigger.closest("[data-filter]") !== dropdown.closest("[data-filter]"))) {- dropdown.style.display = "none";- }- });- });+ closeInlineFilterDropdowns(root, event.target as HTMLElement);};menuElement.addEventListener("click", closeDropdowns, true);panelElement.addEventListener("change", event => {diff --git a/app/src/protyle/render/av/filter.ts b/app/src/protyle/render/av/filter.tsindex 488b5161a7..419fd8d690 100644--- a/app/src/protyle/render/av/filter.ts+++ b/app/src/protyle/render/av/filter.ts@@ -13,6 +13,7 @@ import {Constants} from "../../../constants";import {countFilterLeaves} from "./filterTree";import {getAVColorStyle} from "./color";import {setFilterSelectPosition} from "./selectPosition";+import {closeInlineFilterDropdowns} from "./filterDropdown";interface FilterEditorOptions {action?: IAVFilterOperation["action"];@@ -1303,28 +1304,13 @@ export const bindInlineFilterEvents = (panelElement: HTMLElement, data: IAV, proevent.stopImmediatePropagation();});- // 点击面板空白处收起所有 select 下拉+ // 点击条件外部时收起下拉,保持当前触发器的切换行为和下拉内部操作。panelElement.addEventListener("click", (event: MouseEvent) => {const target = event.target as HTMLElement;if (target.closest('[data-filter-events-bound="true"]') !== panelElement) {return;}- if (!target.closest('[data-type="selectTrigger"]') && !target.closest('[data-type="selectDropdown"]')) {- menuElement.querySelectorAll('[data-type="selectDropdown"]').forEach((el: HTMLElement) => {- el.style.display = "none";- });- }- if (!target.closest('[data-type="relationFilterTrigger"]') &&- !target.closest('[data-type="relationFilterDropdown"]')) {- menuElement.querySelectorAll('[data-type="relationFilterDropdown"]').forEach((el: HTMLElement) => {- el.style.display = "none";- });- }- if (!target.closest('[data-type-rel="relation"]') && !target.closest('[data-type="relList"]')) {- menuElement.querySelectorAll('[data-type="relList"]').forEach((el: HTMLElement) => {- el.style.display = "none";- });- }+ closeInlineFilterDropdowns(menuElement, target);}, true);// select 搜索过滤@@ -1360,7 +1346,7 @@ export const bindInlineFilterEvents = (panelElement: HTMLElement, data: IAV, proid: colData.relation.avID,keyword,}, response => {- if ((target as HTMLInputElement).value !== keyword) {+ if (!target.isConnected || document.activeElement !== target || (target as HTMLInputElement).value !== keyword) {return;}const row = getRow(target);diff --git a/app/src/protyle/render/av/filterDropdown.test.ts b/app/src/protyle/render/av/filterDropdown.test.tsnew file mode 100644index 0000000000..765c223aaf--- /dev/null+++ b/app/src/protyle/render/av/filterDropdown.test.ts@@ -0,0 +1,43 @@+import * as assert from "node:assert/strict";+import {test} from "node:test";+import {closeInlineFilterDropdowns} from "./filterDropdown";++test("inline dropdown dismissal isolates editors and paths and preserves internal interaction", () => {+ for (const [type, selector] of [+ ["selectDropdown", '[data-type="selectTrigger"]'],+ ["relationFilterDropdown", '[data-type="relationFilterTrigger"]'],+ ["relList", '[data-type-rel="relation"]'],+ ]) {+ const firstEditor = {};+ const secondEditor = {};+ const makeDropdown = (editor: object, path: string) => ({+ dataset: {path, selected: '["kept"]'}, style: {display: "block"},+ contains: (target: object) => target === inside,+ closest: () => editor,+ });+ const inside = {};+ const dropdown = makeDropdown(firstEditor, "0");+ const sibling = {...makeDropdown(firstEditor, "1"), contains: () => false};+ const foreign = {...makeDropdown(secondEditor, "0"), contains: () => false};+ const dropdowns = [dropdown, sibling, foreign];+ const root = {querySelectorAll: (query: string) => query === `[data-type="${type}"]` ? dropdowns : []};+ const click = (target: object) => closeInlineFilterDropdowns(root as unknown as HTMLElement, target as HTMLElement);+ const trigger = (editor: object, path: string) => ({closest: (query: string) => query === selector ? {+ dataset: {path}, closest: () => editor,+ } : null});+ const reset = () => dropdowns.forEach(item => { item.style.display = "block"; });+ click(trigger(firstEditor, "0"));+ assert.equal(dropdown.style.display, "block", `${type}: leave trigger toggling to its editor`);+ assert.equal(sibling.style.display, "none", `${type}: close another path in the same editor`);+ assert.equal(foreign.style.display, "none", `${type}: close the same path in another editor`);+ reset();+ Object.assign(inside, {closest: (): null => null});+ click(inside);+ assert.equal(dropdown.style.display, "block", `${type}: keep internal choices and search open`);+ assert.equal(foreign.style.display, "none");+ reset();+ click({closest: (): null => null});+ assert.ok(dropdowns.every(item => item.style.display === "none"), `${type}: close on blank areas`);+ assert.ok(dropdowns.every(item => item.dataset.selected === '["kept"]'), `${type}: dismissal preserves selections`);+ }+});diff --git a/app/src/protyle/render/av/filterDropdown.ts b/app/src/protyle/render/av/filterDropdown.tsnew file mode 100644index 0000000000..659e4160e8--- /dev/null+++ b/app/src/protyle/render/av/filterDropdown.ts@@ -0,0 +1,19 @@+// 按编辑器和路径识别触发器,点击下拉内容或原触发器时保留,其余下拉统一收起。+export const closeInlineFilterDropdowns = (root: HTMLElement, target: HTMLElement) => {+ const dropdownTypes = [+ ["selectDropdown", '[data-type="selectTrigger"]'],+ ["relationFilterDropdown", '[data-type="relationFilterTrigger"]'],+ ["relList", '[data-type-rel="relation"]'],+ ];+ dropdownTypes.forEach(([type, triggerSelector]) => {+ const trigger = target.closest<HTMLElement>(triggerSelector);+ root.querySelectorAll<HTMLElement>(`[data-type="${type}"]`).forEach(dropdown => {+ const sameTrigger = trigger && trigger.dataset.path === dropdown.dataset.path &&+ trigger.closest('[data-filter-events-bound="true"]') ===+ dropdown.closest('[data-filter-events-bound="true"]');+ if (!dropdown.contains(target) && !sameTrigger) {+ dropdown.style.display = "none";+ }+ });+ });+};diff --git a/app/src/protyle/render/av/filterRelationRollup.test.ts b/app/src/protyle/render/av/filterRelationRollup.test.tsindex aada781686..633e95eda5 100644--- a/app/src/protyle/render/av/filterRelationRollup.test.ts+++ b/app/src/protyle/render/av/filterRelationRollup.test.ts@@ -1,4 +1,5 @@import * as capabilities from "./capabilities";+import * as filterDropdown from "./filterDropdown";import * as assert from "node:assert/strict";import {readFileSync} from "node:fs";import {test} from "node:test";@@ -19,6 +20,7 @@ const createEditor = () => {document: {createElement: () => ({style: {}, offsetWidth: 10}), body: {appendChild() {}, removeChild() {}}},require: (name: string) => name === "./capabilities" || name === "../capabilities" ? capabilities : (({"./view": {getFieldsByData: () => fields},+ "./filterDropdown": filterDropdown,"./col": {getColIconByType: () => "iconDatabase"},"../../../util/escape": {escapeAttr: String, escapeHtml: String},"../../../constants": {Constants: {}},diff --git a/app/tests/automationPanel.test.js b/app/tests/automationPanel.test.jsindex 890f72c99c..58b7f81eb9 100644--- a/app/tests/automationPanel.test.js+++ b/app/tests/automationPanel.test.js@@ -24,25 +24,33 @@ const runCases = async (sources, css, mobile) => {const currentCondition = {column: "status", operator: "=", value: {type: "select", mSelect: [{content: "Done"}]}};const database = {id: "source", name: "Tasks", keyValues: [{key: {id: "status", name: "Status", type: "select", options: [{name: "Done"}]}},+ {key: {id: "tags", name: "Tags", type: "mSelect", options: [{name: "Work"}]}},{key: {id: "finished", name: "Completion time", type: "date"}},+ {key: {id: "number", name: "Number", type: "number"}},+ {key: {id: "text", name: "Text", type: "text"}},{key: {id: "relation", name: "Time logs", type: "relation", relation: {avID: "target"}}},], automations: {spec: 1, rules: [{id: "rule", name: "Record completion time", enabled: false, trigger: "changed", keyID: "status",conditions: [currentCondition], actions: [{type: "edit", target: "current", fields: {finished: {mode: "currentTime"}}}]}]}};const targetDatabase = {...database, id: "target", name: "Time logs"};const transactions = [];+ const searches = [];let fieldMenu;let nextID = 0;window.Lute = {NewNodeID: () => `generated-${++nextID}`};- window.siyuan = {languages: lang, config: {}, notebooks: [], menus: {menu: {remove() {}}}};+ window.siyuan = {languages: lang, config: {}, notebooks: [], zIndex: 0, menus: {menu: {remove() {}}}};const mocks = {"plugin/Menu": {Menu: class {items = []; addItem(item) {this.items.push(item);} open() {fieldMenu = {items: this.items};}}},"util/fetch": {fetchSyncPost: async (url, request) => url.includes("getHPathByID") ? {code: 0, data: "/Tasks"} :- {code: 0, data: {av: request.id === "source" ? database : targetDatabase}}},+ {code: 0, data: {av: request.id === "source" ? database : targetDatabase}},+ fetchPost: (_url, _request, callback) => searches.push(() => callback({code: 0, data: {rows: {values: [+ {blockID: "related", block: {content: "Related"}},+ ]}}}))},"protyle/wysiwyg/transaction": {transaction: (_protyle, perform, undo) => transactions.push(structuredClone({perform, undo}))},"protyle/render/av/view": {getFieldsByData: data => data.view.columns},"protyle/render/av/col": {getColIconByType: () => "iconDatabase"},"protyle/render/av/color": {getAVColorStyle: () => ""},- "protyle/render/av/cell": {getCellValueText: value => value.text?.content || ""},+ "protyle/render/av/cell": {getCellValueText: value => value.text?.content || "",+ genCellValue: (type, value) => ({type, mSelect: value})},"protyle/render/av/relation": {openSearchAV: options => options.callback({dataset: {avId: "target"}})},};const cache = {};@@ -78,6 +86,111 @@ const runCases = async (sources, css, mobile) => {assert.equal(get("[data-status]").textContent, lang.automationReady);assert.equal(transactions.length, 0, "opening settings must preserve the stored rule");const originalConditions = structuredClone(database.automations.rules[0].conditions);+ await click('[data-source-conditions] [data-type="selectTrigger"]');+ assert.notEqual(get('[data-source-conditions] [data-type="selectDropdown"]').style.display, "none");+ await click(".av__automation-section");+ assert.equal(get('[data-source-conditions] [data-type="selectDropdown"]').style.display, "none",+ "clicking outside a condition dismisses its dropdown");+ await click('[data-source-conditions] [data-type="selectTrigger"]');+ await click('[data-source-conditions] [data-type="selectDropdown"]');+ assert.notEqual(get('[data-source-conditions] [data-type="selectDropdown"]').style.display, "none",+ "internal interaction does not dismiss the dropdown");+ await click('[data-source-conditions] [data-type="selectTrigger"]');+ assert.equal(get('[data-source-conditions] [data-type="selectDropdown"]').style.display, "none",+ "clicking the same trigger still toggles the dropdown closed");+ await click("[data-source-conditions] [data-add-condition]");+ fieldMenu.items.find(item => item.label === "Tags").click();+ await tick();+ await click('[data-column="tags"] [data-type="selectTrigger"]');+ await click('[data-column="tags"] [data-type="selectOption"]');+ assert.equal(latest().conditions[1].value.mSelect[0].content, "Work");+ assert.notEqual(get('[data-column="tags"] [data-type="selectDropdown"]').style.display, "none",+ "selecting an option keeps the dropdown open for further choices");+ await click('[data-column="status"] [data-type="selectTrigger"]');+ assert.equal(get('[data-column="tags"] [data-type="selectDropdown"]').style.display, "none",+ "opening another condition closes the previous dropdown even when paths match");+ await click('[data-column="tags"] [data-type="selectTrigger"]');+ assert.equal(get('[data-column="status"] [data-type="selectDropdown"]').style.display, "none");+ await click(".av__automation-section");+ assert.equal(get('[data-column="tags"] [data-type="selectDropdown"]').style.display, "none");+ await click('[data-source-conditions] [data-condition="1"] [data-action="remove-condition"]');+ await click("[data-source-conditions] [data-add-condition]");+ fieldMenu.items.find(item => item.label === "Time logs").click();+ await tick();+ await change('[data-column="relation"] [data-type="operation"]', "Contains any item");+ await click('[data-column="relation"] [data-type="relationFilterTrigger"]');+ assert.notEqual(get('[data-column="relation"] [data-type="relationFilterDropdown"]').style.display, "none");+ await click(".av__automation-section");+ searches.splice(0).forEach(finish => finish());+ assert.equal(get('[data-column="relation"] [data-type="relationFilterDropdown"]').style.display, "none",+ "late relation results do not reopen a dismissed dropdown");+ await change('[data-column="relation"] [data-type="operation"]', "Contains");+ const keywordInput = get('[data-column="relation"] [data-type-rel="relation"]');+ keywordInput.focus();+ keywordInput.value = "Related";+ keywordInput.dispatchEvent(new Event("input", {bubbles: true}));+ keywordInput.blur();+ await click(".av__automation-section");+ searches.splice(0).forEach(finish => finish());+ assert.equal(menu.querySelector('[data-type="relList"]'), null, "late keyword results do not recreate a dismissed candidate list");+ keywordInput.focus();+ keywordInput.dispatchEvent(new Event("input", {bubbles: true}));+ searches.splice(0).forEach(finish => finish());+ assert.equal(get('[data-type="relList"]').style.display, "block");+ keywordInput.blur();+ await click(".av__automation-section");+ assert.equal(get('[data-type="relList"]').style.display, "none");+ await click('[data-source-conditions] [data-condition="1"] [data-action="remove-condition"]');+ assert.deepEqual(latest().conditions, originalConditions);+ await click("[data-source-conditions] [data-add-condition]");+ fieldMenu.items.find(item => item.label === "Number").click();+ await tick();+ const numberCondition = get('[data-source-conditions] [data-column="number"]');+ const fieldRect = numberCondition.querySelector(".av__field-wrapper").getBoundingClientRect();+ const operatorRect = numberCondition.querySelector('[data-type="operation"]').getBoundingClientRect();+ const valueRect = numberCondition.querySelector('[data-type="filterValue"]').getBoundingClientRect();+ const removeRect = numberCondition.closest("[data-condition]").querySelector('[data-action="remove-condition"]').getBoundingClientRect();+ assert.ok(Math.abs(fieldRect.top - operatorRect.top) <= 1, "field and operator stay aligned");+ assert.ok(Math.abs(fieldRect.top - valueRect.top) <= 1, "a short number condition stays on one line");+ assert.ok(removeRect.left - valueRect.right <= 16, `removal stays beside the condition value: ${removeRect.left - valueRect.right}`);+ await click("[data-source-conditions] [data-add-condition]");+ fieldMenu.items.find(item => item.label === "Text").click();+ await tick();+ const numberRow = get('[data-source-conditions] [data-condition="1"]');+ const textRow = get('[data-source-conditions] [data-condition="2"]');+ const sourceAddButton = get("[data-source-conditions] [data-add-condition]");+ assert.ok(textRow.getBoundingClientRect().top - numberRow.getBoundingClientRect().bottom >= 8, "conditions have visible spacing");+ assert.ok(sourceAddButton.getBoundingClientRect().top - textRow.getBoundingClientRect().bottom >= 8, "the add button is separated from existing conditions");+ await click("[data-source-conditions] [data-add-condition]");+ fieldMenu.items.find(item => item.label === "Completion time").click();+ await tick();+ await require("electron").ipcRenderer.invoke("automation-size", mobile ? 360 : 560, 900);+ const conditionTheme = document.createElement("style");+ document.head.append(conditionTheme);+ for (const name of ["daylight", "midnight"]) {+ conditionTheme.textContent = sources[name];+ get("[data-source-conditions]").scrollIntoView({block: "center"});+ await tick();+ const currentNumber = get('[data-source-conditions] [data-column="number"]');+ const currentText = get('[data-source-conditions] [data-column="text"]');+ const numberField = currentNumber.querySelector(".av__field-wrapper").getBoundingClientRect();+ const numberValue = currentNumber.querySelector('[data-type="filterValue"]').getBoundingClientRect();+ assert.ok(Math.abs(numberField.top - numberValue.top) <= 1, "a short condition also fits on narrow screens");+ assert.ok(currentText.querySelector('[data-type="filterValue"]').clientWidth >= 48, "wrapped text values keep usable input space");+ for (const row of get("[data-source-conditions]").querySelectorAll("[data-condition]")) {+ assert.ok(row.scrollWidth <= row.clientWidth + 1, "conditions do not overflow");+ const field = row.querySelector(".av__field-wrapper").getBoundingClientRect();+ const remove = row.querySelector('[data-action="remove-condition"]').getBoundingClientRect();+ assert.ok(remove.top >= field.top && remove.bottom <= field.bottom + 1,+ `removal stays with the first line of a wrapped condition: ${JSON.stringify({field, remove})}`);+ }+ await require("electron").ipcRenderer.invoke("automation-capture", `${mobile ? "mobile" : "desktop"}-${mobile ? 360 : 560}-${name}-conditions`);+ }+ conditionTheme.remove();+ await click('[data-source-conditions] [data-condition="3"] [data-action="remove-condition"]');+ await click('[data-source-conditions] [data-condition="2"] [data-action="remove-condition"]');+ await click('[data-source-conditions] [data-condition="1"] [data-action="remove-condition"]');+ assert.deepEqual(latest().conditions, originalConditions);await change("[data-target]", "related");await change("[data-relation]", "relation");assert.equal(get("[data-status]").classList.contains("ft__error"), true);@@ -93,6 +206,16 @@ const runCases = async (sources, css, mobile) => {await tick();assert.equal(latest().actions[0].filters[0].column, "finished");assert.deepEqual(latest().conditions, originalConditions);+ await click("[data-target-filters] [data-add-condition]");+ fieldMenu.items.find(item => item.label === "Status").click();+ await tick();+ await click('[data-target-filters] [data-type="selectTrigger"]');+ assert.notEqual(get('[data-target-filters] [data-type="selectDropdown"]').style.display, "none");+ await click('[data-source-conditions] [data-type="selectTrigger"]');+ assert.equal(get('[data-target-filters] [data-type="selectDropdown"]').style.display, "none",+ "source and target conditions do not retain each other's dropdowns");+ await click(".av__automation-section");+ await click('[data-target-filters] [data-condition="1"] [data-action="remove-condition"]');await click('[data-target-filters] [data-action="remove-condition"]');assert.equal(latest().actions[0].filters.length, 0);assert.deepEqual(latest().conditions, originalConditions);@@ -165,7 +288,7 @@ if (process.versions.electron && process.type === "browser") {ipcMain.handle("automation-size", (_event, width, height) => win.setContentSize(width, height));ipcMain.handle("automation-capture", async (_event, name) => {if (!process.env.SIYUAN_AUTOMATION_CAPTURE_DIR) return;- assert.match(name, /^(desktop|mobile)-\d+-(daylight|midnight)(-actions)?$/);+ assert.match(name, /^(desktop|mobile)-\d+-(daylight|midnight)(-actions|-conditions)?$/);win.webContents.invalidate();await new Promise(resolve => setTimeout(resolve, 150));fs.writeFileSync(path.join(process.env.SIYUAN_AUTOMATION_CAPTURE_DIR, name + ".png"), (await win.webContents.capturePage()).toPNG());@@ -174,7 +297,7 @@ if (process.versions.electron && process.type === "browser") {const sass = require("sass");const sources = {icons: fs.readFileSync(path.join(__dirname, "../appearance/icons/litheness/icon.js"), "utf8"),languages: JSON.parse(fs.readFileSync(path.join(__dirname, "../appearance/langs/zh-CN.json"), "utf8"))};- for (const name of ["automation", "capabilities", "capabilities.generated", "filter", "filterTree", "fieldValueEditor", "blockCollection"]) {+ for (const name of ["automation", "capabilities", "capabilities.generated", "filter", "filterTree", "fieldValueEditor", "blockCollection", "selectPosition", "filterDropdown"]) {sources[`protyle/render/av/${name}`] = ts.transpileModule(fs.readFileSync(path.join(__dirname, `../src/protyle/render/av/${name}.ts`), "utf8"), {compilerOptions: {module: ts.ModuleKind.CommonJS, target: ts.ScriptTarget.ES2022},}).outputText;