@fmdevui/fm-dev 1.0.44 → 1.0.45

package/es/core/api/utils/request.d.ts

@@ -1,4 +1,7 @@
 import { AxiosInstance, AxiosRequestConfig } from 'axios';
+export interface CustomAxiosRequestConfig extends AxiosRequestConfig {
+    loading?: boolean;
+}
 export declare const service: AxiosInstance;
 export declare const accessTokenKey: string;
 export declare const refreshAccessTokenKey: string;
@@ -32,5 +35,5 @@ export declare function getJWTDate(timestamp: number): Date;
  * @config AxiosRequestConfig 请求参数
  * @returns 返回对象
  */
-export declare function request2(config: AxiosRequestConfig<any>): any;
+export declare function request2(config: CustomAxiosRequestConfig): any;
 export default service;

package/es/packages/core/api/utils/request.mjs

@@ -1,6 +1,6 @@
 import axios from 'axios';
 import '../../utils/index.mjs';
-import { ElMessage } from 'element-plus';
+import { ElLoading, ElMessage } from 'element-plus';
 import { PUB } from '../../utils/const/index.mjs';
 import { Local, Session } from '../../utils/storage/index.mjs';
 
@@ -25,8 +25,34 @@ const clearAccessTokens = () => {
   window.location.reload();
 };
 const axiosInstance = axios;
+let loadingCount = 0;
+let loadingInstance = null;
+function startLoading() {
+  if (loadingCount === 0) {
+    loadingInstance = ElLoading.service({
+      lock: true,
+      text: "\u52A0\u8F7D\u4E2D...",
+      background: "rgba(0, 0, 0, 0.7)"
+    });
+  }
+  loadingCount++;
+}
+function endLoading() {
+  if (loadingCount <= 0) return;
+  loadingCount--;
+  if (loadingCount === 0 && loadingInstance) {
+    setTimeout(() => {
+      loadingInstance?.close();
+      loadingInstance = null;
+    }, 200);
+  }
+}
 service.interceptors.request.use(
   (config) => {
+    const customConfig = config;
+    if (customConfig.loading) {
+      startLoading();
+    }
     const controller = new AbortController();
     config.signal = controller.signal;
     const url = config.url || "";
@@ -52,11 +78,19 @@ service.interceptors.request.use(
     return config;
   },
   (error) => {
+    const customConfig = error.config;
+    if (customConfig?.loading === true) {
+      endLoading();
+    }
     return Promise.reject(error);
   }
 );
 service.interceptors.response.use(
   (res) => {
+    const customConfig = res.config;
+    if (customConfig.loading === true) {
+      endLoading();
+    }
     const url = res.config.url || "";
     abortControllerMap.delete(url);
     var status = res.status;
@@ -95,6 +129,10 @@ service.interceptors.response.use(
     return res;
   },
   (error) => {
+    const customConfig = error.config;
+    if (customConfig?.loading === true) {
+      endLoading();
+    }
     if (error.response) {
       if (error.response.status === 401) {
         clearAccessTokens();

package/index.js

@@ -1,4 +1,4 @@
-/*! fm-dev v1.0.44 */
+/*! fm-dev v1.0.45 */
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('vue'), require('crypto'), require('url'), require('http'), require('https'), require('util'), require('stream'), require('assert'), require('zlib'), require('element-plus')) :
   typeof define === 'function' && define.amd ? define(['exports', 'vue', 'crypto', 'url', 'http', 'https', 'util', 'stream', 'assert', 'zlib', 'element-plus'], factory) :
@@ -29519,8 +29519,34 @@
     window.location.reload();
   };
   const axiosInstance = axios;
+  let loadingCount = 0;
+  let loadingInstance = null;
+  function startLoading() {
+    if (loadingCount === 0) {
+      loadingInstance = elementPlus.ElLoading.service({
+        lock: true,
+        text: "\u52A0\u8F7D\u4E2D...",
+        background: "rgba(0, 0, 0, 0.7)"
+      });
+    }
+    loadingCount++;
+  }
+  function endLoading() {
+    if (loadingCount <= 0) return;
+    loadingCount--;
+    if (loadingCount === 0 && loadingInstance) {
+      setTimeout(() => {
+        loadingInstance?.close();
+        loadingInstance = null;
+      }, 200);
+    }
+  }
   service.interceptors.request.use(
     (config) => {
+      const customConfig = config;
+      if (customConfig.loading) {
+        startLoading();
+      }
       const controller = new AbortController();
       config.signal = controller.signal;
       const url = config.url || "";
@@ -29546,11 +29572,19 @@
       return config;
     },
     (error) => {
+      const customConfig = error.config;
+      if (customConfig?.loading === true) {
+        endLoading();
+      }
       return Promise.reject(error);
     }
   );
   service.interceptors.response.use(
     (res) => {
+      const customConfig = res.config;
+      if (customConfig.loading === true) {
+        endLoading();
+      }
       const url = res.config.url || "";
       abortControllerMap.delete(url);
       var status = res.status;
@@ -29589,6 +29623,10 @@
       return res;
     },
     (error) => {
+      const customConfig = error.config;
+      if (customConfig?.loading === true) {
+        endLoading();
+      }
       if (error.response) {
         if (error.response.status === 401) {
           clearAccessTokens();