diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 139b288b9..46e560f21 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -445,6 +445,7 @@ "cancelMerged": "Cancel cell merge", "useDefaultWidth": "Use Default Column Width", "type": "Type", + "replaceType": "Replace type", "searchBlockType": "Block types (searches in the enabled types below, the filter option in the global search overrides this setting)", "searchBlockAttr": "Block attributes (search not only in the content, but also in the following enabled attributes)", "searchIndex": "Index", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 60680b5a7..1820ff6e8 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -445,6 +445,7 @@ "cancelMerged": "Cancelar fusión de celda", "useDefaultWidth": "Usar el ancho de columna por defecto", "type": "Tipo", + "replaceType": "Reemplazar tipo", "searchBlockType": "Tipos de bloque (busque en los tipos habilitados a continuación, la opción de filtro en la búsqueda global anula esta configuración)", "searchBlockAttr": "Atributos de bloque (busca no sólo en el contenido, sino también en los siguientes atributos habilitados)", "searchIndex": "Índice", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index c2eaf140f..6a5b3ed4f 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -445,6 +445,7 @@ "cancelMerged": "Annuler la fusion de cellules", "useDefaultWidth": "Utiliser la largeur de colonne par défaut", "type": "Type", + "replaceType": "Remplacer le type", "searchBlockType": "Types de bloc (recherche dans les types activés ci-dessous, l'option de filtre dans la recherche globale remplace ce paramètre)", "searchBlockAttr": "Attributs de bloc (recherche non seulement dans le contenu, mais aussi dans les attributs activés suivants)", "searchIndex": "Index", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 0b316819b..c569253d8 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -445,6 +445,7 @@ "cancelMerged": "拆分單元格", "useDefaultWidth": "使用預設列寬", "type": "類型", + "replaceType": "替換類型", "searchBlockType": "塊級類型（在以下啟用的類型中進行搜索，全域搜索中的過濾選項會覆蓋該設置）", "searchBlockAttr": "塊級屬性（不僅在內容中進行搜索，同時也會在以下啟用的屬性中搜索）", "searchIndex": "索引", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 78347229d..a4ebe0d40 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -445,6 +445,7 @@ "cancelMerged": "拆分单元格", "useDefaultWidth": "使用默认列宽", "type": "类型", + "replaceType": "替换类型", "searchBlockType": "块级类型（在以下启用的类型中进行搜索，全局搜索中的过滤选项会覆盖该设置）", "searchBlockAttr": "块级属性（不仅在内容中进行搜索，同时也会在以下启用的属性中搜索）", "searchIndex": "索引", diff --git a/app/src/mobile/menu/search.ts b/app/src/mobile/menu/search.ts index 9c306f0ec..0985d921d 100644 --- a/app/src/mobile/menu/search.ts +++ b/app/src/mobile/menu/search.ts @@ -498,7 +498,7 @@ const initSearchEvent = (app: App, element: Element, config: ISearchOption) => { embedBlock: window.siyuan.config.search.embedBlock, databaseBlock: window.siyuan.config.search.databaseBlock, }, - replaceTypes: Constants.SIYUAN_DEFAULT_REPLACETYPES, + replaceTypes: Object.assign({}, Constants.SIYUAN_DEFAULT_REPLACETYPES), }, config); }); window.siyuan.menus.menu.fullscreen(); diff --git a/app/src/protyle/util/compatibility.ts b/app/src/protyle/util/compatibility.ts index afa6cf58e..a09485484 100644 --- a/app/src/protyle/util/compatibility.ts +++ b/app/src/protyle/util/compatibility.ts @@ -239,7 +239,7 @@ export const getLocalStorage = (cb: () => void) => { embedBlock: window.siyuan.config.search.embedBlock, databaseBlock: window.siyuan.config.search.databaseBlock, }, - replaceTypes: Constants.SIYUAN_DEFAULT_REPLACETYPES, + replaceTypes: Object.assign({}, Constants.SIYUAN_DEFAULT_REPLACETYPES), }; defaultStorage[Constants.LOCAL_ZOOM] = 1; @@ -267,7 +267,7 @@ export const getLocalStorage = (cb: () => void) => { // 搜索数据添加 replaceTypes 兼容 if (!window.siyuan.storage[Constants.LOCAL_SEARCHDATA].replaceTypes || Object.keys(window.siyuan.storage[Constants.LOCAL_SEARCHDATA].replaceTypes).length === 0) { - window.siyuan.storage[Constants.LOCAL_SEARCHDATA].replaceTypes = Constants.SIYUAN_DEFAULT_REPLACETYPES; + window.siyuan.storage[Constants.LOCAL_SEARCHDATA].replaceTypes = Object.assign({}, Constants.SIYUAN_DEFAULT_REPLACETYPES); } cb(); }); diff --git a/app/src/search/menu.ts b/app/src/search/menu.ts index ed8c03b92..588571205 100644 --- a/app/src/search/menu.ts +++ b/app/src/search/menu.ts @@ -377,6 +377,13 @@ export const moreMenu = async (config: ISearchOption, }); } }).element); + window.siyuan.menus.menu.append(new MenuItem({ + iconHTML: "", + label: window.siyuan.languages.replaceType, + click() { + replaceFilterMenu(config); + } + }).element); window.siyuan.menus.menu.append(new MenuItem({ iconHTML: "", label: window.siyuan.languages.searchMethod, diff --git a/app/src/search/util.ts b/app/src/search/util.ts index 1c6c3c933..2ce2faf20 100644 --- a/app/src/search/util.ts +++ b/app/src/search/util.ts @@ -477,7 +477,7 @@ export const genSearch = (app: App, config: ISearchOption, element: Element, clo embedBlock: window.siyuan.config.search.embedBlock, databaseBlock: window.siyuan.config.search.databaseBlock, }, - replaceTypes: Constants.SIYUAN_DEFAULT_REPLACETYPES, + replaceTypes: Object.assign({}, Constants.SIYUAN_DEFAULT_REPLACETYPES), }, config, edit); element.querySelector(".b3-chip--current")?.classList.remove("b3-chip--current"); event.stopPropagation(); @@ -693,7 +693,7 @@ export const genSearch = (app: App, config: ISearchOption, element: Element, clo embedBlock: window.siyuan.config.search.embedBlock, databaseBlock: window.siyuan.config.search.databaseBlock, }, - replaceTypes: Constants.SIYUAN_DEFAULT_REPLACETYPES, + replaceTypes: Object.assign({}, Constants.SIYUAN_DEFAULT_REPLACETYPES), }, config, edit); element.querySelector("#criteria .b3-chip--current")?.classList.remove("b3-chip--current"); }, () => {