ibiz4j 发布系统代码

app_web/src/authservice/auth-service.ts

@@ -11,11 +11,20 @@ export default class AuthService {
     /**
      * Vue 状态管理器
      *
-     * @private
+     * @public
      * @type {(any | null)}
      * @memberof AuthService
      */
-    private $store: Store<any> | null = null;
+    public $store: Store<any> | null = null;
+
+    /**
+     * 默认操作符
+     *
+     * @public
+     * @type {(any)}
+     * @memberof AuthService
+     */
+    public defaultOPPrivs: any = { UPDATE: 1, CREATE: 1, READ: 1, DELETE: 1 };
 
     /**
      * Creates an instance of AuthService.
@@ -52,10 +61,10 @@ export default class AuthService {
      * 根据当前数据获取实体操作标识
      *
      * @param {string} name 实体名称
-     * @returns {Promise<any>}
+     * @returns {any}
      * @memberof AuthService
      */
-    public async getOPPrivs(data:any):Promise<any>{
+    public getOPPrivs(data: any): any {
         return null;
     }
 
@@ -66,7 +75,7 @@ export default class AuthService {
      * @returns {boolean}
      * @memberof AuthService
      */
-    public getMenusPermission(item:any):boolean{
+    public getMenusPermission(item: any): boolean {
         return true;
     }
 
@@ -77,7 +86,7 @@ export default class AuthService {
      * @returns {boolean}
      * @memberof AuthService
      */
-    public getResourcePermission(tag:any):boolean{
+    public getResourcePermission(tag: any): boolean {
         return true;
     }
 

app_web/src/authservice/sys-app/sys-app-auth-service-base.ts

 import AuthService from '../auth-service';
+import SysAppUIService from '@/uiservice/sys-app/sys-app-ui-service';
 
 /**
  * 应用权限服务对象基类
@@ -9,6 +10,13 @@ import AuthService from '../auth-service';
  */
 export default class SysAppAuthServiceBase extends AuthService {
 
+    /**
+     * 所依赖UI服务
+     *
+     * @memberof SysAppAuthServiceBase
+     */
+    public sysappUIService:any;
+
     /**
      * Creates an instance of  SysAppAuthServiceBase.
      * 
@@ -17,17 +25,23 @@ export default class SysAppAuthServiceBase extends AuthService {
      */
     constructor(opts: any = {}) {
         super(opts);
+        this.sysappUIService = new SysAppUIService(opts);
     }
 
     /**
      * 根据当前数据获取实体操作标识
      *
-     * @param {string} name 实体名称
-     * @returns {Promise<any>}
+     * @param {*} data 传入数据
+     * @returns {any}
      * @memberof SysAppAuthServiceBase
      */
-    public async getOPPrivs(data:any):Promise<any>{
-        return null;
+    public getOPPrivs(data:any):any{
+        let mainSateOPPrivs:any = this.sysappUIService.getDEMainStateOPPrivs(data);
+        let curDefaultOPPrivs:any = JSON.parse(JSON.stringify(this.defaultOPPrivs));
+        if(mainSateOPPrivs){
+            Object.assign(curDefaultOPPrivs,mainSateOPPrivs);
+        }
+        return curDefaultOPPrivs;
     }
 
 }
\ No newline at end of file

app_web/src/authservice/sys-auth-log/sys-auth-log-auth-service-base.ts

 import AuthService from '../auth-service';
+import SysAuthLogUIService from '@/uiservice/sys-auth-log/sys-auth-log-ui-service';
 
 /**
  * 认证日志权限服务对象基类
@@ -9,6 +10,13 @@ import AuthService from '../auth-service';
  */
 export default class SysAuthLogAuthServiceBase extends AuthService {
 
+    /**
+     * 所依赖UI服务
+     *
+     * @memberof SysAuthLogAuthServiceBase
+     */
+    public sysauthlogUIService:any;
+
     /**
      * Creates an instance of  SysAuthLogAuthServiceBase.
      * 
@@ -17,17 +25,23 @@ export default class SysAuthLogAuthServiceBase extends AuthService {
      */
     constructor(opts: any = {}) {
         super(opts);
+        this.sysauthlogUIService = new SysAuthLogUIService(opts);
     }
 
     /**
      * 根据当前数据获取实体操作标识
      *
-     * @param {string} name 实体名称
-     * @returns {Promise<any>}
+     * @param {*} data 传入数据
+     * @returns {any}
      * @memberof SysAuthLogAuthServiceBase
      */
-    public async getOPPrivs(data:any):Promise<any>{
-        return null;
+    public getOPPrivs(data:any):any{
+        let mainSateOPPrivs:any = this.sysauthlogUIService.getDEMainStateOPPrivs(data);
+        let curDefaultOPPrivs:any = JSON.parse(JSON.stringify(this.defaultOPPrivs));
+        if(mainSateOPPrivs){
+            Object.assign(curDefaultOPPrivs,mainSateOPPrivs);
+        }
+        return curDefaultOPPrivs;
     }
 
 }
\ No newline at end of file

app_web/src/authservice/sys-permission/sys-permission-auth-service-base.ts

 import AuthService from '../auth-service';
+import SysPermissionUIService from '@/uiservice/sys-permission/sys-permission-ui-service';
 
 /**
  * 权限/资源权限服务对象基类
@@ -9,6 +10,13 @@ import AuthService from '../auth-service';
  */
 export default class SysPermissionAuthServiceBase extends AuthService {
 
+    /**
+     * 所依赖UI服务
+     *
+     * @memberof SysPermissionAuthServiceBase
+     */
+    public syspermissionUIService:any;
+
     /**
      * Creates an instance of  SysPermissionAuthServiceBase.
      * 
@@ -17,17 +25,23 @@ export default class SysPermissionAuthServiceBase extends AuthService {
      */
     constructor(opts: any = {}) {
         super(opts);
+        this.syspermissionUIService = new SysPermissionUIService(opts);
     }
 
     /**
      * 根据当前数据获取实体操作标识
      *
-     * @param {string} name 实体名称
-     * @returns {Promise<any>}
+     * @param {*} data 传入数据
+     * @returns {any}
      * @memberof SysPermissionAuthServiceBase
      */
-    public async getOPPrivs(data:any):Promise<any>{
-        return null;
+    public getOPPrivs(data:any):any{
+        let mainSateOPPrivs:any = this.syspermissionUIService.getDEMainStateOPPrivs(data);
+        let curDefaultOPPrivs:any = JSON.parse(JSON.stringify(this.defaultOPPrivs));
+        if(mainSateOPPrivs){
+            Object.assign(curDefaultOPPrivs,mainSateOPPrivs);
+        }
+        return curDefaultOPPrivs;
     }
 
 }
\ No newline at end of file

app_web/src/authservice/sys-role-permission/sys-role-permission-auth-service-base.ts

 import AuthService from '../auth-service';
+import SysRolePermissionUIService from '@/uiservice/sys-role-permission/sys-role-permission-ui-service';
 
 /**
  * 角色权限关系权限服务对象基类
@@ -9,6 +10,13 @@ import AuthService from '../auth-service';
  */
 export default class SysRolePermissionAuthServiceBase extends AuthService {
 
+    /**
+     * 所依赖UI服务
+     *
+     * @memberof SysRolePermissionAuthServiceBase
+     */
+    public sysrolepermissionUIService:any;
+
     /**
      * Creates an instance of  SysRolePermissionAuthServiceBase.
      * 
@@ -17,17 +25,23 @@ export default class SysRolePermissionAuthServiceBase extends AuthService {
      */
     constructor(opts: any = {}) {
         super(opts);
+        this.sysrolepermissionUIService = new SysRolePermissionUIService(opts);
     }
 
     /**
      * 根据当前数据获取实体操作标识
      *
-     * @param {string} name 实体名称
-     * @returns {Promise<any>}
+     * @param {*} data 传入数据
+     * @returns {any}
      * @memberof SysRolePermissionAuthServiceBase
      */
-    public async getOPPrivs(data:any):Promise<any>{
-        return null;
+    public getOPPrivs(data:any):any{
+        let mainSateOPPrivs:any = this.sysrolepermissionUIService.getDEMainStateOPPrivs(data);
+        let curDefaultOPPrivs:any = JSON.parse(JSON.stringify(this.defaultOPPrivs));
+        if(mainSateOPPrivs){
+            Object.assign(curDefaultOPPrivs,mainSateOPPrivs);
+        }
+        return curDefaultOPPrivs;
     }
 
 }
\ No newline at end of file

app_web/src/authservice/sys-role/sys-role-auth-service-base.ts

 import AuthService from '../auth-service';
+import SysRoleUIService from '@/uiservice/sys-role/sys-role-ui-service';
 
 /**
  * 系统角色权限服务对象基类
@@ -9,6 +10,13 @@ import AuthService from '../auth-service';
  */
 export default class SysRoleAuthServiceBase extends AuthService {
 
+    /**
+     * 所依赖UI服务
+     *
+     * @memberof SysRoleAuthServiceBase
+     */
+    public sysroleUIService:any;
+
     /**
      * Creates an instance of  SysRoleAuthServiceBase.
      * 
@@ -17,17 +25,23 @@ export default class SysRoleAuthServiceBase extends AuthService {
      */
     constructor(opts: any = {}) {
         super(opts);
+        this.sysroleUIService = new SysRoleUIService(opts);
     }
 
     /**
      * 根据当前数据获取实体操作标识
      *
-     * @param {string} name 实体名称
-     * @returns {Promise<any>}
+     * @param {*} data 传入数据
+     * @returns {any}
      * @memberof SysRoleAuthServiceBase
      */
-    public async getOPPrivs(data:any):Promise<any>{
-        return null;
+    public getOPPrivs(data:any):any{
+        let mainSateOPPrivs:any = this.sysroleUIService.getDEMainStateOPPrivs(data);
+        let curDefaultOPPrivs:any = JSON.parse(JSON.stringify(this.defaultOPPrivs));
+        if(mainSateOPPrivs){
+            Object.assign(curDefaultOPPrivs,mainSateOPPrivs);
+        }
+        return curDefaultOPPrivs;
     }
 
 }
\ No newline at end of file

app_web/src/authservice/sys-user-role/sys-user-role-auth-service-base.ts

 import AuthService from '../auth-service';
+import SysUserRoleUIService from '@/uiservice/sys-user-role/sys-user-role-ui-service';
 
 /**
  * 用户角色关系权限服务对象基类
@@ -9,6 +10,13 @@ import AuthService from '../auth-service';
  */
 export default class SysUserRoleAuthServiceBase extends AuthService {
 
+    /**
+     * 所依赖UI服务
+     *
+     * @memberof SysUserRoleAuthServiceBase
+     */
+    public sysuserroleUIService:any;
+
     /**
      * Creates an instance of  SysUserRoleAuthServiceBase.
      * 
@@ -17,17 +25,23 @@ export default class SysUserRoleAuthServiceBase extends AuthService {
      */
     constructor(opts: any = {}) {
         super(opts);
+        this.sysuserroleUIService = new SysUserRoleUIService(opts);
     }
 
     /**
      * 根据当前数据获取实体操作标识
      *
-     * @param {string} name 实体名称
-     * @returns {Promise<any>}
+     * @param {*} data 传入数据
+     * @returns {any}
      * @memberof SysUserRoleAuthServiceBase
      */
-    public async getOPPrivs(data:any):Promise<any>{
-        return null;
+    public getOPPrivs(data:any):any{
+        let mainSateOPPrivs:any = this.sysuserroleUIService.getDEMainStateOPPrivs(data);
+        let curDefaultOPPrivs:any = JSON.parse(JSON.stringify(this.defaultOPPrivs));
+        if(mainSateOPPrivs){
+            Object.assign(curDefaultOPPrivs,mainSateOPPrivs);
+        }
+        return curDefaultOPPrivs;
     }
 
 }
\ No newline at end of file

app_web/src/authservice/sys-user/sys-user-auth-service-base.ts

 import AuthService from '../auth-service';
+import SysUserUIService from '@/uiservice/sys-user/sys-user-ui-service';
 
 /**
  * 系统用户权限服务对象基类
@@ -9,6 +10,13 @@ import AuthService from '../auth-service';
  */
 export default class SysUserAuthServiceBase extends AuthService {
 
+    /**
+     * 所依赖UI服务
+     *
+     * @memberof SysUserAuthServiceBase
+     */
+    public sysuserUIService:any;
+
     /**
      * Creates an instance of  SysUserAuthServiceBase.
      * 
@@ -17,17 +25,23 @@ export default class SysUserAuthServiceBase extends AuthService {
      */
     constructor(opts: any = {}) {
         super(opts);
+        this.sysuserUIService = new SysUserUIService(opts);
     }
 
     /**
      * 根据当前数据获取实体操作标识
      *
-     * @param {string} name 实体名称
-     * @returns {Promise<any>}
+     * @param {*} data 传入数据
+     * @returns {any}
      * @memberof SysUserAuthServiceBase
      */
-    public async getOPPrivs(data:any):Promise<any>{
-        return null;
+    public getOPPrivs(data:any):any{
+        let mainSateOPPrivs:any = this.sysuserUIService.getDEMainStateOPPrivs(data);
+        let curDefaultOPPrivs:any = JSON.parse(JSON.stringify(this.defaultOPPrivs));
+        if(mainSateOPPrivs){
+            Object.assign(curDefaultOPPrivs,mainSateOPPrivs);
+        }
+        return curDefaultOPPrivs;
     }
 
 }
\ No newline at end of file

app_web/src/components/app-rich-text-editor/app-rich-text-editor.vue

@@ -313,5 +313,4 @@ export default class AppRichTextEditor extends Vue {
 }
 </script>
 <style lang="less">
-@import './app-rich-text-editor.less';
 </style>
\ No newline at end of file

app_web/src/components/app-transfer/app-transfer.vue

@@ -128,7 +128,7 @@ export default class AppTransfer extends Vue {
      * @type{Array<string>}
      * @memberof AppTransfer
      */
-    public titles:Array<string>=[(this.$t('components.appTransfer.title1') as string), (this.$t('components.appTransfer.title2') as string)]
+    public titles?: Array<string>;
 
     /**
      * 左侧框数据
@@ -160,6 +160,7 @@ export default class AppTransfer extends Vue {
      */
     public created() {
         this.dataHandle();
+        this.titles= [(this.$t('components.appTransfer.title1') as string),(this.$t('components.appTransfer.title2') as string)];
     }
 
     /**

app_web/src/components/input-box/input-box.less

@@ -5,6 +5,9 @@
         top: 0;
         right: 20px;
     }
+    .ivu-input-number{
+        width: 100%;
+    }
     .ivu-input-number-input{
         text-align: right;
     }

app_web/src/locale/lang/en-US.ts

@@ -21,9 +21,17 @@ export default {
             sysException: "System abnormality",
             warning: "Warning",
             wrong: "Error",
+            rulesException: "Abnormal value check rule",
+            saveSuccess: "Saved successfully",
+            saveFailed: "Save failed",
+            deleteSuccess: "Successfully deleted!",
+            deleteError: "Failed to delete",
+            delDataFail: "Failed to delete data",
+            noData: "No data",
         },
         local:{
-            new: "New"
+            new: "New",
+            add: "Add",
         },
         gridpage: {
             choicecolumns: "Choice columns",
@@ -31,6 +39,50 @@ export default {
             show: "Show",
             records: "records",
             totle: "totle",
+            noData: "No data",
+            valueVail: "Value cannot be empty",
+            notConfig: {
+                fetchAction: "The view table fetchaction parameter is not configured",
+                removeAction: "The view table removeaction parameter is not configured",
+                createAction: "The view table createaction parameter is not configured",
+                updateAction: "The view table updateaction parameter is not configured",
+                loaddraftAction: "The view table loadtrafaction parameter is not configured",
+            },
+            data: "Data",
+            delDataFail: "Failed to delete data",
+            delSuccess: "Delete successfully!",
+            confirmDel: "Are you sure you want to delete",
+            notRecoverable: "delete will not be recoverable?",
+            notBatch: "Batch addition not implemented",
+            grid: "Grid",
+            exportFail: "Data export failed",
+            sum: "Total",
+            formitemFailed: "Form item update failed",
+        },
+        list: {
+            notConfig: {
+                fetchAction: "View list fetchAction parameter is not configured",
+                removeAction: "View table removeAction parameter is not configured",
+                createAction: "View list createAction parameter is not configured",
+                updateAction: "View list updateAction parameter is not configured",
+            },
+            confirmDel: "Are you sure you want to delete",
+            notRecoverable: "delete will not be recoverable?",
+        },
+        listExpBar: {
+            title: "List navigation bar",
+        },
+        wfExpBar: {
+            title: "Process navigation bar",
+        },
+        calendarExpBar:{
+            title: "Calendar navigation bar",
+        },
+        treeExpBar: {
+            title: "Tree view navigation bar",
+        },
+        portlet: {
+            noExtensions: "No extensions",
         },
         tabpage: {
             sureclosetip: {
@@ -55,6 +107,8 @@ export default {
           list: "list",
           dateSelectModalTitle: "select the time you wanted",
           gotoDate: "goto",
+          from: "From",
+          to: "To",
         },
         // 非实体视图
         views: {
@@ -98,7 +152,41 @@ export default {
                 submitsuccess: "Workflow submitted successfully",
             },
             updateerror: "Form item update failed",       
-        }
+        },
+        gridBar: {
+            title: "Table navigation bar",
+        },
+        multiEditView: {
+            notConfig: {
+                fetchAction: "View multi-edit view panel fetchAction parameter is not configured",
+                loaddraftAction: "View multi-edit view panel loaddraftAction parameter is not configured",
+            },
+        },
+        dataViewExpBar: {
+            title: "Card view navigation bar",
+        },
+        kanban: {
+            notConfig: {
+                fetchAction: "View list fetchAction parameter is not configured",
+                removeAction: "View table removeAction parameter is not configured",
+            },
+            delete1: "Confirm to delete ",
+            delete2: "the delete operation will be unrecoverable!",
+        },
+        dashBoard: {
+            handleClick: {
+                title: "Panel design",
+            },
+        },
+        dataView: {
+            sum: "total",
+            data: "data",
+        },
+        chart: {
+            undefined: "Undefined",
+            quarter: "Quarter",   
+            year: "Year",
+        },
     },
     entities: {
         sysauthlog: sysauthlog_en_US,

app_web/src/locale/lang/zh-CN.ts

@@ -21,9 +21,17 @@ export default {
             sysException: "系统异常",
             warning: "警告",
             wrong: "错误",
+            rulesException: "值规则校验异常",
+            saveSuccess: "保存成功",
+            saveFailed: "保存失败",
+            deleteSuccess: "删除成功！",
+            deleteError: "删除失败！",
+            delDataFail: "删除数据失败",
+            noData: "暂无数据",
         },
         local:{
-            new: "新建"
+            new: "新建",
+            add: "增加",
         },
         gridpage: {
             choicecolumns: "选择列",
@@ -31,6 +39,50 @@ export default {
             show: "显示",
             records: "条",
             totle: "共",
+            noData: "无数据",
+            valueVail: "值不能为空",
+            notConfig: {
+                fetchAction: "视图表格fetchAction参数未配置",
+                removeAction: "视图表格removeAction参数未配置",
+                createAction: "视图表格createAction参数未配置",
+                updateAction: "视图表格updateAction参数未配置",
+                loaddraftAction: "视图表格loaddraftAction参数未配置",
+            },
+            data: "数据",
+            delDataFail: "删除数据失败",
+            delSuccess: "删除成功!",
+            confirmDel: "确认要删除",
+            notRecoverable: "删除操作将不可恢复？",
+            notBatch: "批量添加未实现",
+            grid: "表",
+            exportFail: "数据导出失败",
+            sum: "合计",
+            formitemFailed: "表单项更新失败",
+        },
+        list: {
+            notConfig: {
+                fetchAction: "视图列表fetchAction参数未配置",
+                removeAction: "视图表格removeAction参数未配置",
+                createAction: "视图列表createAction参数未配置",
+                updateAction: "视图列表updateAction参数未配置",
+            },
+            confirmDel: "确认要删除",
+            notRecoverable: "删除操作将不可恢复？",
+        },
+        listExpBar: {
+            title: "列表导航栏",
+        },
+        wfExpBar: {
+            title: "流程导航栏",
+        },
+        calendarExpBar:{
+            title: "日历导航栏",
+        },
+        treeExpBar: {
+            title: "树视图导航栏",
+        },
+        portlet: {
+            noExtensions: "无扩展插件",
         },
         tabpage: {
             sureclosetip: {
@@ -55,6 +107,8 @@ export default {
           list: "列",
           dateSelectModalTitle: "选择要跳转的时间",
           gotoDate: "跳转",
+          from: "从",
+          to: "至",
         },
         // 非实体视图
         views: {
@@ -97,7 +151,41 @@ export default {
                 submitsuccess: "工作流提交成功",
             },
             updateerror: "表单项更新失败",     
-        }
+        },
+        gridBar: {
+            title: "表格导航栏",
+        },
+        multiEditView: {
+            notConfig: {
+                fetchAction: "视图多编辑视图面板fetchAction参数未配置",
+                loaddraftAction: "视图多编辑视图面板loaddraftAction参数未配置",
+            },
+        },
+        dataViewExpBar: {
+            title: "卡片视图导航栏",
+        },
+        kanban: {
+            notConfig: {
+                fetchAction: "视图列表fetchAction参数未配置",
+                removeAction: "视图表格removeAction参数未配置",
+            },
+            delete1: "确认要删除 ",
+            delete2: "删除操作将不可恢复？",
+        },
+        dashBoard: {
+            handleClick: {
+                title: "面板设计",
+            },
+        },
+        dataView: {
+            sum: "共",
+            data: "条数据",
+        },
+        chart: {
+            undefined: "未定义",
+            quarter: "季度",   
+            year: "年",
+        },
     },
     entities: {
         sysauthlog: sysauthlog_zh_CN,

app_web/src/pages/uaa/index/index-base.vue

@@ -2,8 +2,8 @@
 <div class="index_view index">
     <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="index"></app-studioaction>
     <layout :class="themeClasses" :style="themeStyle">
-        <layout>
-            <sider :width="collapseChange ? 64 : 200" hide-trigger v-model="collapseChange">
+        <layout id="movebox">
+            <sider class="index_sider" :width="collapseChange ? 64 : 200" hide-trigger v-model="collapseChange" id= "left_move">
                 <div class="sider-top">
                     <div class="page-logo">
                         <span class="menuicon" v-if="isEnableAppSwitch" @click="contextMenuDragVisiable=!contextMenuDragVisiable"><Icon type="md-menu" /></span>
@@ -29,7 +29,8 @@
 </view_appmenu>
                 <context-menu-drag v-if="isEnableAppSwitch" :contextMenuDragVisiable="contextMenuDragVisiable"></context-menu-drag>
             </sider>
-            <layout>
+            <div v-show="!collapseChange"  id="move_axis"></div>
+            <layout id="right_move">
                 <header class="index_header">
                     <div class="header-left" >
                         <div class="page-logo">
@@ -46,7 +47,7 @@
                         <app-theme style="width:45px;display: flex;justify-content: center;"></app-theme>
                     </div>
                 </header>
-                <content :class="{'index_content':true,'index_tab_content':Object.is(navModel,'tab')?true:false,'index_route_content':Object.is(navModel,'route')?true:false}" :style="{'width':this.collapseChange ? 'calc(100vw - 64px)' : 'calc(100vw - 200px)' }"  @click="contextMenuDragVisiable=false">
+                <content :class="{'index_content':true,'index_tab_content':Object.is(navModel,'tab')?true:false,'index_route_content':Object.is(navModel,'route')?true:false}"   @click="contextMenuDragVisiable=false">
                     <tab-page-exp v-if="Object.is(navModel,'tab')"></tab-page-exp>
                     <app-keep-alive :routerList="getRouterList">
                         <router-view :key="getRouterViewKey"></router-view>
@@ -495,6 +496,7 @@ export default class IndexBase extends Vue {
                 this.viewState.next({ tag: 'appmenu', action: 'load', data: {} });
         this.$viewTool.setIndexParameters([{ pathName: 'index', parameterName: 'index' }]);
         this.$viewTool.setIndexViewParam(this.context);
+        this.mouse_move();
 
     }
 
@@ -686,6 +688,41 @@ export default class IndexBase extends Vue {
         return this.$route.fullPath;
     }
 
+    /**
+     * 鼠标拖动事件
+     *
+     * @param {*} val
+     * @returns {*}
+     * @memberof IndexBase
+     */
+    public mouse_move(){
+        let move_axis:any = document.getElementById("move_axis");
+        let left_move :any= document.getElementById("left_move");
+        let right_move :any= document.getElementById("right_move");
+        let movebox :any= document.getElementById("movebox");
+        move_axis.onmousedown = (e:any) =>{
+            let startX = e.clientX;
+            move_axis.left = move_axis.offsetLeft;
+            document.onmousemove =  (e:any) =>{
+                let endX = e.clientX; 
+                let moveLen = move_axis.left + (endX - startX);
+                let maxT = movebox.clientWidth - move_axis.offsetWidth;
+                if (moveLen < 150) moveLen = 150;
+                if (moveLen > maxT - 150) moveLen = maxT - 150; 
+                move_axis.style.left = moveLen;
+                left_move.style.width = moveLen + "px";
+                right_move.style.width = (movebox.clientWidth - moveLen - 5) + "px";
+            }
+            document.onmouseup = (evt) =>{
+                document.onmousemove = null;
+                document.onmouseup = null;
+                move_axis.releaseCapture && move_axis.releaseCapture();
+            }
+            move_axis.setCapture && move_axis.setCapture();
+            return false;
+        }
+    }
+
 }
 </script>
 

app_web/src/pages/uaa/index/index.less

@@ -104,6 +104,18 @@
     }
 }
 
+#move_axis{
+    width: 5px;
+    height: 100%;
+    cursor: w-resize;
+    float: left;
+}
+.index_sider{
+    flex: none!important;
+    max-width: none !important;
+    transition: none 0s ease 0s;
+}
+
 /***    BRGIN:滚动条样式    ***/
 ::-webkit-scrollbar {
     background: transparent;

app_web/src/pages/uaa/sys-app-edit-view/sys-app-edit-view-base.vue

@@ -266,15 +266,15 @@ export default class SysAppEditViewBase extends Vue {
      * @memberof SysAppEditView
      */
     public toolBarModels: any = {
-        tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
+        tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
-        tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+        tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
 
         tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem12: { name: 'tbitem12', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'New', target: '' } },
+        tbitem12: { name: 'tbitem12', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
         tbitem13: {  name: 'tbitem13', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem14: { name: 'tbitem14', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
+        tbitem14: { name: 'tbitem14', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
 
     };
 

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

@@ -325,27 +325,27 @@ export default class SysAppGridViewBase extends Vue {
      * @memberof SysAppGridView
      */
     public toolBarModels: any = {
-        tbitem3: { name: 'tbitem3', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'New', target: '' } },
+        tbitem3: { name: 'tbitem3', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
-        tbitem4: { name: 'tbitem4', caption: '编辑', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' } },
+        tbitem4: { name: 'tbitem4', caption: '编辑', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' } },
 
-        tbitem6: { name: 'tbitem6', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
+        tbitem6: { name: 'tbitem6', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
 
         tbitem7: {  name: 'tbitem7', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem24: { name: 'tbitem24', caption: '行编辑', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'ToggleRowEdit', target: '' } },
+        tbitem24: { name: 'tbitem24', caption: '行编辑', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'ToggleRowEdit', target: '' } },
 
-        tbitem25: { name: 'tbitem25', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'NewRow', target: '' } },
+        tbitem25: { name: 'tbitem25', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'NewRow', target: '' } },
 
-        deuiaction1: { name: 'deuiaction1', caption: '保存行', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'SaveRow', target: '' } },
+        deuiaction1: { name: 'deuiaction1', caption: '保存行', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'SaveRow', target: '' } },
 
         tbitem26: {  name: 'tbitem26', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem8: { name: 'tbitem8', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' } },
+        tbitem8: { name: 'tbitem8', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' } },
 
         tbitem9: {  name: 'tbitem9', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem13: { name: 'tbitem13', caption: '导出', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'ExportExcel', target: '' }, MaxRowCount: 1000  },
+        tbitem13: { name: 'tbitem13', caption: '导出', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'ExportExcel', target: '' }, MaxRowCount: 1000  },
 
         tbitem10: {  name: 'tbitem10', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem19: { name: 'tbitem19', caption: '过滤', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'ToggleFilter', target: '' } },
+        tbitem19: { name: 'tbitem19', caption: '过滤', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'ToggleFilter', target: '' } },
 
     };
 

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

@@ -266,15 +266,15 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
      * @memberof SYS_PERMISSIONEditView
      */
     public toolBarModels: any = {
-        tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
+        tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
-        tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+        tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
 
         tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem12: { name: 'tbitem12', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'New', target: '' } },
+        tbitem12: { name: 'tbitem12', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
         tbitem13: {  name: 'tbitem13', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem14: { name: 'tbitem14', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
+        tbitem14: { name: 'tbitem14', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
 
     };
 

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

@@ -278,15 +278,15 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
      * @memberof SYS_PERMISSIONEditView2
      */
     public toolBarModels: any = {
-        tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
+        tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
-        tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+        tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
 
         tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem12: { name: 'tbitem12', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'New', target: '' } },
+        tbitem12: { name: 'tbitem12', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
         tbitem13: {  name: 'tbitem13', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem14: { name: 'tbitem14', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
+        tbitem14: { name: 'tbitem14', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
 
     };
 

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

@@ -304,20 +304,20 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
      * @memberof SYS_PERMISSIONGridView
      */
     public toolBarModels: any = {
-        tbitem3: { name: 'tbitem3', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'New', target: '' } },
+        tbitem3: { name: 'tbitem3', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
-        tbitem4: { name: 'tbitem4', caption: '编辑', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' } },
+        tbitem4: { name: 'tbitem4', caption: '编辑', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' } },
 
-        tbitem6: { name: 'tbitem6', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
+        tbitem6: { name: 'tbitem6', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
 
         tbitem7: {  name: 'tbitem7', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem8: { name: 'tbitem8', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' } },
+        tbitem8: { name: 'tbitem8', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' } },
 
         tbitem9: {  name: 'tbitem9', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem13: { name: 'tbitem13', caption: '导出', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'ExportExcel', target: '' }, MaxRowCount: 1000  },
+        tbitem13: { name: 'tbitem13', caption: '导出', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'ExportExcel', target: '' }, MaxRowCount: 1000  },
 
         tbitem10: {  name: 'tbitem10', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem19: { name: 'tbitem19', caption: '过滤', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'ToggleFilter', target: '' } },
+        tbitem19: { name: 'tbitem19', caption: '过滤', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'ToggleFilter', target: '' } },
 
     };
 

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

@@ -304,20 +304,20 @@ export default class SysRoleGridViewBase extends Vue {
      * @memberof SysRoleGridView
      */
     public toolBarModels: any = {
-        tbitem3: { name: 'tbitem3', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'New', target: '' } },
+        tbitem3: { name: 'tbitem3', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
-        tbitem4: { name: 'tbitem4', caption: '编辑', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' } },
+        tbitem4: { name: 'tbitem4', caption: '编辑', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' } },
 
-        tbitem6: { name: 'tbitem6', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
+        tbitem6: { name: 'tbitem6', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
 
         tbitem7: {  name: 'tbitem7', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem8: { name: 'tbitem8', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' } },
+        tbitem8: { name: 'tbitem8', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' } },
 
         tbitem9: {  name: 'tbitem9', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem13: { name: 'tbitem13', caption: '导出', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'ExportExcel', target: '' }, MaxRowCount: 1000  },
+        tbitem13: { name: 'tbitem13', caption: '导出', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'ExportExcel', target: '' }, MaxRowCount: 1000  },
 
         tbitem10: {  name: 'tbitem10', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem19: { name: 'tbitem19', caption: '过滤', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'ToggleFilter', target: '' } },
+        tbitem19: { name: 'tbitem19', caption: '过滤', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'ToggleFilter', target: '' } },
 
     };
 

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

@@ -301,20 +301,20 @@ export default class SysRolePermissionGridViewBase extends Vue {
      * @memberof SysRolePermissionGridView
      */
     public toolBarModels: any = {
-        tbitem3: { name: 'tbitem3', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'New', target: '' } },
+        tbitem3: { name: 'tbitem3', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
-        tbitem4: { name: 'tbitem4', caption: '编辑', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' } },
+        tbitem4: { name: 'tbitem4', caption: '编辑', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' } },
 
-        tbitem6: { name: 'tbitem6', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
+        tbitem6: { name: 'tbitem6', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
 
         tbitem7: {  name: 'tbitem7', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem8: { name: 'tbitem8', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' } },
+        tbitem8: { name: 'tbitem8', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' } },
 
         tbitem9: {  name: 'tbitem9', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem13: { name: 'tbitem13', caption: '导出', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'ExportExcel', target: '' }, MaxRowCount: 1000  },
+        tbitem13: { name: 'tbitem13', caption: '导出', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'ExportExcel', target: '' }, MaxRowCount: 1000  },
 
         tbitem10: {  name: 'tbitem10', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem19: { name: 'tbitem19', caption: '过滤', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'ToggleFilter', target: '' } },
+        tbitem19: { name: 'tbitem19', caption: '过滤', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'ToggleFilter', target: '' } },
 
     };
 

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

@@ -266,15 +266,15 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
      * @memberof SYS_ROLE_PERMISSIONEditView
      */
     public toolBarModels: any = {
-        tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
+        tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
-        tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+        tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
 
         tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem12: { name: 'tbitem12', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'New', target: '' } },
+        tbitem12: { name: 'tbitem12', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
         tbitem13: {  name: 'tbitem13', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem14: { name: 'tbitem14', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
+        tbitem14: { name: 'tbitem14', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
 
     };
 

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

@@ -278,15 +278,15 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
      * @memberof SYS_ROLE_PERMISSIONEditView2
      */
     public toolBarModels: any = {
-        tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
+        tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
-        tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+        tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
 
         tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem12: { name: 'tbitem12', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'New', target: '' } },
+        tbitem12: { name: 'tbitem12', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
         tbitem13: {  name: 'tbitem13', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem14: { name: 'tbitem14', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
+        tbitem14: { name: 'tbitem14', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
 
     };
 

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

@@ -266,15 +266,15 @@ export default class SYS_ROLEEditViewBase extends Vue {
      * @memberof SYS_ROLEEditView
      */
     public toolBarModels: any = {
-        tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
+        tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
-        tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+        tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
 
         tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem12: { name: 'tbitem12', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'New', target: '' } },
+        tbitem12: { name: 'tbitem12', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
         tbitem13: {  name: 'tbitem13', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem14: { name: 'tbitem14', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
+        tbitem14: { name: 'tbitem14', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
 
     };
 

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

@@ -278,15 +278,15 @@ export default class SYS_ROLEEditView2Base extends Vue {
      * @memberof SYS_ROLEEditView2
      */
     public toolBarModels: any = {
-        tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
+        tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
-        tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+        tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
 
         tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem12: { name: 'tbitem12', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'New', target: '' } },
+        tbitem12: { name: 'tbitem12', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
         tbitem13: {  name: 'tbitem13', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem14: { name: 'tbitem14', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
+        tbitem14: { name: 'tbitem14', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
 
     };
 

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

@@ -304,20 +304,20 @@ export default class SysUserGridViewBase extends Vue {
      * @memberof SysUserGridView
      */
     public toolBarModels: any = {
-        tbitem3: { name: 'tbitem3', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'New', target: '' } },
+        tbitem3: { name: 'tbitem3', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
-        tbitem4: { name: 'tbitem4', caption: '编辑', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' } },
+        tbitem4: { name: 'tbitem4', caption: '编辑', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' } },
 
-        tbitem6: { name: 'tbitem6', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
+        tbitem6: { name: 'tbitem6', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
 
         tbitem7: {  name: 'tbitem7', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem8: { name: 'tbitem8', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' } },
+        tbitem8: { name: 'tbitem8', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' } },
 
         tbitem9: {  name: 'tbitem9', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem13: { name: 'tbitem13', caption: '导出', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'ExportExcel', target: '' }, MaxRowCount: 1000  },
+        tbitem13: { name: 'tbitem13', caption: '导出', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'ExportExcel', target: '' }, MaxRowCount: 1000  },
 
         tbitem10: {  name: 'tbitem10', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem19: { name: 'tbitem19', caption: '过滤', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'ToggleFilter', target: '' } },
+        tbitem19: { name: 'tbitem19', caption: '过滤', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'ToggleFilter', target: '' } },
 
     };
 

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

@@ -266,15 +266,15 @@ export default class SysUserRoleEditViewBase extends Vue {
      * @memberof SysUserRoleEditView
      */
     public toolBarModels: any = {
-        tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
+        tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
-        tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+        tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
 
         tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem12: { name: 'tbitem12', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'New', target: '' } },
+        tbitem12: { name: 'tbitem12', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
         tbitem13: {  name: 'tbitem13', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem14: { name: 'tbitem14', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
+        tbitem14: { name: 'tbitem14', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
 
     };
 

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

@@ -278,15 +278,15 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
      * @memberof SYS_USER_ROLEEditView2
      */
     public toolBarModels: any = {
-        tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
+        tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
-        tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+        tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
 
         tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem12: { name: 'tbitem12', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'New', target: '' } },
+        tbitem12: { name: 'tbitem12', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
         tbitem13: {  name: 'tbitem13', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem14: { name: 'tbitem14', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
+        tbitem14: { name: 'tbitem14', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
 
     };
 

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

@@ -301,20 +301,20 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
      * @memberof SYS_USER_ROLEGridView
      */
     public toolBarModels: any = {
-        tbitem3: { name: 'tbitem3', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'New', target: '' } },
+        tbitem3: { name: 'tbitem3', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
-        tbitem4: { name: 'tbitem4', caption: '编辑', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' } },
+        tbitem4: { name: 'tbitem4', caption: '编辑', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' } },
 
-        tbitem6: { name: 'tbitem6', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
+        tbitem6: { name: 'tbitem6', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
 
         tbitem7: {  name: 'tbitem7', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem8: { name: 'tbitem8', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' } },
+        tbitem8: { name: 'tbitem8', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' } },
 
         tbitem9: {  name: 'tbitem9', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem13: { name: 'tbitem13', caption: '导出', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'ExportExcel', target: '' }, MaxRowCount: 1000  },
+        tbitem13: { name: 'tbitem13', caption: '导出', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'ExportExcel', target: '' }, MaxRowCount: 1000  },
 
         tbitem10: {  name: 'tbitem10', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem19: { name: 'tbitem19', caption: '过滤', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'ToggleFilter', target: '' } },
+        tbitem19: { name: 'tbitem19', caption: '过滤', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'ToggleFilter', target: '' } },
 
     };
 

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

@@ -266,15 +266,15 @@ export default class SYS_USEREditViewBase extends Vue {
      * @memberof SYS_USEREditView
      */
     public toolBarModels: any = {
-        tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
+        tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
-        tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+        tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
 
         tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem12: { name: 'tbitem12', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'New', target: '' } },
+        tbitem12: { name: 'tbitem12', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
         tbitem13: {  name: 'tbitem13', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem14: { name: 'tbitem14', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
+        tbitem14: { name: 'tbitem14', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
 
     };
 

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

@@ -278,15 +278,15 @@ export default class SYS_USEREditView2Base extends Vue {
      * @memberof SYS_USEREditView2
      */
     public toolBarModels: any = {
-        tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
+        tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
-        tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+        tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
 
         tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem12: { name: 'tbitem12', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'New', target: '' } },
+        tbitem12: { name: 'tbitem12', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
         tbitem13: {  name: 'tbitem13', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem14: { name: 'tbitem14', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
+        tbitem14: { name: 'tbitem14', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:'2',dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
 
     };
 

app_web/src/uiservice/sys-app/sys-app-ui-service-base.ts

@@ -177,12 +177,12 @@ export default class SysAppUIServiceBase extends UIService {
         }
 		if(!Environment.isAppMode){
             if(this.getDEMainStateTag(curData)){
-                return `MOBEDITVIEW:MSTAG:${ await this.getDEMainStateTag(curData)}`;
+                return `MOBEDITVIEW:MSTAG:${ this.getDEMainStateTag(curData)}`;
             }
 			return 'MOBEDITVIEW:';
         }
         if(this.getDEMainStateTag(curData)){
-            return `EDITVIEW:MSTAG:${ await this.getDEMainStateTag(curData)}`;
+            return `EDITVIEW:MSTAG:${ this.getDEMainStateTag(curData)}`;
         }
 		return 'EDITVIEW:';
     }
@@ -193,7 +193,7 @@ export default class SysAppUIServiceBase extends UIService {
      * @param curData 当前数据
      * @memberof  SysAppUIServiceBase
      */  
-    public async getDEMainStateTag(curData:any){
+    public getDEMainStateTag(curData:any){
         if(this.mainStateFields.length === 0) return null;
 
         this.mainStateFields.forEach((singleMainField:any) =>{
@@ -223,4 +223,18 @@ export default class SysAppUIServiceBase extends UIService {
         return null;
     }
 
+    /**
+    * 获取数据对象的操作标识
+    * 
+    * @param curData 当前数据
+    * @memberof  SysAppUIServiceBase
+    */  
+   public getDEMainStateOPPrivs(curData:any){
+        if(this.getDEMainStateTag(curData)){
+            return this.allDeMainStateOPPrivsMap.get((this.getDEMainStateTag(curData) as string));
+        }else{
+            return null;
+        }
+   }
+
 }
\ No newline at end of file

app_web/src/uiservice/sys-auth-log/sys-auth-log-ui-service-base.ts

@@ -176,12 +176,12 @@ export default class SysAuthLogUIServiceBase extends UIService {
         }
 		if(!Environment.isAppMode){
             if(this.getDEMainStateTag(curData)){
-                return `MOBEDITVIEW:MSTAG:${ await this.getDEMainStateTag(curData)}`;
+                return `MOBEDITVIEW:MSTAG:${ this.getDEMainStateTag(curData)}`;
             }
 			return 'MOBEDITVIEW:';
         }
         if(this.getDEMainStateTag(curData)){
-            return `EDITVIEW:MSTAG:${ await this.getDEMainStateTag(curData)}`;
+            return `EDITVIEW:MSTAG:${ this.getDEMainStateTag(curData)}`;
         }
 		return 'EDITVIEW:';
     }
@@ -192,7 +192,7 @@ export default class SysAuthLogUIServiceBase extends UIService {
      * @param curData 当前数据
      * @memberof  SysAuthLogUIServiceBase
      */  
-    public async getDEMainStateTag(curData:any){
+    public getDEMainStateTag(curData:any){
         if(this.mainStateFields.length === 0) return null;
 
         this.mainStateFields.forEach((singleMainField:any) =>{
@@ -222,4 +222,18 @@ export default class SysAuthLogUIServiceBase extends UIService {
         return null;
     }
 
+    /**
+    * 获取数据对象的操作标识
+    * 
+    * @param curData 当前数据
+    * @memberof  SysAuthLogUIServiceBase
+    */  
+   public getDEMainStateOPPrivs(curData:any){
+        if(this.getDEMainStateTag(curData)){
+            return this.allDeMainStateOPPrivsMap.get((this.getDEMainStateTag(curData) as string));
+        }else{
+            return null;
+        }
+   }
+
 }
\ No newline at end of file

app_web/src/uiservice/sys-permission/sys-permission-ui-service-base.ts

@@ -182,12 +182,12 @@ export default class SysPermissionUIServiceBase extends UIService {
         }
 		if(!Environment.isAppMode){
             if(this.getDEMainStateTag(curData)){
-                return `MOBEDITVIEW:MSTAG:${ await this.getDEMainStateTag(curData)}`;
+                return `MOBEDITVIEW:MSTAG:${ this.getDEMainStateTag(curData)}`;
             }
 			return 'MOBEDITVIEW:';
         }
         if(this.getDEMainStateTag(curData)){
-            return `EDITVIEW:MSTAG:${ await this.getDEMainStateTag(curData)}`;
+            return `EDITVIEW:MSTAG:${ this.getDEMainStateTag(curData)}`;
         }
 		return 'EDITVIEW:';
     }
@@ -198,7 +198,7 @@ export default class SysPermissionUIServiceBase extends UIService {
      * @param curData 当前数据
      * @memberof  SysPermissionUIServiceBase
      */  
-    public async getDEMainStateTag(curData:any){
+    public getDEMainStateTag(curData:any){
         if(this.mainStateFields.length === 0) return null;
 
         this.mainStateFields.forEach((singleMainField:any) =>{
@@ -228,4 +228,18 @@ export default class SysPermissionUIServiceBase extends UIService {
         return null;
     }
 
+    /**
+    * 获取数据对象的操作标识
+    * 
+    * @param curData 当前数据
+    * @memberof  SysPermissionUIServiceBase
+    */  
+   public getDEMainStateOPPrivs(curData:any){
+        if(this.getDEMainStateTag(curData)){
+            return this.allDeMainStateOPPrivsMap.get((this.getDEMainStateTag(curData) as string));
+        }else{
+            return null;
+        }
+   }
+
 }
\ No newline at end of file

app_web/src/uiservice/sys-role-permission/sys-role-permission-ui-service-base.ts

@@ -183,12 +183,12 @@ export default class SysRolePermissionUIServiceBase extends UIService {
         }
 		if(!Environment.isAppMode){
             if(this.getDEMainStateTag(curData)){
-                return `MOBEDITVIEW:MSTAG:${ await this.getDEMainStateTag(curData)}`;
+                return `MOBEDITVIEW:MSTAG:${ this.getDEMainStateTag(curData)}`;
             }
 			return 'MOBEDITVIEW:';
         }
         if(this.getDEMainStateTag(curData)){
-            return `EDITVIEW:MSTAG:${ await this.getDEMainStateTag(curData)}`;
+            return `EDITVIEW:MSTAG:${ this.getDEMainStateTag(curData)}`;
         }
 		return 'EDITVIEW:';
     }
@@ -199,7 +199,7 @@ export default class SysRolePermissionUIServiceBase extends UIService {
      * @param curData 当前数据
      * @memberof  SysRolePermissionUIServiceBase
      */  
-    public async getDEMainStateTag(curData:any){
+    public getDEMainStateTag(curData:any){
         if(this.mainStateFields.length === 0) return null;
 
         this.mainStateFields.forEach((singleMainField:any) =>{
@@ -229,4 +229,18 @@ export default class SysRolePermissionUIServiceBase extends UIService {
         return null;
     }
 
+    /**
+    * 获取数据对象的操作标识
+    * 
+    * @param curData 当前数据
+    * @memberof  SysRolePermissionUIServiceBase
+    */  
+   public getDEMainStateOPPrivs(curData:any){
+        if(this.getDEMainStateTag(curData)){
+            return this.allDeMainStateOPPrivsMap.get((this.getDEMainStateTag(curData) as string));
+        }else{
+            return null;
+        }
+   }
+
 }
\ No newline at end of file

app_web/src/uiservice/sys-role/sys-role-ui-service-base.ts

@@ -182,12 +182,12 @@ export default class SysRoleUIServiceBase extends UIService {
         }
 		if(!Environment.isAppMode){
             if(this.getDEMainStateTag(curData)){
-                return `MOBEDITVIEW:MSTAG:${ await this.getDEMainStateTag(curData)}`;
+                return `MOBEDITVIEW:MSTAG:${ this.getDEMainStateTag(curData)}`;
             }
 			return 'MOBEDITVIEW:';
         }
         if(this.getDEMainStateTag(curData)){
-            return `EDITVIEW:MSTAG:${ await this.getDEMainStateTag(curData)}`;
+            return `EDITVIEW:MSTAG:${ this.getDEMainStateTag(curData)}`;
         }
 		return 'EDITVIEW:';
     }
@@ -198,7 +198,7 @@ export default class SysRoleUIServiceBase extends UIService {
      * @param curData 当前数据
      * @memberof  SysRoleUIServiceBase
      */  
-    public async getDEMainStateTag(curData:any){
+    public getDEMainStateTag(curData:any){
         if(this.mainStateFields.length === 0) return null;
 
         this.mainStateFields.forEach((singleMainField:any) =>{
@@ -228,4 +228,18 @@ export default class SysRoleUIServiceBase extends UIService {
         return null;
     }
 
+    /**
+    * 获取数据对象的操作标识
+    * 
+    * @param curData 当前数据
+    * @memberof  SysRoleUIServiceBase
+    */  
+   public getDEMainStateOPPrivs(curData:any){
+        if(this.getDEMainStateTag(curData)){
+            return this.allDeMainStateOPPrivsMap.get((this.getDEMainStateTag(curData) as string));
+        }else{
+            return null;
+        }
+   }
+
 }
\ No newline at end of file

app_web/src/uiservice/sys-user-role/sys-user-role-ui-service-base.ts

@@ -182,12 +182,12 @@ export default class SysUserRoleUIServiceBase extends UIService {
         }
 		if(!Environment.isAppMode){
             if(this.getDEMainStateTag(curData)){
-                return `MOBEDITVIEW:MSTAG:${ await this.getDEMainStateTag(curData)}`;
+                return `MOBEDITVIEW:MSTAG:${ this.getDEMainStateTag(curData)}`;
             }
 			return 'MOBEDITVIEW:';
         }
         if(this.getDEMainStateTag(curData)){
-            return `EDITVIEW:MSTAG:${ await this.getDEMainStateTag(curData)}`;
+            return `EDITVIEW:MSTAG:${ this.getDEMainStateTag(curData)}`;
         }
 		return 'EDITVIEW:';
     }
@@ -198,7 +198,7 @@ export default class SysUserRoleUIServiceBase extends UIService {
      * @param curData 当前数据
      * @memberof  SysUserRoleUIServiceBase
      */  
-    public async getDEMainStateTag(curData:any){
+    public getDEMainStateTag(curData:any){
         if(this.mainStateFields.length === 0) return null;
 
         this.mainStateFields.forEach((singleMainField:any) =>{
@@ -228,4 +228,18 @@ export default class SysUserRoleUIServiceBase extends UIService {
         return null;
     }
 
+    /**
+    * 获取数据对象的操作标识
+    * 
+    * @param curData 当前数据
+    * @memberof  SysUserRoleUIServiceBase
+    */  
+   public getDEMainStateOPPrivs(curData:any){
+        if(this.getDEMainStateTag(curData)){
+            return this.allDeMainStateOPPrivsMap.get((this.getDEMainStateTag(curData) as string));
+        }else{
+            return null;
+        }
+   }
+
 }
\ No newline at end of file

app_web/src/uiservice/sys-user/sys-user-ui-service-base.ts

@@ -182,12 +182,12 @@ export default class SysUserUIServiceBase extends UIService {
         }
 		if(!Environment.isAppMode){
             if(this.getDEMainStateTag(curData)){
-                return `MOBEDITVIEW:MSTAG:${ await this.getDEMainStateTag(curData)}`;
+                return `MOBEDITVIEW:MSTAG:${ this.getDEMainStateTag(curData)}`;
             }
 			return 'MOBEDITVIEW:';
         }
         if(this.getDEMainStateTag(curData)){
-            return `EDITVIEW:MSTAG:${ await this.getDEMainStateTag(curData)}`;
+            return `EDITVIEW:MSTAG:${ this.getDEMainStateTag(curData)}`;
         }
 		return 'EDITVIEW:';
     }
@@ -198,7 +198,7 @@ export default class SysUserUIServiceBase extends UIService {
      * @param curData 当前数据
      * @memberof  SysUserUIServiceBase
      */  
-    public async getDEMainStateTag(curData:any){
+    public getDEMainStateTag(curData:any){
         if(this.mainStateFields.length === 0) return null;
 
         this.mainStateFields.forEach((singleMainField:any) =>{
@@ -228,4 +228,18 @@ export default class SysUserUIServiceBase extends UIService {
         return null;
     }
 
+    /**
+    * 获取数据对象的操作标识
+    * 
+    * @param curData 当前数据
+    * @memberof  SysUserUIServiceBase
+    */  
+   public getDEMainStateOPPrivs(curData:any){
+        if(this.getDEMainStateTag(curData)){
+            return this.allDeMainStateOPPrivsMap.get((this.getDEMainStateTag(curData) as string));
+        }else{
+            return null;
+        }
+   }
+
 }
\ No newline at end of file

config.xml

@@ -37,11 +37,6 @@
 	  git clone -b master $para2 ibzuaa/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzuaa/
-      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 ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-app-web.jar
 
-EXPOSE 30002
+EXPOSE 8080
 
 ADD ibzuaa-app-web.jar /ibzuaa-app-web.jar

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

@@ -3,24 +3,9 @@ services:
   ibzuaa-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-app-web:latest
     ports:
-      - "30002:30002"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=30002
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
-      - SPRING_REDIS_HOST=172.16.100.243
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
-      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
-      - ABC=1
-      - DEC=2
-      - NACOS=172.16.102.211:8848
     deploy:
       resources:
            limits: