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

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

@@ -32,7 +32,6 @@ export class CalendarServiceBase extends MdServiceBase {
      * @memberof CalendarServiceBase
      */
     protected async loadDEDataSet(action: string, context: any, data: any, calendarItem: string, serviceName?: string): Promise<any[]> {
-        this.model.itemType = calendarItem;
         if (serviceName) {
             const service: any = await this.getService(serviceName);
             const response: HttpResponse = await service[action](context, data);

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

@@ -81,6 +81,24 @@ export class EntityServiceBase {
      */
     protected readonly rootUrl: string = '';
 
+    /**
+     * 当前应用名
+     *
+     * @protected
+     * @type {string}
+     * @memberof EntityServiceBase
+     */
+    protected readonly appName: string = '';
+
+    /**
+     * 当前系统名
+     *
+     * @protected
+     * @type {string}
+     * @memberof EntityServiceBase
+     */
+    protected readonly systemName: string = '';
+
     /**
      * Creates an instance of EntityServiceBase.
      * @param {string} deName
@@ -697,6 +715,32 @@ export class EntityServiceBase {
         return this.http.post(`/${this.dePath}/${context[this.key]}/wfsubmit`, data);
     }
 
+    /**
+     * WFGetWFStep接口方法(根据系统实体查找当前适配的工作流模型步骤)
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof EntityServiceBase
+     */
+    public async WFGetWFStep(context: any = {}, data: any = {}, isloading?: boolean): Promise<any> {
+        return Http.getInstance().get(`/wfcore/${this.systemName}-app-${this.appName}/${this.dePath}/process-definitions-nodes`);
+    }
+
+    /**
+     * GetWFLink接口方法(根据业务主键和当前步骤获取操作路径)
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof EntityServiceBase
+     */
+    public async GetWFLink(context: any = {}, data: any = {}, isloading?: boolean): Promise<any> {
+        return Http.getInstance().get(`/wfcore/${this.systemName}-app-${this.appName}/${this.dePath}/${context[this.deName]}/usertasks/${data['taskDefinitionKey']}/ways`);
+    }
+
     /**
      * 获取其他实体服务
      *