@fmdeui/fmui 1.0.23 → 1.0.25

package/es/index.mjs

@@ -34,9 +34,9 @@ export { initBackEndControlRoutes, setDynamicViewsModules } from './packages/rou
 export { initFrontEndControlRoutes } from './packages/router/frontEnd.mjs';
 export { judgementIdCard, verifiyNumberInteger, verifyAccount, verifyAndSpace, verifyCarNum, verifyCnAndSpace, verifyEmail, verifyEnAndSpace, verifyFullName, verifyIPAddress, verifyIdCard, verifyNumberCnUppercase, verifyNumberComma, verifyNumberIntegerAndFloat, verifyNumberPercentage, verifyNumberPercentageFloat, verifyPassword, verifyPasswordPowerful, verifyPasswordStrength, verifyPhone, verifyPostalCode, verifyTelPhone, verifyTextColor, verifyUrl } from './packages/utils/toolsValidate.mjs';
 export { loadSysInfo, updateFavicon } from './packages/hooks/sysInfo.mjs';
+export { restartSignalR, signalR } from './packages/utils/signalR.mjs';
 export { router } from './packages/router/createRouter.mjs';
 export { saulVModel } from './packages/utils/saulVModel.mjs';
-export { signalR } from './packages/utils/signalR.mjs';
 export { signatureByKSort } from './packages/utils/data-signature.mjs';
 export { useApi, useBaseApi } from './packages/api/base/index.mjs';
 export { useChangeColor } from './packages/utils/theme.mjs';

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/index.mjs

@@ -18,4 +18,4 @@ export { saulVModel } from './saulVModel.mjs';
 export { Local, Session } from './storage.mjs';
 export { useChangeColor } from './theme.mjs';
 export { judgementIdCard, verifiyNumberInteger, verifyAccount, verifyAndSpace, verifyCarNum, verifyCnAndSpace, verifyEmail, verifyEnAndSpace, verifyFullName, verifyIPAddress, verifyIdCard, verifyNumberCnUppercase, verifyNumberComma, verifyNumberIntegerAndFloat, verifyNumberPercentage, verifyNumberPercentageFloat, verifyPassword, verifyPasswordPowerful, verifyPasswordStrength, verifyPhone, verifyPostalCode, verifyTelPhone, verifyTextColor, verifyUrl } from './toolsValidate.mjs';
-export { signalR } from './signalR.mjs';
+export { restartSignalR, signalR } from './signalR.mjs';

package/es/packages/utils/signalR.mjs

@@ -2,8 +2,13 @@ import * as SignalR from '@microsoft/signalr';
 import { ElNotification } from 'element-plus';
 import { getToken } from './request.mjs';
 
-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({
+const initSignalR = () => {
+  const token = getToken();
+  if (!token) return null;
+  const connection = new SignalR.HubConnectionBuilder().configureLogging(SignalR.LogLevel.Warning).withUrl(`${window.__env__.VITE_API_URL}/hubs/onlineUser?token=${token}`, {
+    transport: SignalR.HttpTransportType.WebSockets,
+    skipNegotiation: true
+  }).withAutomaticReconnect({
     nextRetryDelayInMilliseconds: () => {
       return 5e3;
     }
@@ -11,6 +16,8 @@ if (!window.__SIGNALR_INSTANCE__) {
   connection.keepAliveIntervalInMilliseconds = 15 * 1e3;
   connection.serverTimeoutInMilliseconds = 30 * 1e3;
   connection.start().then(() => {
+  }).catch((err) => {
+    console.error("SignalR \u8FDE\u63A5\u5931\u8D25:", err);
   });
   connection.onclose(async () => {
   });
@@ -44,8 +51,27 @@ if (!window.__SIGNALR_INSTANCE__) {
       duration: 5e3
     });
   });
-  window.__SIGNALR_INSTANCE__ = connection;
+  return connection;
+};
+if (!window.__SIGNALR_INSTANCE__) {
+  const instance = initSignalR();
+  if (instance) {
+    window.__SIGNALR_INSTANCE__ = instance;
+  }
 }
-const signalR = window.__SIGNALR_INSTANCE__;
+const signalR = window.__SIGNALR_INSTANCE__ || initSignalR();
+const restartSignalR = () => {
+  if (window.__SIGNALR_INSTANCE__) {
+    window.__SIGNALR_INSTANCE__.stop().then(() => {
+      const instance = initSignalR();
+      if (instance)
+        window.__SIGNALR_INSTANCE__ = instance;
+    });
+  } else {
+    const instance = initSignalR();
+    if (instance)
+      window.__SIGNALR_INSTANCE__ = instance;
+  }
+};
 
-export { signalR };
+export { restartSignalR, signalR };

package/es/utils/signalR.d.ts

@@ -1,5 +1,7 @@
 import * as SignalR from '@microsoft/signalr';
-export declare const signalR: SignalR.HubConnection;
+declare const signalR: SignalR.HubConnection;
+declare const restartSignalR: () => void;
+export { signalR, restartSignalR };
 declare global {
     interface Window {
         __SIGNALR_INSTANCE__: SignalR.HubConnection;

package/index.js

@@ -1,4 +1,4 @@
-/*! fmdeui-fmui v1.0.23 */
+/*! fmdeui-fmui v1.0.25 */
 (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,8 +1690,13 @@
 	  return entity;
 	}
 
-	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({
+	const initSignalR = () => {
+	  const token = getToken();
+	  if (!token) return null;
+	  const connection = new SignalR__namespace.HubConnectionBuilder().configureLogging(SignalR__namespace.LogLevel.Warning).withUrl(`${window.__env__.VITE_API_URL}/hubs/onlineUser?token=${token}`, {
+	    transport: SignalR__namespace.HttpTransportType.WebSockets,
+	    skipNegotiation: true
+	  }).withAutomaticReconnect({
 	    nextRetryDelayInMilliseconds: () => {
 	      return 5e3;
 	    }
@@ -1699,6 +1704,8 @@
 	  connection.keepAliveIntervalInMilliseconds = 15 * 1e3;
 	  connection.serverTimeoutInMilliseconds = 30 * 1e3;
 	  connection.start().then(() => {
+	  }).catch((err) => {
+	    console.error("SignalR \u8FDE\u63A5\u5931\u8D25:", err);
 	  });
 	  connection.onclose(async () => {
 	  });
@@ -1732,14 +1739,28 @@
 	      duration: 5e3
 	    });
 	  });
-	  window.__SIGNALR_INSTANCE__ = connection;
+	  return connection;
+	};
+	if (!window.__SIGNALR_INSTANCE__) {
+	  const instance = initSignalR();
+	  if (instance) {
+	    window.__SIGNALR_INSTANCE__ = instance;
+	  }
 	}
-	const signalR$1 = window.__SIGNALR_INSTANCE__;
-
-	var signalR$2 = /*#__PURE__*/Object.freeze({
-		__proto__: null,
-		signalR: signalR$1
-	});
+	const signalR = window.__SIGNALR_INSTANCE__ || initSignalR();
+	const restartSignalR = () => {
+	  if (window.__SIGNALR_INSTANCE__) {
+	    window.__SIGNALR_INSTANCE__.stop().then(() => {
+	      const instance = initSignalR();
+	      if (instance)
+	        window.__SIGNALR_INSTANCE__ = instance;
+	    });
+	  } else {
+	    const instance = initSignalR();
+	    if (instance)
+	      window.__SIGNALR_INSTANCE__ = instance;
+	  }
+	};
 
 	const setWatermark = (str) => {
 	  const id = "1.23452384164.123412416";
@@ -18798,13 +18819,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$2; });
-	    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 {
@@ -18882,8 +18901,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);
@@ -23149,6 +23168,7 @@
 	exports.refreshAccessTokenKey = refreshAccessTokenKey;
 	exports.removeDuplicate = removeDuplicate;
 	exports.request2 = request2;
+	exports.restartSignalR = restartSignalR;
 	exports.roles = roles;
 	exports.router = router;
 	exports.saulVModel = saulVModel;
@@ -23159,7 +23179,7 @@
 	exports.setJsCdn = setJsCdn;
 	exports.setPathPrefix = setPathPrefix;
 	exports.setupI18n = setupI18n;
-	exports.signalR = signalR$1;
+	exports.signalR = signalR;
 	exports.signatureByKSort = signatureByKSort;
 	exports.sleep = sleep;
 	exports.tansParams = tansParams;