diff --git a/src/components/Screenfull/index.vue b/src/components/Screenfull/index.vue index c936bc7f..13b519f1 100644 --- a/src/components/Screenfull/index.vue +++ b/src/components/Screenfull/index.vue @@ -25,12 +25,8 @@ const tips = ref(props.openTips) const isFullscreen = ref(false) const handleClick = () => { - if (!screenfull.isEnabled) { - ElMessage.warning("您的浏览器无法工作") - return - } const dom = document.querySelector(props.element) || undefined - screenfull.toggle(dom) + screenfull.isEnabled ? screenfull.toggle(dom) : ElMessage.warning("您的浏览器无法工作") } const handleChange = () => { diff --git a/src/hooks/useFullscreenLoading.ts b/src/hooks/useFullscreenLoading.ts index 57defd8c..4f7137a0 100644 --- a/src/hooks/useFullscreenLoading.ts +++ b/src/hooks/useFullscreenLoading.ts @@ -26,8 +26,7 @@ export const useFullscreenLoading: UseFullscreenLoading = (fn, options = {}) => return async (...args) => { try { loadingInstance = ElLoading.service({ ...defaultOptions, ...options }) - const result = await fn(...args) - return result + return await fn(...args) } finally { loadingInstance?.close() }