@fmdeui/fmui 1.0.21 → 1.0.22

package/es/packages/router/backEnd.mjs

@@ -78,7 +78,15 @@ function backEndComponent(routes) {
 function dynamicImport(dynamicViewsModules2, component) {
   const keys = Object.keys(dynamicViewsModules2);
   const matchKeys = keys.filter((key) => {
-    const k = key.replace(/..\/views|../, "");
+    const REMOVE_PREFIXES = [
+      "../../../../packages/fmasyspage/views",
+      "../../../../packages/fmwlpage/views",
+      "../../../../packages/fmreliefpage/views",
+      "../views",
+      "./views",
+      ".."
+    ].map((p) => p.replace(/\./g, "\\.").replace(/\//g, "\\/")).join("|");
+    const k = key.replace(new RegExp(`^(${REMOVE_PREFIXES})/?`), "/");
     return k.startsWith(`${component}`) || k.startsWith(`/${component}`);
   });
   if ((matchKeys == null ? void 0 : matchKeys.length) === 1) {

package/es/packages/utils/request.mjs

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import { ElMessage } from 'element-plus';
+import { ElLoading, ElMessage } from 'element-plus';
 import { Local, Session } from './storage.mjs';
 
 const abortControllerMap = /* @__PURE__ */ new Map();
@@ -31,9 +31,35 @@ const clearTokens = () => {
   Session.clear();
 };
 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 == null ? void 0 : loadingInstance.close();
+      loadingInstance = null;
+    }, 200);
+  }
+}
 service.interceptors.request.use(
   (config) => {
     var _a;
+    const customConfig = config;
+    if (customConfig.loading) {
+      startLoading();
+    }
     const controller = new AbortController();
     config.signal = controller.signal;
     const url = config.url || "";
@@ -59,11 +85,19 @@ service.interceptors.request.use(
     return config;
   },
   (error) => {
+    const customConfig = error.config;
+    if ((customConfig == null ? void 0 : 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;
@@ -97,6 +131,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 @@
-/*! fmdeui-fmui v1.0.21 */
+/*! fmdeui-fmui v1.0.22 */
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('pinia'), require('crypto-js'), require('xlsx-js-style'), require('element-plus'), require('vue'), require('@element-plus/icons-vue'), require('axios'), require('js-cookie'), require('@microsoft/signalr'), require('vxe-table'), require('@vxe-ui/plugin-render-element'), require('@vxe-ui/plugin-export-xlsx'), require('vxe-pc-ui'), require('vue-i18n'), require('exceljs'), require('lodash-es'), require('@vueuse/core'), require('mitt'), require('vue-router'), require('nprogress')) :
 	typeof define === 'function' && define.amd ? define(['exports', 'pinia', 'crypto-js', 'xlsx-js-style', 'element-plus', 'vue', '@element-plus/icons-vue', 'axios', 'js-cookie', '@microsoft/signalr', 'vxe-table', '@vxe-ui/plugin-render-element', '@vxe-ui/plugin-export-xlsx', 'vxe-pc-ui', 'vue-i18n', 'exceljs', 'lodash-es', '@vueuse/core', 'mitt', 'vue-router', 'nprogress'], factory) :
@@ -1263,9 +1263,35 @@
 	  Session.clear();
 	};
 	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 == null ? void 0 : loadingInstance.close();
+	      loadingInstance = null;
+	    }, 200);
+	  }
+	}
 	service.interceptors.request.use(
 	  (config) => {
 	    var _a;
+	    const customConfig = config;
+	    if (customConfig.loading) {
+	      startLoading();
+	    }
 	    const controller = new AbortController();
 	    config.signal = controller.signal;
 	    const url = config.url || "";
@@ -1291,11 +1317,19 @@
 	    return config;
 	  },
 	  (error) => {
+	    const customConfig = error.config;
+	    if ((customConfig == null ? void 0 : 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;
@@ -1329,6 +1363,10 @@
 	    return res;
 	  },
 	  (error) => {
+	    const customConfig = error.config;
+	    if (customConfig.loading === true) {
+	      endLoading();
+	    }
 	    if (error.response) {
 	      if (error.response.status === 401) {
 	        clearAccessTokens();
@@ -22824,7 +22862,15 @@
 	function dynamicImport(dynamicViewsModules2, component) {
 	  const keys = Object.keys(dynamicViewsModules2);
 	  const matchKeys = keys.filter((key) => {
-	    const k = key.replace(/..\/views|../, "");
+	    const REMOVE_PREFIXES = [
+	      "../../../../packages/fmasyspage/views",
+	      "../../../../packages/fmwlpage/views",
+	      "../../../../packages/fmreliefpage/views",
+	      "../views",
+	      "./views",
+	      ".."
+	    ].map((p) => p.replace(/\./g, "\\.").replace(/\//g, "\\/")).join("|");
+	    const k = key.replace(new RegExp(`^(${REMOVE_PREFIXES})/?`), "/");
 	    return k.startsWith(`${component}`) || k.startsWith(`/${component}`);
 	  });
 	  if ((matchKeys == null ? void 0 : matchKeys.length) === 1) {