✨ fix https://github.com/siyuan-note/siyuan/issues/6744

app/appearance/langs/en_US.json

@@ -2,7 +2,7 @@
   "keyword": "Keyword",
   "searchMethod": "Search Method",
   "regex": "Regex",
-  "groupBy": "Group By",
+  "groupBy": "Grouping and Layout",
   "keywordsLimit": "Keywords Limit",
   "exportAsImage": "Export as image",
   "exportBySiYuan": "Export by SiYuan",

app/appearance/langs/es_ES.json

@@ -2,7 +2,7 @@
   "keyword": "Palabra clave",
   "searchMethod": "método de búsqueda",
   "regex": "Regex",
-  "groupBy": "Agrupar por",
+  "groupBy": "Agrupación y diseño",
   "keywordsLimit": "Límite de palabras clave",
   "exportAsImage": "Exportar como imagen",
   "exportBySiYuan": "Exportar por SiYuan",

app/appearance/langs/fr_FR.json

@@ -2,7 +2,7 @@
   "keyword": "Mot-clé",
   "searchMethod": "méthode de recherche",
   "regex": "Regex",
-  "groupBy": "Regrouper par",
+  "groupBy": "Regroupement et mise en page",
   "keywordsLimit": "Limite de mots clés",
   "exportAsImage": "Exporter en tant qu'image",
   "exportBySiYuan": "Exporter par SiYuan",

app/appearance/langs/zh_CHT.json

@@ -2,7 +2,7 @@
   "keyword": "關鍵字",
   "searchMethod":"搜索方式",
   "regex":"正則表達式",
-  "groupBy": "分組",
+  "groupBy": "分組及佈局",
   "keywordsLimit": "關鍵字數量限制",
   "exportAsImage": "導出為圖片",
   "exportBySiYuan": "由思源筆記導出",

app/appearance/langs/zh_CN.json

@@ -2,7 +2,7 @@
   "keyword": "关键字",
   "searchMethod":"搜索方式",
   "regex":"正则表达式",
-  "groupBy": "分组",
+  "groupBy": "分组及布局",
   "keywordsLimit": "关键字数量限制",
   "exportAsImage": "导出为图片",
   "exportBySiYuan": "由思源笔记导出",

app/src/assets/scss/_search.scss

@@ -73,7 +73,7 @@
 
   &__list {
     position: relative;
-    height: calc(50% - 69px);
+    flex: 1;
     overflow: auto;
     padding-bottom: 8px;
   }

app/src/search/spread.ts

@@ -104,6 +104,7 @@ export const openSearch = async (hotkey: string, key?: string, notebookId?: stri
         list: localData.list || [],
         replaceList: localData.replaceList || [],
         group: localData.group || 0,
+        layout: localData.layout || 0,
         types: localData.types
     }, dialog.element.querySelector(".b3-dialog__container").lastElementChild, () => {
         dialog.destroy();

app/src/search/util.ts

@@ -13,7 +13,7 @@ import {MenuItem} from "../menus/Menu";
 import {getDisplayName, getNotebookIcon, getNotebookName, movePathTo, pathPosix} from "../util/pathName";
 import {Protyle} from "../protyle";
 import {onGet} from "../protyle/util/onGet";
-import {addLoading} from "../protyle/ui/initUI";
+import {addLoading, setPadding} from "../protyle/ui/initUI";
 import {getIconByType} from "../editor/getIcon";
 import {unicode2Emoji} from "../emoji";
 
@@ -66,6 +66,7 @@ export const openGlobalSearch = (text: string, replace: boolean) => {
                     list: [],
                     replaceList: [],
                     group: localData.group || 0,
+                    layout: localData.layout || 0,
                     types: localData.types
                 }
             });
@@ -154,8 +155,10 @@ export const genSearch = (config: ISearchOption, element: Element, closeCB?: ()
             </span>
         </div>
     </div>
-    <div id="searchList" class="search__list b3-list b3-list--background"></div>
-    <div id="searchPreview" class="fn__flex-1 search__preview"></div>
+    <div class="fn__flex-1 fn__flex" style="flex-direction: ${config.layout === 0 ? "column" : "row"}">
+        <div id="searchList" class="fn__flex-1 search__list b3-list b3-list--background"></div>
+        <div id="searchPreview" class="fn__flex-1 search__preview"></div>
+    </div>
 </div>
 <div class="fn__loading fn__loading--top"><img width="120px" src="/stage/loading-pure.svg"></div>`;
     const searchPanelElement = element.querySelector("#searchList");
@@ -275,9 +278,8 @@ export const genSearch = (config: ISearchOption, element: Element, closeCB?: ()
                 event.preventDefault();
                 break;
             } else if (target.id === "searchGroup") {
-                element.querySelector("#searchCollapse").parentElement.classList.toggle("fn__none")
-                config.group = config.group === 0 ? 1 : 0;
-                inputTimeout = inputEvent(element, config, inputTimeout, edit);
+                addConfigGroupMenu(config, edit, element);
+                window.siyuan.menus.menu.popup({x: event.clientX - 16, y: event.clientY - 16}, true);
                 event.stopPropagation();
                 event.preventDefault();
                 break;
@@ -552,6 +554,44 @@ export const genSearch = (config: ISearchOption, element: Element, closeCB?: ()
     return edit;
 };
 
+const addConfigGroupMenu = (config: ISearchOption, edit: Protyle, element: Element) => {
+    window.siyuan.menus.menu.remove()
+    window.siyuan.menus.menu.append(new MenuItem({
+        label: window.siyuan.languages.list1,
+        current: config.group === 0,
+        click() {
+            element.querySelector("#searchCollapse").parentElement.classList.add("fn__none")
+            config.group = 0;
+            inputEvent(element, config, undefined, edit);
+        }
+    }).element);
+    window.siyuan.menus.menu.append(new MenuItem({
+        label: window.siyuan.languages.doc,
+        current: config.group === 1,
+        click() {
+            element.querySelector("#searchCollapse").parentElement.classList.remove("fn__none")
+            config.group = 1;
+            inputEvent(element, config, undefined, edit);
+        }
+    }).element);
+    window.siyuan.menus.menu.append(new MenuItem({
+        label: window.siyuan.languages.document_properties_page_size_orientation_portrait,
+        current: config.layout === 0,
+        click() {
+            element.querySelector("#searchList").parentElement.style.flexDirection = "column";
+            setPadding(edit.protyle)
+        }
+    }).element);
+    window.siyuan.menus.menu.append(new MenuItem({
+        label: window.siyuan.languages.document_properties_page_size_orientation_landscape,
+        current: config.layout === 1,
+        click() {
+            element.querySelector("#searchList").parentElement.style.flexDirection = "row";
+            setPadding(edit.protyle)
+        }
+    }).element);
+};
+
 const addConfigMenu = (config: ISearchOption, lang: string, key: "mathBlock" | "table" | "blockquote" | "superBlock" | "paragraph" | "document" | "heading" | "list" | "listItem" | "codeBlock" | "htmlBlock",
                        edit: Protyle, element: Element) => {
     window.siyuan.menus.menu.append(new MenuItem({
@@ -748,7 +788,7 @@ const inputEvent = (element: Element, config: ISearchOption, inputTimeout: numbe
                 method: config.method,
                 types: config.types,
                 paths: config.idPath || [],
-                groupBy: config.group, // 0：不分组，1：按文档分组
+                groupBy: config.group,
             }, (response) => {
                 onSearch(response.data.blocks, edit, element);
                 element.querySelector("#searchResult").innerHTML = window.siyuan.languages.findInDoc.replace("${x}", response.data.matchedRootCount).replace("${y}", response.data.matchedBlockCount);

app/src/types/index.d.ts

@@ -49,7 +49,8 @@ interface Window {
 }
 
 interface ISearchOption {
-    group: number,
+    group: number,  // 0：不分组，1：按文档分组
+    layout: number  // 0：上下，1：左右
     hasReplace: boolean,
     method: number //  0：文本，1：查询语法，2：SQL，3：正则表达式
     hPath: string