@fmdeui/fmui 1.0.22 → 1.0.24

package/es/packages/hooks/idleTimeout.mjs

@@ -7,13 +7,11 @@ import { useLocale } from './useLocale.mjs';
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-let signalR;
 async function loadSignalR() {
-  if (!signalR) {
-    const module = await import('../utils/signalR.mjs');
-    signalR = module.signalR;
+  while (!window.__SIGNALR_INSTANCE__) {
+    await new Promise((resolve) => setTimeout(resolve, 100));
   }
-  return signalR;
+  return window.__SIGNALR_INSTANCE__;
 }
 const { t } = useLocale();
 class IdleTimeoutManager {
@@ -91,8 +89,8 @@ class IdleTimeoutManager {
   timeOutExec() {
     const appEl = document.getElementById("app");
     appEl == null ? void 0 : appEl.remove();
-    loadSignalR().then((signalR2) => {
-      signalR2.stop();
+    loadSignalR().then((signalR) => {
+      signalR.stop();
     });
     Local.remove(accessTokenKey);
     Local.remove(refreshAccessTokenKey);

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.22 */
+/*! fmdeui-fmui v1.0.24 */
 (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) :
@@ -1690,52 +1690,51 @@
 	  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"
+	    });
 	  });
-	});
-
-	var signalR$1 = /*#__PURE__*/Object.freeze({
-		__proto__: null,
-		signalR: connection
-	});
+	  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 = window.__SIGNALR_INSTANCE__;
 
 	const setWatermark = (str) => {
 	  const id = "1.23452384164.123412416";
@@ -18794,13 +18793,11 @@
 	var __defProp = Object.defineProperty;
 	var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 	var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-	let signalR;
 	async function loadSignalR() {
-	  if (!signalR) {
-	    const module = await Promise.resolve().then(function () { return signalR$1; });
-	    signalR = module.signalR;
+	  while (!window.__SIGNALR_INSTANCE__) {
+	    await new Promise((resolve) => setTimeout(resolve, 100));
 	  }
-	  return signalR;
+	  return window.__SIGNALR_INSTANCE__;
 	}
 	const { t } = useLocale();
 	class IdleTimeoutManager {
@@ -18878,8 +18875,8 @@
 	  timeOutExec() {
 	    const appEl = document.getElementById("app");
 	    appEl == null ? void 0 : appEl.remove();
-	    loadSignalR().then((signalR2) => {
-	      signalR2.stop();
+	    loadSignalR().then((signalR) => {
+	      signalR.stop();
 	    });
 	    Local.remove(accessTokenKey);
 	    Local.remove(refreshAccessTokenKey);
@@ -23155,7 +23152,7 @@
 	exports.setJsCdn = setJsCdn;
 	exports.setPathPrefix = setPathPrefix;
 	exports.setupI18n = setupI18n;
-	exports.signalR = connection;
+	exports.signalR = signalR;
 	exports.signatureByKSort = signatureByKSort;
 	exports.sleep = sleep;
 	exports.tansParams = tansParams;