Mosher 发布系统代码 [后台服务，演示应用]

app_Web/src/widgets/ibizappctrl/ctrl-amount-list/ctrl-amount-list-base.vue

@@ -710,10 +710,10 @@ export default class CtrlAmountBase extends Vue implements ControlInterface {
                     this.$Notice.error({ title: '', desc: (this.$t('app.commonWords.delDataFail') as string) + ',' + response.info });
                     return;
                 }
-                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中已删除的项
                 datas.forEach((data: any) => {
                     this.items.some((item:any,index:number)=>{

app_Web/src/widgets/ibizappctrl/ctrl-list-list/ctrl-list-list-base.vue

@@ -772,10 +772,10 @@ export default class CtrlListBase extends Vue implements ControlInterface {
                     this.$Notice.error({ title: '', desc: (this.$t('app.commonWords.delDataFail') as string) + ',' + response.info });
                     return;
                 }
-                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中已删除的项
                 datas.forEach((data: any) => {
                     this.items.some((item:any,index:number)=>{

app_Web/src/widgets/ibizappeditor/editor-amount-list/editor-amount-list-base.vue

@@ -710,10 +710,10 @@ export default class EditorAmountBase extends Vue implements ControlInterface {
                     this.$Notice.error({ title: '', desc: (this.$t('app.commonWords.delDataFail') as string) + ',' + response.info });
                     return;
                 }
-                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中已删除的项
                 datas.forEach((data: any) => {
                     this.items.some((item:any,index:number)=>{

app_Web/src/widgets/ibizappeditor/editor-list-list/editor-list-list-base.vue

@@ -772,10 +772,10 @@ export default class EditorListBase extends Vue implements ControlInterface {
                     this.$Notice.error({ title: '', desc: (this.$t('app.commonWords.delDataFail') as string) + ',' + response.info });
                     return;
                 }
-                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中已删除的项
                 datas.forEach((data: any) => {
                     this.items.some((item:any,index:number)=>{

app_Web/src/widgets/ibizappextendeditor/extend-editor-amount-list/extend-editor-amount-list-base.vue

@@ -710,10 +710,10 @@ export default class ExtendEditorAmountBase extends Vue implements ControlInterf
                     this.$Notice.error({ title: '', desc: (this.$t('app.commonWords.delDataFail') as string) + ',' + response.info });
                     return;
                 }
-                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中已删除的项
                 datas.forEach((data: any) => {
                     this.items.some((item:any,index:number)=>{

app_Web/src/widgets/ibizappextendeditor/extend-editor-list-list/extend-editor-list-list-base.vue

@@ -772,10 +772,10 @@ export default class ExtendEditorListBase extends Vue implements ControlInterfac
                     this.$Notice.error({ title: '', desc: (this.$t('app.commonWords.delDataFail') as string) + ',' + response.info });
                     return;
                 }
-                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中已删除的项
                 datas.forEach((data: any) => {
                     this.items.some((item:any,index:number)=>{

app_Web/src/widgets/ibizappview/view-amount-list/view-amount-list-base.vue

@@ -710,10 +710,10 @@ export default class ViewAmountBase extends Vue implements ControlInterface {
                     this.$Notice.error({ title: '', desc: (this.$t('app.commonWords.delDataFail') as string) + ',' + response.info });
                     return;
                 }
-                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中已删除的项
                 datas.forEach((data: any) => {
                     this.items.some((item:any,index:number)=>{

app_Web/src/widgets/ibizappview/view-list-list/view-list-list-base.vue

@@ -800,10 +800,10 @@ export default class ViewListBase extends Vue implements ControlInterface {
                     this.$Notice.error({ title: '', desc: (this.$t('app.commonWords.delDataFail') as string) + ',' + response.info });
                     return;
                 }
-                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中已删除的项
                 datas.forEach((data: any) => {
                     this.items.some((item:any,index:number)=>{

app_Web/src/widgets/ibizbook/auto-group-list-list/auto-group-list-list-base.vue

@@ -936,10 +936,10 @@ export default class AutoGroupListBase extends Vue implements ControlInterface {
                     this.$Notice.error({ title: '', desc: (this.$t('app.commonWords.delDataFail') as string) + ',' + response.info });
                     return;
                 }
-                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中已删除的项
                 datas.forEach((data: any) => {
                     this.items.some((item:any,index:number)=>{

app_Web/src/widgets/ibizbook/booklist-list/booklist-list-base.vue

@@ -730,10 +730,10 @@ export default class BooklistBase extends Vue implements ControlInterface {
                     this.$Notice.error({ title: '', desc: (this.$t('app.commonWords.delDataFail') as string) + ',' + response.info });
                     return;
                 }
-                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中已删除的项
                 datas.forEach((data: any) => {
                     this.items.some((item:any,index:number)=>{

app_Web/src/widgets/ibizbook/data-view-exp-viewdataviewexpbar-dataviewexpbar/data-view-exp-viewdataviewexpbar-dataviewexpbar-base.vue

@@ -495,8 +495,14 @@ export default class DataViewExpViewdataviewexpbarBase extends Vue implements Co
                 viewparams: tempViewParam
             }
         }
+        this.handleCtrlEvents('onselectionchange', { data: args }).then((res: boolean) => {
+            if (!res) {
+                this.calcToolbarItemState(true);
+                return;
+            }
             this.calcToolbarItemState(false);
             this.$emit('selectionchange', navItem);
+        })
     }
 
     /**

app_Web/src/widgets/ibizbook/group-by-codelist-kan-ban-kanban/group-by-codelist-kan-ban-kanban-base.vue

@@ -545,7 +545,7 @@ export default class GroupByCodelistKanBanBase extends Vue implements ControlInt
      * @param {boolean} [isReset=false] 是否重置items
      * @memberof GroupByCodelistKanBanBase
      */
-    public async load(opt: any = {}, isReset: boolean = false) {
+    public async load(opt: any = {}, isReset: boolean = false): Promise<any> {
         if(!this.fetchAction){
             this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKGroupByCodelistKanBanView' + (this.$t('app.kanban.notConfig.fetchAction') as string) });
             return;
@@ -567,14 +567,23 @@ export default class GroupByCodelistKanBanBase extends Vue implements ControlInt
         let tempViewParams:any = parentdata.viewparams?parentdata.viewparams:{};
         Object.assign(tempViewParams,JSON.parse(JSON.stringify(this.viewparams)));
         Object.assign(arg,{viewparams:tempViewParams});
-        const post: Promise<any> = this.service.search(this.fetchAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
-        post.then((response: any) => {
+        if (!(await this.handleCtrlEvents('onbeforeload', { viewparams: arg }))) {
+            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 (!(await this.handleCtrlEvents('onloaderror', { data: response && response.data ? response.data : [] }))) {
+                    return;
+                }
                 if (response.data && response.data.message) {
                     this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
                 }
                 return;
             }
+            if (!(await this.handleCtrlEvents('onloadsuccess', { data: response.data }))) {
+                return;
+            }
             const data: any = response.data;
             if(!this.isAddBehind){
                 this.items = [];
@@ -597,12 +606,15 @@ export default class GroupByCodelistKanBanBase extends Vue implements ControlInt
             if(this.isSelectFirstDefault){
                 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) {
                 return;
             }
             this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data && response.data.message ? response.data.message : "" });
-        });
+        }
     }
 
     /**
@@ -652,22 +664,29 @@ export default class GroupByCodelistKanBanBase extends Vue implements ControlInt
             dataInfo = dataInfo + '...' + ' 共' + _datas.length + '条数据';
         }
        
-        const removeData = () => {
+        const removeData = async () => {
             let keys: any[] = [];
             _datas.forEach((data: any) => {
                 keys.push(data.srfkey);
             });
             let _removeAction = keys.length > 1 ? 'removeBatch' : this.removeAction ;
             const context:any = JSON.parse(JSON.stringify(this.context));
-            const post: Promise<any> = this.service.delete(_removeAction,Object.assign(context,{ ibizbook: keys.join(';') }),Object.assign({ ibizbook: keys.join(';') },{viewparams:this.viewparams}), this.showBusyIndicator);
-            return new Promise((resolve: any, reject: any) => {
-                post.then((response: any) => {
+            if (!(await this.handleCtrlEvents('onbeforeremove', { data: datas }))) {
+                return;
+            }
+            try {
+                const response: any = await this.service.delete(_removeAction,Object.assign(context,{ ibizbook: keys.join(';') }),Object.assign({ ibizbook: keys.join(';') },{viewparams:this.viewparams}), this.showBusyIndicator);
                 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 });
                     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中已删除的项
                 _datas.forEach((data: any) => {
                     this.items.some((item:any,index:number)=>{
@@ -679,19 +698,19 @@ export default class GroupByCodelistKanBanBase extends Vue implements ControlInt
                 });
                 this.$emit('remove', null);
                 this.selections = [];
-                    resolve(response);
-                }).catch((response: any) => {
+                return response;
+            } catch (response: any) {
+                if (!(await this.handleCtrlEvents('onremoveerror', { data: response && response.data ? response.data : datas }))) {
+                    return;
+                }
                 if (response && response.status === 401) {
                     return;
                 }
                 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) });
-                        reject(response);
-                        return;
                 }
-                    reject(response);
-                });
-            });
+                return response;
+            }
         }
 
         dataInfo = dataInfo.replace(/[null]/g, '').replace(/[undefined]/g, '').replace(/[ ]/g, '');
@@ -862,6 +881,10 @@ export default class GroupByCodelistKanBanBase extends Vue implements ControlInt
      *
      */
     public selectchange() {
+        this.handleCtrlEvents('onselectionchange').then((res: boolean) => {
+            if (!res) {
+                return;
+            }
             this.selections = [];
             this.items.map((item: any) => {
                 if (item.isselected) {
@@ -869,6 +892,7 @@ export default class GroupByCodelistKanBanBase extends Vue implements ControlInt
                 }
             });
             this.$emit('selectionchange', this.selections);
+        })
     }
 
     /**

app_Web/src/widgets/ibizbook/group-by-codelist-list-list/group-by-codelist-list-list-base.vue

@@ -867,10 +867,10 @@ export default class GroupByCodelistListBase extends Vue implements ControlInter
                     this.$Notice.error({ title: '', desc: (this.$t('app.commonWords.delDataFail') as string) + ',' + response.info });
                     return;
                 }
-                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中已删除的项
                 datas.forEach((data: any) => {
                     this.items.some((item:any,index:number)=>{

app_Web/src/widgets/ibizbook/has-panel-kan-ban-kanban/has-panel-kan-ban-kanban-base.vue

@@ -545,7 +545,7 @@ export default class HasPanelKanBanBase extends Vue implements ControlInterface
      * @param {boolean} [isReset=false] 是否重置items
      * @memberof HasPanelKanBanBase
      */
-    public async load(opt: any = {}, isReset: boolean = false) {
+    public async load(opt: any = {}, isReset: boolean = false): Promise<any> {
         if(!this.fetchAction){
             this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKHasPanelKanBanView' + (this.$t('app.kanban.notConfig.fetchAction') as string) });
             return;
@@ -567,14 +567,23 @@ export default class HasPanelKanBanBase extends Vue implements ControlInterface
         let tempViewParams:any = parentdata.viewparams?parentdata.viewparams:{};
         Object.assign(tempViewParams,JSON.parse(JSON.stringify(this.viewparams)));
         Object.assign(arg,{viewparams:tempViewParams});
-        const post: Promise<any> = this.service.search(this.fetchAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
-        post.then((response: any) => {
+        if (!(await this.handleCtrlEvents('onbeforeload', { viewparams: arg }))) {
+            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 (!(await this.handleCtrlEvents('onloaderror', { data: response && response.data ? response.data : [] }))) {
+                    return;
+                }
                 if (response.data && response.data.message) {
                     this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
                 }
                 return;
             }
+            if (!(await this.handleCtrlEvents('onloadsuccess', { data: response.data }))) {
+                return;
+            }
             const data: any = response.data;
             if(!this.isAddBehind){
                 this.items = [];
@@ -597,12 +606,15 @@ export default class HasPanelKanBanBase extends Vue implements ControlInterface
             if(this.isSelectFirstDefault){
                 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) {
                 return;
             }
             this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data && response.data.message ? response.data.message : "" });
-        });
+        }
     }
 
     /**
@@ -652,22 +664,29 @@ export default class HasPanelKanBanBase extends Vue implements ControlInterface
             dataInfo = dataInfo + '...' + ' 共' + _datas.length + '条数据';
         }
        
-        const removeData = () => {
+        const removeData = async () => {
             let keys: any[] = [];
             _datas.forEach((data: any) => {
                 keys.push(data.srfkey);
             });
             let _removeAction = keys.length > 1 ? 'removeBatch' : this.removeAction ;
             const context:any = JSON.parse(JSON.stringify(this.context));
-            const post: Promise<any> = this.service.delete(_removeAction,Object.assign(context,{ ibizbook: keys.join(';') }),Object.assign({ ibizbook: keys.join(';') },{viewparams:this.viewparams}), this.showBusyIndicator);
-            return new Promise((resolve: any, reject: any) => {
-                post.then((response: any) => {
+            if (!(await this.handleCtrlEvents('onbeforeremove', { data: datas }))) {
+                return;
+            }
+            try {
+                const response: any = await this.service.delete(_removeAction,Object.assign(context,{ ibizbook: keys.join(';') }),Object.assign({ ibizbook: keys.join(';') },{viewparams:this.viewparams}), this.showBusyIndicator);
                 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 });
                     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中已删除的项
                 _datas.forEach((data: any) => {
                     this.items.some((item:any,index:number)=>{
@@ -679,19 +698,19 @@ export default class HasPanelKanBanBase extends Vue implements ControlInterface
                 });
                 this.$emit('remove', null);
                 this.selections = [];
-                    resolve(response);
-                }).catch((response: any) => {
+                return response;
+            } catch (response: any) {
+                if (!(await this.handleCtrlEvents('onremoveerror', { data: response && response.data ? response.data : datas }))) {
+                    return;
+                }
                 if (response && response.status === 401) {
                     return;
                 }
                 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) });
-                        reject(response);
-                        return;
                 }
-                    reject(response);
-                });
-            });
+                return response;
+            }
         }
 
         dataInfo = dataInfo.replace(/[null]/g, '').replace(/[undefined]/g, '').replace(/[ ]/g, '');
@@ -862,6 +881,10 @@ export default class HasPanelKanBanBase extends Vue implements ControlInterface
      *
      */
     public selectchange() {
+        this.handleCtrlEvents('onselectionchange').then((res: boolean) => {
+            if (!res) {
+                return;
+            }
             this.selections = [];
             this.items.map((item: any) => {
                 if (item.isselected) {
@@ -869,6 +892,7 @@ export default class HasPanelKanBanBase extends Vue implements ControlInterface
                 }
             });
             this.$emit('selectionchange', this.selections);
+        })
     }
 
     /**

app_Web/src/widgets/ibizbook/has-panel-list-list/has-panel-list-list-base.vue

@@ -724,10 +724,10 @@ export default class HasPanelListBase extends Vue implements ControlInterface {
                     this.$Notice.error({ title: '', desc: (this.$t('app.commonWords.delDataFail') as string) + ',' + response.info });
                     return;
                 }
-                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中已删除的项
                 datas.forEach((data: any) => {
                     this.items.some((item:any,index:number)=>{

app_Web/src/widgets/ibizbook/inter-func-kanban-kanban/inter-func-kanban-kanban-base.vue

@@ -583,7 +583,7 @@ export default class InterFuncKanbanBase extends Vue implements ControlInterface
      * @param {boolean} [isReset=false] 是否重置items
      * @memberof InterFuncKanbanBase
      */
-    public async load(opt: any = {}, isReset: boolean = false) {
+    public async load(opt: any = {}, isReset: boolean = false): Promise<any> {
         if(!this.fetchAction){
             this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKInterFuncKanBanView' + (this.$t('app.kanban.notConfig.fetchAction') as string) });
             return;
@@ -605,14 +605,23 @@ export default class InterFuncKanbanBase extends Vue implements ControlInterface
         let tempViewParams:any = parentdata.viewparams?parentdata.viewparams:{};
         Object.assign(tempViewParams,JSON.parse(JSON.stringify(this.viewparams)));
         Object.assign(arg,{viewparams:tempViewParams});
-        const post: Promise<any> = this.service.search(this.fetchAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
-        post.then((response: any) => {
+        if (!(await this.handleCtrlEvents('onbeforeload', { viewparams: arg }))) {
+            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 (!(await this.handleCtrlEvents('onloaderror', { data: response && response.data ? response.data : [] }))) {
+                    return;
+                }
                 if (response.data && response.data.message) {
                     this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
                 }
                 return;
             }
+            if (!(await this.handleCtrlEvents('onloadsuccess', { data: response.data }))) {
+                return;
+            }
             const data: any = response.data;
             if(!this.isAddBehind){
                 this.items = [];
@@ -635,12 +644,15 @@ export default class InterFuncKanbanBase extends Vue implements ControlInterface
             if(this.isSelectFirstDefault){
                 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) {
                 return;
             }
             this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data && response.data.message ? response.data.message : "" });
-        });
+        }
     }
 
     /**
@@ -690,22 +702,29 @@ export default class InterFuncKanbanBase extends Vue implements ControlInterface
             dataInfo = dataInfo + '...' + ' 共' + _datas.length + '条数据';
         }
        
-        const removeData = () => {
+        const removeData = async () => {
             let keys: any[] = [];
             _datas.forEach((data: any) => {
                 keys.push(data.srfkey);
             });
             let _removeAction = keys.length > 1 ? 'removeBatch' : this.removeAction ;
             const context:any = JSON.parse(JSON.stringify(this.context));
-            const post: Promise<any> = this.service.delete(_removeAction,Object.assign(context,{ ibizbook: keys.join(';') }),Object.assign({ ibizbook: keys.join(';') },{viewparams:this.viewparams}), this.showBusyIndicator);
-            return new Promise((resolve: any, reject: any) => {
-                post.then((response: any) => {
+            if (!(await this.handleCtrlEvents('onbeforeremove', { data: datas }))) {
+                return;
+            }
+            try {
+                const response: any = await this.service.delete(_removeAction,Object.assign(context,{ ibizbook: keys.join(';') }),Object.assign({ ibizbook: keys.join(';') },{viewparams:this.viewparams}), this.showBusyIndicator);
                 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 });
                     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中已删除的项
                 _datas.forEach((data: any) => {
                     this.items.some((item:any,index:number)=>{
@@ -717,19 +736,19 @@ export default class InterFuncKanbanBase extends Vue implements ControlInterface
                 });
                 this.$emit('remove', null);
                 this.selections = [];
-                    resolve(response);
-                }).catch((response: any) => {
+                return response;
+            } catch (response: any) {
+                if (!(await this.handleCtrlEvents('onremoveerror', { data: response && response.data ? response.data : datas }))) {
+                    return;
+                }
                 if (response && response.status === 401) {
                     return;
                 }
                 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) });
-                        reject(response);
-                        return;
                 }
-                    reject(response);
-                });
-            });
+                return response;
+            }
         }
 
         dataInfo = dataInfo.replace(/[null]/g, '').replace(/[undefined]/g, '').replace(/[ ]/g, '');
@@ -900,6 +919,10 @@ export default class InterFuncKanbanBase extends Vue implements ControlInterface
      *
      */
     public selectchange() {
+        this.handleCtrlEvents('onselectionchange').then((res: boolean) => {
+            if (!res) {
+                return;
+            }
             this.selections = [];
             this.items.map((item: any) => {
                 if (item.isselected) {
@@ -907,6 +930,7 @@ export default class InterFuncKanbanBase extends Vue implements ControlInterface
                 }
             });
             this.$emit('selectionchange', this.selections);
+        })
     }
 
     /**

app_Web/src/widgets/ibizbook/listpanel-list/listpanel-list-base.vue

@@ -724,10 +724,10 @@ export default class ListpanelBase extends Vue implements ControlInterface {
                     this.$Notice.error({ title: '', desc: (this.$t('app.commonWords.delDataFail') as string) + ',' + response.info });
                     return;
                 }
-                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中已删除的项
                 datas.forEach((data: any) => {
                     this.items.some((item:any,index:number)=>{

app_Web/src/widgets/ibizbook/lnternal-func-list-list/lnternal-func-list-list-base.vue

@@ -46,11 +46,11 @@
             <span class="quick-toolbar">
                             <div class='toolbar-container'>
                 <tooltip :transfer="true" :max-width="600">
-                        <i-button v-show="usr4listview_layoutlist_quicktoolbarModels.deuiaction1.visabled" :disabled="usr4listview_layoutlist_quicktoolbarModels.deuiaction1.disabled" class='' v-button-loading:i-button @click="list_quicktoolbar_click({ tag: 'deuiaction1' }, $event)">
+                        <i-button v-show="listviewlist_quicktoolbarModels.deuiaction1.visabled" :disabled="listviewlist_quicktoolbarModels.deuiaction1.disabled" class='' v-button-loading:i-button @click="list_quicktoolbar_click({ tag: 'deuiaction1' }, $event)">
                             <i class='fa fa-file-text-o'></i>
-                            <span class='caption'>{{$t('entities.ibizbook.usr4listview_layoutlist_quicktoolbar_toolbar.deuiaction1.caption')}}</span>
+                            <span class='caption'>{{$t('entities.ibizbook.listviewlist_quicktoolbar_toolbar.deuiaction1.caption')}}</span>
                         </i-button>
-                    <div slot='content'>{{$t('entities.ibizbook.usr4listview_layoutlist_quicktoolbar_toolbar.deuiaction1.tip')}}</div>
+                    <div slot='content'>{{$t('entities.ibizbook.listviewlist_quicktoolbar_toolbar.deuiaction1.tip')}}</div>
                 </tooltip>
             </div>
             </span>
@@ -61,18 +61,18 @@
         <span class="batch-toolbar">
                     <div class='toolbar-container'>
                 <tooltip :transfer="true" :max-width="600">
-                        <i-button v-show="usr4listview_layoutlist_batchtoolbarModels.deuiaction1.visabled" :disabled="usr4listview_layoutlist_batchtoolbarModels.deuiaction1.disabled" class='' v-button-loading:i-button @click="list_batchtoolbar_click({ tag: 'deuiaction1' }, $event)">
+                        <i-button v-show="listviewlist_batchtoolbarModels.deuiaction1.visabled" :disabled="listviewlist_batchtoolbarModels.deuiaction1.disabled" class='' v-button-loading:i-button @click="list_batchtoolbar_click({ tag: 'deuiaction1' }, $event)">
                             <i class='fa fa-edit'></i>
-                            <span class='caption'>{{$t('entities.ibizbook.usr4listview_layoutlist_batchtoolbar_toolbar.deuiaction1.caption')}}</span>
+                            <span class='caption'>{{$t('entities.ibizbook.listviewlist_batchtoolbar_toolbar.deuiaction1.caption')}}</span>
                         </i-button>
-                    <div slot='content'>{{$t('entities.ibizbook.usr4listview_layoutlist_batchtoolbar_toolbar.deuiaction1.tip')}}</div>
+                    <div slot='content'>{{$t('entities.ibizbook.listviewlist_batchtoolbar_toolbar.deuiaction1.tip')}}</div>
                 </tooltip>
                 <tooltip :transfer="true" :max-width="600">
-                        <i-button v-show="usr4listview_layoutlist_batchtoolbarModels.deuiaction2.visabled" :disabled="usr4listview_layoutlist_batchtoolbarModels.deuiaction2.disabled" class='' v-button-loading:i-button @click="list_batchtoolbar_click({ tag: 'deuiaction2' }, $event)">
+                        <i-button v-show="listviewlist_batchtoolbarModels.deuiaction2.visabled" :disabled="listviewlist_batchtoolbarModels.deuiaction2.disabled" class='' v-button-loading:i-button @click="list_batchtoolbar_click({ tag: 'deuiaction2' }, $event)">
                             <i class='fa fa-remove'></i>
-                            <span class='caption'>{{$t('entities.ibizbook.usr4listview_layoutlist_batchtoolbar_toolbar.deuiaction2.caption')}}</span>
+                            <span class='caption'>{{$t('entities.ibizbook.listviewlist_batchtoolbar_toolbar.deuiaction2.caption')}}</span>
                         </i-button>
-                    <div slot='content'>{{$t('entities.ibizbook.usr4listview_layoutlist_batchtoolbar_toolbar.deuiaction2.tip')}}</div>
+                    <div slot='content'>{{$t('entities.ibizbook.listviewlist_batchtoolbar_toolbar.deuiaction2.tip')}}</div>
                 </tooltip>
             </div>
         </span>
@@ -381,7 +381,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZBOOKUsr4ListView_layoutBase
+     * @memberof IBIZBOOKListViewBase
      */
     public New(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
          const _this: any = this;
@@ -401,7 +401,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZBOOKUsr4ListView_layoutBase
+     * @memberof IBIZBOOKListViewBase
      */
     public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         if (args.length === 0) {
@@ -427,7 +427,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZBOOKUsr4ListView_layoutBase
+     * @memberof IBIZBOOKListViewBase
      */
     public Remove(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         const _this: any = this;
@@ -623,9 +623,9 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      * 工具栏模型
      *
      * @type {*}
-     * @memberof IBIZBOOKUsr4ListView_layout
+     * @memberof IBIZBOOKListView
      */
-    public usr4listview_layoutlist_quicktoolbarModels: any = {
+    public listviewlist_quicktoolbarModels: any = {
         deuiaction1: { name: 'deuiaction1', actiontarget: 'NONE', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
     };
@@ -635,9 +635,9 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      * 工具栏模型
      *
      * @type {*}
-     * @memberof IBIZBOOKUsr4ListView_layout
+     * @memberof IBIZBOOKListView
      */
-    public usr4listview_layoutlist_batchtoolbarModels: any = {
+    public listviewlist_batchtoolbarModels: any = {
         deuiaction1: { name: 'deuiaction1', actiontarget: 'NONE', caption: '编辑', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' } },
 
         deuiaction2: { name: 'deuiaction2', actiontarget: 'NONE', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' } },
@@ -860,7 +860,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      */
     public async load(opt: any = {}): Promise<any> {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4ListView_layout' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKListView' + (this.$t('app.list.notConfig.fetchAction') as string) });
             return;
         }        
         const arg: any = {...opt};
@@ -990,7 +990,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      */
     public async remove(datas: any[]): Promise<any> {
         if(!this.removeAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4ListView_layout' + (this.$t('app.list.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKListView' + (this.$t('app.list.notConfig.removeAction') as string) });
             return;
         }
         if (datas.length === 0) {
@@ -1034,10 +1034,10 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
                     this.$Notice.error({ title: '', desc: (this.$t('app.commonWords.delDataFail') as string) + ',' + response.info });
                     return;
                 }
-                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中已删除的项
                 datas.forEach((data: any) => {
                     this.items.some((item:any,index:number)=>{
@@ -1095,7 +1095,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
             try {
                 if(Object.is(item.rowDataState, 'create')){
                     if(!this.createAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4ListView_layout' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKListView' + (this.$t('app.list.notConfig.createAction') as string) });
                     }else{
                       Object.assign(item,{viewparams:this.viewparams});
                       let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
@@ -1103,7 +1103,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
                     }
                 }else if(Object.is(item.rowDataState, 'update')){
                     if(!this.updateAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.warning') as string), desc: 'IBIZBOOKUsr4ListView_layout' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.warning') as string), desc: 'IBIZBOOKListView' + (this.$t('app.list.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizbook){

app_Web/src/widgets/ibizbook/major-state-list-list/major-state-list-list-base.vue

@@ -800,10 +800,10 @@ export default class MajorStateListBase extends Vue implements ControlInterface
                     this.$Notice.error({ title: '', desc: (this.$t('app.commonWords.delDataFail') as string) + ',' + response.info });
                     return;
                 }
-                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中已删除的项
                 datas.forEach((data: any) => {
                     this.items.some((item:any,index:number)=>{

app_Web/src/widgets/ibizbook/test-list-list/test-list-list-base.vue

@@ -724,10 +724,10 @@ export default class TestListBase extends Vue implements ControlInterface {
                     this.$Notice.error({ title: '', desc: (this.$t('app.commonWords.delDataFail') as string) + ',' + response.info });
                     return;
                 }
-                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中已删除的项
                 datas.forEach((data: any) => {
                     this.items.some((item:any,index:number)=>{

app_Web/src/widgets/ibizbook/usr-list/usr-list-base.vue

@@ -823,10 +823,10 @@ export default class UsrBase extends Vue implements ControlInterface {
                     this.$Notice.error({ title: '', desc: (this.$t('app.commonWords.delDataFail') as string) + ',' + response.info });
                     return;
                 }
-                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中已删除的项
                 datas.forEach((data: any) => {
                     this.items.some((item:any,index:number)=>{

app_Web/src/widgets/ibizbook/usr4-dataview/usr4-dataview-base.vue

@@ -697,7 +697,7 @@ export default class Usr4Base extends Vue implements ControlInterface {
      */
     public async load(opt: any = {}, isReset: boolean = false): Promise<any> {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.fetchAction') as string) });
             return;
         }      
         const arg: any = {...opt};
@@ -791,7 +791,7 @@ export default class Usr4Base extends Vue implements ControlInterface {
      */
     public async remove(datas: any[]): Promise<any> {
         if(!this.removeAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -907,7 +907,7 @@ export default class Usr4Base extends Vue implements ControlInterface {
             try {
                 if(Object.is(item.rowDataState, 'create')){
                     if(!this.createAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.createAction') as string) });
                     }else{
                       Object.assign(item,{viewparams:this.viewparams});
                       let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
@@ -915,7 +915,7 @@ export default class Usr4Base extends Vue implements ControlInterface {
                     }
                 }else if(Object.is(item.rowDataState, 'update')){
                     if(!this.updateAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizbook){

app_Web/src/widgets/ibizbook/usr4-dataview/usr4-dataview-model.ts

@@ -69,6 +69,11 @@ export default class Usr4Model {
         prop: 'n_ibizbookname_like',
         dataType: 'QUERYPARAM'
       },
+      {
+        name: 'n_price_gtandeq',
+        prop: 'n_price_gtandeq',
+        dataType: 'QUERYPARAM'
+      },
 
 
       {

app_Web/src/widgets/ibizorder-detail/order-details-list-list/order-details-list-list-base.vue

@@ -744,10 +744,10 @@ export default class OrderDetailsListBase extends Vue implements ControlInterfac
                     this.$Notice.error({ title: '', desc: (this.$t('app.commonWords.delDataFail') as string) + ',' + response.info });
                     return;
                 }
-                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中已删除的项
                 datas.forEach((data: any) => {
                     this.items.some((item:any,index:number)=>{

app_Web/src/widgets/ibizorder-detail/order-details-money-list/order-details-money-list-base.vue

@@ -703,10 +703,10 @@ export default class OrderDetailsMoneyBase extends Vue implements ControlInterfa
                     this.$Notice.error({ title: '', desc: (this.$t('app.commonWords.delDataFail') as string) + ',' + response.info });
                     return;
                 }
-                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中已删除的项
                 datas.forEach((data: any) => {
                     this.items.some((item:any,index:number)=>{

app_Web/src/widgets/ibizorder-detail/order-details-total-list/order-details-total-list-base.vue

@@ -703,10 +703,10 @@ export default class OrderDetailsTotalBase extends Vue implements ControlInterfa
                     this.$Notice.error({ title: '', desc: (this.$t('app.commonWords.delDataFail') as string) + ',' + response.info });
                     return;
                 }
-                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中已删除的项
                 datas.forEach((data: any) => {
                     this.items.some((item:any,index:number)=>{

app_Web/src/widgets/ibizorder-detail/order-details-type-list/order-details-type-list-base.vue

@@ -704,10 +704,10 @@ export default class OrderDetailsTypeBase extends Vue implements ControlInterfac
                     this.$Notice.error({ title: '', desc: (this.$t('app.commonWords.delDataFail') as string) + ',' + response.info });
                     return;
                 }
-                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中已删除的项
                 datas.forEach((data: any) => {
                     this.items.some((item:any,index:number)=>{

app_Web/src/widgets/ibizorder/calendar-exp-view-layoutcalendarexpbar-calendarexpbar/calendar-exp-view-layoutcalendarexpbar-calendarexpbar-base.vue

@@ -576,8 +576,14 @@ export default class CalendarExpView_layoutcalendarexpbarBase extends Vue implem
                 viewparams: tempViewParam
             }
         }
+        this.handleCtrlEvents('onselectionchange', { data: args }).then((res: boolean) => {
+            if (!res) {
+                this.calcToolbarItemState(true);
+                return;
+            }
             this.calcToolbarItemState(false);
             this.$emit('selectionchange', navItem);
+        })
     }
 
     /**

app_Web/src/widgets/ibizorder/calendar-exp-viewcalendarexpbar-calendarexpbar/calendar-exp-viewcalendarexpbar-calendarexpbar-base.vue

@@ -576,8 +576,14 @@ export default class CalendarExpViewcalendarexpbarBase extends Vue implements Co
                 viewparams: tempViewParam
             }
         }
+        this.handleCtrlEvents('onselectionchange', { data: args }).then((res: boolean) => {
+            if (!res) {
+                this.calcToolbarItemState(true);
+                return;
+            }
             this.calcToolbarItemState(false);
             this.$emit('selectionchange', navItem);
+        })
     }
 
     /**

app_Web/src/widgets/ibizorder/data-view-exp-view-layoutdataviewexpbar-dataviewexpbar/data-view-exp-view-layoutdataviewexpbar-dataviewexpbar-base.vue

@@ -591,8 +591,14 @@ export default class DataViewExpView_layoutdataviewexpbarBase extends Vue implem
                 viewparams: tempViewParam
             }
         }
+        this.handleCtrlEvents('onselectionchange', { data: args }).then((res: boolean) => {
+            if (!res) {
+                this.calcToolbarItemState(true);
+                return;
+            }
             this.calcToolbarItemState(false);
             this.$emit('selectionchange', navItem);
+        })
     }
 
     /**

app_Web/src/widgets/ibizorder/data-view-exp-viewdataviewexpbar-dataviewexpbar/data-view-exp-viewdataviewexpbar-dataviewexpbar-base.vue

@@ -591,8 +591,14 @@ export default class DataViewExpViewdataviewexpbarBase extends Vue implements Co
                 viewparams: tempViewParam
             }
         }
+        this.handleCtrlEvents('onselectionchange', { data: args }).then((res: boolean) => {
+            if (!res) {
+                this.calcToolbarItemState(true);
+                return;
+            }
             this.calcToolbarItemState(false);
             this.$emit('selectionchange', navItem);
+        })
     }
 
     /**

app_Web/src/widgets/ibizorder/grid-exp-viewgridexpbar-gridexpbar/grid-exp-viewgridexpbar-gridexpbar-base.vue

@@ -589,8 +589,14 @@ export default class GridExpViewgridexpbarBase extends Vue implements ControlInt
                 viewparams: tempViewParam
             }
         }
+        this.handleCtrlEvents('onselectionchange', { data: args }).then((res: boolean) => {
+            if (!res) {
+                this.calcToolbarItemState(true);
+                return;
+            }
             this.calcToolbarItemState(false);
             this.$emit('selectionchange', navItem);
+        })
     }
 
     /**

app_Web/src/widgets/ibizorder/list-exp-list/list-exp-list-base.vue

@@ -600,7 +600,7 @@ export default class ListExpBase extends Vue implements ControlInterface {
      */
     public async load(opt: any = {}): Promise<any> {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderListExpView' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderListExpView_layout' + (this.$t('app.list.notConfig.fetchAction') as string) });
             return;
         }        
         const arg: any = {...opt};
@@ -730,7 +730,7 @@ export default class ListExpBase extends Vue implements ControlInterface {
      */
     public async remove(datas: any[]): Promise<any> {
         if(!this.removeAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderListExpView' + (this.$t('app.list.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderListExpView_layout' + (this.$t('app.list.notConfig.removeAction') as string) });
             return;
         }
         if (datas.length === 0) {
@@ -774,10 +774,10 @@ export default class ListExpBase extends Vue implements ControlInterface {
                     this.$Notice.error({ title: '', desc: (this.$t('app.commonWords.delDataFail') as string) + ',' + response.info });
                     return;
                 }
-                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中已删除的项
                 datas.forEach((data: any) => {
                     this.items.some((item:any,index:number)=>{
@@ -835,7 +835,7 @@ export default class ListExpBase extends Vue implements ControlInterface {
             try {
                 if(Object.is(item.rowDataState, 'create')){
                     if(!this.createAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderListExpView' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderListExpView_layout' + (this.$t('app.list.notConfig.createAction') as string) });
                     }else{
                       Object.assign(item,{viewparams:this.viewparams});
                       let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
@@ -843,7 +843,7 @@ export default class ListExpBase extends Vue implements ControlInterface {
                     }
                 }else if(Object.is(item.rowDataState, 'update')){
                     if(!this.updateAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.warning') as string), desc: 'IBIZOrderListExpView' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.warning') as string), desc: 'IBIZOrderListExpView_layout' + (this.$t('app.list.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizorder){

app_Web/src/widgets/ibizorder/list-exp-view-layoutlistexpbar-listexpbar/list-exp-view-layoutlistexpbar-listexpbar-base.vue

@@ -593,8 +593,14 @@ export default class ListExpView_layoutlistexpbarBase extends Vue implements Con
                 viewparams: tempViewParam
             }
         }
+        this.handleCtrlEvents('onselectionchange', { data: args }).then((res: boolean) => {
+            if (!res) {
+                this.calcToolbarItemState(true);
+                return;
+            }
             this.calcToolbarItemState(false);
             this.$emit('selectionchange', navItem);
+        })
     }
 
     /**

app_Web/src/widgets/ibizorder/list-exp-viewlistexpbar-listexpbar/list-exp-viewlistexpbar-listexpbar-base.vue

@@ -593,8 +593,14 @@ export default class ListExpViewlistexpbarBase extends Vue implements ControlInt
                 viewparams: tempViewParam
             }
         }
+        this.handleCtrlEvents('onselectionchange', { data: args }).then((res: boolean) => {
+            if (!res) {
+                this.calcToolbarItemState(true);
+                return;
+            }
             this.calcToolbarItemState(false);
             this.$emit('selectionchange', navItem);
+        })
     }
 
     /**

app_Web/src/widgets/ibizorder/test-custom-layout-panel-grid-exp-viewgridexpbar-gridexpbar/test-custom-layout-panel-grid-exp-viewgridexpbar-gridexpbar-base.vue

@@ -493,8 +493,14 @@ export default class TestCustomLayoutPanelGridExpViewgridexpbarBase extends Vue
                 viewparams: tempViewParam
             }
         }
+        this.handleCtrlEvents('onselectionchange', { data: args }).then((res: boolean) => {
+            if (!res) {
+                this.calcToolbarItemState(true);
+                return;
+            }
             this.calcToolbarItemState(false);
             this.$emit('selectionchange', navItem);
+        })
     }
 
     /**

app_Web/src/widgets/ibizorder/tree-exp-view-layouttreeexpbar-treeexpbar/tree-exp-view-layouttreeexpbar-treeexpbar-base.vue

@@ -510,8 +510,14 @@ export default class TreeExpView_layouttreeexpbarBase extends Vue implements Con
                 viewparams: tempViewparam
             }
         }
+        this.handleCtrlEvents('onselectionchange', { data: args }).then((res: boolean) => {
+            if (!res) {
+                this.calcToolbarItemState(true);
+                return;
+            }
             this.calcToolbarItemState(false);
             this.$emit('selectionchange', navItem);
+        })
     }
 
     /**

app_Web/src/widgets/ibizorder/tree-exp-viewtreeexpbar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar-base.vue

@@ -510,8 +510,14 @@ export default class TreeExpViewtreeexpbarBase extends Vue implements ControlInt
                 viewparams: tempViewparam
             }
         }
+        this.handleCtrlEvents('onselectionchange', { data: args }).then((res: boolean) => {
+            if (!res) {
+                this.calcToolbarItemState(true);
+                return;
+            }
             this.calcToolbarItemState(false);
             this.$emit('selectionchange', navItem);
+        })
     }
 
     /**

app_Web/src/widgets/ibizorder/usr-list/usr-list-base.vue

@@ -730,10 +730,10 @@ export default class UsrBase extends Vue implements ControlInterface {
                     this.$Notice.error({ title: '', desc: (this.$t('app.commonWords.delDataFail') as string) + ',' + response.info });
                     return;
                 }
-                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中已删除的项
                 datas.forEach((data: any) => {
                     this.items.some((item:any,index:number)=>{

app_Web/src/widgets/ibizorder/usr2-calendar-exp-viewcalendarexpbar-calendarexpbar/usr2-calendar-exp-viewcalendarexpbar-calendarexpbar-base.vue

@@ -576,8 +576,14 @@ export default class Usr2CalendarExpViewcalendarexpbarBase extends Vue implement
                 viewparams: tempViewParam
             }
         }
+        this.handleCtrlEvents('onselectionchange', { data: args }).then((res: boolean) => {
+            if (!res) {
+                this.calcToolbarItemState(true);
+                return;
+            }
             this.calcToolbarItemState(false);
             this.$emit('selectionchange', navItem);
+        })
     }
 
     /**

app_Web/src/widgets/ibizsample0003/f1-tree-exp-viewtreeexpbar-treeexpbar/f1-tree-exp-viewtreeexpbar-treeexpbar-base.vue

@@ -426,8 +426,14 @@ export default class F1TreeExpViewtreeexpbarBase extends Vue implements ControlI
                 viewparams: tempViewparam
             }
         }
+        this.handleCtrlEvents('onselectionchange', { data: args }).then((res: boolean) => {
+            if (!res) {
+                this.calcToolbarItemState(true);
+                return;
+            }
             this.calcToolbarItemState(false);
             this.$emit('selectionchange', navItem);
+        })
     }
 
     /**

app_Web/src/widgets/ibizsample0003/f2-tree-exp-viewtreeexpbar-treeexpbar/f2-tree-exp-viewtreeexpbar-treeexpbar-base.vue

@@ -421,8 +421,14 @@ export default class F2TreeExpViewtreeexpbarBase extends Vue implements ControlI
                 viewparams: tempViewparam
             }
         }
+        this.handleCtrlEvents('onselectionchange', { data: args }).then((res: boolean) => {
+            if (!res) {
+                this.calcToolbarItemState(true);
+                return;
+            }
             this.calcToolbarItemState(false);
             this.$emit('selectionchange', navItem);
+        })
     }
 
     /**

app_Web/src/widgets/ibizsample0003/f3-tree-exp-viewtreeexpbar-treeexpbar/f3-tree-exp-viewtreeexpbar-treeexpbar-base.vue

@@ -419,8 +419,14 @@ export default class F3TreeExpViewtreeexpbarBase extends Vue implements ControlI
                 viewparams: tempViewparam
             }
         }
+        this.handleCtrlEvents('onselectionchange', { data: args }).then((res: boolean) => {
+            if (!res) {
+                this.calcToolbarItemState(true);
+                return;
+            }
             this.calcToolbarItemState(false);
             this.$emit('selectionchange', navItem);
+        })
     }
 
     /**

app_Web/src/widgets/ibizsample0003/f4-tree-exp-viewtreeexpbar-treeexpbar/f4-tree-exp-viewtreeexpbar-treeexpbar-base.vue

@@ -419,8 +419,14 @@ export default class F4TreeExpViewtreeexpbarBase extends Vue implements ControlI
                 viewparams: tempViewparam
             }
         }
+        this.handleCtrlEvents('onselectionchange', { data: args }).then((res: boolean) => {
+            if (!res) {
+                this.calcToolbarItemState(true);
+                return;
+            }
             this.calcToolbarItemState(false);
             this.$emit('selectionchange', navItem);
+        })
     }
 
     /**