This commit is contained in:
Vanessa 2023-08-28 23:26:47 +08:00
parent f28ce5a3b7
commit 5d6c71e35a
8 changed files with 40 additions and 46 deletions

View file

@ -385,8 +385,8 @@ export const assetMethodMenu = (target: HTMLElement, cb: () => void) => {
}
}).element);
/// #if MOBILE
window.siyuan.menus.menu.element.style.zIndex = "221"
window.siyuan.menus.menu.fullscreen()
window.siyuan.menus.menu.element.style.zIndex = "221";
window.siyuan.menus.menu.fullscreen();
/// #else
const rect = target.getBoundingClientRect();
window.siyuan.menus.menu.popup({x: rect.right, y: rect.bottom}, true);
@ -536,8 +536,8 @@ export const assetMoreMenu = (target: Element, element: Element, cb: () => void)
},
}).element);
/// #if MOBILE
window.siyuan.menus.menu.element.style.zIndex = "221"
window.siyuan.menus.menu.fullscreen()
window.siyuan.menus.menu.element.style.zIndex = "221";
window.siyuan.menus.menu.fullscreen();
/// #else
const rect = target.getBoundingClientRect();
window.siyuan.menus.menu.popup({x: rect.right, y: rect.bottom}, true);

View file

@ -286,7 +286,7 @@ export const saveCriterion = (config: ISearchOption,
}
});
saveCriterionData(config, criteriaData, element, value, saveDialog);
})
});
}
} else if (!hasSameName && hasSameConfig) {
confirmDialog(window.siyuan.languages.confirm, window.siyuan.languages.searchUpdateName.replace("${x}", hasSameConfig).replace("${y}", value), () => {
@ -458,10 +458,10 @@ const configIsSame = (config: ISearchOption, config2: ISearchOption) => {
if (config2.group === config.group && config2.hPath === config.hPath && config2.hasReplace === config.hasReplace &&
config2.k === config.k && config2.method === config.method && config2.r === config.r &&
config2.sort === config.sort && objEquals(config2.types, config.types) && objEquals(config2.idPath, config.idPath)) {
return true
return true;
}
return false
}
return false;
};
export const initCriteriaMenu = (element: HTMLElement, data: ISearchOption[], config: ISearchOption) => {
fetchPost("/api/storage/getCriteria", {}, (response) => {