ibizdev提交

app_web/src/components/app-form-group/app-form-group.vue

@@ -131,6 +131,14 @@ export default class AppFormGroup extends Vue {
      */    
     @Prop() public titleStyle?:string;
 
+    /**
+     * 分组图标
+     *
+     * @type {string}
+     * @memberof AppFormGroup
+     */ 
+    @Prop() public iconInfo?:any;
+
     /**
      * 是否显示标题
      *

app_web/src/pages/uaa/sys-permissionedit-view/sys-permissionedit-view-base.vue

 <template>
-<div class="view-container sys-permissionedit-view">
+<div class="view-container deeditview sys-permissionedit-view">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_permissioneditview"></app-studioaction>
     <card class='view-card ' :disHover="true" :bordered="false">
 
@@ -1154,6 +1154,8 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
             if (_this.viewdata) {
                 _this.$emit('viewdataschange', [{ ..._data }]);
                 _this.$emit('close');
+            }else if (this.$tabPageExp) {
+                this.$tabPageExp.onClose(this.$route.fullPath);
             }
         });
     }

app_web/src/pages/uaa/sys-permissionedit-view2/sys-permissionedit-view2-base.vue

 <template>
-<div class="view-container sys-permissionedit-view2">
+<div class="view-container deeditview2 sys-permissionedit-view2">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_permissioneditview2"></app-studioaction>
     <card class='view-card' :dis-hover="true" :bordered="false">
 
@@ -1186,6 +1186,8 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
             if (_this.viewdata) {
                 _this.$emit('viewdataschange', [{ ..._data }]);
                 _this.$emit('close');
+            }else if (this.$tabPageExp) {
+                this.$tabPageExp.onClose(this.$route.fullPath);
             }
         });
     }

app_web/src/pages/uaa/sys-permissiongrid-view/sys-permissiongrid-view-base.vue

 <template>
-    <div class='view-container sys-permissiongrid-view'>
+    <div class='view-container degridview sys-permissiongrid-view'>
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_permissiongridview"></app-studioaction>
     <card class='view-card'  :dis-hover="true" :bordered="false">
         <p slot='title'>

app_web/src/pages/uaa/sys-permissionmpickup-view/sys-permissionmpickup-view-base.vue

 <template>
-<div class="view-container sys-permissionmpickup-view">
+<div class="view-container dempickupview sys-permissionmpickup-view">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_permissionmpickupview"></app-studioaction>
     <card class='view-card' :dis-hover="true" :padding="0" :bordered="false">
         <div class="content-container pickup-view">

app_web/src/pages/uaa/sys-permissionpickup-grid-view/sys-permissionpickup-grid-view-base.vue

 <template>
-<div class='view-container sys-permissionpickup-grid-view'>
+<div class='view-container depickupgridview sys-permissionpickup-grid-view'>
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_permissionpickupgridview"></app-studioaction>
     <card class='view-card view-no-caption' :dis-hover="true" :bordered="false">
         <div class='content-container pickup-grid-view'>

app_web/src/pages/uaa/sys-permissionpickup-view/sys-permissionpickup-view-base.vue

 <template>
-<div class="view-container sys-permissionpickup-view">
+<div class="view-container depickupview sys-permissionpickup-view">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_permissionpickupview"></app-studioaction>
     <card class='view-card' :dis-hover="true" :padding="0" :bordered="false">
         <div class="content-container pickup-view">

app_web/src/pages/uaa/sys-permissionredirect-view/sys-permissionredirect-view-base.vue

 
 <template>
-<div class="view-container sys-permissionredirect-view">
+<div class="view-container deredirectview sys-permissionredirect-view">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_permissionredirectview"></app-studioaction>
 </div>
 </template>

app_web/src/pages/uaa/sys-role-permissionedit-view/sys-role-permissionedit-view-base.vue

 <template>
-<div class="view-container sys-role-permissionedit-view">
+<div class="view-container deeditview sys-role-permissionedit-view">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_role_permissioneditview"></app-studioaction>
     <card class='view-card ' :disHover="true" :bordered="false">
 
@@ -1154,6 +1154,8 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
             if (_this.viewdata) {
                 _this.$emit('viewdataschange', [{ ..._data }]);
                 _this.$emit('close');
+            }else if (this.$tabPageExp) {
+                this.$tabPageExp.onClose(this.$route.fullPath);
             }
         });
     }

app_web/src/pages/uaa/sys-role-permissionedit-view2/sys-role-permissionedit-view2-base.vue

 <template>
-<div class="view-container sys-role-permissionedit-view2">
+<div class="view-container deeditview2 sys-role-permissionedit-view2">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_role_permissioneditview2"></app-studioaction>
     <card class='view-card' :dis-hover="true" :bordered="false">
 
@@ -1186,6 +1186,8 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
             if (_this.viewdata) {
                 _this.$emit('viewdataschange', [{ ..._data }]);
                 _this.$emit('close');
+            }else if (this.$tabPageExp) {
+                this.$tabPageExp.onClose(this.$route.fullPath);
             }
         });
     }

app_web/src/pages/uaa/sys-role-permissiongrid-view/sys-role-permissiongrid-view-base.vue

 <template>
-    <div class='view-container sys-role-permissiongrid-view'>
+    <div class='view-container degridview sys-role-permissiongrid-view'>
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_role_permissiongridview"></app-studioaction>
     <card class='view-card'  :dis-hover="true" :bordered="false">
         <p slot='title'>

app_web/src/pages/uaa/sys-role-permissionmpickup-view/sys-role-permissionmpickup-view-base.vue

 <template>
-<div class="view-container sys-role-permissionmpickup-view">
+<div class="view-container dempickupview sys-role-permissionmpickup-view">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_role_permissionmpickupview"></app-studioaction>
     <card class='view-card' :dis-hover="true" :padding="0" :bordered="false">
         <div class="content-container pickup-view">

app_web/src/pages/uaa/sys-role-permissionpickup-grid-view/sys-role-permissionpickup-grid-view-base.vue

 <template>
-<div class='view-container sys-role-permissionpickup-grid-view'>
+<div class='view-container depickupgridview sys-role-permissionpickup-grid-view'>
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_role_permissionpickupgridview"></app-studioaction>
     <card class='view-card view-no-caption' :dis-hover="true" :bordered="false">
         <div class='content-container pickup-grid-view'>

app_web/src/pages/uaa/sys-role-permissionpickup-view/sys-role-permissionpickup-view-base.vue

 <template>
-<div class="view-container sys-role-permissionpickup-view">
+<div class="view-container depickupview sys-role-permissionpickup-view">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_role_permissionpickupview"></app-studioaction>
     <card class='view-card' :dis-hover="true" :padding="0" :bordered="false">
         <div class="content-container pickup-view">

app_web/src/pages/uaa/sys-role-permissionredirect-view/sys-role-permissionredirect-view-base.vue

 
 <template>
-<div class="view-container sys-role-permissionredirect-view">
+<div class="view-container deredirectview sys-role-permissionredirect-view">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_role_permissionredirectview"></app-studioaction>
 </div>
 </template>

app_web/src/pages/uaa/sys-roleedit-view/sys-roleedit-view-base.vue

 <template>
-<div class="view-container sys-roleedit-view">
+<div class="view-container deeditview sys-roleedit-view">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_roleeditview"></app-studioaction>
     <card class='view-card ' :disHover="true" :bordered="false">
 
@@ -1154,6 +1154,8 @@ export default class SYS_ROLEEditViewBase extends Vue {
             if (_this.viewdata) {
                 _this.$emit('viewdataschange', [{ ..._data }]);
                 _this.$emit('close');
+            }else if (this.$tabPageExp) {
+                this.$tabPageExp.onClose(this.$route.fullPath);
             }
         });
     }

app_web/src/pages/uaa/sys-roleedit-view2/sys-roleedit-view2-base.vue

 <template>
-<div class="view-container sys-roleedit-view2">
+<div class="view-container deeditview2 sys-roleedit-view2">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_roleeditview2"></app-studioaction>
     <card class='view-card' :dis-hover="true" :bordered="false">
 
@@ -1186,6 +1186,8 @@ export default class SYS_ROLEEditView2Base extends Vue {
             if (_this.viewdata) {
                 _this.$emit('viewdataschange', [{ ..._data }]);
                 _this.$emit('close');
+            }else if (this.$tabPageExp) {
+                this.$tabPageExp.onClose(this.$route.fullPath);
             }
         });
     }

app_web/src/pages/uaa/sys-rolegrid-view/sys-rolegrid-view-base.vue

 <template>
-    <div class='view-container sys-rolegrid-view'>
+    <div class='view-container degridview sys-rolegrid-view'>
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_rolegridview"></app-studioaction>
     <card class='view-card'  :dis-hover="true" :bordered="false">
         <p slot='title'>

app_web/src/pages/uaa/sys-rolempickup-view/sys-rolempickup-view-base.vue

 <template>
-<div class="view-container sys-rolempickup-view">
+<div class="view-container dempickupview sys-rolempickup-view">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_rolempickupview"></app-studioaction>
     <card class='view-card' :dis-hover="true" :padding="0" :bordered="false">
         <div class="content-container pickup-view">

app_web/src/pages/uaa/sys-rolepickup-grid-view/sys-rolepickup-grid-view-base.vue

 <template>
-<div class='view-container sys-rolepickup-grid-view'>
+<div class='view-container depickupgridview sys-rolepickup-grid-view'>
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_rolepickupgridview"></app-studioaction>
     <card class='view-card view-no-caption' :dis-hover="true" :bordered="false">
         <div class='content-container pickup-grid-view'>

app_web/src/pages/uaa/sys-rolepickup-view/sys-rolepickup-view-base.vue

 <template>
-<div class="view-container sys-rolepickup-view">
+<div class="view-container depickupview sys-rolepickup-view">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_rolepickupview"></app-studioaction>
     <card class='view-card' :dis-hover="true" :padding="0" :bordered="false">
         <div class="content-container pickup-view">

app_web/src/pages/uaa/sys-roleredirect-view/sys-roleredirect-view-base.vue

 
 <template>
-<div class="view-container sys-roleredirect-view">
+<div class="view-container deredirectview sys-roleredirect-view">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_roleredirectview"></app-studioaction>
 </div>
 </template>

app_web/src/pages/uaa/sys-user-roleedit-view/sys-user-roleedit-view-base.vue

 <template>
-<div class="view-container sys-user-roleedit-view">
+<div class="view-container deeditview sys-user-roleedit-view">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_user_roleeditview"></app-studioaction>
     <card class='view-card ' :disHover="true" :bordered="false">
 
@@ -1154,6 +1154,8 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
             if (_this.viewdata) {
                 _this.$emit('viewdataschange', [{ ..._data }]);
                 _this.$emit('close');
+            }else if (this.$tabPageExp) {
+                this.$tabPageExp.onClose(this.$route.fullPath);
             }
         });
     }

app_web/src/pages/uaa/sys-user-roleedit-view2/sys-user-roleedit-view2-base.vue

 <template>
-<div class="view-container sys-user-roleedit-view2">
+<div class="view-container deeditview2 sys-user-roleedit-view2">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_user_roleeditview2"></app-studioaction>
     <card class='view-card' :dis-hover="true" :bordered="false">
 
@@ -1186,6 +1186,8 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
             if (_this.viewdata) {
                 _this.$emit('viewdataschange', [{ ..._data }]);
                 _this.$emit('close');
+            }else if (this.$tabPageExp) {
+                this.$tabPageExp.onClose(this.$route.fullPath);
             }
         });
     }

app_web/src/pages/uaa/sys-user-rolegrid-view/sys-user-rolegrid-view-base.vue

 <template>
-    <div class='view-container sys-user-rolegrid-view'>
+    <div class='view-container degridview sys-user-rolegrid-view'>
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_user_rolegridview"></app-studioaction>
     <card class='view-card'  :dis-hover="true" :bordered="false">
         <p slot='title'>

app_web/src/pages/uaa/sys-user-rolempickup-view/sys-user-rolempickup-view-base.vue

 <template>
-<div class="view-container sys-user-rolempickup-view">
+<div class="view-container dempickupview sys-user-rolempickup-view">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_user_rolempickupview"></app-studioaction>
     <card class='view-card' :dis-hover="true" :padding="0" :bordered="false">
         <div class="content-container pickup-view">

app_web/src/pages/uaa/sys-user-rolepickup-grid-view/sys-user-rolepickup-grid-view-base.vue

 <template>
-<div class='view-container sys-user-rolepickup-grid-view'>
+<div class='view-container depickupgridview sys-user-rolepickup-grid-view'>
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_user_rolepickupgridview"></app-studioaction>
     <card class='view-card view-no-caption' :dis-hover="true" :bordered="false">
         <div class='content-container pickup-grid-view'>

app_web/src/pages/uaa/sys-user-rolepickup-view/sys-user-rolepickup-view-base.vue

 <template>
-<div class="view-container sys-user-rolepickup-view">
+<div class="view-container depickupview sys-user-rolepickup-view">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_user_rolepickupview"></app-studioaction>
     <card class='view-card' :dis-hover="true" :padding="0" :bordered="false">
         <div class="content-container pickup-view">

app_web/src/pages/uaa/sys-user-roleredirect-view/sys-user-roleredirect-view-base.vue

 
 <template>
-<div class="view-container sys-user-roleredirect-view">
+<div class="view-container deredirectview sys-user-roleredirect-view">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_user_roleredirectview"></app-studioaction>
 </div>
 </template>

app_web/src/pages/uaa/sys-useredit-view/sys-useredit-view-base.vue

 <template>
-<div class="view-container sys-useredit-view">
+<div class="view-container deeditview sys-useredit-view">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_usereditview"></app-studioaction>
     <card class='view-card ' :disHover="true" :bordered="false">
 
@@ -1154,6 +1154,8 @@ export default class SYS_USEREditViewBase extends Vue {
             if (_this.viewdata) {
                 _this.$emit('viewdataschange', [{ ..._data }]);
                 _this.$emit('close');
+            }else if (this.$tabPageExp) {
+                this.$tabPageExp.onClose(this.$route.fullPath);
             }
         });
     }

app_web/src/pages/uaa/sys-useredit-view2/sys-useredit-view2-base.vue

 <template>
-<div class="view-container sys-useredit-view2">
+<div class="view-container deeditview2 sys-useredit-view2">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_usereditview2"></app-studioaction>
     <card class='view-card' :dis-hover="true" :bordered="false">
 
@@ -1186,6 +1186,8 @@ export default class SYS_USEREditView2Base extends Vue {
             if (_this.viewdata) {
                 _this.$emit('viewdataschange', [{ ..._data }]);
                 _this.$emit('close');
+            }else if (this.$tabPageExp) {
+                this.$tabPageExp.onClose(this.$route.fullPath);
             }
         });
     }

app_web/src/pages/uaa/sys-usergrid-view/sys-usergrid-view-base.vue

 <template>
-    <div class='view-container sys-usergrid-view'>
+    <div class='view-container degridview sys-usergrid-view'>
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_usergridview"></app-studioaction>
     <card class='view-card'  :dis-hover="true" :bordered="false">
         <p slot='title'>

app_web/src/pages/uaa/sys-usermpickup-view/sys-usermpickup-view-base.vue

 <template>
-<div class="view-container sys-usermpickup-view">
+<div class="view-container dempickupview sys-usermpickup-view">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_usermpickupview"></app-studioaction>
     <card class='view-card' :dis-hover="true" :padding="0" :bordered="false">
         <div class="content-container pickup-view">

app_web/src/pages/uaa/sys-userpickup-grid-view/sys-userpickup-grid-view-base.vue

 <template>
-<div class='view-container sys-userpickup-grid-view'>
+<div class='view-container depickupgridview sys-userpickup-grid-view'>
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_userpickupgridview"></app-studioaction>
     <card class='view-card view-no-caption' :dis-hover="true" :bordered="false">
         <div class='content-container pickup-grid-view'>

app_web/src/pages/uaa/sys-userpickup-view/sys-userpickup-view-base.vue

 <template>
-<div class="view-container sys-userpickup-view">
+<div class="view-container depickupview sys-userpickup-view">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_userpickupview"></app-studioaction>
     <card class='view-card' :dis-hover="true" :padding="0" :bordered="false">
         <div class="content-container pickup-view">

app_web/src/pages/uaa/sys-userredirect-view/sys-userredirect-view-base.vue

 
 <template>
-<div class="view-container sys-userredirect-view">
+<div class="view-container deredirectview sys-userredirect-view">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_userredirectview"></app-studioaction>
 </div>
 </template>

app_web/src/styles/default.less

@@ -208,4 +208,52 @@
 }
 /***    END:多数据视图属性布局    ***/
 
+// 看板视图，卡片模式
+.view-container.appportalview,.view-container.deportalview,.view-container.deportalview9{
+  >.view-card>.ivu-card-body>.content-container{
+    background: #efefef;
+  }
+  .dashboard{
+    padding: 8px;
+  }
+  .portlet-container{
+    background: #efefef;
+  }
+  .portlet-container::after{
+    content: "";
+    clear: both;
+  }
+  .portlet{
+    margin: 8px;
+    height: calc(100% - 16px);
+    width: calc(100% - 16px);
+    background: #fff;
+    border-radius: 4px;
+    box-shadow: 0 1px 1px rgba(0,0,0,.05), 0 2px 6px 0 rgba(0,0,0,.045);
+    border: 1px solid transparent;
+    >.portlet-with-title{
+      margin-bottom: 12px;
+      height: calc(100% - 64px);
+    }
+    >.portlet-without-title{
+      margin-top: 12px;
+      margin-bottom: 12px;
+      height: calc(100% - 24px);
+    }
+  }
+}
+
+// 看板视图，无缝模式
+.view-container.appportalview.seamless-mode,.view-container.deportalview.seamless-mode,.view-container.deportalview9.seamless-mode{
+  >.view-card>.ivu-card-body>.content-container{
+    background: transparent;
+  }
+  .portlet-container{
+    background: transparent;
+  }
+  .portlet{
+    background: transparent;
+  }
+}
+
 @import './user.less';
\ No newline at end of file

app_web/src/widgets/sys-permission/main-form/main-form-base.vue

@@ -1014,8 +1014,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 });
             }
         }).catch((response: any) => {
-            if (response && response.status) {
-                this.$Notice.error({ title: '错误', desc: response.message });
+            if (response && response.status && response.data) {
+                this.$Notice.error({ title: '错误', desc: response.data.message });
                 return;
             }
             if (!response || !response.status || !response.data) {
@@ -1041,8 +1041,8 @@ export default class MainBase extends Vue implements ControlInterface {
         let post: Promise<any> = this.service.loadDraft(this.loaddraftAction,JSON.parse(JSON.stringify(this.context)),{viewparams:viewparamResult}, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: '错误', desc: response.errorMessage });
+                if (response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                 }
                 return;
             }
@@ -1068,8 +1068,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 }
             });
         }).catch((response: any) => {
-            if (response && response.status) {
-                this.$Notice.error({ title: '错误', desc: response.message });
+            if (response && response.status  && response.data) {
+                this.$Notice.error({ title: '错误', desc: response.data.message });
                 return;
             }
             if (!response || !response.status || !response.data) {
@@ -1102,8 +1102,8 @@ export default class MainBase extends Vue implements ControlInterface {
         const post: Promise<any> = this.service.add(action, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: '错误', desc: response.errorMessage });
+                if (response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                 }
                 return;
             }
@@ -1116,8 +1116,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 this.formState.next({ type: 'save', data: data });
             });
         }).catch((response: any) => {
-            if (response && response.status) {
-                this.$Notice.error({ title: '错误', desc: response.message });
+            if (response && response.status && response.data) {
+                this.$Notice.error({ title: '错误', desc: response.data.message });
                 return;
             }
             if (!response || !response.status || !response.data) {
@@ -1166,8 +1166,8 @@ export default class MainBase extends Vue implements ControlInterface {
             const post: Promise<any> = Object.is(data.srfuf, '1')?this.service.update(action, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator):this.service.add(action,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
             post.then((response: any) => {
                 if (!response.status || response.status !== 200) {
-                    if (response.errorMessage) {
-                        this.$Notice.error({ title: '错误', desc: response.errorMessage });
+                    if (response.data) {
+                        this.$Notice.error({ title: '错误', desc: response.data.message });
                     }
                     return;
                 }
@@ -1184,8 +1184,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 }
                 resolve(response);
             }).catch((response: any) => {
-                if (response && response.status) {
-                    this.$Notice.error({ title: '错误', desc: response.message });
+                if (response && response.status  && response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                     reject(response);
                     return;
                 }
@@ -1254,14 +1254,16 @@ export default class MainBase extends Vue implements ControlInterface {
                 const result: Promise<any> = this.service.wfstart(_this.WFStartAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,localdata);
                 result.then((response: any) => {
                     if (!response || response.status !== 200) {
-                        this.$Notice.error({ title: '', desc: '工作流启动失败, ' + response.info });
+                        if(response.data){
+                            this.$Notice.error({ title: '', desc: '工作流启动失败, ' + response.data.message });
+                        }
                         return;
                     }
                     this.$Notice.info({ title: '', desc: '工作流启动成功' });
                     resolve(response);
             }).catch((response: any) => {
-                if (response && response.status) {
-                    this.$Notice.error({ title: '错误', desc: response.message });
+                if (response && response.status && response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                     reject(response);
                     return;
                 }
@@ -1273,8 +1275,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 reject(response);
             });
             }).catch((response: any) => {
-                    if (response && response.status) {
-                        this.$Notice.error({ title: '错误', desc: response.message });
+                    if (response && response.status && response.data) {
+                        this.$Notice.error({ title: '错误', desc: response.data.message });
                         reject(response);
                         return;
                     }
@@ -1313,14 +1315,16 @@ export default class MainBase extends Vue implements ControlInterface {
                 const result: Promise<any> = this.service.wfsubmit(_this.WFSubmitAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,localdata);
                 result.then((response: any) => {
                     if (!response || response.status !== 200) {
-                        this.$Notice.error({ title: '', desc: '工作流提交失败, ' + response.info });
+                        if(response.data){
+                            this.$Notice.error({ title: '', desc: '工作流提交失败, ' + response.data.message });
+                        }
                         return;
                     }
                     this.$Notice.info({ title: '', desc: '工作流提交成功' });
                     resolve(response);
             }).catch((response: any) => {
-                if (response && response.status) {
-                    this.$Notice.error({ title: '错误', desc: response.message });
+                if (response && response.status && response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                     reject(response);
                     return;
                 }
@@ -1332,8 +1336,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 reject(response);
             });
             }).catch((response: any) => {
-                    if (response && response.status) {
-                        this.$Notice.error({ title: '错误', desc: response.message });
+                    if (response && response.status && response.data) {
+                        this.$Notice.error({ title: '错误', desc: response.data.message });
                         reject(response);
                         return;
                     }
@@ -1385,8 +1389,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 this.formState.next({ type: 'updateformitem', ufimode: arg.srfufimode, data: _data });
             });
         }).catch((response: any) => {
-            if (response && response.status) {
-                this.$Notice.error({ title: '错误', desc: response.message });
+            if (response && response.status && response.data) {
+                this.$Notice.error({ title: '错误', desc: response.data.message });
                 return;
             }
             if (!response || !response.status || !response.data) {

app_web/src/widgets/sys-permission/main-grid/main-grid-base.vue

@@ -670,8 +670,9 @@ export default class MainBase extends Vue implements ControlInterface {
             _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(this.removeAction,Object.assign(context,{ sys_permission: keys.join(';') }),Object.assign({ permissionid: keys.join(';') },{viewparams:this.viewparams}), this.showBusyIndicator);
+            const post: Promise<any> = this.service.delete(_removeAction,Object.assign(context,{ sys_permission: keys.join(';') }),Object.assign({ sys_permission: keys.join(';') },{viewparams:this.viewparams}), this.showBusyIndicator);
             return new Promise((resolve: any, reject: any) => {
                 post.then((response: any) => {
                     if (!response || response.status !== 200) {

app_web/src/widgets/sys-role-permission/main-form/main-form-base.vue

@@ -4,8 +4,7 @@
     <row >
             
 <i-col v-show="detailsModel.group1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.sys_role_permission.main_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false">
-    
+    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.sys_role_permission.main_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
     <row>
         <i-col v-show="detailsModel.sys_rolename.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='sys_rolename' :itemRules="this.rules.sys_rolename" class='' :caption="$t('entities.sys_role_permission.main_form.details.sys_rolename')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.sys_rolename.error" :isEmptyCaption="false" labelPos="LEFT">
@@ -1107,8 +1106,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 });
             }
         }).catch((response: any) => {
-            if (response && response.status) {
-                this.$Notice.error({ title: '错误', desc: response.message });
+            if (response && response.status && response.data) {
+                this.$Notice.error({ title: '错误', desc: response.data.message });
                 return;
             }
             if (!response || !response.status || !response.data) {
@@ -1134,8 +1133,8 @@ export default class MainBase extends Vue implements ControlInterface {
         let post: Promise<any> = this.service.loadDraft(this.loaddraftAction,JSON.parse(JSON.stringify(this.context)),{viewparams:viewparamResult}, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: '错误', desc: response.errorMessage });
+                if (response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                 }
                 return;
             }
@@ -1161,8 +1160,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 }
             });
         }).catch((response: any) => {
-            if (response && response.status) {
-                this.$Notice.error({ title: '错误', desc: response.message });
+            if (response && response.status  && response.data) {
+                this.$Notice.error({ title: '错误', desc: response.data.message });
                 return;
             }
             if (!response || !response.status || !response.data) {
@@ -1195,8 +1194,8 @@ export default class MainBase extends Vue implements ControlInterface {
         const post: Promise<any> = this.service.add(action, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: '错误', desc: response.errorMessage });
+                if (response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                 }
                 return;
             }
@@ -1209,8 +1208,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 this.formState.next({ type: 'save', data: data });
             });
         }).catch((response: any) => {
-            if (response && response.status) {
-                this.$Notice.error({ title: '错误', desc: response.message });
+            if (response && response.status && response.data) {
+                this.$Notice.error({ title: '错误', desc: response.data.message });
                 return;
             }
             if (!response || !response.status || !response.data) {
@@ -1259,8 +1258,8 @@ export default class MainBase extends Vue implements ControlInterface {
             const post: Promise<any> = Object.is(data.srfuf, '1')?this.service.update(action, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator):this.service.add(action,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
             post.then((response: any) => {
                 if (!response.status || response.status !== 200) {
-                    if (response.errorMessage) {
-                        this.$Notice.error({ title: '错误', desc: response.errorMessage });
+                    if (response.data) {
+                        this.$Notice.error({ title: '错误', desc: response.data.message });
                     }
                     return;
                 }
@@ -1277,8 +1276,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 }
                 resolve(response);
             }).catch((response: any) => {
-                if (response && response.status) {
-                    this.$Notice.error({ title: '错误', desc: response.message });
+                if (response && response.status  && response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                     reject(response);
                     return;
                 }
@@ -1347,14 +1346,16 @@ export default class MainBase extends Vue implements ControlInterface {
                 const result: Promise<any> = this.service.wfstart(_this.WFStartAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,localdata);
                 result.then((response: any) => {
                     if (!response || response.status !== 200) {
-                        this.$Notice.error({ title: '', desc: '工作流启动失败, ' + response.info });
+                        if(response.data){
+                            this.$Notice.error({ title: '', desc: '工作流启动失败, ' + response.data.message });
+                        }
                         return;
                     }
                     this.$Notice.info({ title: '', desc: '工作流启动成功' });
                     resolve(response);
             }).catch((response: any) => {
-                if (response && response.status) {
-                    this.$Notice.error({ title: '错误', desc: response.message });
+                if (response && response.status && response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                     reject(response);
                     return;
                 }
@@ -1366,8 +1367,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 reject(response);
             });
             }).catch((response: any) => {
-                    if (response && response.status) {
-                        this.$Notice.error({ title: '错误', desc: response.message });
+                    if (response && response.status && response.data) {
+                        this.$Notice.error({ title: '错误', desc: response.data.message });
                         reject(response);
                         return;
                     }
@@ -1406,14 +1407,16 @@ export default class MainBase extends Vue implements ControlInterface {
                 const result: Promise<any> = this.service.wfsubmit(_this.WFSubmitAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,localdata);
                 result.then((response: any) => {
                     if (!response || response.status !== 200) {
-                        this.$Notice.error({ title: '', desc: '工作流提交失败, ' + response.info });
+                        if(response.data){
+                            this.$Notice.error({ title: '', desc: '工作流提交失败, ' + response.data.message });
+                        }
                         return;
                     }
                     this.$Notice.info({ title: '', desc: '工作流提交成功' });
                     resolve(response);
             }).catch((response: any) => {
-                if (response && response.status) {
-                    this.$Notice.error({ title: '错误', desc: response.message });
+                if (response && response.status && response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                     reject(response);
                     return;
                 }
@@ -1425,8 +1428,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 reject(response);
             });
             }).catch((response: any) => {
-                    if (response && response.status) {
-                        this.$Notice.error({ title: '错误', desc: response.message });
+                    if (response && response.status && response.data) {
+                        this.$Notice.error({ title: '错误', desc: response.data.message });
                         reject(response);
                         return;
                     }
@@ -1478,8 +1481,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 this.formState.next({ type: 'updateformitem', ufimode: arg.srfufimode, data: _data });
             });
         }).catch((response: any) => {
-            if (response && response.status) {
-                this.$Notice.error({ title: '错误', desc: response.message });
+            if (response && response.status && response.data) {
+                this.$Notice.error({ title: '错误', desc: response.data.message });
                 return;
             }
             if (!response || !response.status || !response.data) {

app_web/src/widgets/sys-role-permission/main-grid/main-grid-base.vue

@@ -668,8 +668,9 @@ export default class MainBase extends Vue implements ControlInterface {
             _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(this.removeAction,Object.assign(context,{ sys_role_permission: keys.join(';') }),Object.assign({ rolepermissionid: keys.join(';') },{viewparams:this.viewparams}), this.showBusyIndicator);
+            const post: Promise<any> = this.service.delete(_removeAction,Object.assign(context,{ sys_role_permission: keys.join(';') }),Object.assign({ sys_role_permission: keys.join(';') },{viewparams:this.viewparams}), this.showBusyIndicator);
             return new Promise((resolve: any, reject: any) => {
                 post.then((response: any) => {
                     if (!response || response.status !== 200) {

app_web/src/widgets/sys-role/main-form/main-form-base.vue

@@ -4,8 +4,7 @@
     <row >
             
 <i-col v-show="detailsModel.group1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.sys_role.main_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false">
-    
+    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.sys_role.main_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
     <row>
         <i-col v-show="detailsModel.sys_rolename.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='sys_rolename' :itemRules="this.rules.sys_rolename" class='' :caption="$t('entities.sys_role.main_form.details.sys_rolename')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.sys_rolename.error" :isEmptyCaption="false" labelPos="LEFT">
@@ -1032,8 +1031,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 });
             }
         }).catch((response: any) => {
-            if (response && response.status) {
-                this.$Notice.error({ title: '错误', desc: response.message });
+            if (response && response.status && response.data) {
+                this.$Notice.error({ title: '错误', desc: response.data.message });
                 return;
             }
             if (!response || !response.status || !response.data) {
@@ -1059,8 +1058,8 @@ export default class MainBase extends Vue implements ControlInterface {
         let post: Promise<any> = this.service.loadDraft(this.loaddraftAction,JSON.parse(JSON.stringify(this.context)),{viewparams:viewparamResult}, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: '错误', desc: response.errorMessage });
+                if (response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                 }
                 return;
             }
@@ -1086,8 +1085,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 }
             });
         }).catch((response: any) => {
-            if (response && response.status) {
-                this.$Notice.error({ title: '错误', desc: response.message });
+            if (response && response.status  && response.data) {
+                this.$Notice.error({ title: '错误', desc: response.data.message });
                 return;
             }
             if (!response || !response.status || !response.data) {
@@ -1120,8 +1119,8 @@ export default class MainBase extends Vue implements ControlInterface {
         const post: Promise<any> = this.service.add(action, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: '错误', desc: response.errorMessage });
+                if (response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                 }
                 return;
             }
@@ -1134,8 +1133,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 this.formState.next({ type: 'save', data: data });
             });
         }).catch((response: any) => {
-            if (response && response.status) {
-                this.$Notice.error({ title: '错误', desc: response.message });
+            if (response && response.status && response.data) {
+                this.$Notice.error({ title: '错误', desc: response.data.message });
                 return;
             }
             if (!response || !response.status || !response.data) {
@@ -1184,8 +1183,8 @@ export default class MainBase extends Vue implements ControlInterface {
             const post: Promise<any> = Object.is(data.srfuf, '1')?this.service.update(action, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator):this.service.add(action,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
             post.then((response: any) => {
                 if (!response.status || response.status !== 200) {
-                    if (response.errorMessage) {
-                        this.$Notice.error({ title: '错误', desc: response.errorMessage });
+                    if (response.data) {
+                        this.$Notice.error({ title: '错误', desc: response.data.message });
                     }
                     return;
                 }
@@ -1202,8 +1201,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 }
                 resolve(response);
             }).catch((response: any) => {
-                if (response && response.status) {
-                    this.$Notice.error({ title: '错误', desc: response.message });
+                if (response && response.status  && response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                     reject(response);
                     return;
                 }
@@ -1272,14 +1271,16 @@ export default class MainBase extends Vue implements ControlInterface {
                 const result: Promise<any> = this.service.wfstart(_this.WFStartAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,localdata);
                 result.then((response: any) => {
                     if (!response || response.status !== 200) {
-                        this.$Notice.error({ title: '', desc: '工作流启动失败, ' + response.info });
+                        if(response.data){
+                            this.$Notice.error({ title: '', desc: '工作流启动失败, ' + response.data.message });
+                        }
                         return;
                     }
                     this.$Notice.info({ title: '', desc: '工作流启动成功' });
                     resolve(response);
             }).catch((response: any) => {
-                if (response && response.status) {
-                    this.$Notice.error({ title: '错误', desc: response.message });
+                if (response && response.status && response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                     reject(response);
                     return;
                 }
@@ -1291,8 +1292,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 reject(response);
             });
             }).catch((response: any) => {
-                    if (response && response.status) {
-                        this.$Notice.error({ title: '错误', desc: response.message });
+                    if (response && response.status && response.data) {
+                        this.$Notice.error({ title: '错误', desc: response.data.message });
                         reject(response);
                         return;
                     }
@@ -1331,14 +1332,16 @@ export default class MainBase extends Vue implements ControlInterface {
                 const result: Promise<any> = this.service.wfsubmit(_this.WFSubmitAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,localdata);
                 result.then((response: any) => {
                     if (!response || response.status !== 200) {
-                        this.$Notice.error({ title: '', desc: '工作流提交失败, ' + response.info });
+                        if(response.data){
+                            this.$Notice.error({ title: '', desc: '工作流提交失败, ' + response.data.message });
+                        }
                         return;
                     }
                     this.$Notice.info({ title: '', desc: '工作流提交成功' });
                     resolve(response);
             }).catch((response: any) => {
-                if (response && response.status) {
-                    this.$Notice.error({ title: '错误', desc: response.message });
+                if (response && response.status && response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                     reject(response);
                     return;
                 }
@@ -1350,8 +1353,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 reject(response);
             });
             }).catch((response: any) => {
-                    if (response && response.status) {
-                        this.$Notice.error({ title: '错误', desc: response.message });
+                    if (response && response.status && response.data) {
+                        this.$Notice.error({ title: '错误', desc: response.data.message });
                         reject(response);
                         return;
                     }
@@ -1403,8 +1406,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 this.formState.next({ type: 'updateformitem', ufimode: arg.srfufimode, data: _data });
             });
         }).catch((response: any) => {
-            if (response && response.status) {
-                this.$Notice.error({ title: '错误', desc: response.message });
+            if (response && response.status && response.data) {
+                this.$Notice.error({ title: '错误', desc: response.data.message });
                 return;
             }
             if (!response || !response.status || !response.data) {

app_web/src/widgets/sys-role/main-grid/main-grid-base.vue

@@ -682,8 +682,9 @@ export default class MainBase extends Vue implements ControlInterface {
             _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(this.removeAction,Object.assign(context,{ sys_role: keys.join(';') }),Object.assign({ roleid: keys.join(';') },{viewparams:this.viewparams}), this.showBusyIndicator);
+            const post: Promise<any> = this.service.delete(_removeAction,Object.assign(context,{ sys_role: keys.join(';') }),Object.assign({ sys_role: keys.join(';') },{viewparams:this.viewparams}), this.showBusyIndicator);
             return new Promise((resolve: any, reject: any) => {
                 post.then((response: any) => {
                     if (!response || response.status !== 200) {

app_web/src/widgets/sys-user-role/main-form/main-form-base.vue

@@ -4,8 +4,7 @@
     <row >
             
 <i-col v-show="detailsModel.group1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.sys_user_role.main_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false">
-    
+    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.sys_user_role.main_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
     <row>
         <i-col v-show="detailsModel.sys_user_rolename.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='sys_user_rolename' :itemRules="this.rules.sys_user_rolename" class='' :caption="$t('entities.sys_user_role.main_form.details.sys_user_rolename')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.sys_user_rolename.error" :isEmptyCaption="false" labelPos="LEFT">
@@ -1148,8 +1147,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 });
             }
         }).catch((response: any) => {
-            if (response && response.status) {
-                this.$Notice.error({ title: '错误', desc: response.message });
+            if (response && response.status && response.data) {
+                this.$Notice.error({ title: '错误', desc: response.data.message });
                 return;
             }
             if (!response || !response.status || !response.data) {
@@ -1175,8 +1174,8 @@ export default class MainBase extends Vue implements ControlInterface {
         let post: Promise<any> = this.service.loadDraft(this.loaddraftAction,JSON.parse(JSON.stringify(this.context)),{viewparams:viewparamResult}, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: '错误', desc: response.errorMessage });
+                if (response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                 }
                 return;
             }
@@ -1202,8 +1201,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 }
             });
         }).catch((response: any) => {
-            if (response && response.status) {
-                this.$Notice.error({ title: '错误', desc: response.message });
+            if (response && response.status  && response.data) {
+                this.$Notice.error({ title: '错误', desc: response.data.message });
                 return;
             }
             if (!response || !response.status || !response.data) {
@@ -1236,8 +1235,8 @@ export default class MainBase extends Vue implements ControlInterface {
         const post: Promise<any> = this.service.add(action, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: '错误', desc: response.errorMessage });
+                if (response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                 }
                 return;
             }
@@ -1250,8 +1249,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 this.formState.next({ type: 'save', data: data });
             });
         }).catch((response: any) => {
-            if (response && response.status) {
-                this.$Notice.error({ title: '错误', desc: response.message });
+            if (response && response.status && response.data) {
+                this.$Notice.error({ title: '错误', desc: response.data.message });
                 return;
             }
             if (!response || !response.status || !response.data) {
@@ -1300,8 +1299,8 @@ export default class MainBase extends Vue implements ControlInterface {
             const post: Promise<any> = Object.is(data.srfuf, '1')?this.service.update(action, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator):this.service.add(action,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
             post.then((response: any) => {
                 if (!response.status || response.status !== 200) {
-                    if (response.errorMessage) {
-                        this.$Notice.error({ title: '错误', desc: response.errorMessage });
+                    if (response.data) {
+                        this.$Notice.error({ title: '错误', desc: response.data.message });
                     }
                     return;
                 }
@@ -1318,8 +1317,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 }
                 resolve(response);
             }).catch((response: any) => {
-                if (response && response.status) {
-                    this.$Notice.error({ title: '错误', desc: response.message });
+                if (response && response.status  && response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                     reject(response);
                     return;
                 }
@@ -1388,14 +1387,16 @@ export default class MainBase extends Vue implements ControlInterface {
                 const result: Promise<any> = this.service.wfstart(_this.WFStartAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,localdata);
                 result.then((response: any) => {
                     if (!response || response.status !== 200) {
-                        this.$Notice.error({ title: '', desc: '工作流启动失败, ' + response.info });
+                        if(response.data){
+                            this.$Notice.error({ title: '', desc: '工作流启动失败, ' + response.data.message });
+                        }
                         return;
                     }
                     this.$Notice.info({ title: '', desc: '工作流启动成功' });
                     resolve(response);
             }).catch((response: any) => {
-                if (response && response.status) {
-                    this.$Notice.error({ title: '错误', desc: response.message });
+                if (response && response.status && response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                     reject(response);
                     return;
                 }
@@ -1407,8 +1408,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 reject(response);
             });
             }).catch((response: any) => {
-                    if (response && response.status) {
-                        this.$Notice.error({ title: '错误', desc: response.message });
+                    if (response && response.status && response.data) {
+                        this.$Notice.error({ title: '错误', desc: response.data.message });
                         reject(response);
                         return;
                     }
@@ -1447,14 +1448,16 @@ export default class MainBase extends Vue implements ControlInterface {
                 const result: Promise<any> = this.service.wfsubmit(_this.WFSubmitAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,localdata);
                 result.then((response: any) => {
                     if (!response || response.status !== 200) {
-                        this.$Notice.error({ title: '', desc: '工作流提交失败, ' + response.info });
+                        if(response.data){
+                            this.$Notice.error({ title: '', desc: '工作流提交失败, ' + response.data.message });
+                        }
                         return;
                     }
                     this.$Notice.info({ title: '', desc: '工作流提交成功' });
                     resolve(response);
             }).catch((response: any) => {
-                if (response && response.status) {
-                    this.$Notice.error({ title: '错误', desc: response.message });
+                if (response && response.status && response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                     reject(response);
                     return;
                 }
@@ -1466,8 +1469,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 reject(response);
             });
             }).catch((response: any) => {
-                    if (response && response.status) {
-                        this.$Notice.error({ title: '错误', desc: response.message });
+                    if (response && response.status && response.data) {
+                        this.$Notice.error({ title: '错误', desc: response.data.message });
                         reject(response);
                         return;
                     }
@@ -1519,8 +1522,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 this.formState.next({ type: 'updateformitem', ufimode: arg.srfufimode, data: _data });
             });
         }).catch((response: any) => {
-            if (response && response.status) {
-                this.$Notice.error({ title: '错误', desc: response.message });
+            if (response && response.status && response.data) {
+                this.$Notice.error({ title: '错误', desc: response.data.message });
                 return;
             }
             if (!response || !response.status || !response.data) {

app_web/src/widgets/sys-user-role/main-grid/main-grid-base.vue

@@ -682,8 +682,9 @@ export default class MainBase extends Vue implements ControlInterface {
             _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(this.removeAction,Object.assign(context,{ sys_user_role: keys.join(';') }),Object.assign({ userroleid: keys.join(';') },{viewparams:this.viewparams}), this.showBusyIndicator);
+            const post: Promise<any> = this.service.delete(_removeAction,Object.assign(context,{ sys_user_role: keys.join(';') }),Object.assign({ sys_user_role: keys.join(';') },{viewparams:this.viewparams}), this.showBusyIndicator);
             return new Promise((resolve: any, reject: any) => {
                 post.then((response: any) => {
                     if (!response || response.status !== 200) {

app_web/src/widgets/sys-user/main-form/main-form-base.vue

@@ -997,8 +997,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 });
             }
         }).catch((response: any) => {
-            if (response && response.status) {
-                this.$Notice.error({ title: '错误', desc: response.message });
+            if (response && response.status && response.data) {
+                this.$Notice.error({ title: '错误', desc: response.data.message });
                 return;
             }
             if (!response || !response.status || !response.data) {
@@ -1024,8 +1024,8 @@ export default class MainBase extends Vue implements ControlInterface {
         let post: Promise<any> = this.service.loadDraft(this.loaddraftAction,JSON.parse(JSON.stringify(this.context)),{viewparams:viewparamResult}, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: '错误', desc: response.errorMessage });
+                if (response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                 }
                 return;
             }
@@ -1051,8 +1051,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 }
             });
         }).catch((response: any) => {
-            if (response && response.status) {
-                this.$Notice.error({ title: '错误', desc: response.message });
+            if (response && response.status  && response.data) {
+                this.$Notice.error({ title: '错误', desc: response.data.message });
                 return;
             }
             if (!response || !response.status || !response.data) {
@@ -1085,8 +1085,8 @@ export default class MainBase extends Vue implements ControlInterface {
         const post: Promise<any> = this.service.add(action, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: '错误', desc: response.errorMessage });
+                if (response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                 }
                 return;
             }
@@ -1099,8 +1099,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 this.formState.next({ type: 'save', data: data });
             });
         }).catch((response: any) => {
-            if (response && response.status) {
-                this.$Notice.error({ title: '错误', desc: response.message });
+            if (response && response.status && response.data) {
+                this.$Notice.error({ title: '错误', desc: response.data.message });
                 return;
             }
             if (!response || !response.status || !response.data) {
@@ -1149,8 +1149,8 @@ export default class MainBase extends Vue implements ControlInterface {
             const post: Promise<any> = Object.is(data.srfuf, '1')?this.service.update(action, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator):this.service.add(action,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
             post.then((response: any) => {
                 if (!response.status || response.status !== 200) {
-                    if (response.errorMessage) {
-                        this.$Notice.error({ title: '错误', desc: response.errorMessage });
+                    if (response.data) {
+                        this.$Notice.error({ title: '错误', desc: response.data.message });
                     }
                     return;
                 }
@@ -1167,8 +1167,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 }
                 resolve(response);
             }).catch((response: any) => {
-                if (response && response.status) {
-                    this.$Notice.error({ title: '错误', desc: response.message });
+                if (response && response.status  && response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                     reject(response);
                     return;
                 }
@@ -1237,14 +1237,16 @@ export default class MainBase extends Vue implements ControlInterface {
                 const result: Promise<any> = this.service.wfstart(_this.WFStartAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,localdata);
                 result.then((response: any) => {
                     if (!response || response.status !== 200) {
-                        this.$Notice.error({ title: '', desc: '工作流启动失败, ' + response.info });
+                        if(response.data){
+                            this.$Notice.error({ title: '', desc: '工作流启动失败, ' + response.data.message });
+                        }
                         return;
                     }
                     this.$Notice.info({ title: '', desc: '工作流启动成功' });
                     resolve(response);
             }).catch((response: any) => {
-                if (response && response.status) {
-                    this.$Notice.error({ title: '错误', desc: response.message });
+                if (response && response.status && response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                     reject(response);
                     return;
                 }
@@ -1256,8 +1258,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 reject(response);
             });
             }).catch((response: any) => {
-                    if (response && response.status) {
-                        this.$Notice.error({ title: '错误', desc: response.message });
+                    if (response && response.status && response.data) {
+                        this.$Notice.error({ title: '错误', desc: response.data.message });
                         reject(response);
                         return;
                     }
@@ -1296,14 +1298,16 @@ export default class MainBase extends Vue implements ControlInterface {
                 const result: Promise<any> = this.service.wfsubmit(_this.WFSubmitAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,localdata);
                 result.then((response: any) => {
                     if (!response || response.status !== 200) {
-                        this.$Notice.error({ title: '', desc: '工作流提交失败, ' + response.info });
+                        if(response.data){
+                            this.$Notice.error({ title: '', desc: '工作流提交失败, ' + response.data.message });
+                        }
                         return;
                     }
                     this.$Notice.info({ title: '', desc: '工作流提交成功' });
                     resolve(response);
             }).catch((response: any) => {
-                if (response && response.status) {
-                    this.$Notice.error({ title: '错误', desc: response.message });
+                if (response && response.status && response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                     reject(response);
                     return;
                 }
@@ -1315,8 +1319,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 reject(response);
             });
             }).catch((response: any) => {
-                    if (response && response.status) {
-                        this.$Notice.error({ title: '错误', desc: response.message });
+                    if (response && response.status && response.data) {
+                        this.$Notice.error({ title: '错误', desc: response.data.message });
                         reject(response);
                         return;
                     }
@@ -1368,8 +1372,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 this.formState.next({ type: 'updateformitem', ufimode: arg.srfufimode, data: _data });
             });
         }).catch((response: any) => {
-            if (response && response.status) {
-                this.$Notice.error({ title: '错误', desc: response.message });
+            if (response && response.status && response.data) {
+                this.$Notice.error({ title: '错误', desc: response.data.message });
                 return;
             }
             if (!response || !response.status || !response.data) {

app_web/src/widgets/sys-user/main-grid/main-grid-base.vue

@@ -668,8 +668,9 @@ export default class MainBase extends Vue implements ControlInterface {
             _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(this.removeAction,Object.assign(context,{ sys_user: keys.join(';') }),Object.assign({ userid: keys.join(';') },{viewparams:this.viewparams}), this.showBusyIndicator);
+            const post: Promise<any> = this.service.delete(_removeAction,Object.assign(context,{ sys_user: keys.join(';') }),Object.assign({ sys_user: keys.join(';') },{viewparams:this.viewparams}), this.showBusyIndicator);
             return new Promise((resolve: any, reject: any) => {
                 post.then((response: any) => {
                     if (!response || response.status !== 200) {

config.xml

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

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

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

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

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

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

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

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

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

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

 server:
-  port: 40002
+  port: 8080
 

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

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

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

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

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

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

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

 server:
-  port: 40002
+  port: 8081

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

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