@fmdevui/fm-dev 1.0.44 → 1.0.45

package/index.mjs

@@ -1,4 +1,4 @@
-/*! fm-dev v1.0.44 */
+/*! fm-dev v1.0.45 */
 import { defineComponent, reactive, computed, watch, resolveComponent, createBlock, openBlock, withCtx, createVNode, createElementVNode, createTextVNode, toDisplayString as toDisplayString$1, withDirectives, createElementBlock, Fragment, renderList, vShow, ref, onMounted, nextTick, normalizeStyle, createCommentVNode, normalizeClass, withModifiers, resolveDynamicComponent, effectScope, getCurrentInstance, shallowRef, isRef as isRef$1, inject, onUnmounted, h, Text, markRaw, toRaw as toRaw$1, hasInjectionContext, unref, isReactive as isReactive$1, toRef, getCurrentScope, onScopeDispose, toRefs, resolveDirective } from 'vue';
 import crypto from 'crypto';
 import require$$0 from 'url';
@@ -8,7 +8,7 @@ import util from 'util';
 import stream, { Readable } from 'stream';
 import require$$4 from 'assert';
 import zlib from 'zlib';
-import { ElMessage, dayjs } from 'element-plus';
+import { ElMessage, ElLoading, dayjs } from 'element-plus';
 
 const _hoisted_1$3 = { class: "fm-transfer-panel" };
 const _hoisted_2$2 = { class: "fm-transfer-panel__header" };
@@ -29524,8 +29524,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 || "";
@@ -29551,11 +29577,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;
@@ -29594,6 +29628,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/lib/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/lib/packages/core/api/utils/request.js

@@ -29,8 +29,34 @@ const clearAccessTokens = () => {
   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 || "";
@@ -56,11 +82,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;
@@ -99,6 +133,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fmdevui/fm-dev",
-  "version": "1.0.44",
+  "version": "1.0.45",
   "description": "Page level components developed based on Element Plus.",
   "author": "fmdevui",
   "keywords": [