Pull request #8944: REPORT-116621 fix: 【服务拆分】emit回调无法触发问题

Merge in DEC/decision-webui-dcm from ~AUSTIN.DUAN/decision-webui-dcm:research/11.0 to research/11.0

* commit '4847988a9289a70ba747bccb0294cb09249a832d':
  REPORT-116621  fix: 【服务拆分】emit回调无法触发问题

src/modules/constants/env.ts

@@ -9,12 +9,12 @@ export const connectionType: {
     JNDI: string;
 } = DecCst.Connect.ConnectionType;
 
-export const editStatusEvent: {
+export const editStatusEvent = {
-    OPEN: string;
+    OPEN: 'getConnectionStatus',
-    SHUTDOWN: string;
+    SHUTDOWN: 'shutdownConnectionStatus',
-    CONNECTION_EDITED: string,
+    CONNECTION_EDITED: 'connectionEdited',
-    CONNECTION_RELEASED: string,
+    CONNECTION_RELEASED: 'connectionReleased',
-} = DecCst.Connect.EditStatusEvent;
+};
 
 export const errorCode: {
     CONNECTION_DELETED: string;

src/modules/crud/decision.api.ts

@@ -61,11 +61,14 @@ export class DecisionApi implements Api {
     }
 
     getConnectionStatus(name: string): Promise<SocketResult> {
-        return this.sendEditStatusEvent(name, editStatusEvent.OPEN)
+        // TODO: 当前emit同步回调已无法执行
-            .then(re => {
+        this.sendEditStatusEvent(name, editStatusEvent.OPEN);
-                if (re.errorCode) {
+
+        return new Promise((resolve, rejected) => {
+            this.addEventListener(editStatusEvent.OPEN, res => {
+                if (res.errorCode) {
                     let errorMessage = '';
-                    switch (re.errorCode) {
+                    switch (res.errorCode) {
                         case errorCode.CONNECTION_DELETED:
                             errorMessage = 'Dec-Dcm_Connection_Deleted';
                             break;
@@ -73,17 +76,18 @@ export class DecisionApi implements Api {
                             errorMessage = 'Dec-Dcm_Connection_Is_Using';
                             break;
                         default:
-                            errorMessage = re.errorMsg;
+                            errorMessage = res.errorMsg;
                             break;
                     }
-                    BI.Msg.toast(BI.i18nText(errorMessage, re.errorMsg), {
+                    BI.Msg.toast(BI.i18nText(errorMessage, res.errorMsg), {
                         level: 'error',
                     });
-                    throw re;
+                    rejected(res);
                 } else {
-                    return re;
+                    resolve(res);
                 }
             });
+        });
     }
 
     setEditedConnectionStatus(name: string): Promise<SocketResult> {
@@ -131,4 +135,14 @@ export class DecisionApi implements Api {
             }
         });
     }
+
+    private addEventListener(name: string, callback: Function) {
+        if (!Dec.socket) return;
+
+        if (Dec.socket.hasListeners(name)) {
+            Dec.socket.removeListener(name);
+        }
+
+        Dec.socket.originOn(name, callback);
+    }
 }

types/globals.d.ts

@@ -10,6 +10,9 @@ declare const Dec: {
     socket: {
         connected: boolean;
         emit: Function;
+        originOn: Function;
+        hasListeners: Function;
+        removeListener: Function;
     };
     system: {