ibizdev提交

app_web/src/engine/view/wfdyna-edit-view-engine.ts

+import EditViewEngine from './edit-view-engine';
+
+/**
+ * 视图引擎基础
+ *
+ * @export
+ * @class WFDynaEditViewEngine
+ * @extends {EditViewEngine}
+ */
+export default class WFDynaEditViewEngine extends EditViewEngine {
+
+    /**
+     * Creates an instance of WFDynaEditViewEngine.
+     * @memberof WFDynaEditViewEngine
+     */
+    constructor() {
+        super();
+    }
+    
+    /**
+     * 表单加载完成
+     *
+     * @param {*} args
+     * @memberof WFDynaEditViewEngine
+     */
+    public onFormLoad(arg: any): void {
+        super.onFormLoad(arg);
+        this.view.getWFLinkModel();
+    }
+}
\ No newline at end of file

app_web/src/service/entity-service.ts

@@ -628,13 +628,16 @@ export default class EntityService {
      * @param {*} [context={}]
      * @param {*} [data={}]
      * @param {boolean} [isloading]
-     * @param {boolean} [isEmbeddedApp]
+     * @param {*} [localdata]
      * @returns {Promise<any>}
      * @memberof EntityService
      */
-    public async WFStart(context: any = {},data: any = {}, isloading?: boolean,isEmbeddedApp?:boolean): Promise<any> {
-        if(isEmbeddedApp){
-            return Http.getInstance().post(`/wfcore/${this.SYSTEMNAME}-app-${this.APPNAME}/${this.APPDENAME}/${data[this.APPDEKEY]}/process-instances`,data,isloading);
+    public async WFStart(context: any = {},data: any = {}, isloading?: boolean,localdata?:any): Promise<any> {
+        if(localdata && Object.keys(localdata).length > 0){
+            const requestData:any = {};
+            Object.assign(requestData,{activedata:data});
+            Object.assign(requestData,localdata);
+            return Http.getInstance().post(`/wfcore/${this.SYSTEMNAME}-app-${this.APPNAME}/${this.APPDENAME}/${data[this.APPDEKEY]}/process-instances`,requestData,isloading);
         }else{
             const requestData:any = {};
             Object.assign(requestData,{wfdata:data});
@@ -759,7 +762,7 @@ export default class EntityService {
      * @memberof EntityService
      */
     public async GetWFLink(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        return Http.getInstance().get(`/wfcore/${this.SYSTEMNAME}-app-${this.APPNAME}/${this.APPDENAME}/${data[this.APPDEKEY]}/usertasks/${data['taskDefinitionKey']}/ways`);
+        return Http.getInstance().get(`/wfcore/${this.SYSTEMNAME}-app-${this.APPNAME}/${this.APPDENAME}/${context[this.APPLYDEKEY]}/usertasks/${data['taskDefinitionKey']}/ways`);
     }
 
     /**
@@ -768,13 +771,19 @@ export default class EntityService {
      * @param {*} [context={}]
      * @param {*} [data={}]
      * @param {boolean} [isloading]
-     * @param {boolean} [isEmbeddedApp]
+     * @param {*} [localdata]
      * @returns {Promise<any>}
      * @memberof EntityService
      */
-    public async WFSubmit(context: any = {},data: any = {}, isloading?: boolean,isEmbeddedApp?:boolean): Promise<any> {
-        if(isEmbeddedApp){
-            return Http.getInstance().post(`/wfcore/${this.SYSTEMNAME}-app-${this.APPNAME}/${this.APPDENAME}/${data[this.APPDEKEY]}/tasks/${data['taskId']}`);
+    public async WFSubmit(context: any = {},data: any = {}, isloading?: boolean,localdata?:any): Promise<any> {
+        if(localdata && Object.keys(localdata).length > 0){
+            const requestData:any = {};
+            if(data.viewparams){
+                delete data.viewparams;
+            }
+            Object.assign(requestData,{activedata:data});
+            Object.assign(requestData,localdata);
+            return Http.getInstance().post(`/wfcore/${this.SYSTEMNAME}-app-${this.APPNAME}/${this.APPDENAME}/${data[this.APPDEKEY]}/tasks/${localdata['taskId']}`,requestData,isloading);
         }else{
             const requestData:any = {};
             if(data.srfwfmemo){

app_web/src/widgets/ibzdepartment/default-searchform/default-searchform-service.ts

@@ -91,20 +91,21 @@ export default class DefaultService extends ControlService {
      * @param {*} [context={}]
      * @param {*} [data={}]
      * @param {boolean} [isloading]
+     * @param {*} [localdata]
      * @returns {Promise<any>}
      * @memberof DefaultService
      */
     @Errorlog
-    public wfstart(action: string,context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+    public wfstart(action: string,context: any = {},data: any = {}, isloading?: boolean,localdata?:any): Promise<any> {
         data = this.handleWFData(data);
         context = this.handleRequestData(action,context,data).context;
         return new Promise((resolve: any, reject: any) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;
             if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
-                result = _appEntityService[action](context,data, isloading);
+                result = _appEntityService[action](context,data, isloading,localdata);
             } else {
-                result = this.appEntityService.Create(context,data, isloading);
+                result = this.appEntityService.WFStart(context,data, isloading,localdata);
             }
             result.then((response) => {
                 this.handleResponse(action, response);
@@ -122,20 +123,21 @@ export default class DefaultService extends ControlService {
      * @param {*} [context={}]
      * @param {*} [data={}]
      * @param {boolean} [isloading]
+     * @param {*} [localdata]
      * @returns {Promise<any>}
      * @memberof DefaultService
      */
     @Errorlog
-    public wfsubmit(action: string,context: any = {}, data: any = {}, isloading?: boolean): Promise<any> {
+    public wfsubmit(action: string,context: any = {}, data: any = {}, isloading?: boolean,localdata?:any): Promise<any> {
         data = this.handleWFData(data,true);
         context = this.handleRequestData(action,context,data).context;
         return new Promise((resolve: any, reject: any) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;
             if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
-                result = _appEntityService[action](context,data, isloading);
+                result = _appEntityService[action](context,data, isloading,localdata);
             } else {
-                result = this.appEntityService.Create(context,data, isloading);
+                result = this.appEntityService.WFSubmit(context,data, isloading,localdata);
             }
             result.then((response) => {
                 this.handleResponse(action, response);

app_web/src/widgets/ibzdepartment/main-form/main-form-base.vue

@@ -1543,25 +1543,22 @@ export default class MainBase extends Vue implements ControlInterface {
      * 工作流启动
      *
      * @param {*} [data={}]
+     * @param {*} [localdata={}]
      * @returns {Promise<any>}
      * @memberof Main
      */
-    protected async wfstart(data: any): Promise<any> {
+    protected async wfstart(data: any,localdata?:any): Promise<any> {
         return new Promise((resolve: any, reject: any) => {
-            if(!this.WFStartAction){
-                this.$Notice.error({ title: '错误', desc: 'WFCIDEditView视图表单WFStartAction参数未配置' });
-                return;
-            }
             const _this: any = this;
             const arg: any = data[0];
             Object.assign(arg,{viewparams:this.viewparams});
-            const post: Promise<any> = Object.is(data.srfuf, '1')?this.service.update(this.updateAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator):this.service.add(this.createAction,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
+            const post: Promise<any> = Object.is(arg.srfuf, '1')?this.service.update(this.updateAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator):this.service.add(this.createAction,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
             post.then((response:any) =>{
                 const arg:any = response.data;
                 if(this.viewparams){
                     Object.assign(arg,{viewparams:this.viewparams});
                 }
-                const result: Promise<any> = this.service.wfstart(_this.WFStartAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
+                const result: Promise<any> = this.service.wfstart(_this.WFStartAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,localdata);
                 result.then((response: any) => {
                     if (!response || response.status !== 200) {
                         this.$Notice.error({ title: '', desc: '工作流启动失败, ' + response.info });
@@ -1602,15 +1599,12 @@ export default class MainBase extends Vue implements ControlInterface {
      * 工作流提交
      *
      * @param {*} [data={}]
+     * @param {*} [localdata={}]
      * @returns {Promise<any>}
      * @memberof Main
      */
-    protected async wfsubmit(data: any): Promise<any> {
+    protected async wfsubmit(data: any,localdata?:any): Promise<any> {
         return new Promise((resolve: any, reject: any) => {
-        if(!this.WFSubmitAction){
-            this.$Notice.error({ title: '错误', desc: 'IBZDepartmentEditView视图表单WFSubmitAction参数未配置' });
-            return;
-        }
         const _this: any = this;
         const arg: any = data[0];
         Object.assign(arg,{viewparams:this.viewparams});
@@ -1623,7 +1617,7 @@ export default class MainBase extends Vue implements ControlInterface {
                 if(this.viewparams){
                     Object.assign(arg,{viewparams:this.viewparams});
                 }
-                const result: Promise<any> = this.service.wfsubmit(_this.WFSubmitAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
+                const result: Promise<any> = this.service.wfsubmit(_this.WFSubmitAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,localdata);
                 result.then((response: any) => {
                     if (!response || response.status !== 200) {
                         this.$Notice.error({ title: '', desc: '工作流提交失败, ' + response.info });

app_web/src/widgets/ibzdepartment/main-form/main-form-service.ts

@@ -106,20 +106,21 @@ export default class MainService extends ControlService {
      * @param {*} [context={}]
      * @param {*} [data={}]
      * @param {boolean} [isloading]
+     * @param {*} [localdata]
      * @returns {Promise<any>}
      * @memberof MainService
      */
     @Errorlog
-    public wfstart(action: string,context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+    public wfstart(action: string,context: any = {},data: any = {}, isloading?: boolean,localdata?:any): Promise<any> {
         data = this.handleWFData(data);
         context = this.handleRequestData(action,context,data).context;
         return new Promise((resolve: any, reject: any) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;
             if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
-                result = _appEntityService[action](context,data, isloading);
+                result = _appEntityService[action](context,data, isloading,localdata);
             } else {
-                result = this.appEntityService.Create(context,data, isloading);
+                result = this.appEntityService.WFStart(context,data, isloading,localdata);
             }
             result.then((response) => {
                 this.handleResponse(action, response);
@@ -137,20 +138,21 @@ export default class MainService extends ControlService {
      * @param {*} [context={}]
      * @param {*} [data={}]
      * @param {boolean} [isloading]
+     * @param {*} [localdata]
      * @returns {Promise<any>}
      * @memberof MainService
      */
     @Errorlog
-    public wfsubmit(action: string,context: any = {}, data: any = {}, isloading?: boolean): Promise<any> {
+    public wfsubmit(action: string,context: any = {}, data: any = {}, isloading?: boolean,localdata?:any): Promise<any> {
         data = this.handleWFData(data,true);
         context = this.handleRequestData(action,context,data).context;
         return new Promise((resolve: any, reject: any) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;
             if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
-                result = _appEntityService[action](context,data, isloading);
+                result = _appEntityService[action](context,data, isloading,localdata);
             } else {
-                result = this.appEntityService.Create(context,data, isloading);
+                result = this.appEntityService.WFSubmit(context,data, isloading,localdata);
             }
             result.then((response) => {
                 this.handleResponse(action, response);

app_web/src/widgets/ibzemployee/change-pw-form/change-pw-form-base.vue

@@ -1275,25 +1275,22 @@ export default class ChangePwBase extends Vue implements ControlInterface {
      * 工作流启动
      *
      * @param {*} [data={}]
+     * @param {*} [localdata={}]
      * @returns {Promise<any>}
      * @memberof ChangePw
      */
-    protected async wfstart(data: any): Promise<any> {
+    protected async wfstart(data: any,localdata?:any): Promise<any> {
         return new Promise((resolve: any, reject: any) => {
-            if(!this.WFStartAction){
-                this.$Notice.error({ title: '错误', desc: 'WFCIDEditView视图表单WFStartAction参数未配置' });
-                return;
-            }
             const _this: any = this;
             const arg: any = data[0];
             Object.assign(arg,{viewparams:this.viewparams});
-            const post: Promise<any> = Object.is(data.srfuf, '1')?this.service.update(this.updateAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator):this.service.add(this.createAction,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
+            const post: Promise<any> = Object.is(arg.srfuf, '1')?this.service.update(this.updateAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator):this.service.add(this.createAction,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
             post.then((response:any) =>{
                 const arg:any = response.data;
                 if(this.viewparams){
                     Object.assign(arg,{viewparams:this.viewparams});
                 }
-                const result: Promise<any> = this.service.wfstart(_this.WFStartAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
+                const result: Promise<any> = this.service.wfstart(_this.WFStartAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,localdata);
                 result.then((response: any) => {
                     if (!response || response.status !== 200) {
                         this.$Notice.error({ title: '', desc: '工作流启动失败, ' + response.info });
@@ -1334,15 +1331,12 @@ export default class ChangePwBase extends Vue implements ControlInterface {
      * 工作流提交
      *
      * @param {*} [data={}]
+     * @param {*} [localdata={}]
      * @returns {Promise<any>}
      * @memberof ChangePw
      */
-    protected async wfsubmit(data: any): Promise<any> {
+    protected async wfsubmit(data: any,localdata?:any): Promise<any> {
         return new Promise((resolve: any, reject: any) => {
-        if(!this.WFSubmitAction){
-            this.$Notice.error({ title: '错误', desc: 'IBZEmployeeChangePwdView视图表单WFSubmitAction参数未配置' });
-            return;
-        }
         const _this: any = this;
         const arg: any = data[0];
         Object.assign(arg,{viewparams:this.viewparams});
@@ -1355,7 +1349,7 @@ export default class ChangePwBase extends Vue implements ControlInterface {
                 if(this.viewparams){
                     Object.assign(arg,{viewparams:this.viewparams});
                 }
-                const result: Promise<any> = this.service.wfsubmit(_this.WFSubmitAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
+                const result: Promise<any> = this.service.wfsubmit(_this.WFSubmitAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,localdata);
                 result.then((response: any) => {
                     if (!response || response.status !== 200) {
                         this.$Notice.error({ title: '', desc: '工作流提交失败, ' + response.info });

app_web/src/widgets/ibzemployee/change-pw-form/change-pw-form-service.ts

@@ -91,20 +91,21 @@ export default class ChangePwService extends ControlService {
      * @param {*} [context={}]
      * @param {*} [data={}]
      * @param {boolean} [isloading]
+     * @param {*} [localdata]
      * @returns {Promise<any>}
      * @memberof ChangePwService
      */
     @Errorlog
-    public wfstart(action: string,context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+    public wfstart(action: string,context: any = {},data: any = {}, isloading?: boolean,localdata?:any): Promise<any> {
         data = this.handleWFData(data);
         context = this.handleRequestData(action,context,data).context;
         return new Promise((resolve: any, reject: any) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;
             if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
-                result = _appEntityService[action](context,data, isloading);
+                result = _appEntityService[action](context,data, isloading,localdata);
             } else {
-                result = this.appEntityService.Create(context,data, isloading);
+                result = this.appEntityService.WFStart(context,data, isloading,localdata);
             }
             result.then((response) => {
                 this.handleResponse(action, response);
@@ -122,20 +123,21 @@ export default class ChangePwService extends ControlService {
      * @param {*} [context={}]
      * @param {*} [data={}]
      * @param {boolean} [isloading]
+     * @param {*} [localdata]
      * @returns {Promise<any>}
      * @memberof ChangePwService
      */
     @Errorlog
-    public wfsubmit(action: string,context: any = {}, data: any = {}, isloading?: boolean): Promise<any> {
+    public wfsubmit(action: string,context: any = {}, data: any = {}, isloading?: boolean,localdata?:any): Promise<any> {
         data = this.handleWFData(data,true);
         context = this.handleRequestData(action,context,data).context;
         return new Promise((resolve: any, reject: any) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;
             if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
-                result = _appEntityService[action](context,data, isloading);
+                result = _appEntityService[action](context,data, isloading,localdata);
             } else {
-                result = this.appEntityService.Create(context,data, isloading);
+                result = this.appEntityService.WFSubmit(context,data, isloading,localdata);
             }
             result.then((response) => {
                 this.handleResponse(action, response);

app_web/src/widgets/ibzemployee/default-searchform/default-searchform-service.ts

@@ -91,20 +91,21 @@ export default class DefaultService extends ControlService {
      * @param {*} [context={}]
      * @param {*} [data={}]
      * @param {boolean} [isloading]
+     * @param {*} [localdata]
      * @returns {Promise<any>}
      * @memberof DefaultService
      */
     @Errorlog
-    public wfstart(action: string,context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+    public wfstart(action: string,context: any = {},data: any = {}, isloading?: boolean,localdata?:any): Promise<any> {
         data = this.handleWFData(data);
         context = this.handleRequestData(action,context,data).context;
         return new Promise((resolve: any, reject: any) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;
             if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
-                result = _appEntityService[action](context,data, isloading);
+                result = _appEntityService[action](context,data, isloading,localdata);
             } else {
-                result = this.appEntityService.Create(context,data, isloading);
+                result = this.appEntityService.WFStart(context,data, isloading,localdata);
             }
             result.then((response) => {
                 this.handleResponse(action, response);
@@ -122,20 +123,21 @@ export default class DefaultService extends ControlService {
      * @param {*} [context={}]
      * @param {*} [data={}]
      * @param {boolean} [isloading]
+     * @param {*} [localdata]
      * @returns {Promise<any>}
      * @memberof DefaultService
      */
     @Errorlog
-    public wfsubmit(action: string,context: any = {}, data: any = {}, isloading?: boolean): Promise<any> {
+    public wfsubmit(action: string,context: any = {}, data: any = {}, isloading?: boolean,localdata?:any): Promise<any> {
         data = this.handleWFData(data,true);
         context = this.handleRequestData(action,context,data).context;
         return new Promise((resolve: any, reject: any) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;
             if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
-                result = _appEntityService[action](context,data, isloading);
+                result = _appEntityService[action](context,data, isloading,localdata);
             } else {
-                result = this.appEntityService.Create(context,data, isloading);
+                result = this.appEntityService.WFSubmit(context,data, isloading,localdata);
             }
             result.then((response) => {
                 this.handleResponse(action, response);

app_web/src/widgets/ibzemployee/main-form/main-form-base.vue

@@ -1885,25 +1885,22 @@ export default class MainBase extends Vue implements ControlInterface {
      * 工作流启动
      *
      * @param {*} [data={}]
+     * @param {*} [localdata={}]
      * @returns {Promise<any>}
      * @memberof Main
      */
-    protected async wfstart(data: any): Promise<any> {
+    protected async wfstart(data: any,localdata?:any): Promise<any> {
         return new Promise((resolve: any, reject: any) => {
-            if(!this.WFStartAction){
-                this.$Notice.error({ title: '错误', desc: 'WFCIDEditView视图表单WFStartAction参数未配置' });
-                return;
-            }
             const _this: any = this;
             const arg: any = data[0];
             Object.assign(arg,{viewparams:this.viewparams});
-            const post: Promise<any> = Object.is(data.srfuf, '1')?this.service.update(this.updateAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator):this.service.add(this.createAction,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
+            const post: Promise<any> = Object.is(arg.srfuf, '1')?this.service.update(this.updateAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator):this.service.add(this.createAction,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
             post.then((response:any) =>{
                 const arg:any = response.data;
                 if(this.viewparams){
                     Object.assign(arg,{viewparams:this.viewparams});
                 }
-                const result: Promise<any> = this.service.wfstart(_this.WFStartAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
+                const result: Promise<any> = this.service.wfstart(_this.WFStartAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,localdata);
                 result.then((response: any) => {
                     if (!response || response.status !== 200) {
                         this.$Notice.error({ title: '', desc: '工作流启动失败, ' + response.info });
@@ -1944,15 +1941,12 @@ export default class MainBase extends Vue implements ControlInterface {
      * 工作流提交
      *
      * @param {*} [data={}]
+     * @param {*} [localdata={}]
      * @returns {Promise<any>}
      * @memberof Main
      */
-    protected async wfsubmit(data: any): Promise<any> {
+    protected async wfsubmit(data: any,localdata?:any): Promise<any> {
         return new Promise((resolve: any, reject: any) => {
-        if(!this.WFSubmitAction){
-            this.$Notice.error({ title: '错误', desc: 'IBZEmployeeEditView视图表单WFSubmitAction参数未配置' });
-            return;
-        }
         const _this: any = this;
         const arg: any = data[0];
         Object.assign(arg,{viewparams:this.viewparams});
@@ -1965,7 +1959,7 @@ export default class MainBase extends Vue implements ControlInterface {
                 if(this.viewparams){
                     Object.assign(arg,{viewparams:this.viewparams});
                 }
-                const result: Promise<any> = this.service.wfsubmit(_this.WFSubmitAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
+                const result: Promise<any> = this.service.wfsubmit(_this.WFSubmitAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,localdata);
                 result.then((response: any) => {
                     if (!response || response.status !== 200) {
                         this.$Notice.error({ title: '', desc: '工作流提交失败, ' + response.info });

app_web/src/widgets/ibzemployee/main-form/main-form-service.ts

@@ -115,20 +115,21 @@ export default class MainService extends ControlService {
      * @param {*} [context={}]
      * @param {*} [data={}]
      * @param {boolean} [isloading]
+     * @param {*} [localdata]
      * @returns {Promise<any>}
      * @memberof MainService
      */
     @Errorlog
-    public wfstart(action: string,context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+    public wfstart(action: string,context: any = {},data: any = {}, isloading?: boolean,localdata?:any): Promise<any> {
         data = this.handleWFData(data);
         context = this.handleRequestData(action,context,data).context;
         return new Promise((resolve: any, reject: any) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;
             if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
-                result = _appEntityService[action](context,data, isloading);
+                result = _appEntityService[action](context,data, isloading,localdata);
             } else {
-                result = this.appEntityService.Create(context,data, isloading);
+                result = this.appEntityService.WFStart(context,data, isloading,localdata);
             }
             result.then((response) => {
                 this.handleResponse(action, response);
@@ -146,20 +147,21 @@ export default class MainService extends ControlService {
      * @param {*} [context={}]
      * @param {*} [data={}]
      * @param {boolean} [isloading]
+     * @param {*} [localdata]
      * @returns {Promise<any>}
      * @memberof MainService
      */
     @Errorlog
-    public wfsubmit(action: string,context: any = {}, data: any = {}, isloading?: boolean): Promise<any> {
+    public wfsubmit(action: string,context: any = {}, data: any = {}, isloading?: boolean,localdata?:any): Promise<any> {
         data = this.handleWFData(data,true);
         context = this.handleRequestData(action,context,data).context;
         return new Promise((resolve: any, reject: any) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;
             if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
-                result = _appEntityService[action](context,data, isloading);
+                result = _appEntityService[action](context,data, isloading,localdata);
             } else {
-                result = this.appEntityService.Create(context,data, isloading);
+                result = this.appEntityService.WFSubmit(context,data, isloading,localdata);
             }
             result.then((response) => {
                 this.handleResponse(action, response);

app_web/src/widgets/ibzorganization/default-searchform/default-searchform-service.ts

@@ -91,20 +91,21 @@ export default class DefaultService extends ControlService {
      * @param {*} [context={}]
      * @param {*} [data={}]
      * @param {boolean} [isloading]
+     * @param {*} [localdata]
      * @returns {Promise<any>}
      * @memberof DefaultService
      */
     @Errorlog
-    public wfstart(action: string,context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+    public wfstart(action: string,context: any = {},data: any = {}, isloading?: boolean,localdata?:any): Promise<any> {
         data = this.handleWFData(data);
         context = this.handleRequestData(action,context,data).context;
         return new Promise((resolve: any, reject: any) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;
             if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
-                result = _appEntityService[action](context,data, isloading);
+                result = _appEntityService[action](context,data, isloading,localdata);
             } else {
-                result = this.appEntityService.Create(context,data, isloading);
+                result = this.appEntityService.WFStart(context,data, isloading,localdata);
             }
             result.then((response) => {
                 this.handleResponse(action, response);
@@ -122,20 +123,21 @@ export default class DefaultService extends ControlService {
      * @param {*} [context={}]
      * @param {*} [data={}]
      * @param {boolean} [isloading]
+     * @param {*} [localdata]
      * @returns {Promise<any>}
      * @memberof DefaultService
      */
     @Errorlog
-    public wfsubmit(action: string,context: any = {}, data: any = {}, isloading?: boolean): Promise<any> {
+    public wfsubmit(action: string,context: any = {}, data: any = {}, isloading?: boolean,localdata?:any): Promise<any> {
         data = this.handleWFData(data,true);
         context = this.handleRequestData(action,context,data).context;
         return new Promise((resolve: any, reject: any) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;
             if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
-                result = _appEntityService[action](context,data, isloading);
+                result = _appEntityService[action](context,data, isloading,localdata);
             } else {
-                result = this.appEntityService.Create(context,data, isloading);
+                result = this.appEntityService.WFSubmit(context,data, isloading,localdata);
             }
             result.then((response) => {
                 this.handleResponse(action, response);

app_web/src/widgets/ibzorganization/main-form/main-form-base.vue

@@ -1446,25 +1446,22 @@ export default class MainBase extends Vue implements ControlInterface {
      * 工作流启动
      *
      * @param {*} [data={}]
+     * @param {*} [localdata={}]
      * @returns {Promise<any>}
      * @memberof Main
      */
-    protected async wfstart(data: any): Promise<any> {
+    protected async wfstart(data: any,localdata?:any): Promise<any> {
         return new Promise((resolve: any, reject: any) => {
-            if(!this.WFStartAction){
-                this.$Notice.error({ title: '错误', desc: 'WFCIDEditView视图表单WFStartAction参数未配置' });
-                return;
-            }
             const _this: any = this;
             const arg: any = data[0];
             Object.assign(arg,{viewparams:this.viewparams});
-            const post: Promise<any> = Object.is(data.srfuf, '1')?this.service.update(this.updateAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator):this.service.add(this.createAction,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
+            const post: Promise<any> = Object.is(arg.srfuf, '1')?this.service.update(this.updateAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator):this.service.add(this.createAction,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
             post.then((response:any) =>{
                 const arg:any = response.data;
                 if(this.viewparams){
                     Object.assign(arg,{viewparams:this.viewparams});
                 }
-                const result: Promise<any> = this.service.wfstart(_this.WFStartAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
+                const result: Promise<any> = this.service.wfstart(_this.WFStartAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,localdata);
                 result.then((response: any) => {
                     if (!response || response.status !== 200) {
                         this.$Notice.error({ title: '', desc: '工作流启动失败, ' + response.info });
@@ -1505,15 +1502,12 @@ export default class MainBase extends Vue implements ControlInterface {
      * 工作流提交
      *
      * @param {*} [data={}]
+     * @param {*} [localdata={}]
      * @returns {Promise<any>}
      * @memberof Main
      */
-    protected async wfsubmit(data: any): Promise<any> {
+    protected async wfsubmit(data: any,localdata?:any): Promise<any> {
         return new Promise((resolve: any, reject: any) => {
-        if(!this.WFSubmitAction){
-            this.$Notice.error({ title: '错误', desc: 'IBZOrganizationEditView视图表单WFSubmitAction参数未配置' });
-            return;
-        }
         const _this: any = this;
         const arg: any = data[0];
         Object.assign(arg,{viewparams:this.viewparams});
@@ -1526,7 +1520,7 @@ export default class MainBase extends Vue implements ControlInterface {
                 if(this.viewparams){
                     Object.assign(arg,{viewparams:this.viewparams});
                 }
-                const result: Promise<any> = this.service.wfsubmit(_this.WFSubmitAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
+                const result: Promise<any> = this.service.wfsubmit(_this.WFSubmitAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,localdata);
                 result.then((response: any) => {
                     if (!response || response.status !== 200) {
                         this.$Notice.error({ title: '', desc: '工作流提交失败, ' + response.info });

app_web/src/widgets/ibzorganization/main-form/main-form-service.ts

@@ -94,20 +94,21 @@ export default class MainService extends ControlService {
      * @param {*} [context={}]
      * @param {*} [data={}]
      * @param {boolean} [isloading]
+     * @param {*} [localdata]
      * @returns {Promise<any>}
      * @memberof MainService
      */
     @Errorlog
-    public wfstart(action: string,context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+    public wfstart(action: string,context: any = {},data: any = {}, isloading?: boolean,localdata?:any): Promise<any> {
         data = this.handleWFData(data);
         context = this.handleRequestData(action,context,data).context;
         return new Promise((resolve: any, reject: any) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;
             if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
-                result = _appEntityService[action](context,data, isloading);
+                result = _appEntityService[action](context,data, isloading,localdata);
             } else {
-                result = this.appEntityService.Create(context,data, isloading);
+                result = this.appEntityService.WFStart(context,data, isloading,localdata);
             }
             result.then((response) => {
                 this.handleResponse(action, response);
@@ -125,20 +126,21 @@ export default class MainService extends ControlService {
      * @param {*} [context={}]
      * @param {*} [data={}]
      * @param {boolean} [isloading]
+     * @param {*} [localdata]
      * @returns {Promise<any>}
      * @memberof MainService
      */
     @Errorlog
-    public wfsubmit(action: string,context: any = {}, data: any = {}, isloading?: boolean): Promise<any> {
+    public wfsubmit(action: string,context: any = {}, data: any = {}, isloading?: boolean,localdata?:any): Promise<any> {
         data = this.handleWFData(data,true);
         context = this.handleRequestData(action,context,data).context;
         return new Promise((resolve: any, reject: any) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;
             if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
-                result = _appEntityService[action](context,data, isloading);
+                result = _appEntityService[action](context,data, isloading,localdata);
             } else {
-                result = this.appEntityService.Create(context,data, isloading);
+                result = this.appEntityService.WFSubmit(context,data, isloading,localdata);
             }
             result.then((response) => {
                 this.handleResponse(action, response);

app_web/src/widgets/ibzorganization/new-form-form/new-form-form-base.vue

@@ -1400,25 +1400,22 @@ export default class NewFormBase extends Vue implements ControlInterface {
      * 工作流启动
      *
      * @param {*} [data={}]
+     * @param {*} [localdata={}]
      * @returns {Promise<any>}
      * @memberof NewForm
      */
-    protected async wfstart(data: any): Promise<any> {
+    protected async wfstart(data: any,localdata?:any): Promise<any> {
         return new Promise((resolve: any, reject: any) => {
-            if(!this.WFStartAction){
-                this.$Notice.error({ title: '错误', desc: 'WFCIDEditView视图表单WFStartAction参数未配置' });
-                return;
-            }
             const _this: any = this;
             const arg: any = data[0];
             Object.assign(arg,{viewparams:this.viewparams});
-            const post: Promise<any> = Object.is(data.srfuf, '1')?this.service.update(this.updateAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator):this.service.add(this.createAction,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
+            const post: Promise<any> = Object.is(arg.srfuf, '1')?this.service.update(this.updateAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator):this.service.add(this.createAction,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
             post.then((response:any) =>{
                 const arg:any = response.data;
                 if(this.viewparams){
                     Object.assign(arg,{viewparams:this.viewparams});
                 }
-                const result: Promise<any> = this.service.wfstart(_this.WFStartAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
+                const result: Promise<any> = this.service.wfstart(_this.WFStartAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,localdata);
                 result.then((response: any) => {
                     if (!response || response.status !== 200) {
                         this.$Notice.error({ title: '', desc: '工作流启动失败, ' + response.info });
@@ -1459,15 +1456,12 @@ export default class NewFormBase extends Vue implements ControlInterface {
      * 工作流提交
      *
      * @param {*} [data={}]
+     * @param {*} [localdata={}]
      * @returns {Promise<any>}
      * @memberof NewForm
      */
-    protected async wfsubmit(data: any): Promise<any> {
+    protected async wfsubmit(data: any,localdata?:any): Promise<any> {
         return new Promise((resolve: any, reject: any) => {
-        if(!this.WFSubmitAction){
-            this.$Notice.error({ title: '错误', desc: 'IBZOrganizationOptionView视图表单WFSubmitAction参数未配置' });
-            return;
-        }
         const _this: any = this;
         const arg: any = data[0];
         Object.assign(arg,{viewparams:this.viewparams});
@@ -1480,7 +1474,7 @@ export default class NewFormBase extends Vue implements ControlInterface {
                 if(this.viewparams){
                     Object.assign(arg,{viewparams:this.viewparams});
                 }
-                const result: Promise<any> = this.service.wfsubmit(_this.WFSubmitAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
+                const result: Promise<any> = this.service.wfsubmit(_this.WFSubmitAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,localdata);
                 result.then((response: any) => {
                     if (!response || response.status !== 200) {
                         this.$Notice.error({ title: '', desc: '工作流提交失败, ' + response.info });

app_web/src/widgets/ibzorganization/new-form-form/new-form-form-service.ts

@@ -94,20 +94,21 @@ export default class NewFormService extends ControlService {
      * @param {*} [context={}]
      * @param {*} [data={}]
      * @param {boolean} [isloading]
+     * @param {*} [localdata]
      * @returns {Promise<any>}
      * @memberof NewFormService
      */
     @Errorlog
-    public wfstart(action: string,context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+    public wfstart(action: string,context: any = {},data: any = {}, isloading?: boolean,localdata?:any): Promise<any> {
         data = this.handleWFData(data);
         context = this.handleRequestData(action,context,data).context;
         return new Promise((resolve: any, reject: any) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;
             if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
-                result = _appEntityService[action](context,data, isloading);
+                result = _appEntityService[action](context,data, isloading,localdata);
             } else {
-                result = this.appEntityService.Create(context,data, isloading);
+                result = this.appEntityService.WFStart(context,data, isloading,localdata);
             }
             result.then((response) => {
                 this.handleResponse(action, response);
@@ -125,20 +126,21 @@ export default class NewFormService extends ControlService {
      * @param {*} [context={}]
      * @param {*} [data={}]
      * @param {boolean} [isloading]
+     * @param {*} [localdata]
      * @returns {Promise<any>}
      * @memberof NewFormService
      */
     @Errorlog
-    public wfsubmit(action: string,context: any = {}, data: any = {}, isloading?: boolean): Promise<any> {
+    public wfsubmit(action: string,context: any = {}, data: any = {}, isloading?: boolean,localdata?:any): Promise<any> {
         data = this.handleWFData(data,true);
         context = this.handleRequestData(action,context,data).context;
         return new Promise((resolve: any, reject: any) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;
             if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
-                result = _appEntityService[action](context,data, isloading);
+                result = _appEntityService[action](context,data, isloading,localdata);
             } else {
-                result = this.appEntityService.Create(context,data, isloading);
+                result = this.appEntityService.WFSubmit(context,data, isloading,localdata);
             }
             result.then((response) => {
                 this.handleResponse(action, response);

config.xml

@@ -38,11 +38,11 @@
 	  git clone -b master $para2 ibzou/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzou/
-      mvn clean package -Papi
-      cd ibzou-provider/ibzou-provider-api
-      mvn -Papi docker:build
-      mvn -Papi docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzou-provider-api.yaml dev --with-registry-auth      
+      mvn clean package -Pweb
+      cd ibzou-app/ibzou-app-web
+      mvn -Pweb docker:build
+      mvn -Pweb docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzou-app-web.yaml dev --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

ibzou-app/ibzou-app-web/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzou-app-web.jar
 
-EXPOSE 8080
+EXPOSE 30001
 
 ADD ibzou-app-web.jar /ibzou-app-web.jar

ibzou-app/ibzou-app-web/src/main/docker/ibzou-app-web.yaml

@@ -3,9 +3,11 @@ services:
   ibzou-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-app-web:latest
     ports:
-      - "8080:8080"
+      - "30001:30001"
     networks:
       - agent_network
+    environment:
+      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.180.237
     deploy:
       mode: replicated
       replicas: 1

ibzou-app/ibzou-app-web/src/main/resources/application-web-dev.yml

 server:
-  port: 8080
+  port: 30001
\ No newline at end of file

ibzou-app/ibzou-app-web/src/main/resources/application-web-prod.yml

 server:
-  port: 8080
+  port: 30001
 
 #zuul网关路由设置
 zuul:

ibzou-boot/src/main/resources/application-dev.yml

 server:
-  port: 40001
+  port: 8080
 

ibzou-provider/ibzou-provider-api/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzou-provider-api.jar
 
-EXPOSE 40001
+EXPOSE 8081
 
 ADD ibzou-provider-api.jar /ibzou-provider-api.jar

ibzou-provider/ibzou-provider-api/src/main/docker/ibzou-provider-api.yaml

@@ -3,11 +3,9 @@ services:
   ibzou-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-provider-api:latest
     ports:
-      - "40001:40001"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.180.237
     deploy:
       mode: replicated
       replicas: 1

ibzou-provider/ibzou-provider-api/src/main/resources/application-api-dev.yml

 server:
-  port: 40001
+  port: 8081
\ No newline at end of file

ibzou-provider/ibzou-provider-api/src/main/resources/application-api-prod.yml

 server:
-  port: 40001
+  port: 8081

ibzou-util/src/main/java/cn/ibizlab/util/job/PermissionSyncJob.java

@@ -32,7 +32,7 @@ public class PermissionSyncJob implements ApplicationRunner {
     @Value("${ibiz.enablePermissionValid:false}")
     boolean enablePermissionValid;  //是否开启权限校验
 
-    @Value("${ibiz.systemid:2C40DFCD-0DF5-47BF-91A5-C45F810B0001}")
+    @Value("${ibiz.systemid:110B1A3E-4944-47C8-B4C4-EC15FB8982F3}")
     private String systemId;
 
     @Override