diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 78284d4ff..efd219be6 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -393,6 +393,7 @@ "math": "Formula Block", "listItem": "List item", "superBlock": "Super block", + "embedBlock": "Embed block", "expand": "Expand", "showDock": "Show Dock", "hideDock": "Hide Dock", @@ -574,7 +575,6 @@ "sync": "Sync", "syncNow": "Sync now", "waitSync": "The editing data has not been synchronized to the cloud", - "cloudBook": "Cloud Notebook", "paymentSum": "Cumulatively paid", "refresh": "Refresh", "accountManage": "Account Manage", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 70d85d13a..b798c51cc 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -393,6 +393,7 @@ "math": "Bloque de fórmula", "listItem": "Elemento de la lista", "superBlock": "Superbloque", + "embedBlock": "Bloque incrustado", "expand": "Expandir", "showDock": "Mostrar Dock", "hideDock": "Ocultar Dock", @@ -574,7 +575,6 @@ "sync": "Sincronización", "syncNow": "Sincronizar ahora", "waitSync": "Los datos de edición no se han sincronizado con la nube", - "cloudBook": "Cuaderno de notas en la nube", "paymentSum": "Pagado acumulativamente", "refresh": "Actualizar", "accountManage": "Gestión de la cuenta", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index e12a21882..372e1dbfb 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -393,6 +393,7 @@ "math": "Bloc de formule", "listItem": "Élément de liste", "superBlock": "Superblock", + "embedBlock": "Bloc intégré", "expand": "Élargir", "showDock": "Montrer le Dock", "hideDock": "Cacher le Dock", @@ -574,7 +575,6 @@ "sync": "Synchro", "syncNow": "Synchro maintenant", "waitSync": "Les données d'édition n'ont pas été synchronisées avec le cloud", - "cloudBook": "Carnet de notes du Cloud", "paymentSum": "Cumulativement payé", "refresh": "Rafraîchir", "accountManage": "Gestion des comptes", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 0c8adee30..ff0298d4a 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -393,6 +393,7 @@ "math": "公式塊", "listItem": "列表項", "superBlock": "超級塊", + "embedBlock": "嵌入塊", "expand": "展開", "showDock": "顯示停靠欄", "hideDock": "隱藏停靠欄", @@ -574,7 +575,6 @@ "sync": "同步", "syncNow": "立即同步", "waitSync": "編輯數據尚未同步到雲端", - "cloudBook": "雲端筆記本", "payment": "累計已支付", "refresh": "重新整理", "accountManage": "帳號管理", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 1c750a43c..4d6bf6359 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -393,6 +393,7 @@ "math": "公式块", "listItem": "列表项", "superBlock": "超级块", + "embedBlock": "嵌入块", "expand": "展开", "showDock": "显示停靠栏", "hideDock": "隐藏停靠栏", @@ -574,7 +575,6 @@ "sync": "同步", "syncNow": "立即同步", "waitSync": "编辑数据尚未同步到云端", - "cloudBook": "云端笔记本", "paymentSum": "累计已支付", "refresh": "刷新", "accountManage": "账号管理", diff --git a/app/src/config/query.ts b/app/src/config/query.ts index 25c35f36c..2a565faee 100644 --- a/app/src/config/query.ts +++ b/app/src/config/query.ts @@ -83,6 +83,13 @@ export const query = { +
@@ -226,6 +233,7 @@ export const query = { listItem: (query.element.querySelector("#listItem") as HTMLInputElement).checked, codeBlock: (query.element.querySelector("#codeBlock") as HTMLInputElement).checked, htmlBlock: (query.element.querySelector("#htmlBlock") as HTMLInputElement).checked, + embedBlock: (query.element.querySelector("#embedBlock") as HTMLInputElement).checked, mathBlock: (query.element.querySelector("#mathBlock") as HTMLInputElement).checked, table: (query.element.querySelector("#table") as HTMLInputElement).checked, blockquote: (query.element.querySelector("#blockquote") as HTMLInputElement).checked, diff --git a/app/src/protyle/util/compatibility.ts b/app/src/protyle/util/compatibility.ts index 2e2233206..2ec5939db 100644 --- a/app/src/protyle/util/compatibility.ts +++ b/app/src/protyle/util/compatibility.ts @@ -197,6 +197,7 @@ export const getLocalStorage = (cb:()=>void) => { blockquote: window.siyuan.config.search.blockquote, superBlock: window.siyuan.config.search.superBlock, paragraph: window.siyuan.config.search.paragraph, + embedBlock: window.siyuan.config.search.embedBlock, } }; defaultStorage[Constants.LOCAL_ZOOM] = 1; diff --git a/app/src/search/util.ts b/app/src/search/util.ts index 01be43469..e117715df 100644 --- a/app/src/search/util.ts +++ b/app/src/search/util.ts @@ -846,6 +846,7 @@ const addConfigMoreMenu = async (config: ISearchOption, edit: Protyle, element: blockquote: window.siyuan.config.search.blockquote, superBlock: window.siyuan.config.search.superBlock, paragraph: window.siyuan.config.search.paragraph, + embedBlock: window.siyuan.config.search.embedBlock, } }, config, edit); } @@ -990,6 +991,13 @@ const addConfigFilterMenu = (config: ISearchOption, edit: Protyle, element: Elem +
diff --git a/app/src/types/index.d.ts b/app/src/types/index.d.ts index b95c5c5f3..4b969fe69 100644 --- a/app/src/types/index.d.ts +++ b/app/src/types/index.d.ts @@ -85,6 +85,7 @@ interface ISearchOption { listItem: boolean codeBlock: boolean htmlBlock: boolean + embedBlock: boolean } } @@ -442,6 +443,7 @@ declare interface IConfig { sort: number } search: { + embedBlock: boolean htmlBlock: boolean document: boolean heading: boolean diff --git a/kernel/conf/search.go b/kernel/conf/search.go index eace0a039..da9cd05c9 100644 --- a/kernel/conf/search.go +++ b/kernel/conf/search.go @@ -189,7 +189,7 @@ func (s *Search) TypeFilter() string { buf.WriteString(",") } // 无法搜索到 iframe 块、视频块和音频块 https://github.com/siyuan-note/siyuan/issues/3604 - buf.WriteString("'iframe','query_embed','video','audio',") + buf.WriteString("'iframe','video','audio',") // 挂件块支持内置属性搜索 https://github.com/siyuan-note/siyuan/issues/4497 buf.WriteString("'widget',") diff --git a/kernel/model/conf.go b/kernel/model/conf.go index fa8ea985c..9b9271475 100644 --- a/kernel/model/conf.go +++ b/kernel/model/conf.go @@ -398,7 +398,7 @@ func Close(force bool, execInstallPkg int) (exitCode int) { WaitForWritingFiles() if !force { - SyncData(false, true, false) + syncData(false, true, false) if 0 != ExitSyncSucc { exitCode = 1 return diff --git a/kernel/model/transaction.go b/kernel/model/transaction.go index b3c19d9a7..1af9342ab 100644 --- a/kernel/model/transaction.go +++ b/kernel/model/transaction.go @@ -1220,7 +1220,7 @@ func updateRefText(refNode *ast.Node, changedDefNodes map[string]*ast.Node) (cha func AutoIndexEmbedBlock() { for { task.AppendTask(task.DatabaseIndexEmbedBlock, autoIndexEmbedBlock) - time.Sleep(30 * time.Second) + time.Sleep(10 * time.Minute) } }