Merge pull request #10342 in DEC/decision-webui-dcm from final/11.0 to persist/11.0

* commit '2c7e4bdcbe0159f00f3672bddc890afec635816d':

assets/scripts/dec.js

@@ -16,8 +16,6 @@ window.DecCst = {
       EditStatusEvent: {
         OPEN: 'getConnectionStatus',
         SHUTDOWN: 'shutdownConnectionStatus',
-        CONNECTION_EDITED: 'connectionEdited',
-        CONNECTION_RELEASED: 'connectionReleased',
       }
     },
     Hyperlink: {

src/modules/constants/env.ts

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

src/modules/crud/api.ts

@@ -75,12 +75,6 @@ export interface Api {
      */
     getConnectionStatus(name: string): Promise<SocketResult>;
 
-    /**
-     * 设置编辑状态
-     * @param name
-     */
-    setEditedConnectionStatus(name: string): void;
-
     /**
      * 关闭连接
      * @param name

src/modules/crud/decision.api.ts

@@ -82,20 +82,11 @@ export class DecisionApi implements Api {
     }
 
     getConnectionStatus(name: string): Promise<SocketResult> {
-        // TODO: 当前emit同步回调已无法执行
-        this.sendEditStatusEvent(name, editStatusEvent.OPEN);
-
-        if (!Dec.socket?.connected) {
-            return Promise.resolve({ data: 'success' });
-        }
-
-        return new Promise((resolve, rejected) => {
-            this.addEventListener(editStatusEvent.OPEN, res => {
-                const data = JSON.parse(res.data);
-
-                if (data.errorCode) {
+        return this.sendEditStatusEvent(name, editStatusEvent.OPEN)
+            .then(re => {
+                if (re.errorCode) {
                     let errorMessage = '';
-                    switch (data.errorCode) {
+                    switch (re.errorCode) {
                         case errorCode.CONNECTION_DELETED:
                             errorMessage = 'Dec-Dcm_Connection_Deleted';
                             break;
@@ -103,30 +94,29 @@ export class DecisionApi implements Api {
                             errorMessage = 'Dec-Dcm_Connection_Is_Using';
                             break;
                         default:
-                            errorMessage = data.errorMessage;
+                            errorMessage = re.errorMsg;
                             break;
                     }
-                    BI.Msg.toast(BI.i18nText(errorMessage, data.errorMessage), {
+                    BI.Msg.toast(BI.i18nText(errorMessage, re.errorMsg), {
                         level: 'error',
                     });
-                    rejected(data);
+                    throw re;
                 } else {
-                    resolve(res);
+                    return re;
                 }
             });
-        });
-    }
-
-    setEditedConnectionStatus(name: string): Promise<SocketResult> {
-        return this.sendEditStatusEvent(name, editStatusEvent.CONNECTION_EDITED);
     }
 
     shutdownConnectionStatus(name: string): Promise<SocketResult> {
-        return this.sendEditStatusEvent(name, editStatusEvent.CONNECTION_RELEASED);
+        return this.sendEditStatusEvent(name, editStatusEvent.SHUTDOWN);
     }
 
     getSocketStatus(): boolean {
-        return !!Dec?.socket?.connected;
+        if (Dec) {
+            return Dec.socket.connected;
+        }
+
+        return false;
     }
 
     isDriverError(errorCode: string) {
@@ -174,8 +164,8 @@ export class DecisionApi implements Api {
 
     private sendEditStatusEvent(name: string, type: string): Promise<SocketResult> {
         return new Promise(resolve => {
-            if (Dec?.socket?.connected) {
-                Dec.socket.emit(type, BI.encode(name), (re: any) => {
+            if (Dec && Dec.socket.connected) {
+                Dec.socketEmit(type, BI.encode(name), (re: any) => {
                     resolve(re);
                 });
             } else {
@@ -183,14 +173,4 @@ 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);
-    }
 }

src/modules/pages/maintain/maintain.ts

@@ -25,7 +25,7 @@ export class Maintain extends BI.Widget {
     render() {
         const { isEdit, databaseType } = this.getEditConnection();
         const titleText = getTextByDatabaseType(databaseType);
-
+        
         return {
             type: BI.VTapeLayout.xtype,
             hgap: 16,
@@ -81,14 +81,11 @@ export class Maintain extends BI.Widget {
             });
             this.socketTip.setVisible(true);
         }
-
-        this.model.connectionSelectedOne
-            && api.setEditedConnectionStatus(this.model.connectionSelectedOne.connectionName);
     }
 
     private renderItems() {
         const { type } = this.getEditConnection();
-
+        
         return [{
             type: MaintainForm.xtype,
             connectionType: type,
@@ -109,7 +106,7 @@ export class Maintain extends BI.Widget {
             const connectionJDBC = this.model.connectionSelectedOne.connectionData as ConnectionJDBC;
             databaseType = getJdbcDatabaseType(connectionJDBC.database, connectionJDBC.driver).databaseType;
         }
-
+        
         return {
             type: this.model.connectionSelectedOne.connectionType,
             text: this.model.connectionSelectedOne.connectionName,

types/globals.d.ts

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