@fmdeui/fmui 1.0.21 → 1.0.23

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/es/packages/utils/signalR.mjs

@@ -2,46 +2,50 @@ import * as SignalR from '@microsoft/signalr';
 import { ElNotification } from 'element-plus';
 import { getToken } from './request.mjs';
 
-const connection = new SignalR.HubConnectionBuilder().configureLogging(SignalR.LogLevel.Warning).withUrl(`${window.__env__.VITE_API_URL}/hubs/onlineUser?token=${getToken()}`, { transport: SignalR.HttpTransportType.WebSockets, skipNegotiation: true }).withAutomaticReconnect({
-  nextRetryDelayInMilliseconds: () => {
-    return 5e3;
-  }
-}).build();
-connection.keepAliveIntervalInMilliseconds = 15 * 1e3;
-connection.serverTimeoutInMilliseconds = 30 * 1e3;
-connection.start().then(() => {
-});
-connection.onclose(async () => {
-});
-connection.onreconnecting(() => {
-  ElNotification({
-    title: "\u63D0\u793A",
-    message: "\u8FDE\u63A5\u5DF2\u65AD\u5F00  >>>>>",
-    type: "error",
-    position: "bottom-right"
+if (!window.__SIGNALR_INSTANCE__) {
+  const connection = new SignalR.HubConnectionBuilder().configureLogging(SignalR.LogLevel.Warning).withUrl(`${window.__env__.VITE_API_URL}/hubs/onlineUser?token=${getToken()}`, { transport: SignalR.HttpTransportType.WebSockets, skipNegotiation: true }).withAutomaticReconnect({
+    nextRetryDelayInMilliseconds: () => {
+      return 5e3;
+    }
+  }).build();
+  connection.keepAliveIntervalInMilliseconds = 15 * 1e3;
+  connection.serverTimeoutInMilliseconds = 30 * 1e3;
+  connection.start().then(() => {
   });
-});
-connection.onreconnected(() => {
-  ElNotification({
-    title: "\u63D0\u793A",
-    message: "\u8FDE\u63A5\u5DF2\u6062\u590D  >>>>>",
-    type: "success",
-    position: "bottom-right"
+  connection.onclose(async () => {
   });
-});
-connection.on("OnlineUserList", () => {
-});
-connection.on("ReceiveMessage", (message) => {
-  var tmpMsg = `<div style="white-space: pre-wrap;">${message.message}<div><br/>`;
-  tmpMsg += `<p style="color:#808080; font-size:10px;float:right"> ${message.sendUserName}  ${message.sendTime}<p>`;
-  ElNotification({
-    title: `${message.title}`,
-    message: tmpMsg,
-    type: message.messageType.toString().toLowerCase(),
-    position: "top-right",
-    dangerouslyUseHTMLString: true,
-    duration: 5e3
+  connection.onreconnecting(() => {
+    ElNotification({
+      title: "\u63D0\u793A",
+      message: "\u8FDE\u63A5\u5DF2\u65AD\u5F00  >>>>>",
+      type: "error",
+      position: "bottom-right"
+    });
   });
-});
+  connection.onreconnected(() => {
+    ElNotification({
+      title: "\u63D0\u793A",
+      message: "\u8FDE\u63A5\u5DF2\u6062\u590D  >>>>>",
+      type: "success",
+      position: "bottom-right"
+    });
+  });
+  connection.on("OnlineUserList", () => {
+  });
+  connection.on("ReceiveMessage", (message) => {
+    var tmpMsg = `<div style="white-space: pre-wrap;">${message.message}<div><br/>`;
+    tmpMsg += `<p style="color:#808080; font-size:10px;float:right"> ${message.sendUserName}  ${message.sendTime}<p>`;
+    ElNotification({
+      title: `${message.title}`,
+      message: tmpMsg,
+      type: message.messageType.toString().toLowerCase(),
+      position: "top-right",
+      dangerouslyUseHTMLString: true,
+      duration: 5e3
+    });
+  });
+  window.__SIGNALR_INSTANCE__ = connection;
+}
+const signalR = window.__SIGNALR_INSTANCE__;
 
-export { connection as signalR };
+export { signalR };

package/es/utils/signalR.d.ts

@@ -1,3 +1,7 @@
 import * as SignalR from '@microsoft/signalr';
-declare const connection: SignalR.HubConnection;
-export { connection as signalR };
+export declare const signalR: SignalR.HubConnection;
+declare global {
+    interface Window {
+        __SIGNALR_INSTANCE__: SignalR.HubConnection;
+    }
+}

package/index.js

@@ -1,4 +1,4 @@
-/*! fmdeui-fmui v1.0.21 */
+/*! fmdeui-fmui v1.0.23 */
 (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();
@@ -1652,51 +1690,55 @@
 	  return entity;
 	}
 
-	const connection = new SignalR__namespace.HubConnectionBuilder().configureLogging(SignalR__namespace.LogLevel.Warning).withUrl(`${window.__env__.VITE_API_URL}/hubs/onlineUser?token=${getToken()}`, { transport: SignalR__namespace.HttpTransportType.WebSockets, skipNegotiation: true }).withAutomaticReconnect({
-	  nextRetryDelayInMilliseconds: () => {
-	    return 5e3;
-	  }
-	}).build();
-	connection.keepAliveIntervalInMilliseconds = 15 * 1e3;
-	connection.serverTimeoutInMilliseconds = 30 * 1e3;
-	connection.start().then(() => {
-	});
-	connection.onclose(async () => {
-	});
-	connection.onreconnecting(() => {
-	  elementPlus.ElNotification({
-	    title: "\u63D0\u793A",
-	    message: "\u8FDE\u63A5\u5DF2\u65AD\u5F00  >>>>>",
-	    type: "error",
-	    position: "bottom-right"
+	if (!window.__SIGNALR_INSTANCE__) {
+	  const connection = new SignalR__namespace.HubConnectionBuilder().configureLogging(SignalR__namespace.LogLevel.Warning).withUrl(`${window.__env__.VITE_API_URL}/hubs/onlineUser?token=${getToken()}`, { transport: SignalR__namespace.HttpTransportType.WebSockets, skipNegotiation: true }).withAutomaticReconnect({
+	    nextRetryDelayInMilliseconds: () => {
+	      return 5e3;
+	    }
+	  }).build();
+	  connection.keepAliveIntervalInMilliseconds = 15 * 1e3;
+	  connection.serverTimeoutInMilliseconds = 30 * 1e3;
+	  connection.start().then(() => {
 	  });
-	});
-	connection.onreconnected(() => {
-	  elementPlus.ElNotification({
-	    title: "\u63D0\u793A",
-	    message: "\u8FDE\u63A5\u5DF2\u6062\u590D  >>>>>",
-	    type: "success",
-	    position: "bottom-right"
+	  connection.onclose(async () => {
 	  });
-	});
-	connection.on("OnlineUserList", () => {
-	});
-	connection.on("ReceiveMessage", (message) => {
-	  var tmpMsg = `<div style="white-space: pre-wrap;">${message.message}<div><br/>`;
-	  tmpMsg += `<p style="color:#808080; font-size:10px;float:right"> ${message.sendUserName}  ${message.sendTime}<p>`;
-	  elementPlus.ElNotification({
-	    title: `${message.title}`,
-	    message: tmpMsg,
-	    type: message.messageType.toString().toLowerCase(),
-	    position: "top-right",
-	    dangerouslyUseHTMLString: true,
-	    duration: 5e3
+	  connection.onreconnecting(() => {
+	    elementPlus.ElNotification({
+	      title: "\u63D0\u793A",
+	      message: "\u8FDE\u63A5\u5DF2\u65AD\u5F00  >>>>>",
+	      type: "error",
+	      position: "bottom-right"
+	    });
 	  });
-	});
+	  connection.onreconnected(() => {
+	    elementPlus.ElNotification({
+	      title: "\u63D0\u793A",
+	      message: "\u8FDE\u63A5\u5DF2\u6062\u590D  >>>>>",
+	      type: "success",
+	      position: "bottom-right"
+	    });
+	  });
+	  connection.on("OnlineUserList", () => {
+	  });
+	  connection.on("ReceiveMessage", (message) => {
+	    var tmpMsg = `<div style="white-space: pre-wrap;">${message.message}<div><br/>`;
+	    tmpMsg += `<p style="color:#808080; font-size:10px;float:right"> ${message.sendUserName}  ${message.sendTime}<p>`;
+	    elementPlus.ElNotification({
+	      title: `${message.title}`,
+	      message: tmpMsg,
+	      type: message.messageType.toString().toLowerCase(),
+	      position: "top-right",
+	      dangerouslyUseHTMLString: true,
+	      duration: 5e3
+	    });
+	  });
+	  window.__SIGNALR_INSTANCE__ = connection;
+	}
+	const signalR$1 = window.__SIGNALR_INSTANCE__;
 
-	var signalR$1 = /*#__PURE__*/Object.freeze({
+	var signalR$2 = /*#__PURE__*/Object.freeze({
 		__proto__: null,
-		signalR: connection
+		signalR: signalR$1
 	});
 
 	const setWatermark = (str) => {
@@ -18759,7 +18801,7 @@
 	let signalR;
 	async function loadSignalR() {
 	  if (!signalR) {
-	    const module = await Promise.resolve().then(function () { return signalR$1; });
+	    const module = await Promise.resolve().then(function () { return signalR$2; });
 	    signalR = module.signalR;
 	  }
 	  return signalR;
@@ -22824,7 +22866,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) {
@@ -23109,7 +23159,7 @@
 	exports.setJsCdn = setJsCdn;
 	exports.setPathPrefix = setPathPrefix;
 	exports.setupI18n = setupI18n;
-	exports.signalR = connection;
+	exports.signalR = signalR$1;
 	exports.signatureByKSort = signatureByKSort;
 	exports.sleep = sleep;
 	exports.tansParams = tansParams;