提交 d7d7c622 编写于 作者: Mosher's avatar Mosher

update:更新

上级 b234fea8
...@@ -823,10 +823,10 @@ import CodeListService from "@/codelist/codelist-service"; ...@@ -823,10 +823,10 @@ import CodeListService from "@/codelist/codelist-service";
this.$Notice.error({ title: '', desc: (this.$t('app.commonWords.delDataFail') as string) + ',' + response.info }); this.$Notice.error({ title: '', desc: (this.$t('app.commonWords.delDataFail') as string) + ',' + response.info });
return; return;
} }
this.$Notice.success({ title: '', desc: (this.$t('app.commonWords.deleteSuccess') as string) });
if (!(await this.handleCtrlEvents('onremovesuccess', { data: response.data }))) { if (!(await this.handleCtrlEvents('onremovesuccess', { data: response.data }))) {
return; return;
} }
this.$Notice.success({ title: '', desc: (this.$t('app.commonWords.deleteSuccess') as string) });
//删除items中已删除的项 //删除items中已删除的项
datas.forEach((data: any) => { datas.forEach((data: any) => {
this.items.some((item:any,index:number)=>{ this.items.some((item:any,index:number)=>{
......
...@@ -477,8 +477,14 @@ import ${srfclassname('${appCounter.getCodeName()}')}CounterService from '@/co ...@@ -477,8 +477,14 @@ import ${srfclassname('${appCounter.getCodeName()}')}CounterService from '@/co
viewparams: tempViewParam viewparams: tempViewParam
} }
} }
this.handleCtrlEvents('onselectionchange', { data: args }).then((res: boolean) => {
if (!res) {
this.calcToolbarItemState(true);
return;
}
this.calcToolbarItemState(false); this.calcToolbarItemState(false);
this.$emit('selectionchange', navItem); this.$emit('selectionchange', navItem);
})
} }
/** /**
......
...@@ -475,8 +475,14 @@ import ${srfclassname('${appCounter.getCodeName()}')}CounterService from '@/co ...@@ -475,8 +475,14 @@ import ${srfclassname('${appCounter.getCodeName()}')}CounterService from '@/co
viewparams: tempViewParam viewparams: tempViewParam
} }
} }
this.handleCtrlEvents('onselectionchange', { data: args }).then((res: boolean) => {
if (!res) {
this.calcToolbarItemState(true);
return;
}
this.calcToolbarItemState(false); this.calcToolbarItemState(false);
this.$emit('selectionchange', navItem); this.$emit('selectionchange', navItem);
})
} }
/** /**
......
...@@ -345,8 +345,14 @@ ...@@ -345,8 +345,14 @@
viewparams: tempViewParam viewparams: tempViewParam
} }
} }
this.handleCtrlEvents('onselectionchange', { data: args }).then((res: boolean) => {
if (!res) {
this.calcToolbarItemState(true);
return;
}
this.calcToolbarItemState(false); this.calcToolbarItemState(false);
this.$emit('selectionchange', navItem); this.$emit('selectionchange', navItem);
})
} }
/** /**
......
...@@ -235,8 +235,14 @@ ...@@ -235,8 +235,14 @@
viewparams: tempViewparam viewparams: tempViewparam
} }
} }
this.handleCtrlEvents('onselectionchange', { data: args }).then((res: boolean) => {
if (!res) {
this.calcToolbarItemState(true);
return;
}
this.calcToolbarItemState(false); this.calcToolbarItemState(false);
this.$emit('selectionchange', navItem); this.$emit('selectionchange', navItem);
})
} }
/** /**
......
...@@ -442,7 +442,7 @@ draggable, ...@@ -442,7 +442,7 @@ draggable,
* @param {boolean} [isReset=false] 是否重置items * @param {boolean} [isReset=false] 是否重置items
* @memberof ${srfclassname('${ctrl.codeName}')}Base * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public async load(opt: any = {}, isReset: boolean = false) { public async load(opt: any = {}, isReset: boolean = false): Promise<any> {
if(!this.fetchAction){ if(!this.fetchAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: '${view.getName()}' + (this.$t('app.kanban.notConfig.fetchAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: '${view.getName()}' + (this.$t('app.kanban.notConfig.fetchAction') as string) });
return; return;
...@@ -464,14 +464,23 @@ draggable, ...@@ -464,14 +464,23 @@ draggable,
let tempViewParams:any = parentdata.viewparams?parentdata.viewparams:{}; let tempViewParams:any = parentdata.viewparams?parentdata.viewparams:{};
Object.assign(tempViewParams,JSON.parse(JSON.stringify(this.viewparams))); Object.assign(tempViewParams,JSON.parse(JSON.stringify(this.viewparams)));
Object.assign(arg,{viewparams:tempViewParams}); Object.assign(arg,{viewparams:tempViewParams});
const post: Promise<any> = this.service.search(this.fetchAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator); if (!(await this.handleCtrlEvents('onbeforeload', { viewparams: arg }))) {
post.then((response: any) => { return;
}
try {
const response = await this.service.search(this.fetchAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
if (!response || response.status !== 200) { if (!response || response.status !== 200) {
if (!(await this.handleCtrlEvents('onloaderror', { data: response && response.data ? response.data : [] }))) {
return;
}
if (response.data && response.data.message) { if (response.data && response.data.message) {
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
} }
return; return;
} }
if (!(await this.handleCtrlEvents('onloadsuccess', { data: response.data }))) {
return;
}
const data: any = response.data; const data: any = response.data;
if(!this.isAddBehind){ if(!this.isAddBehind){
this.items = []; this.items = [];
...@@ -494,12 +503,15 @@ draggable, ...@@ -494,12 +503,15 @@ draggable,
if(this.isSelectFirstDefault){ if(this.isSelectFirstDefault){
this.handleClick(this.items[0]); this.handleClick(this.items[0]);
} }
}, (response: any) => { } catch (response: any) {
if (!(await this.handleCtrlEvents('onloaderror', { data: response && response.data ? response.data : [] }))) {
return;
}
if (response && response.status === 401) { if (response && response.status === 401) {
return; return;
} }
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data && response.data.message ? response.data.message : "" }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data && response.data.message ? response.data.message : "" });
}); }
} }
/** /**
...@@ -549,22 +561,29 @@ draggable, ...@@ -549,22 +561,29 @@ draggable,
dataInfo = dataInfo + '...' + ' 共' + _datas.length + '条数据'; dataInfo = dataInfo + '...' + ' 共' + _datas.length + '条数据';
} }
const removeData = () => { const removeData = async () => {
let keys: any[] = []; let keys: any[] = [];
_datas.forEach((data: any) => { _datas.forEach((data: any) => {
keys.push(data.srfkey); keys.push(data.srfkey);
}); });
let _removeAction = keys.length > 1 ? 'removeBatch' : this.removeAction ; let _removeAction = keys.length > 1 ? 'removeBatch' : this.removeAction ;
const context:any = JSON.parse(JSON.stringify(this.context)); const context:any = JSON.parse(JSON.stringify(this.context));
const post: Promise<any> = this.service.delete(_removeAction,Object.assign(context,{ ${ctrl.getPSAppDataEntity().codeName?lower_case}: keys.join(';') }),Object.assign({ ${ctrl.getPSAppDataEntity().codeName?lower_case}: keys.join(';') },{viewparams:this.viewparams}), this.showBusyIndicator); if (!(await this.handleCtrlEvents('onbeforeremove', { data: datas }))) {
return new Promise((resolve: any, reject: any) => { return;
post.then((response: any) => { }
try {
const response: any = await this.service.delete(_removeAction,Object.assign(context,{ ${ctrl.getPSAppDataEntity().codeName?lower_case}: keys.join(';') }),Object.assign({ ${ctrl.getPSAppDataEntity().codeName?lower_case}: keys.join(';') },{viewparams:this.viewparams}), this.showBusyIndicator);
if (!response || response.status !== 200) { if (!response || response.status !== 200) {
if (!(await this.handleCtrlEvents('onremoveerror', { data: response && response.data ? response.data : datas }))) {
return;
}
this.$Notice.error({ title: '', desc: (this.$t('app.commonWords.delDataFail') as string) + ',' + response.info }); this.$Notice.error({ title: '', desc: (this.$t('app.commonWords.delDataFail') as string) + ',' + response.info });
return; return;
} else {
this.$Notice.success({ title: '', desc: (this.$t('app.commonWords.deleteSuccess') as string) });
} }
if (!(await this.handleCtrlEvents('onremovesuccess', { data: response.data }))) {
return;
}
this.$Notice.success({ title: '', desc: (this.$t('app.commonWords.deleteSuccess') as string) });
//删除items中已删除的项 //删除items中已删除的项
_datas.forEach((data: any) => { _datas.forEach((data: any) => {
this.items.some((item:any,index:number)=>{ this.items.some((item:any,index:number)=>{
...@@ -576,19 +595,19 @@ draggable, ...@@ -576,19 +595,19 @@ draggable,
}); });
this.$emit('remove', null); this.$emit('remove', null);
this.selections = []; this.selections = [];
resolve(response); return response;
}).catch((response: any) => { } catch (response: any) {
if (!(await this.handleCtrlEvents('onremoveerror', { data: response && response.data ? response.data : datas }))) {
return;
}
if (response && response.status === 401) { if (response && response.status === 401) {
return; return;
} }
if (!response || !response.status || !response.data) { if (!response || !response.status || !response.data) {
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: (this.$t('app.commonWords.sysException') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: (this.$t('app.commonWords.sysException') as string) });
reject(response);
return;
} }
reject(response); return response;
}); }
});
} }
dataInfo = dataInfo.replace(/[null]/g, '').replace(/[undefined]/g, '').replace(/[ ]/g, ''); dataInfo = dataInfo.replace(/[null]/g, '').replace(/[undefined]/g, '').replace(/[ ]/g, '');
...@@ -761,6 +780,10 @@ draggable, ...@@ -761,6 +780,10 @@ draggable,
* *
*/ */
public selectchange() { public selectchange() {
this.handleCtrlEvents('onselectionchange').then((res: boolean) => {
if (!res) {
return;
}
this.selections = []; this.selections = [];
this.items.map((item: any) => { this.items.map((item: any) => {
if (item.isselected) { if (item.isselected) {
...@@ -768,6 +791,7 @@ draggable, ...@@ -768,6 +791,7 @@ draggable,
} }
}); });
this.$emit('selectionchange', this.selections); this.$emit('selectionchange', this.selections);
})
} }
/** /**
......
...@@ -474,8 +474,14 @@ import ${srfclassname('${appCounter.getCodeName()}')}CounterService from '@/co ...@@ -474,8 +474,14 @@ import ${srfclassname('${appCounter.getCodeName()}')}CounterService from '@/co
viewparams: tempViewParam viewparams: tempViewParam
} }
} }
this.handleCtrlEvents('onselectionchange', { data: args }).then((res: boolean) => {
if (!res) {
this.calcToolbarItemState(true);
return;
}
this.calcToolbarItemState(false); this.calcToolbarItemState(false);
this.$emit('selectionchange', navItem); this.$emit('selectionchange', navItem);
})
} }
/** /**
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册