@fmdeui/fmui 1.0.25 → 1.0.26

package/es/packages/utils/signalR.mjs

@@ -53,24 +53,62 @@ const initSignalR = () => {
   });
   return connection;
 };
+const getSignalR = () => {
+  return window.__SIGNALR_INSTANCE__;
+};
 if (!window.__SIGNALR_INSTANCE__) {
   const instance = initSignalR();
   if (instance) {
     window.__SIGNALR_INSTANCE__ = 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;
-    });
+if (!window.__SIGNALR_INSTANCE__) {
+  const instance = initSignalR();
+  if (instance) {
+    window.__SIGNALR_INSTANCE__ = instance;
   } else {
-    const instance = initSignalR();
-    if (instance)
-      window.__SIGNALR_INSTANCE__ = instance;
+  }
+}
+const signalR = {
+  on: (event, callback) => {
+    const instance = getSignalR();
+    if (instance) {
+      instance.on(event, callback);
+    } else {
+      console.warn(`SignalR \u672A\u8FDE\u63A5\uFF0C\u65E0\u6CD5\u76D1\u542C\u4E8B\u4EF6: ${event}`);
+    }
+  },
+  off: (event, callback) => {
+    const instance = getSignalR();
+    if (instance) {
+      instance.off(event, callback);
+    }
+  },
+  send: (method, ...args) => {
+    const instance = getSignalR();
+    if (instance) {
+      return instance.invoke(method, ...args);
+    } else {
+      console.warn("SignalR \u672A\u8FDE\u63A5\uFF0C\u65E0\u6CD5\u53D1\u9001\u6D88\u606F");
+      return Promise.reject("SignalR \u672A\u8FDE\u63A5");
+    }
+  },
+  stop: () => {
+    const instance = getSignalR();
+    if (instance) {
+      return instance.stop();
+    }
+    return Promise.resolve();
+  }
+};
+const restartSignalR = async () => {
+  const instance = getSignalR();
+  if (instance) {
+    await instance.stop();
+  }
+  const newInstance = initSignalR();
+  if (newInstance) {
+    window.__SIGNALR_INSTANCE__ = newInstance;
   }
 };
 

package/es/utils/signalR.d.ts

@@ -1,6 +1,11 @@
 import * as SignalR from '@microsoft/signalr';
-declare const signalR: SignalR.HubConnection;
-declare const restartSignalR: () => void;
+declare const signalR: {
+    on: (event: any, callback: any) => void;
+    off: (event: any, callback: any) => void;
+    send: (method: any, ...args: any[]) => Promise<any>;
+    stop: () => Promise<void>;
+};
+declare const restartSignalR: () => Promise<void>;
 export { signalR, restartSignalR };
 declare global {
     interface Window {

package/index.js

@@ -1,4 +1,4 @@
-/*! fmdeui-fmui v1.0.25 */
+/*! fmdeui-fmui v1.0.26 */
 (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) :
@@ -1741,24 +1741,61 @@
 	  });
 	  return connection;
 	};
+	const getSignalR = () => {
+	  return window.__SIGNALR_INSTANCE__;
+	};
 	if (!window.__SIGNALR_INSTANCE__) {
 	  const instance = initSignalR();
 	  if (instance) {
 	    window.__SIGNALR_INSTANCE__ = 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;
+	if (!window.__SIGNALR_INSTANCE__) {
+	  const instance = initSignalR();
+	  if (instance) {
+	    window.__SIGNALR_INSTANCE__ = instance;
+	  }
+	}
+	const signalR = {
+	  on: (event, callback) => {
+	    const instance = getSignalR();
+	    if (instance) {
+	      instance.on(event, callback);
+	    } else {
+	      console.warn(`SignalR \u672A\u8FDE\u63A5\uFF0C\u65E0\u6CD5\u76D1\u542C\u4E8B\u4EF6: ${event}`);
+	    }
+	  },
+	  off: (event, callback) => {
+	    const instance = getSignalR();
+	    if (instance) {
+	      instance.off(event, callback);
+	    }
+	  },
+	  send: (method, ...args) => {
+	    const instance = getSignalR();
+	    if (instance) {
+	      return instance.invoke(method, ...args);
+	    } else {
+	      console.warn("SignalR \u672A\u8FDE\u63A5\uFF0C\u65E0\u6CD5\u53D1\u9001\u6D88\u606F");
+	      return Promise.reject("SignalR \u672A\u8FDE\u63A5");
+	    }
+	  },
+	  stop: () => {
+	    const instance = getSignalR();
+	    if (instance) {
+	      return instance.stop();
+	    }
+	    return Promise.resolve();
+	  }
+	};
+	const restartSignalR = async () => {
+	  const instance = getSignalR();
+	  if (instance) {
+	    await instance.stop();
+	  }
+	  const newInstance = initSignalR();
+	  if (newInstance) {
+	    window.__SIGNALR_INSTANCE__ = newInstance;
 	  }
 	};