提交 58c2a00b 编写于 作者: ibizdev's avatar ibizdev

ibizdev提交

上级 67143ce7
...@@ -1127,36 +1127,16 @@ export default class SYS_PERMISSIONEditViewBase extends Vue { ...@@ -1127,36 +1127,16 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
}); });
} }
} }
/** !!!!模版产生代码错误:----
* 开始流程 Tip: It's the step after the last dot that caused this error, not those before it.
* ----
* @param {any[]} args 当前数据 Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
* @param {any} contextJO 行为附加上下文 ----
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源 ----
* @param {*} [xData] 执行行为所需当前部件 FTL stack trace ("~" means nesting-related):
* @param {*} [actionContext] 执行行为上下文 - Failed at: #if item.getPSControlContainer()?? &&... [in template "TEMPLCODE_zh_CN" at line 17, column 9]
* @memberof SYS_PERMISSIONEditViewBase ----
*/
protected SaveAndStart(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (!xData || !(xData.wfstart instanceof Function)) {
return;
}
xData.wfstart(args).then((response: any) => {
if (!response || response.status !== 200) {
return;
}
const { data: _data } = response;
if(window.parent){
window.parent.postMessage({ ..._data },'*');
}
if (_this.viewdata) {
_this.$emit('viewdataschange', [{ ..._data }]);
_this.$emit('close');
}
});
}
/** /**
* 当前流程步骤 * 当前流程步骤
* *
......
...@@ -1159,36 +1159,16 @@ export default class SYS_PERMISSIONEditView2Base extends Vue { ...@@ -1159,36 +1159,16 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
}); });
} }
} }
/** !!!!模版产生代码错误:----
* 开始流程 Tip: It's the step after the last dot that caused this error, not those before it.
* ----
* @param {any[]} args 当前数据 Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
* @param {any} contextJO 行为附加上下文 ----
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源 ----
* @param {*} [xData] 执行行为所需当前部件 FTL stack trace ("~" means nesting-related):
* @param {*} [actionContext] 执行行为上下文 - Failed at: #if item.getPSControlContainer()?? &&... [in template "TEMPLCODE_zh_CN" at line 17, column 9]
* @memberof SYS_PERMISSIONEditView2Base ----
*/
protected SaveAndStart(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (!xData || !(xData.wfstart instanceof Function)) {
return;
}
xData.wfstart(args).then((response: any) => {
if (!response || response.status !== 200) {
return;
}
const { data: _data } = response;
if(window.parent){
window.parent.postMessage({ ..._data },'*');
}
if (_this.viewdata) {
_this.$emit('viewdataschange', [{ ..._data }]);
_this.$emit('close');
}
});
}
/** /**
* 当前流程步骤 * 当前流程步骤
* *
......
...@@ -1127,36 +1127,16 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue { ...@@ -1127,36 +1127,16 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
}); });
} }
} }
/** !!!!模版产生代码错误:----
* 开始流程 Tip: It's the step after the last dot that caused this error, not those before it.
* ----
* @param {any[]} args 当前数据 Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
* @param {any} contextJO 行为附加上下文 ----
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源 ----
* @param {*} [xData] 执行行为所需当前部件 FTL stack trace ("~" means nesting-related):
* @param {*} [actionContext] 执行行为上下文 - Failed at: #if item.getPSControlContainer()?? &&... [in template "TEMPLCODE_zh_CN" at line 17, column 9]
* @memberof SYS_ROLE_PERMISSIONEditViewBase ----
*/
protected SaveAndStart(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (!xData || !(xData.wfstart instanceof Function)) {
return;
}
xData.wfstart(args).then((response: any) => {
if (!response || response.status !== 200) {
return;
}
const { data: _data } = response;
if(window.parent){
window.parent.postMessage({ ..._data },'*');
}
if (_this.viewdata) {
_this.$emit('viewdataschange', [{ ..._data }]);
_this.$emit('close');
}
});
}
/** /**
* 当前流程步骤 * 当前流程步骤
* *
......
...@@ -1159,36 +1159,16 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue { ...@@ -1159,36 +1159,16 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
}); });
} }
} }
/** !!!!模版产生代码错误:----
* 开始流程 Tip: It's the step after the last dot that caused this error, not those before it.
* ----
* @param {any[]} args 当前数据 Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
* @param {any} contextJO 行为附加上下文 ----
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源 ----
* @param {*} [xData] 执行行为所需当前部件 FTL stack trace ("~" means nesting-related):
* @param {*} [actionContext] 执行行为上下文 - Failed at: #if item.getPSControlContainer()?? &&... [in template "TEMPLCODE_zh_CN" at line 17, column 9]
* @memberof SYS_ROLE_PERMISSIONEditView2Base ----
*/
protected SaveAndStart(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (!xData || !(xData.wfstart instanceof Function)) {
return;
}
xData.wfstart(args).then((response: any) => {
if (!response || response.status !== 200) {
return;
}
const { data: _data } = response;
if(window.parent){
window.parent.postMessage({ ..._data },'*');
}
if (_this.viewdata) {
_this.$emit('viewdataschange', [{ ..._data }]);
_this.$emit('close');
}
});
}
/** /**
* 当前流程步骤 * 当前流程步骤
* *
......
...@@ -1127,36 +1127,16 @@ export default class SYS_ROLEEditViewBase extends Vue { ...@@ -1127,36 +1127,16 @@ export default class SYS_ROLEEditViewBase extends Vue {
}); });
} }
} }
/** !!!!模版产生代码错误:----
* 开始流程 Tip: It's the step after the last dot that caused this error, not those before it.
* ----
* @param {any[]} args 当前数据 Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
* @param {any} contextJO 行为附加上下文 ----
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源 ----
* @param {*} [xData] 执行行为所需当前部件 FTL stack trace ("~" means nesting-related):
* @param {*} [actionContext] 执行行为上下文 - Failed at: #if item.getPSControlContainer()?? &&... [in template "TEMPLCODE_zh_CN" at line 17, column 9]
* @memberof SYS_ROLEEditViewBase ----
*/
protected SaveAndStart(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (!xData || !(xData.wfstart instanceof Function)) {
return;
}
xData.wfstart(args).then((response: any) => {
if (!response || response.status !== 200) {
return;
}
const { data: _data } = response;
if(window.parent){
window.parent.postMessage({ ..._data },'*');
}
if (_this.viewdata) {
_this.$emit('viewdataschange', [{ ..._data }]);
_this.$emit('close');
}
});
}
/** /**
* 当前流程步骤 * 当前流程步骤
* *
......
...@@ -1159,36 +1159,16 @@ export default class SYS_ROLEEditView2Base extends Vue { ...@@ -1159,36 +1159,16 @@ export default class SYS_ROLEEditView2Base extends Vue {
}); });
} }
} }
/** !!!!模版产生代码错误:----
* 开始流程 Tip: It's the step after the last dot that caused this error, not those before it.
* ----
* @param {any[]} args 当前数据 Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
* @param {any} contextJO 行为附加上下文 ----
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源 ----
* @param {*} [xData] 执行行为所需当前部件 FTL stack trace ("~" means nesting-related):
* @param {*} [actionContext] 执行行为上下文 - Failed at: #if item.getPSControlContainer()?? &&... [in template "TEMPLCODE_zh_CN" at line 17, column 9]
* @memberof SYS_ROLEEditView2Base ----
*/
protected SaveAndStart(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (!xData || !(xData.wfstart instanceof Function)) {
return;
}
xData.wfstart(args).then((response: any) => {
if (!response || response.status !== 200) {
return;
}
const { data: _data } = response;
if(window.parent){
window.parent.postMessage({ ..._data },'*');
}
if (_this.viewdata) {
_this.$emit('viewdataschange', [{ ..._data }]);
_this.$emit('close');
}
});
}
/** /**
* 当前流程步骤 * 当前流程步骤
* *
......
...@@ -1127,36 +1127,16 @@ export default class SYS_USER_ROLEEditViewBase extends Vue { ...@@ -1127,36 +1127,16 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
}); });
} }
} }
/** !!!!模版产生代码错误:----
* 开始流程 Tip: It's the step after the last dot that caused this error, not those before it.
* ----
* @param {any[]} args 当前数据 Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
* @param {any} contextJO 行为附加上下文 ----
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源 ----
* @param {*} [xData] 执行行为所需当前部件 FTL stack trace ("~" means nesting-related):
* @param {*} [actionContext] 执行行为上下文 - Failed at: #if item.getPSControlContainer()?? &&... [in template "TEMPLCODE_zh_CN" at line 17, column 9]
* @memberof SYS_USER_ROLEEditViewBase ----
*/
protected SaveAndStart(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (!xData || !(xData.wfstart instanceof Function)) {
return;
}
xData.wfstart(args).then((response: any) => {
if (!response || response.status !== 200) {
return;
}
const { data: _data } = response;
if(window.parent){
window.parent.postMessage({ ..._data },'*');
}
if (_this.viewdata) {
_this.$emit('viewdataschange', [{ ..._data }]);
_this.$emit('close');
}
});
}
/** /**
* 当前流程步骤 * 当前流程步骤
* *
......
...@@ -1159,36 +1159,16 @@ export default class SYS_USER_ROLEEditView2Base extends Vue { ...@@ -1159,36 +1159,16 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
}); });
} }
} }
/** !!!!模版产生代码错误:----
* 开始流程 Tip: It's the step after the last dot that caused this error, not those before it.
* ----
* @param {any[]} args 当前数据 Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
* @param {any} contextJO 行为附加上下文 ----
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源 ----
* @param {*} [xData] 执行行为所需当前部件 FTL stack trace ("~" means nesting-related):
* @param {*} [actionContext] 执行行为上下文 - Failed at: #if item.getPSControlContainer()?? &&... [in template "TEMPLCODE_zh_CN" at line 17, column 9]
* @memberof SYS_USER_ROLEEditView2Base ----
*/
protected SaveAndStart(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (!xData || !(xData.wfstart instanceof Function)) {
return;
}
xData.wfstart(args).then((response: any) => {
if (!response || response.status !== 200) {
return;
}
const { data: _data } = response;
if(window.parent){
window.parent.postMessage({ ..._data },'*');
}
if (_this.viewdata) {
_this.$emit('viewdataschange', [{ ..._data }]);
_this.$emit('close');
}
});
}
/** /**
* 当前流程步骤 * 当前流程步骤
* *
......
...@@ -1127,36 +1127,16 @@ export default class SYS_USEREditViewBase extends Vue { ...@@ -1127,36 +1127,16 @@ export default class SYS_USEREditViewBase extends Vue {
}); });
} }
} }
/** !!!!模版产生代码错误:----
* 开始流程 Tip: It's the step after the last dot that caused this error, not those before it.
* ----
* @param {any[]} args 当前数据 Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
* @param {any} contextJO 行为附加上下文 ----
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源 ----
* @param {*} [xData] 执行行为所需当前部件 FTL stack trace ("~" means nesting-related):
* @param {*} [actionContext] 执行行为上下文 - Failed at: #if item.getPSControlContainer()?? &&... [in template "TEMPLCODE_zh_CN" at line 17, column 9]
* @memberof SYS_USEREditViewBase ----
*/
protected SaveAndStart(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (!xData || !(xData.wfstart instanceof Function)) {
return;
}
xData.wfstart(args).then((response: any) => {
if (!response || response.status !== 200) {
return;
}
const { data: _data } = response;
if(window.parent){
window.parent.postMessage({ ..._data },'*');
}
if (_this.viewdata) {
_this.$emit('viewdataschange', [{ ..._data }]);
_this.$emit('close');
}
});
}
/** /**
* 当前流程步骤 * 当前流程步骤
* *
......
...@@ -1159,36 +1159,16 @@ export default class SYS_USEREditView2Base extends Vue { ...@@ -1159,36 +1159,16 @@ export default class SYS_USEREditView2Base extends Vue {
}); });
} }
} }
/** !!!!模版产生代码错误:----
* 开始流程 Tip: It's the step after the last dot that caused this error, not those before it.
* ----
* @param {any[]} args 当前数据 Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
* @param {any} contextJO 行为附加上下文 ----
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源 ----
* @param {*} [xData] 执行行为所需当前部件 FTL stack trace ("~" means nesting-related):
* @param {*} [actionContext] 执行行为上下文 - Failed at: #if item.getPSControlContainer()?? &&... [in template "TEMPLCODE_zh_CN" at line 17, column 9]
* @memberof SYS_USEREditView2Base ----
*/
protected SaveAndStart(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (!xData || !(xData.wfstart instanceof Function)) {
return;
}
xData.wfstart(args).then((response: any) => {
if (!response || response.status !== 200) {
return;
}
const { data: _data } = response;
if(window.parent){
window.parent.postMessage({ ..._data },'*');
}
if (_this.viewdata) {
_this.$emit('viewdataschange', [{ ..._data }]);
_this.$emit('close');
}
});
}
/** /**
* 当前流程步骤 * 当前流程步骤
* *
......
...@@ -628,13 +628,16 @@ export default class EntityService { ...@@ -628,13 +628,16 @@ export default class EntityService {
* @param {*} [context={}] * @param {*} [context={}]
* @param {*} [data={}] * @param {*} [data={}]
* @param {boolean} [isloading] * @param {boolean} [isloading]
* @param {boolean} [isEmbeddedApp] * @param {*} [localdata]
* @returns {Promise<any>} * @returns {Promise<any>}
* @memberof EntityService * @memberof EntityService
*/ */
public async WFStart(context: any = {},data: any = {}, isloading?: boolean,isEmbeddedApp?:boolean): Promise<any> { public async WFStart(context: any = {},data: any = {}, isloading?: boolean,localdata?:any): Promise<any> {
if(isEmbeddedApp){ if(localdata && Object.keys(localdata).length > 0){
return Http.getInstance().post(`/wfcore/${this.SYSTEMNAME}-app-${this.APPNAME}/${this.APPDENAME}/${data[this.APPDEKEY]}/process-instances`,data,isloading); 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{ }else{
const requestData:any = {}; const requestData:any = {};
Object.assign(requestData,{wfdata:data}); Object.assign(requestData,{wfdata:data});
......
...@@ -91,20 +91,21 @@ export default class DefaultService extends ControlService { ...@@ -91,20 +91,21 @@ export default class DefaultService extends ControlService {
* @param {*} [context={}] * @param {*} [context={}]
* @param {*} [data={}] * @param {*} [data={}]
* @param {boolean} [isloading] * @param {boolean} [isloading]
* @param {*} [localdata]
* @returns {Promise<any>} * @returns {Promise<any>}
* @memberof DefaultService * @memberof DefaultService
*/ */
@Errorlog @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); data = this.handleWFData(data);
context = this.handleRequestData(action,context,data).context; context = this.handleRequestData(action,context,data).context;
return new Promise((resolve: any, reject: any) => { return new Promise((resolve: any, reject: any) => {
let result: Promise<any>; let result: Promise<any>;
const _appEntityService: any = this.appEntityService; const _appEntityService: any = this.appEntityService;
if (_appEntityService[action] && _appEntityService[action] instanceof Function) { if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
result = _appEntityService[action](context,data, isloading); result = _appEntityService[action](context,data, isloading,localdata);
} else { } else {
result = this.appEntityService.Create(context,data, isloading); result = this.appEntityService.WFStart(context,data, isloading,localdata);
} }
result.then((response) => { result.then((response) => {
this.handleResponse(action, response); this.handleResponse(action, response);
......
...@@ -1236,10 +1236,11 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1236,10 +1236,11 @@ export default class MainBase extends Vue implements ControlInterface {
* 工作流启动 * 工作流启动
* *
* @param {*} [data={}] * @param {*} [data={}]
* @param {*} [localdata={}]
* @returns {Promise<any>} * @returns {Promise<any>}
* @memberof Main * @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) => { return new Promise((resolve: any, reject: any) => {
if(!this.WFStartAction){ if(!this.WFStartAction){
this.$Notice.error({ title: '错误', desc: 'WFCIDEditView视图表单WFStartAction参数未配置' }); this.$Notice.error({ title: '错误', desc: 'WFCIDEditView视图表单WFStartAction参数未配置' });
...@@ -1254,7 +1255,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1254,7 +1255,7 @@ export default class MainBase extends Vue implements ControlInterface {
if(this.viewparams){ if(this.viewparams){
Object.assign(arg,{viewparams: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) => { result.then((response: any) => {
if (!response || response.status !== 200) { if (!response || response.status !== 200) {
this.$Notice.error({ title: '', desc: '工作流启动失败, ' + response.info }); this.$Notice.error({ title: '', desc: '工作流启动失败, ' + response.info });
......
...@@ -91,20 +91,21 @@ export default class MainService extends ControlService { ...@@ -91,20 +91,21 @@ export default class MainService extends ControlService {
* @param {*} [context={}] * @param {*} [context={}]
* @param {*} [data={}] * @param {*} [data={}]
* @param {boolean} [isloading] * @param {boolean} [isloading]
* @param {*} [localdata]
* @returns {Promise<any>} * @returns {Promise<any>}
* @memberof MainService * @memberof MainService
*/ */
@Errorlog @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); data = this.handleWFData(data);
context = this.handleRequestData(action,context,data).context; context = this.handleRequestData(action,context,data).context;
return new Promise((resolve: any, reject: any) => { return new Promise((resolve: any, reject: any) => {
let result: Promise<any>; let result: Promise<any>;
const _appEntityService: any = this.appEntityService; const _appEntityService: any = this.appEntityService;
if (_appEntityService[action] && _appEntityService[action] instanceof Function) { if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
result = _appEntityService[action](context,data, isloading); result = _appEntityService[action](context,data, isloading,localdata);
} else { } else {
result = this.appEntityService.Create(context,data, isloading); result = this.appEntityService.WFStart(context,data, isloading,localdata);
} }
result.then((response) => { result.then((response) => {
this.handleResponse(action, response); this.handleResponse(action, response);
......
...@@ -91,20 +91,21 @@ export default class DefaultService extends ControlService { ...@@ -91,20 +91,21 @@ export default class DefaultService extends ControlService {
* @param {*} [context={}] * @param {*} [context={}]
* @param {*} [data={}] * @param {*} [data={}]
* @param {boolean} [isloading] * @param {boolean} [isloading]
* @param {*} [localdata]
* @returns {Promise<any>} * @returns {Promise<any>}
* @memberof DefaultService * @memberof DefaultService
*/ */
@Errorlog @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); data = this.handleWFData(data);
context = this.handleRequestData(action,context,data).context; context = this.handleRequestData(action,context,data).context;
return new Promise((resolve: any, reject: any) => { return new Promise((resolve: any, reject: any) => {
let result: Promise<any>; let result: Promise<any>;
const _appEntityService: any = this.appEntityService; const _appEntityService: any = this.appEntityService;
if (_appEntityService[action] && _appEntityService[action] instanceof Function) { if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
result = _appEntityService[action](context,data, isloading); result = _appEntityService[action](context,data, isloading,localdata);
} else { } else {
result = this.appEntityService.Create(context,data, isloading); result = this.appEntityService.WFStart(context,data, isloading,localdata);
} }
result.then((response) => { result.then((response) => {
this.handleResponse(action, response); this.handleResponse(action, response);
......
...@@ -1329,10 +1329,11 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1329,10 +1329,11 @@ export default class MainBase extends Vue implements ControlInterface {
* 工作流启动 * 工作流启动
* *
* @param {*} [data={}] * @param {*} [data={}]
* @param {*} [localdata={}]
* @returns {Promise<any>} * @returns {Promise<any>}
* @memberof Main * @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) => { return new Promise((resolve: any, reject: any) => {
if(!this.WFStartAction){ if(!this.WFStartAction){
this.$Notice.error({ title: '错误', desc: 'WFCIDEditView视图表单WFStartAction参数未配置' }); this.$Notice.error({ title: '错误', desc: 'WFCIDEditView视图表单WFStartAction参数未配置' });
...@@ -1347,7 +1348,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1347,7 +1348,7 @@ export default class MainBase extends Vue implements ControlInterface {
if(this.viewparams){ if(this.viewparams){
Object.assign(arg,{viewparams: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) => { result.then((response: any) => {
if (!response || response.status !== 200) { if (!response || response.status !== 200) {
this.$Notice.error({ title: '', desc: '工作流启动失败, ' + response.info }); this.$Notice.error({ title: '', desc: '工作流启动失败, ' + response.info });
......
...@@ -115,20 +115,21 @@ export default class MainService extends ControlService { ...@@ -115,20 +115,21 @@ export default class MainService extends ControlService {
* @param {*} [context={}] * @param {*} [context={}]
* @param {*} [data={}] * @param {*} [data={}]
* @param {boolean} [isloading] * @param {boolean} [isloading]
* @param {*} [localdata]
* @returns {Promise<any>} * @returns {Promise<any>}
* @memberof MainService * @memberof MainService
*/ */
@Errorlog @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); data = this.handleWFData(data);
context = this.handleRequestData(action,context,data).context; context = this.handleRequestData(action,context,data).context;
return new Promise((resolve: any, reject: any) => { return new Promise((resolve: any, reject: any) => {
let result: Promise<any>; let result: Promise<any>;
const _appEntityService: any = this.appEntityService; const _appEntityService: any = this.appEntityService;
if (_appEntityService[action] && _appEntityService[action] instanceof Function) { if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
result = _appEntityService[action](context,data, isloading); result = _appEntityService[action](context,data, isloading,localdata);
} else { } else {
result = this.appEntityService.Create(context,data, isloading); result = this.appEntityService.WFStart(context,data, isloading,localdata);
} }
result.then((response) => { result.then((response) => {
this.handleResponse(action, response); this.handleResponse(action, response);
......
...@@ -91,20 +91,21 @@ export default class DefaultService extends ControlService { ...@@ -91,20 +91,21 @@ export default class DefaultService extends ControlService {
* @param {*} [context={}] * @param {*} [context={}]
* @param {*} [data={}] * @param {*} [data={}]
* @param {boolean} [isloading] * @param {boolean} [isloading]
* @param {*} [localdata]
* @returns {Promise<any>} * @returns {Promise<any>}
* @memberof DefaultService * @memberof DefaultService
*/ */
@Errorlog @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); data = this.handleWFData(data);
context = this.handleRequestData(action,context,data).context; context = this.handleRequestData(action,context,data).context;
return new Promise((resolve: any, reject: any) => { return new Promise((resolve: any, reject: any) => {
let result: Promise<any>; let result: Promise<any>;
const _appEntityService: any = this.appEntityService; const _appEntityService: any = this.appEntityService;
if (_appEntityService[action] && _appEntityService[action] instanceof Function) { if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
result = _appEntityService[action](context,data, isloading); result = _appEntityService[action](context,data, isloading,localdata);
} else { } else {
result = this.appEntityService.Create(context,data, isloading); result = this.appEntityService.WFStart(context,data, isloading,localdata);
} }
result.then((response) => { result.then((response) => {
this.handleResponse(action, response); this.handleResponse(action, response);
......
...@@ -1254,10 +1254,11 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1254,10 +1254,11 @@ export default class MainBase extends Vue implements ControlInterface {
* 工作流启动 * 工作流启动
* *
* @param {*} [data={}] * @param {*} [data={}]
* @param {*} [localdata={}]
* @returns {Promise<any>} * @returns {Promise<any>}
* @memberof Main * @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) => { return new Promise((resolve: any, reject: any) => {
if(!this.WFStartAction){ if(!this.WFStartAction){
this.$Notice.error({ title: '错误', desc: 'WFCIDEditView视图表单WFStartAction参数未配置' }); this.$Notice.error({ title: '错误', desc: 'WFCIDEditView视图表单WFStartAction参数未配置' });
...@@ -1272,7 +1273,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1272,7 +1273,7 @@ export default class MainBase extends Vue implements ControlInterface {
if(this.viewparams){ if(this.viewparams){
Object.assign(arg,{viewparams: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) => { result.then((response: any) => {
if (!response || response.status !== 200) { if (!response || response.status !== 200) {
this.$Notice.error({ title: '', desc: '工作流启动失败, ' + response.info }); this.$Notice.error({ title: '', desc: '工作流启动失败, ' + response.info });
......
...@@ -91,20 +91,21 @@ export default class MainService extends ControlService { ...@@ -91,20 +91,21 @@ export default class MainService extends ControlService {
* @param {*} [context={}] * @param {*} [context={}]
* @param {*} [data={}] * @param {*} [data={}]
* @param {boolean} [isloading] * @param {boolean} [isloading]
* @param {*} [localdata]
* @returns {Promise<any>} * @returns {Promise<any>}
* @memberof MainService * @memberof MainService
*/ */
@Errorlog @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); data = this.handleWFData(data);
context = this.handleRequestData(action,context,data).context; context = this.handleRequestData(action,context,data).context;
return new Promise((resolve: any, reject: any) => { return new Promise((resolve: any, reject: any) => {
let result: Promise<any>; let result: Promise<any>;
const _appEntityService: any = this.appEntityService; const _appEntityService: any = this.appEntityService;
if (_appEntityService[action] && _appEntityService[action] instanceof Function) { if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
result = _appEntityService[action](context,data, isloading); result = _appEntityService[action](context,data, isloading,localdata);
} else { } else {
result = this.appEntityService.Create(context,data, isloading); result = this.appEntityService.WFStart(context,data, isloading,localdata);
} }
result.then((response) => { result.then((response) => {
this.handleResponse(action, response); this.handleResponse(action, response);
......
...@@ -91,20 +91,21 @@ export default class DefaultService extends ControlService { ...@@ -91,20 +91,21 @@ export default class DefaultService extends ControlService {
* @param {*} [context={}] * @param {*} [context={}]
* @param {*} [data={}] * @param {*} [data={}]
* @param {boolean} [isloading] * @param {boolean} [isloading]
* @param {*} [localdata]
* @returns {Promise<any>} * @returns {Promise<any>}
* @memberof DefaultService * @memberof DefaultService
*/ */
@Errorlog @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); data = this.handleWFData(data);
context = this.handleRequestData(action,context,data).context; context = this.handleRequestData(action,context,data).context;
return new Promise((resolve: any, reject: any) => { return new Promise((resolve: any, reject: any) => {
let result: Promise<any>; let result: Promise<any>;
const _appEntityService: any = this.appEntityService; const _appEntityService: any = this.appEntityService;
if (_appEntityService[action] && _appEntityService[action] instanceof Function) { if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
result = _appEntityService[action](context,data, isloading); result = _appEntityService[action](context,data, isloading,localdata);
} else { } else {
result = this.appEntityService.Create(context,data, isloading); result = this.appEntityService.WFStart(context,data, isloading,localdata);
} }
result.then((response) => { result.then((response) => {
this.handleResponse(action, response); this.handleResponse(action, response);
......
...@@ -1370,10 +1370,11 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1370,10 +1370,11 @@ export default class MainBase extends Vue implements ControlInterface {
* 工作流启动 * 工作流启动
* *
* @param {*} [data={}] * @param {*} [data={}]
* @param {*} [localdata={}]
* @returns {Promise<any>} * @returns {Promise<any>}
* @memberof Main * @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) => { return new Promise((resolve: any, reject: any) => {
if(!this.WFStartAction){ if(!this.WFStartAction){
this.$Notice.error({ title: '错误', desc: 'WFCIDEditView视图表单WFStartAction参数未配置' }); this.$Notice.error({ title: '错误', desc: 'WFCIDEditView视图表单WFStartAction参数未配置' });
...@@ -1388,7 +1389,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1388,7 +1389,7 @@ export default class MainBase extends Vue implements ControlInterface {
if(this.viewparams){ if(this.viewparams){
Object.assign(arg,{viewparams: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) => { result.then((response: any) => {
if (!response || response.status !== 200) { if (!response || response.status !== 200) {
this.$Notice.error({ title: '', desc: '工作流启动失败, ' + response.info }); this.$Notice.error({ title: '', desc: '工作流启动失败, ' + response.info });
......
...@@ -115,20 +115,21 @@ export default class MainService extends ControlService { ...@@ -115,20 +115,21 @@ export default class MainService extends ControlService {
* @param {*} [context={}] * @param {*} [context={}]
* @param {*} [data={}] * @param {*} [data={}]
* @param {boolean} [isloading] * @param {boolean} [isloading]
* @param {*} [localdata]
* @returns {Promise<any>} * @returns {Promise<any>}
* @memberof MainService * @memberof MainService
*/ */
@Errorlog @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); data = this.handleWFData(data);
context = this.handleRequestData(action,context,data).context; context = this.handleRequestData(action,context,data).context;
return new Promise((resolve: any, reject: any) => { return new Promise((resolve: any, reject: any) => {
let result: Promise<any>; let result: Promise<any>;
const _appEntityService: any = this.appEntityService; const _appEntityService: any = this.appEntityService;
if (_appEntityService[action] && _appEntityService[action] instanceof Function) { if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
result = _appEntityService[action](context,data, isloading); result = _appEntityService[action](context,data, isloading,localdata);
} else { } else {
result = this.appEntityService.Create(context,data, isloading); result = this.appEntityService.WFStart(context,data, isloading,localdata);
} }
result.then((response) => { result.then((response) => {
this.handleResponse(action, response); this.handleResponse(action, response);
......
...@@ -91,20 +91,21 @@ export default class DefaultService extends ControlService { ...@@ -91,20 +91,21 @@ export default class DefaultService extends ControlService {
* @param {*} [context={}] * @param {*} [context={}]
* @param {*} [data={}] * @param {*} [data={}]
* @param {boolean} [isloading] * @param {boolean} [isloading]
* @param {*} [localdata]
* @returns {Promise<any>} * @returns {Promise<any>}
* @memberof DefaultService * @memberof DefaultService
*/ */
@Errorlog @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); data = this.handleWFData(data);
context = this.handleRequestData(action,context,data).context; context = this.handleRequestData(action,context,data).context;
return new Promise((resolve: any, reject: any) => { return new Promise((resolve: any, reject: any) => {
let result: Promise<any>; let result: Promise<any>;
const _appEntityService: any = this.appEntityService; const _appEntityService: any = this.appEntityService;
if (_appEntityService[action] && _appEntityService[action] instanceof Function) { if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
result = _appEntityService[action](context,data, isloading); result = _appEntityService[action](context,data, isloading,localdata);
} else { } else {
result = this.appEntityService.Create(context,data, isloading); result = this.appEntityService.WFStart(context,data, isloading,localdata);
} }
result.then((response) => { result.then((response) => {
this.handleResponse(action, response); this.handleResponse(action, response);
......
...@@ -1219,10 +1219,11 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1219,10 +1219,11 @@ export default class MainBase extends Vue implements ControlInterface {
* 工作流启动 * 工作流启动
* *
* @param {*} [data={}] * @param {*} [data={}]
* @param {*} [localdata={}]
* @returns {Promise<any>} * @returns {Promise<any>}
* @memberof Main * @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) => { return new Promise((resolve: any, reject: any) => {
if(!this.WFStartAction){ if(!this.WFStartAction){
this.$Notice.error({ title: '错误', desc: 'WFCIDEditView视图表单WFStartAction参数未配置' }); this.$Notice.error({ title: '错误', desc: 'WFCIDEditView视图表单WFStartAction参数未配置' });
...@@ -1237,7 +1238,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1237,7 +1238,7 @@ export default class MainBase extends Vue implements ControlInterface {
if(this.viewparams){ if(this.viewparams){
Object.assign(arg,{viewparams: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) => { result.then((response: any) => {
if (!response || response.status !== 200) { if (!response || response.status !== 200) {
this.$Notice.error({ title: '', desc: '工作流启动失败, ' + response.info }); this.$Notice.error({ title: '', desc: '工作流启动失败, ' + response.info });
......
...@@ -91,20 +91,21 @@ export default class MainService extends ControlService { ...@@ -91,20 +91,21 @@ export default class MainService extends ControlService {
* @param {*} [context={}] * @param {*} [context={}]
* @param {*} [data={}] * @param {*} [data={}]
* @param {boolean} [isloading] * @param {boolean} [isloading]
* @param {*} [localdata]
* @returns {Promise<any>} * @returns {Promise<any>}
* @memberof MainService * @memberof MainService
*/ */
@Errorlog @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); data = this.handleWFData(data);
context = this.handleRequestData(action,context,data).context; context = this.handleRequestData(action,context,data).context;
return new Promise((resolve: any, reject: any) => { return new Promise((resolve: any, reject: any) => {
let result: Promise<any>; let result: Promise<any>;
const _appEntityService: any = this.appEntityService; const _appEntityService: any = this.appEntityService;
if (_appEntityService[action] && _appEntityService[action] instanceof Function) { if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
result = _appEntityService[action](context,data, isloading); result = _appEntityService[action](context,data, isloading,localdata);
} else { } else {
result = this.appEntityService.Create(context,data, isloading); result = this.appEntityService.WFStart(context,data, isloading,localdata);
} }
result.then((response) => { result.then((response) => {
this.handleResponse(action, response); this.handleResponse(action, response);
......
...@@ -23,7 +23,7 @@ public interface IBZUAAFeignClient ...@@ -23,7 +23,7 @@ public interface IBZUAAFeignClient
* @param authorizationLogin 登录信息 * @param authorizationLogin 登录信息
* @return * @return
*/ */
@PostMapping(value = "/uaa/authentication/login") @PostMapping(value = "/uaa/login")
AuthenticationUser login(@RequestBody AuthorizationLogin authorizationLogin); AuthenticationUser login(@RequestBody AuthorizationLogin authorizationLogin);
} }
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册