diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 6bc631cd3..bcd1e479e 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1,4 +1,6 @@ { + "video": "Video", + "audio": "Audio", "updateAll": "Update all", "confirmUpdateAll": "Are you sure you want to update all?", "confirmUpdate": "Are you sure you want to update?", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index c0afc04d9..53ecf4460 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1,4 +1,6 @@ { + "vídeo": "Vídeo", + "audio": "Audio", "updateAll": "Actualizar todo", "confirmUpdateAll": "¿Estás seguro de que deseas actualizar todo?", "confirmUpdate": "¿Estás seguro de que deseas actualizar?", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index a2ebd624d..8b3890563 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1,4 +1,6 @@ { + "video": "Vidéo", + "audio": "Audio", "updateAll": "Tout mettre à jour", "confirmUpdateAll": "Etes-vous sûr de vouloir tout mettre à jour ?", "confirmUpdate": "Êtes-vous sûr de vouloir mettre à jour ?", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index d4444e2ae..77af86eb6 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1,4 +1,6 @@ { + "video": "影片", + "audio": "音訊", "updateAll": "全部更新", "confirmUpdateAll": "確定全部更新嗎？", "confirmUpdate": "確定更新嗎？", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index ae3ce17f7..f83d74dc3 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1,4 +1,6 @@ { + "video": "视频", + "audio": "音频", "updateAll": "全部更新", "confirmUpdateAll": "确定全部更新吗？", "confirmUpdate": "确定更新吗？", diff --git a/app/src/config/query.ts b/app/src/config/query.ts index 59171f24c..421af1f18 100644 --- a/app/src/config/query.ts +++ b/app/src/config/query.ts @@ -122,7 +122,43 @@ export const query = { - + + + + +
@@ -279,6 +315,10 @@ export const query = { htmlBlock: (query.element.querySelector("#htmlBlock") as HTMLInputElement).checked, embedBlock: (query.element.querySelector("#embedBlock") as HTMLInputElement).checked, databaseBlock: (query.element.querySelector("#databaseBlock") as HTMLInputElement).checked, + audioBlock: (query.element.querySelector("#audioBlock") as HTMLInputElement).checked, + videoBlock: (query.element.querySelector("#videoBlock") as HTMLInputElement).checked, + iFrameBlock: (query.element.querySelector("#iFrameBlock") as HTMLInputElement).checked, + widgetBlock: (query.element.querySelector("#widgetBlock") 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/search/menu.ts b/app/src/search/menu.ts index cd7fd2481..e3f6a407c 100644 --- a/app/src/search/menu.ts +++ b/app/src/search/menu.ts @@ -130,6 +130,42 @@ export const filterMenu = (config: ISearchOption, cb: () => void) => { + + + +
diff --git a/app/src/search/util.ts b/app/src/search/util.ts index a450011fd..5d5ca9159 100644 --- a/app/src/search/util.ts +++ b/app/src/search/util.ts @@ -507,6 +507,10 @@ export const genSearch = (app: App, config: ISearchOption, element: Element, clo r: "", page: 1, types: { + audioBlock: window.siyuan.config.search.audioBlock, + videoBlock: window.siyuan.config.search.videoBlock, + iFrameBlock: window.siyuan.config.search.iFrameBlock, + widgetBlock: window.siyuan.config.search.widgetBlock, document: window.siyuan.config.search.document, heading: window.siyuan.config.search.heading, list: window.siyuan.config.search.list, @@ -763,6 +767,10 @@ export const genSearch = (app: App, config: ISearchOption, element: Element, clo r: "", page: 1, types: { + audioBlock: window.siyuan.config.search.audioBlock, + videoBlock: window.siyuan.config.search.videoBlock, + iFrameBlock: window.siyuan.config.search.iFrameBlock, + widgetBlock: window.siyuan.config.search.widgetBlock, document: window.siyuan.config.search.document, heading: window.siyuan.config.search.heading, list: window.siyuan.config.search.list, diff --git a/app/src/types/index.d.ts b/app/src/types/index.d.ts index 3412b3b8b..13f817b70 100644 --- a/app/src/types/index.d.ts +++ b/app/src/types/index.d.ts @@ -268,26 +268,32 @@ interface ISearchOption { idPath: string[] k: string r: string - types: { - mathBlock: boolean - table: boolean - blockquote: boolean - superBlock: boolean - paragraph: boolean - document: boolean - heading: boolean - list: boolean - listItem: boolean - codeBlock: boolean - htmlBlock: boolean - embedBlock: boolean - databaseBlock: boolean - }, + types: ISearchType, replaceTypes: { [key: string]: boolean; }, } +interface ISearchType { + audioBlock: boolean + videoBlock: boolean + iFrameBlock: boolean + widgetBlock: boolean + mathBlock: boolean + table: boolean + blockquote: boolean + superBlock: boolean + paragraph: boolean + document: boolean + heading: boolean + list: boolean + listItem: boolean + codeBlock: boolean + htmlBlock: boolean + embedBlock: boolean + databaseBlock: boolean +} + interface ITextOption { color?: string, type: string @@ -823,20 +829,7 @@ interface IConfig { tag: { sort: number } - search: { - databaseBlock: boolean - embedBlock: boolean - htmlBlock: boolean - document: boolean - heading: boolean - list: boolean - listItem: boolean - codeBlock: boolean - mathBlock: boolean - table: boolean - blockquote: boolean - superBlock: boolean - paragraph: boolean + search: ISearchType & { name: boolean alias: boolean memo: boolean