perf: 代码优化 hooks/useFullscreenLoading

src/hooks/useFullscreenLoading.ts

@@ -12,52 +12,24 @@ interface LoadingInstance {
 interface UseFullscreenLoading {
   <T extends (...args: any[]) => ReturnType<T>>(fn: T, options?: LoadingOptions): (
     ...args: Parameters<T>
-  ) => Promise<ReturnType<T>> | ReturnType<T>
+  ) => Promise<ReturnType<T>>
 }
 
 /**
- * 传入一个函数 fn，在它执行周期内，加上「全屏」loading，
+ * 传入一个函数 fn，在它执行周期内，加上「全屏」loading
- * 如果：
+ * @param fn 要执行的函数
- * 1. fn 如果是同步函数，执行结束后隐藏 loading
- * 2. fn 如果是 Promise，resolve 或 reject 后隐藏 loading
- * 3. 报错后隐藏 loading 并抛出错误
- * @param {*} fn 要执行的函数
  * @param options LoadingOptions
- * @returns Function 一个新的函数，去执行它吧
+ * @returns 返回一个新的函数，该函数返回一个 Promise
  */
 export const useFullscreenLoading: UseFullscreenLoading = (fn, options = {}) => {
   let loadingInstance: LoadingInstance
-  const showLoading = (options: LoadingOptions) => {
+  return async (...args) => {
-    loadingInstance = ElLoading.service(options)
-  }
-  const hideLoading = () => {
-    loadingInstance && loadingInstance.close()
-  }
-  const _options = { ...defaultOptions, ...options }
-  return (...args) => {
     try {
-      showLoading(_options)
+      loadingInstance = ElLoading.service({ ...defaultOptions, ...options })
-      const result = fn(...args)
+      const result = await fn(...args)
-      const isPromise = result instanceof Promise
-      // 同步函数
-      if (!isPromise) {
-        hideLoading()
-        return Promise.resolve(result)
-      }
-      // Promise
       return result
-        .then((res) => {
+    } finally {
-          return res
+      loadingInstance?.close()
-        })
-        .catch((err) => {
-          throw err
-        })
-        .finally(() => {
-          hideLoading()
-        })
-    } catch (err) {
-      hideLoading()
-      throw err
     }
   }
 }