Merge remote-tracking branch 'core/dev' into dev

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

@@ -58,17 +58,18 @@ export class FormServiceBase extends ControlServiceBase {
      * @param {*} [context={}]
      * @param {*} [data={}]
      * @param {boolean} [isLoading]
+     * @param {*} [wfdata]
      * @returns {Promise<HttpResponse>}
      * @memberof FormServiceBase
      */
-    public async wfsubmit(action: string, context: any = {}, data: any = {}, isLoading?: boolean): Promise<HttpResponse> {
+    public async wfsubmit(action: string, context: any = {}, data: any = {}, isLoading?: boolean, wfdata?: any): Promise<HttpResponse> {
         await this.onBeforeAction(action, context, data, isLoading);
         data = this.handleRequestData(action, context, data);
         let response: HttpResponse;
         if (Util.isFunction(this.service[action])) {
             response = await this.service[action](context, data);
         } else {
-            response = await this.service.Create(context, data);
+            response = await this.service.WFSubmit(context, data, wfdata);
         }
         if (!response.isError()) {
             response = this.handleResponse(action, response);

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

@@ -708,10 +708,15 @@ export class EntityServiceBase {
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
+     * @param {*} [wfdata]
      * @returns {Promise<HttpResponse>}
      * @memberof EntityServiceBase
      */
-    public async WFSubmit(context: any = {}, data: any = {}): Promise<HttpResponse> {
+    public async WFSubmit(context: any = {}, data: any = {}, wfdata?: any): Promise<HttpResponse> {
+        if (wfdata && Object.keys(wfdata).length !== 0) {
+            const _data: any = { ...{ activedata: data }, wfdata };
+            return Http.getInstance().post(`/wfcore/${this.systemName}-app-${this.appName}/${this.dePath}/${data[this.key]}/tasks/${wfdata['taskId']}`, _data);
+        }
         return this.http.post(`/${this.dePath}/${context[this.key]}/wfsubmit`, data);
     }
 
@@ -720,11 +725,10 @@ export class EntityServiceBase {
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
-     * @param {boolean} [isloading]
      * @returns {Promise<any>}
      * @memberof EntityServiceBase
      */
-    public async WFGetWFStep(context: any = {}, data: any = {}, isloading?: boolean): Promise<any> {
+    public async WFGetWFStep(context: any = {}, data: any = {}): Promise<any> {
         return Http.getInstance().get(`/wfcore/${this.systemName}-app-${this.appName}/${this.dePath}/process-definitions-nodes`);
     }
 
@@ -733,11 +737,10 @@ export class EntityServiceBase {
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
-     * @param {boolean} [isloading]
      * @returns {Promise<any>}
      * @memberof EntityServiceBase
      */
-    public async GetWFLink(context: any = {}, data: any = {}, isloading?: boolean): Promise<any> {
+    public async GetWFLink(context: any = {}, data: any = {}): Promise<any> {
         return Http.getInstance().get(`/wfcore/${this.systemName}-app-${this.appName}/${this.dePath}/${context[this.deName]}/usertasks/${data['taskDefinitionKey']}/ways`);
     }