From 3b17b1ccfddee5fc4cc71396345b2a334118a966 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Wed, 24 Apr 2024 20:41:04 +0800
Subject: [PATCH] :art: Search type setting distinguishes between container
 blocks and leaf blocks https://github.com/siyuan-note/siyuan/issues/10762

---
 app/appearance/langs/en_US.json  |   2 +
 app/appearance/langs/es_ES.json  |   2 +
 app/appearance/langs/fr_FR.json  |   2 +
 app/appearance/langs/zh_CHT.json |   2 +
 app/appearance/langs/zh_CN.json  |   2 +
 app/src/config/query.ts          | 113 ++++++++++++++++---------------
 app/src/search/menu.ts           | 113 ++++++++++++++++---------------
 7 files changed, 128 insertions(+), 108 deletions(-)

diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json
index d144a7fc9..d83dee49f 100644
--- a/app/appearance/langs/en_US.json
+++ b/app/appearance/langs/en_US.json
@@ -1,4 +1,6 @@
 {
+  "containerBlockTip1": "Enabling container blocks will result in duplicate search results",
+  "containerBlockTip2": "Enabling document blocks currently only supports searching for document titles",
   "copyAsPNG": "Copy as PNG",
   "unbindBlock": "Unbind block",
   "showTitle": "Show database title",
diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json
index 2b96a12d1..b567a6158 100644
--- a/app/appearance/langs/es_ES.json
+++ b/app/appearance/langs/es_ES.json
@@ -1,4 +1,6 @@
 {
+  "containerBlockTip1": "Habilitar bloques de contenedores generará resultados de búsqueda duplicados",
+  "containerBlockTip2": "Habilitar bloques de documentos actualmente solo admite la búsqueda de títulos de documentos",
   "copyAsPNG": "Copiar como PNG",
   "unbindBlock": "Desvincular bloque",
   "showTitle": "Mostrar título de la base de datos",
diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json
index ea9d663f8..1a55a4bb6 100644
--- a/app/appearance/langs/fr_FR.json
+++ b/app/appearance/langs/fr_FR.json
@@ -1,4 +1,6 @@
 {
+  "containerBlockTip1": "L'activation des blocs de conteneurs entraînera des résultats de recherche en double",
+  "containerBlockTip2": "L'activation des blocs de documents ne prend actuellement en charge que la recherche de titres de documents",
   "copyAsPNG": "Copier en tant PNG",
   "unbindBlock": "Dissocier le bloc",
   "showTitle": "Afficher le titre de la base de données",
diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json
index d1e2e16cc..8b02b66a7 100644
--- a/app/appearance/langs/zh_CHT.json
+++ b/app/appearance/langs/zh_CHT.json
@@ -1,4 +1,6 @@
 {
+  "containerBlockTip1": "啟用容器區塊後會導致搜尋結果重複",
+  "containerBlockTip2": "啟用文件區塊目前僅支援搜尋文件名稱",
   "copyAsPNG": "複製為 PNG",
   "unbindBlock": "取消綁定區塊",
   "showTitle": "顯示資料庫標題",
diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json
index 2734c553b..c2f94a27f 100644
--- a/app/appearance/langs/zh_CN.json
+++ b/app/appearance/langs/zh_CN.json
@@ -1,4 +1,6 @@
 {
+  "containerBlockTip1": "启用容器块后会导致搜索结果重复",
+  "containerBlockTip2": "启用文档块目前仅支持搜索文档名",
   "copyAsPNG": "复制为 PNG",
   "unbindBlock": "取消绑定块",
   "showTitle": "显示数据库标题",
diff --git a/app/src/config/query.ts b/app/src/config/query.ts
index 7dc1c8eec..3c42f3243 100644
--- a/app/src/config/query.ts
+++ b/app/src/config/query.ts
@@ -24,24 +24,6 @@ export const query = {
             <span class="fn__space"></span>
             <input class="b3-switch" id="table" type="checkbox"${window.siyuan.config.search.table ? " checked" : ""}/>
         </label>
-        <label class="fn__flex">
-            <svg class="svg"><use xlink:href="#iconQuote"></use></svg>
-            <span class="fn__space"></span>
-            <div class="fn__flex-1">
-                ${window.siyuan.languages.quote}
-            </div>
-            <span class="fn__space"></span>
-            <input class="b3-switch" id="blockquote" type="checkbox"${window.siyuan.config.search.blockquote ? " checked" : ""}/>
-        </label>
-        <label class="fn__flex">
-            <svg class="svg"><use xlink:href="#iconSuper"></use></svg>
-            <span class="fn__space"></span>
-            <div class="fn__flex-1">
-                ${window.siyuan.languages.superBlock}
-            </div>
-            <span class="fn__space"></span>
-            <input class="b3-switch" id="superBlock" type="checkbox"${window.siyuan.config.search.superBlock ? " checked" : ""}/>
-        </label>
         <label class="fn__flex">
             <svg class="svg"><use xlink:href="#iconParagraph"></use></svg>
             <span class="fn__space"></span>
@@ -51,15 +33,6 @@ export const query = {
             <span class="fn__space"></span>
             <input class="b3-switch" id="paragraph" type="checkbox"${window.siyuan.config.search.paragraph ? " checked" : ""}/>
         </label>
-        <label class="fn__flex">
-            <svg class="svg"><use xlink:href="#iconFile"></use></svg>
-            <span class="fn__space"></span>
-            <div class="fn__flex-1">
-                ${window.siyuan.languages.doc}
-            </div>
-            <span class="fn__space"></span>
-            <input class="b3-switch" id="document" type="checkbox"${window.siyuan.config.search.document ? " checked" : ""}/>
-        </label>
         <label class="fn__flex">
             <svg class="svg"><use xlink:href="#iconHeadings"></use></svg>
             <span class="fn__space"></span>
@@ -69,24 +42,6 @@ export const query = {
             <span class="fn__space"></span>
             <input class="b3-switch" id="heading" type="checkbox"${window.siyuan.config.search.heading ? " checked" : ""}/>
         </label>
-        <label class="fn__flex">
-            <svg class="svg"><use xlink:href="#iconList"></use></svg>
-            <span class="fn__space"></span>
-            <div class="fn__flex-1">
-                ${window.siyuan.languages.list1}
-            </div>
-            <span class="fn__space"></span>
-            <input class="b3-switch" id="list" type="checkbox"${window.siyuan.config.search.list ? " checked" : ""}/>
-        </label>
-        <label class="fn__flex">
-            <svg class="svg"><use xlink:href="#iconListItem"></use></svg>
-            <span class="fn__space"></span>
-            <div class="fn__flex-1">
-                ${window.siyuan.languages.listItem}
-            </div>
-            <span class="fn__space"></span>
-            <input class="b3-switch" id="listItem" type="checkbox"${window.siyuan.config.search.listItem ? " checked" : ""}/>
-        </label>
         <label class="fn__flex">
             <svg class="svg"><use xlink:href="#iconCode"></use></svg>
             <span class="fn__space"></span>
@@ -105,15 +60,6 @@ export const query = {
             <span class="fn__space"></span>
             <input class="b3-switch" id="htmlBlock" type="checkbox"${window.siyuan.config.search.htmlBlock ? " checked" : ""}/>
         </label>
-        <label class="fn__flex">
-            <svg class="svg"><use xlink:href="#iconSQL"></use></svg>
-            <span class="fn__space"></span>
-            <div class="fn__flex-1">
-                ${window.siyuan.languages.embedBlock}
-            </div>
-            <span class="fn__space"></span>
-            <input class="b3-switch" id="embedBlock" type="checkbox"${window.siyuan.config.search.embedBlock ? " checked" : ""}/>
-        </label>
         <label class="fn__flex">
             <svg class="svg"><use xlink:href="#iconDatabase"></use></svg>
             <span class="fn__space"></span>
@@ -122,6 +68,15 @@ export const query = {
             </div>
             <span class="fn__space"></span>
             <input class="b3-switch" id="databaseBlock" type="checkbox"${window.siyuan.config.search.databaseBlock ? " checked" : ""}/>
+        </label>        
+        <label class="fn__flex">
+            <svg class="svg"><use xlink:href="#iconSQL"></use></svg>
+            <span class="fn__space"></span>
+            <div class="fn__flex-1">
+                ${window.siyuan.languages.embedBlock}
+            </div>
+            <span class="fn__space"></span>
+            <input class="b3-switch" id="embedBlock" type="checkbox"${window.siyuan.config.search.embedBlock ? " checked" : ""}/>
         </label>
         <label class="fn__flex">
             <svg class="svg"><use xlink:href="#iconVideo"></use></svg>
@@ -159,6 +114,56 @@ export const query = {
             <span class="fn__space"></span>
             <input class="b3-switch" id="widgetBlock" type="checkbox"${window.siyuan.config.search.widgetBlock ? " checked" : ""}/>
         </label>
+        <label class="fn__flex">
+            <svg class="svg"><use xlink:href="#iconQuote"></use></svg>
+            <span class="fn__space"></span>
+            <div class="fn__flex-1">
+                ${window.siyuan.languages.quote} <sup>[1]</sup>
+            </div>
+            <span class="fn__space"></span>
+            <input class="b3-switch" id="blockquote" type="checkbox"${window.siyuan.config.search.blockquote ? " checked" : ""}/>
+        </label>
+        <label class="fn__flex">
+            <svg class="svg"><use xlink:href="#iconSuper"></use></svg>
+            <span class="fn__space"></span>
+            <div class="fn__flex-1">
+                ${window.siyuan.languages.superBlock} <sup>[1]</sup>
+            </div>
+            <span class="fn__space"></span>
+            <input class="b3-switch" id="superBlock" type="checkbox"${window.siyuan.config.search.superBlock ? " checked" : ""}/>
+        </label>
+        <label class="fn__flex">
+            <svg class="svg"><use xlink:href="#iconList"></use></svg>
+            <span class="fn__space"></span>
+            <div class="fn__flex-1">
+                ${window.siyuan.languages.list1} <sup>[1]</sup>
+            </div>
+            <span class="fn__space"></span>
+            <input class="b3-switch" id="list" type="checkbox"${window.siyuan.config.search.list ? " checked" : ""}/>
+        </label>
+        <label class="fn__flex">
+            <svg class="svg"><use xlink:href="#iconListItem"></use></svg>
+            <span class="fn__space"></span>
+            <div class="fn__flex-1">
+                ${window.siyuan.languages.listItem} <sup>[1]</sup>
+            </div>
+            <span class="fn__space"></span>
+            <input class="b3-switch" id="listItem" type="checkbox"${window.siyuan.config.search.listItem ? " checked" : ""}/>
+        </label>
+        <label class="fn__flex">
+            <svg class="svg"><use xlink:href="#iconFile"></use></svg>
+            <span class="fn__space"></span>
+            <div class="fn__flex-1">
+                ${window.siyuan.languages.doc} <sup>[1] [2]</sup>
+            </div>
+            <span class="fn__space"></span>
+            <input class="b3-switch" id="document" type="checkbox"${window.siyuan.config.search.document ? " checked" : ""}/>
+        </label>
+    </div>
+    <span class="fn__space"></span>
+    <div class="fn__flex-1">
+        <div class="b3-label__text">[1] ${window.siyuan.languages.containerBlockTip1}</div>
+        <div class="b3-label__text">[2] ${window.siyuan.languages.containerBlockTip2}</div>
     </div>
 </div>
 <div class="b3-label">
diff --git a/app/src/search/menu.ts b/app/src/search/menu.ts
index 92af04de3..4911e825a 100644
--- a/app/src/search/menu.ts
+++ b/app/src/search/menu.ts
@@ -31,24 +31,6 @@ export const filterMenu = (config: Config.IUILayoutTabSearchConfig, cb: () => vo
         <span class="fn__space"></span>
         <input class="b3-switch fn__flex-center" data-type="table" type="checkbox"${config.types.table ? " checked" : ""}>
     </label>
-    <label class="fn__flex b3-label">
-        <svg class="ft__on-surface svg fn__flex-center"><use xlink:href="#iconQuote"></use></svg>
-        <span class="fn__space"></span>
-        <div class="fn__flex-1 fn__flex-center">
-            ${window.siyuan.languages.quote}
-        </div>
-        <span class="fn__space"></span>
-        <input class="b3-switch fn__flex-center" data-type="blockquote" type="checkbox"${config.types.blockquote ? " checked" : ""}>
-    </label>
-    <label class="fn__flex b3-label">
-        <svg class="ft__on-surface svg fn__flex-center"><use xlink:href="#iconSuper"></use></svg>
-        <span class="fn__space"></span>
-        <div class="fn__flex-1 fn__flex-center">
-            ${window.siyuan.languages.superBlock}
-        </div>
-        <span class="fn__space"></span>
-        <input class="b3-switch fn__flex-center" data-type="superBlock" type="checkbox"${config.types.superBlock ? " checked" : ""}>
-    </label>
     <label class="fn__flex b3-label">
         <svg class="ft__on-surface svg fn__flex-center"><use xlink:href="#iconParagraph"></use></svg>
         <span class="fn__space"></span>
@@ -58,15 +40,6 @@ export const filterMenu = (config: Config.IUILayoutTabSearchConfig, cb: () => vo
         <span class="fn__space"></span>
         <input class="b3-switch fn__flex-center" data-type="paragraph" type="checkbox"${config.types.paragraph ? " checked" : ""}>
     </label>
-    <label class="fn__flex b3-label">
-        <svg class="ft__on-surface svg fn__flex-center"><use xlink:href="#iconFile"></use></svg>
-        <span class="fn__space"></span>
-        <div class="fn__flex-1 fn__flex-center">
-            ${window.siyuan.languages.doc}
-        </div>
-        <span class="fn__space"></span>
-        <input class="b3-switch fn__flex-center" data-type="document" type="checkbox"${config.types.document ? " checked" : ""}>
-    </label>
     <label class="fn__flex b3-label">
         <svg class="ft__on-surface svg fn__flex-center"><use xlink:href="#iconHeadings"></use></svg>
         <span class="fn__space"></span>
@@ -76,24 +49,6 @@ export const filterMenu = (config: Config.IUILayoutTabSearchConfig, cb: () => vo
         <span class="fn__space"></span>
         <input class="b3-switch fn__flex-center" data-type="heading" type="checkbox"${config.types.heading ? " checked" : ""}>
     </label>
-    <label class="fn__flex b3-label">
-        <svg class="ft__on-surface svg fn__flex-center"><use xlink:href="#iconList"></use></svg>
-        <span class="fn__space"></span>
-        <div class="fn__flex-1 fn__flex-center">
-            ${window.siyuan.languages.list1}
-        </div>
-        <span class="fn__space"></span>
-        <input class="b3-switch fn__flex-center" data-type="list" type="checkbox"${config.types.list ? " checked" : ""}>
-    </label>
-    <label class="fn__flex b3-label">
-        <svg class="ft__on-surface svg fn__flex-center"><use xlink:href="#iconListItem"></use></svg>
-        <span class="fn__space"></span>
-        <div class="fn__flex-1 fn__flex-center">
-            ${window.siyuan.languages.listItem}
-        </div>
-        <span class="fn__space"></span>
-        <input class="b3-switch fn__flex-center" data-type="listItem" type="checkbox"${config.types.listItem ? " checked" : ""}>
-    </label>
     <label class="fn__flex b3-label">
         <svg class="ft__on-surface svg fn__flex-center"><use xlink:href="#iconCode"></use></svg>
         <span class="fn__space"></span>
@@ -112,15 +67,6 @@ export const filterMenu = (config: Config.IUILayoutTabSearchConfig, cb: () => vo
         <span class="fn__space"></span>
         <input class="b3-switch fn__flex-center" data-type="htmlBlock" type="checkbox"${config.types.htmlBlock ? " checked" : ""}>
     </label>
-    <label class="fn__flex b3-label">
-        <svg class="ft__on-surface svg fn__flex-center"><use xlink:href="#iconSQL"></use></svg>
-        <span class="fn__space"></span>
-        <div class="fn__flex-1 fn__flex-center">
-            ${window.siyuan.languages.embedBlock}
-        </div>
-        <span class="fn__space"></span>
-        <input class="b3-switch fn__flex-center" data-type="embedBlock" type="checkbox"${config.types.embedBlock ? " checked" : ""}>
-    </label>
     <label class="fn__flex b3-label">
         <svg class="ft__on-surface svg fn__flex-center"><use xlink:href="#iconDatabase"></use></svg>
         <span class="fn__space"></span>
@@ -129,6 +75,15 @@ export const filterMenu = (config: Config.IUILayoutTabSearchConfig, cb: () => vo
         </div>
         <span class="fn__space"></span>
         <input class="b3-switch fn__flex-center" data-type="databaseBlock" type="checkbox"${config.types.databaseBlock ? " checked" : ""}>
+    </label>    
+    <label class="fn__flex b3-label">
+        <svg class="ft__on-surface svg fn__flex-center"><use xlink:href="#iconSQL"></use></svg>
+        <span class="fn__space"></span>
+        <div class="fn__flex-1 fn__flex-center">
+            ${window.siyuan.languages.embedBlock}
+        </div>
+        <span class="fn__space"></span>
+        <input class="b3-switch fn__flex-center" data-type="embedBlock" type="checkbox"${config.types.embedBlock ? " checked" : ""}>
     </label>
     <label class="fn__flex b3-label">
         <svg class="ft__on-surface svg fn__flex-center"><use xlink:href="#iconVideo"></use></svg>
@@ -166,6 +121,56 @@ export const filterMenu = (config: Config.IUILayoutTabSearchConfig, cb: () => vo
         <span class="fn__space"></span>
         <input class="b3-switch fn__flex-center" data-type="widgetBlock" type="checkbox"${config.types.widgetBlock ? " checked" : ""}>
     </label>
+    <label class="fn__flex b3-label">
+        <svg class="ft__on-surface svg fn__flex-center"><use xlink:href="#iconQuote"></use></svg>
+        <span class="fn__space"></span>
+        <div class="fn__flex-1 fn__flex-center">
+            ${window.siyuan.languages.quote} <sup>[1]</sup>
+        </div>
+        <span class="fn__space"></span>
+        <input class="b3-switch fn__flex-center" data-type="blockquote" type="checkbox"${config.types.blockquote ? " checked" : ""}>
+    </label>
+    <label class="fn__flex b3-label">
+        <svg class="ft__on-surface svg fn__flex-center"><use xlink:href="#iconSuper"></use></svg>
+        <span class="fn__space"></span>
+        <div class="fn__flex-1 fn__flex-center">
+            ${window.siyuan.languages.superBlock} <sup>[1]</sup>
+        </div>
+        <span class="fn__space"></span>
+        <input class="b3-switch fn__flex-center" data-type="superBlock" type="checkbox"${config.types.superBlock ? " checked" : ""}>
+    </label>
+    <label class="fn__flex b3-label">
+        <svg class="ft__on-surface svg fn__flex-center"><use xlink:href="#iconList"></use></svg>
+        <span class="fn__space"></span>
+        <div class="fn__flex-1 fn__flex-center">
+            ${window.siyuan.languages.list1} <sup>[1]</sup>
+        </div>
+        <span class="fn__space"></span>
+        <input class="b3-switch fn__flex-center" data-type="list" type="checkbox"${config.types.list ? " checked" : ""}>
+    </label>
+    <label class="fn__flex b3-label">
+        <svg class="ft__on-surface svg fn__flex-center"><use xlink:href="#iconListItem"></use></svg>
+        <span class="fn__space"></span>
+        <div class="fn__flex-1 fn__flex-center">
+            ${window.siyuan.languages.listItem} <sup>[1]</sup>
+        </div>
+        <span class="fn__space"></span>
+        <input class="b3-switch fn__flex-center" data-type="listItem" type="checkbox"${config.types.listItem ? " checked" : ""}>
+    </label>
+    <label class="fn__flex b3-label">
+        <svg class="ft__on-surface svg fn__flex-center"><use xlink:href="#iconFile"></use></svg>
+        <span class="fn__space"></span>
+        <div class="fn__flex-1 fn__flex-center">
+            ${window.siyuan.languages.doc} <sup>[1] [2]</sup>
+        </div>
+        <span class="fn__space"></span>
+        <input class="b3-switch fn__flex-center" data-type="document" type="checkbox"${config.types.document ? " checked" : ""}>
+    </label>
+    <span class="fn__space"></span>
+    <div class="fn__flex-1">
+        <div class="b3-label__text">[1] ${window.siyuan.languages.containerBlockTip1}</div>
+        <div class="b3-label__text">[2] ${window.siyuan.languages.containerBlockTip2}</div>
+    </div>    
 </div>
 <div class="b3-dialog__action">
     <button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div>