部件服务基类调整

src/ibiz-core/control-service/control-service-base.ts

@@ -19,17 +19,6 @@ export class ControlServiceBase {
      */
     protected model: any = null;
 
-    /**
-     * 是否正在加载状态
-     *
-     * @protected
-     * @type {boolean}
-     * @memberof ControlServiceBase
-     */
-    protected $isLoading: boolean = false;
-    public get isLoading(): boolean {
-        return this.$isLoading;
-    }
 
     /**
      * 应用实体名称
@@ -97,7 +86,7 @@ export class ControlServiceBase {
         return appEntityServiceConstructor.getService(entityName);
     }
 
-    /**
+        /**
      * 行为处理之前
      *
      * @protected
@@ -109,9 +98,6 @@ export class ControlServiceBase {
      * @memberof ControlServiceBase
      */
     protected async onBeforeAction(action?: string, context: any = {}, data: any = {}, isLoading: boolean = true): Promise<any> {
-        if (isLoading) {
-            // this.showLoading();
-        }
         if (!this.service) {
             this.service = await this.getService(this.appDEName);
         }
@@ -130,32 +116,6 @@ export class ControlServiceBase {
      */
     protected async beforeAction(action?: string, context: any = {}, data: any = {}): Promise<any> { }
 
-    /**
-     * 行为处理之后
-     *
-     * @protected
-     * @param {string} [action]
-     * @param {*} [context={}]
-     * @param {*} [response]
-     * @returns {Promise<any>}
-     * @memberof ControlServiceBase
-     */
-    protected async onAfterAction(action?: string, context: any = {}, response?: any): Promise<any> {
-        // this.hiddenLoading();
-        this.afterAction(action, context, response);
-    }
-
-    /**
-     * 行为处理之后
-     *
-     * @protected
-     * @param {string} [action]
-     * @param {*} [context={}]
-     * @param {*} [response]
-     * @returns {Promise<any>}
-     * @memberof ControlServiceBase
-     */
-    protected async afterAction(action?: string, context: any = {}, response?: any): Promise<any> { }
 
     /**
      * 添加数据
@@ -168,22 +128,16 @@ export class ControlServiceBase {
      * @memberof ControlServiceBase
      */
     public async add(action: string, context: any = {}, data: any = {}, isLoading?: boolean): Promise<HttpResponse> {
-        let response: any;
         await this.onBeforeAction(action, context, data, isLoading);
-        try{
-            data = this.handleRequestData(action, context, data);
-            if (Util.isFunction(this.service[action])) {
-                response = await this.service[action](context, data, isLoading);
-            } else {
-                response = await this.service.Create(context, data, isLoading);
-            }
-            if (!response.isError()) {
-                response = this.handleResponse(action, response);
-            }
-        }catch (error) {
-            console.error(error);
-        }finally{
-            await this.onAfterAction(action, context, response);
+        data = this.handleRequestData(action, context, data);
+        let response: HttpResponse;
+        if (Util.isFunction(this.service[action])) {
+            response = await this.service[action](context, data, isLoading);
+        } else {
+            response = await this.service.Create(context, data, isLoading);
+        }
+        if (!response.isError()) {
+            response = this.handleResponse(action, response);
         }
         return response;
     }
@@ -199,22 +153,16 @@ export class ControlServiceBase {
      * @memberof ControlServiceBase
      */
     public async delete(action: string, context: any = {}, data: any = {}, isLoading?: boolean): Promise<HttpResponse> {
-        let response: any;
         await this.onBeforeAction(action, context, data, isLoading);
-        try{
-            data = this.handleRequestData(action, context, data);
-            if (Util.isFunction(this.service[action])) {
-                response = await this.service[action](context, data, isLoading);
-            } else {
-                response = await this.service.Remove(context, data, isLoading);
-            }
-            if (!response.isError()) {
-                response = this.handleResponse(action, response);
-            }
-        }catch (error) {
-            console.error(error);
-        }finally{
-            await this.onAfterAction(action, context, response);
+        data = this.handleRequestData(action, context, data);
+        let response: HttpResponse;
+        if (Util.isFunction(this.service[action])) {
+            response = await this.service[action](context, data, isLoading);
+        } else {
+            response = await this.service.Remove(context, data, isLoading);
+        }
+        if (!response.isError()) {
+            response = this.handleResponse(action, response);
         }
         return response;
     }
@@ -230,22 +178,16 @@ export class ControlServiceBase {
      * @memberof ControlServiceBase
      */
     public async update(action: string, context: any = {}, data: any = {}, isLoading?: boolean): Promise<HttpResponse> {
-        let response: any;
         await this.onBeforeAction(action, context, data, isLoading);
-        try{
-            data = this.handleRequestData(action, context, data);
-            if (Util.isFunction(this.service[action])) {
-                response = await this.service[action](context, data, isLoading);
-            } else {
-                response = await this.service.Update(context, data, isLoading);
-            }
-            if (!response.isError()) {
-                response = this.handleResponse(action, response);
-            }
-        }catch(error){
-            console.error(error)
-        }finally{
-            await this.onAfterAction(action, context, response);
+        data = this.handleRequestData(action, context, data);
+        let response: HttpResponse;
+        if (Util.isFunction(this.service[action])) {
+            response = await this.service[action](context, data, isLoading);
+        } else {
+            response = await this.service.Update(context, data, isLoading);
+        }
+        if (!response.isError()) {
+            response = this.handleResponse(action, response);
         }
         return response;
     }
@@ -261,22 +203,16 @@ export class ControlServiceBase {
      * @memberof ControlServiceBase
      */
     public async get(action: string, context: any = {}, data: any = {}, isLoading?: boolean): Promise<HttpResponse> {
-        let response: any;
         await this.onBeforeAction(action, context, data, isLoading);
-        try{
-            data = this.handleRequestData(action, context, data);
-            if (Util.isFunction(this.service[action])) {
-                response = await this.service[action](context, data, isLoading);
-            } else {
-                response = await this.service.Get(context, data, isLoading);
-            }
-            if (!response.isError()) {
-                response = this.handleResponse(action, response);
-            }
-        }catch (error) {
-            console.error(error);
-        }finally{
-            await this.onAfterAction(action, context, response);
+        data = this.handleRequestData(action, context, data);
+        let response: HttpResponse;
+        if (Util.isFunction(this.service[action])) {
+            response = await this.service[action](context, data, isLoading);
+        } else {
+            response = await this.service.Get(context, data, isLoading);
+        }
+        if (!response.isError()) {
+            response = this.handleResponse(action, response);
         }
         return response;
     }
@@ -292,30 +228,23 @@ export class ControlServiceBase {
      * @memberof ControlServiceBase
      */
     public async loadDraft(action: string, context: any = {}, data: any = {}, isLoading?: boolean): Promise<HttpResponse> {
-        let response: any;
         await this.onBeforeAction(action, context, data, isLoading);
-        try{
-        
-            data = this.handleRequestData(action, context, data);
-            let PrimaryKey = Util.createUUID();
-            //仿真主键数据
-            data[this.appDeKey] = PrimaryKey;
-            if (Util.isFunction(this.service[action])) {
-                response = await this.service[action](context, data, isLoading);
-                console.log(response);
-            } else {
-                response = await this.service.GetDraft(context, data, isLoading);
-            }
-            if (!response.isError()) {
-                response = this.handleResponse(action, response, true);
-                this.mergeDefaults(response);
-            }
-            response.data[this.appDeKey] = PrimaryKey;
-        }catch (error) {
-            console.error(error);
-        }finally{
-            await this.onAfterAction(action, context, response);
+        data = this.handleRequestData(action, context, data);
+        let response: HttpResponse;
+        let PrimaryKey = Util.createUUID();
+        //仿真主键数据
+        data[this.appDeKey] = PrimaryKey;
+        if (Util.isFunction(this.service[action])) {
+            response = await this.service[action](context, data, isLoading);
+            console.log(response);
+        } else {
+            response = await this.service.GetDraft(context, data, isLoading);
+        }
+        if (!response.isError()) {
+            response = this.handleResponse(action, response, true);
+            this.mergeDefaults(response);
         }
+        response.data[this.appDeKey] = PrimaryKey;
         return response;
         
     }
@@ -330,23 +259,16 @@ export class ControlServiceBase {
      * @memberof EditServiceBase
      */
     public async frontLogic(action: string, context: any = {}, data: any = {}, isLoading?: boolean): Promise<HttpResponse> {
-        let response: any;
         await this.onBeforeAction(action, context, data, isLoading);
-        try{
-            data = this.handleRequestData(action, context, data);
-            let response: HttpResponse;
-            if (Util.isFunction(this.service[action])) {
-                response = await this.service[action](context, data, isLoading);
-            } else {
-                response = new HttpResponse(200, null, { code: 100, message: `${action}前台逻辑未实现` });
-            }
-            if (!response.isError()) {
-                response = this.handleResponse(action, response, true);
-            }
-        }catch (error) {
-            console.error(error);
-        }finally{
-            await this.onAfterAction(action, context, response);
+        data = this.handleRequestData(action, context, data);
+        let response: HttpResponse;
+        if (Util.isFunction(this.service[action])) {
+            response = await this.service[action](context, data, isLoading);
+        } else {
+            response = new HttpResponse(200, null, { code: 100, message: `${action}前台逻辑未实现` });
+        }
+        if (!response.isError()) {
+            response = this.handleResponse(action, response, true);
         }
         return response;
     }
@@ -436,32 +358,5 @@ export class ControlServiceBase {
      */
     protected mergeDefaults(response: any = {}): void { }
 
-    /**
-     * 开启加载动画
-     *
-     * @protected
-     * @returns {Promise<any>}
-     * @memberof ControlServiceBase
-     */
-    protected async showLoading(): Promise<any> {
-        if (this.$isLoading === false) {
-            this.$isLoading = true;
-            Loading.show();
-        }
-    }
-
-    /**
-     * 结束加载动画
-     *
-     * @protected
-     * @returns {Promise<any>}
-     * @memberof ControlServiceBase
-     */
-    protected async hiddenLoading(): Promise<any> {
-        if (this.$isLoading === true) {
-            Loading.hidden();
-            this.$isLoading = false;
-        }
-    }
 
 }
\ No newline at end of file