Merge remote-tracking branch 'origin/dev' into dev

Vanessa219 · Vanessa219 · commit 983d7ac97a4a · 2026-06-22T21:26:59.000+08:00
diff --git a/app/src/assets/scss/business/_av.scss b/app/src/assets/scss/business/_av.scss
@@ -1012,6 +1012,11 @@
         margin-left: 4px;
       }
 
+      // “添加筛选条件”按钮：label 按内容宽度，使下拉箭头紧跟文案而非被推到最右
+      .av__filter-add-label {
+        flex: none;
+      }
+
       &__item[data-type="nobg"] {
         cursor: auto;
       }
diff --git a/app/src/block/popover.ts b/app/src/block/popover.ts
@@ -1,7 +1,7 @@
 import {BlockPanel} from "./Panel";
 import {hasClosestBlock, hasClosestByAttribute, hasClosestByClassName,} from "../protyle/util/hasClosest";
 import {fetchPost, fetchSyncPost} from "../util/fetch";
-import {hideTooltip, showTooltip} from "../dialog/tooltip";
+import {hideTooltip, showTooltip, tooltipTargetElement} from "../dialog/tooltip";
 import {getIdFromSYProtocol, isLocalPath} from "../util/pathName";
 import {App} from "../index";
 import {Constants} from "../constants";
@@ -213,9 +213,11 @@ export const initBlockPopover = (app: App) => {
             const tipElement = hasClosestByAttribute(event.target, "id", "tooltip", true);
             if (!tipElement) {
                 hideTooltip();
+            } else if (tooltipTargetElement && !tooltipTargetElement.contains(event.target)) {
+                // 鼠标在 #tooltip 上但已离开触发元素范围，正常隐藏
+                // 仍在触发元素范围内时不隐藏，避免 showTooltip ↔ hideTooltip 循环闪烁
+                hideTooltip();
             }
-            // 鼠标仍在 #tooltip 上时不主动隐藏，避免 showTooltip ↔ hideTooltip 循环闪烁；
-            // 待鼠标移到非 tooltip 处再由上面的分支隐藏
         }
         if (window.siyuan.config.editor.floatWindowMode === 1 || window.siyuan.shiftIsPressed) {
             clearTimeout(timeoutHide);
diff --git a/app/src/dialog/tooltip.ts b/app/src/dialog/tooltip.ts
@@ -1,5 +1,8 @@
 import {isMobile} from "../util/functions";
 
+// 记录当前 tooltip 对应的触发元素，便于判断鼠标是否已离开触发区域
+export let tooltipTargetElement: Element | null = null;
+
 export const showTooltip = (
     message: string,
     target: Element,
@@ -10,6 +13,7 @@ export const showTooltip = (
     if (isMobile() || !message) {
         return;
     }
+    tooltipTargetElement = target;
     let targetRect = target.getBoundingClientRect();
     // 跨行元素
     const clientRects = Array.from(target.getClientRects());
@@ -128,5 +132,6 @@ export const showTooltip = (
 };
 
 export const hideTooltip = () => {
+    tooltipTargetElement = null;
     document.getElementById("tooltip").classList.add("fn__none");
 };
diff --git a/app/src/protyle/render/av/col.ts b/app/src/protyle/render/av/col.ts
@@ -847,42 +847,26 @@ export const showColMenu = (protyle: IProtyle, blockElement: Element, cellElemen
                     id: avID,
                 }, (response) => {
                     const avData = response.data as IAV;
-                    let filter: IAVFilter;
-                    // 递归在过滤树中查找该列已存在的叶子
-                    const findFilter = (nodes: IAVFilter[]): IAVFilter => {
-                        for (const n of nodes) {
-                            if (n.filters) {
-                                const found = findFilter(n.filters);
-                                if (found) return found;
-                            } else if (n.column === colId && n.value.type === type) {
-                                return n;
-                            }
-                        }
-                        return undefined;
+                    // 始终新建一个占位条件（允许同列多条件，支持“主键包含111 OR 主键包含222”等组合）
+                    const filter: IAVFilter = {
+                        column: colId,
+                        operator: getDefaultOperatorByType(type),
+                        value: genCellValue(type, ""),
                     };
-                    filter = findFilter(getEditableFilters(avData));
-                    if (!filter) {
-                        // 新建占位条件并保存，随后打开筛选面板 inline 编辑
-                        filter = {
-                            column: colId,
-                            operator: getDefaultOperatorByType(type),
-                            value: genCellValue(type, ""),
-                        };
-                        // 深拷贝旧值用于 undo，撤销时恢复完整筛选状态而非清空全部
-                        const oldFilters = JSON.parse(JSON.stringify(avData.view.filters));
-                        getEditableFilters(avData).push(filter);
-                        transaction(protyle, [{
-                            action: "setAttrViewFilters",
-                            avID,
-                            data: avData.view.filters,
-                            blockID: blockElement.getAttribute("data-node-id")
-                        }], [{
-                            action: "setAttrViewFilters",
-                            avID,
-                            data: oldFilters,
-                            blockID: blockElement.getAttribute("data-node-id")
-                        }]);
-                    }
+                    // 深拷贝旧值用于 undo，撤销时恢复完整筛选状态而非清空全部
+                    const oldFilters = JSON.parse(JSON.stringify(avData.view.filters));
+                    getEditableFilters(avData).push(filter);
+                    transaction(protyle, [{
+                        action: "setAttrViewFilters",
+                        avID,
+                        data: avData.view.filters,
+                        blockID: blockElement.getAttribute("data-node-id")
+                    }], [{
+                        action: "setAttrViewFilters",
+                        avID,
+                        data: oldFilters,
+                        blockID: blockElement.getAttribute("data-node-id")
+                    }]);
                     // 打开筛选面板，用户在内联控件中编辑（替代原 setFilter 弹层）
                     openMenuPanel({
                         protyle,
diff --git a/app/src/protyle/render/av/filter.ts b/app/src/protyle/render/av/filter.ts
@@ -150,23 +150,17 @@ export const addFilter = (options: {
     parentPath?: string
 }) => {
     const menu = new Menu(Constants.MENU_AV_ADD_FILTER);
-    // 仅在目标分组内查重：同一分组内不重复添加同列叶子，但不同分组允许同列（嵌套的核心价值，如 状态=完成 OR 状态=进行中）
+    // 定位目标分组：支持向指定分组内追加，同分组允许同列多条件（如 状态=完成 OR 状态=进行中）
     let targetGroupFilters: IAVFilter[];
     if (options.parentPath && options.parentPath !== "") {
         const node = getFilterByPath(getRootFilters(options.data), options.parentPath);
         targetGroupFilters = node && node.filters ? node.filters : getEditableFilters(options.data);
     } else {
         targetGroupFilters = getEditableFilters(options.data);
     }
-    const usedColumns = new Set<string>();
-    targetGroupFilters.forEach(n => {
-        if (!n.filters && n.column) {
-            usedColumns.add(n.column);
-        }
-    });
     getFieldsByData(options.data).forEach((column) => {
-        // 该列是行号类型列，或目标分组内已有该列叶子，则不重复添加
-        if (column.type !== "lineNumber" && !usedColumns.has(column.id)) {
+        // 行号类型列不可筛选
+        if (column.type !== "lineNumber") {
             menu.addItem({
                 label: column.name,
                 iconHTML: column.icon ? unicode2Emoji(column.icon, "b3-menu__icon", true) : `<svg class="b3-menu__icon"><use xlink:href="#${getColIconByType(column.type)}"></use></svg>`,
@@ -308,7 +302,7 @@ export const getFiltersHTML = (data: IAV) => {
 ${html}
 <button class="b3-menu__item" data-type="addFilterCondition" data-path="" data-depth="0">
     <svg class="b3-menu__icon"><use xlink:href="#iconAdd"></use></svg>
-    <span class="b3-menu__label fn__flex-shrink">${window.siyuan.languages.addFilterCondition}</span>
+    <span class="b3-menu__label av__filter-add-label">${window.siyuan.languages.addFilterCondition}</span>
     <svg class="av__filter-arrow"><use xlink:href="#iconDown"></use></svg>
 </button>
 <button class="b3-menu__item b3-menu__item--warning${leafCount > 0 ? "" : " fn__none"}" data-type="removeFilters">
diff --git a/app/src/protyle/render/av/openMenuPanel.ts b/app/src/protyle/render/av/openMenuPanel.ts
@@ -484,7 +484,8 @@ export const openMenuPanel = (options: {
                         data: JSON.parse(JSON.stringify(data.view.filters)),
                         blockID
                     }]);
-                    data.view.filters = [];
+                    // 本地状态保持“顶层单个空根组”不变量（后端会同样归一化），避免后续 addFilterGroup 误把新分组当成根组
+                    data.view.filters = [{combination: "and", filters: []}];
                     menuElement.innerHTML = getFiltersHTML(data);
                     setPosition(menuElement, tabRect.right - menuElement.clientWidth, tabRect.bottom, tabRect.height);
                     window.siyuan.menus.menu.remove();
diff --git a/app/src/protyle/util/editorCommonEvent.ts b/app/src/protyle/util/editorCommonEvent.ts
diff --git a/app/src/protyle/util/onGet.ts b/app/src/protyle/util/onGet.ts

Original file line number	Diff line number	Diff line change
`@@ -1012,6 +1012,11 @@`
`1012`	`1012`	`margin-left: 4px;`
`1013`	`1013`	`}`
`1014`	`1014`
	`1015`	`+ // “添加筛选条件”按钮：label 按内容宽度，使下拉箭头紧跟文案而非被推到最右`
	`1016`	`+ .av__filter-add-label {`
	`1017`	`+ flex: none;`
	`1018`	`+ }`
	`1019`	`+`
`1015`	`1020`	`&__item[data-type="nobg"] {`
`1016`	`1021`	`cursor: auto;`
`1017`	`1022`	`}`