ibizdev提交

app_web/CHANGELOG.md

+## v7.0.0-alpha.3 [2020-5-10]
+
+### Bug修复
+
+分页导航栏传递srfparentdename和srfparentkey问题
+
+提交流程、启动流程刷新表格数据问题
+
+修复视图自定义导航参数大小写问题
+
+修复批添加功能
+
+修复树部件查询数据集合异常处理
+
+修复图表排序问题
+
+修复富文本国际化切换失效
+
+### 功能新增及优化
+
+#### 模板
+
+搜索面板布局优化
+
+表格checkbox宽度优化
+
+选择类视图不显示标题
+
+补充树节点关系导航上下文，导航参数上下文
+
+#### 基础文件
+
+登录页面调整
+
 ## v7.0.0-alpha.2 [2020-5-7]
 
 ### Bug修复
@@ -31,5 +65,3 @@
 ## v7.0.0-alpha.1 [2020-4-29]
 
 初始化文件
-
-

app_web/public/assets/json/view-config.json

@@ -191,14 +191,6 @@
         "viewname": "SYS_USEREditView",
         "viewtag": "9a896aa77c214ed87ab9be4fd6c6bec5"
     },
-    "sys_user_rolecustomview": {
-        "title": "角色表自定义视图",
-        "caption": "角色表自定义视图",
-        "viewtype": "DECUSTOMVIEW",
-        "viewmodule": "uaa",
-        "viewname": "SYS_USER_ROLECustomView",
-        "viewtag": "9b017760188bc666966521361d0ad5a1"
-    },
     "sys_permissionpickupgridview": {
         "title": "权限表选择表格视图",
         "caption": "权限/资源",

app_web/src/environments/environment.ts

@@ -4,7 +4,7 @@ export const Environment = {
     // 应用名称
     AppName: 'web',
     // 应用 title
-    AppTitle: 'gateway',
+    AppTitle: 'UAA鉴权',
     // 应用基础路径
     BaseUrl: '../',
     // 系统名称

app_web/src/locale/lanres/sys-user-role/sys-user-role_en_US.ts

@@ -22,10 +22,6 @@ export default {
 		pickupgridview: {
 			caption: "用户角色关系",
       title: '用户角色关系',
-		},
-		customview: {
-			caption: "角色表自定义视图",
-      title: '角色表自定义视图',
 		},
 		mpickupview: {
 			caption: "用户角色关系",
@@ -206,64 +202,6 @@ export default {
 			tip: "Help",
 		},
 	},
-	customviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "New",
-			tip: "New",
-		},
-		tbitem4: {
-			caption: "Edit",
-			tip: "Edit {0}",
-		},
-		tbitem5: {
-			caption: "View",
-			tip: "View {0}",
-		},
-		tbitem6: {
-			caption: "Copy",
-			tip: "Copy {0}",
-		},
-		tbitem7: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem8: {
-			caption: "Remove",
-			tip: "Remove {0}",
-		},
-		tbitem9: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem13: {
-			caption: "Export",
-			tip: "Export {0} Data To Excel",
-		},
-		tbitem10: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem16: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem21: {
-			caption: "Export Data Model",
-			tip: "导出数据模型",
-		},
-		tbitem23: {
-			caption: "数据导入",
-			tip: "数据导入",
-		},
-		tbitem17: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem18: {
-			caption: "Help",
-			tip: "Help",
-		},
-	},
 	editview2toolbar_toolbar: {
 		tbitem3: {
 			caption: "Save",
@@ -330,13 +268,4 @@ export default {
 			tip: "Help",
 		},
 	},
-	sys_roletrees_treeview: {
-		nodes: {
-			root: '默认根节点',
-			create: '实体数据能力',
-			testentity: '实体',
-		},
-		uiactions: {
-		},
-	},
 };
\ No newline at end of file

app_web/src/locale/lanres/sys-user-role/sys-user-role_zh_CN.ts

@@ -21,10 +21,6 @@ export default {
 		pickupgridview: {
 			caption: '用户角色关系',
       title: '用户角色关系',
-		},
-		customview: {
-			caption: '角色表自定义视图',
-      title: '角色表自定义视图',
 		},
 		mpickupview: {
 			caption: '用户角色关系',
@@ -205,64 +201,6 @@ export default {
 			tip: '帮助',
 		},
 	},
-	customviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: '新建',
-			tip: '新建',
-		},
-		tbitem4: {
-			caption: '编辑',
-			tip: '编辑',
-		},
-		tbitem5: {
-			caption: '查看',
-			tip: '查看',
-		},
-		tbitem6: {
-			caption: '拷贝',
-			tip: '拷贝',
-		},
-		tbitem7: {
-			caption: '-',
-			tip: '',
-		},
-		tbitem8: {
-			caption: '删除',
-			tip: '删除',
-		},
-		tbitem9: {
-			caption: '-',
-			tip: '',
-		},
-		tbitem13: {
-			caption: '导出',
-			tip: '导出',
-		},
-		tbitem10: {
-			caption: '-',
-			tip: '',
-		},
-		tbitem16: {
-			caption: '其它',
-			tip: '其它',
-		},
-		tbitem21: {
-			caption: '导出数据模型',
-			tip: '导出数据模型',
-		},
-		tbitem23: {
-			caption: '数据导入',
-			tip: '数据导入',
-		},
-		tbitem17: {
-			caption: '-',
-			tip: '',
-		},
-		tbitem18: {
-			caption: '帮助',
-			tip: '帮助',
-		},
-	},
 	editview2toolbar_toolbar: {
 		tbitem3: {
 			caption: '保存',
@@ -329,13 +267,4 @@ export default {
 			tip: '帮助',
 		},
 	},
-	sys_roletrees_treeview: {
-		nodes: {
-			root: '默认根节点',
-			create: '实体数据能力',
-			testentity: '实体',
-		},
-		uiactions: {
-		},
-	},
 };
\ No newline at end of file

app_web/src/mock/viewconfig/viewconfig.ts

@@ -199,14 +199,6 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "SYS_USEREditView",
             "viewtag": "9a896aa77c214ed87ab9be4fd6c6bec5"
         },
-        "sys_user_rolecustomview": {
-            "title": "角色表自定义视图",
-            "caption": "角色表自定义视图",
-            "viewtype": "DECUSTOMVIEW",
-            "viewmodule": "uaa",
-            "viewname": "SYS_USER_ROLECustomView",
-            "viewtag": "9b017760188bc666966521361d0ad5a1"
-        },
         "sys_permissionpickupgridview": {
             "title": "权限表选择表格视图",
             "caption": "权限/资源",

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

@@ -70,7 +70,7 @@ export default class IndexBase extends Vue {
      * @type {Array<*>}
      * @memberof IndexBase
      */    
-    protected counterServiceArray:Array<any> = [];
+    public counterServiceArray:Array<any> = [];
     
     /**
      * 数据变化
@@ -80,7 +80,7 @@ export default class IndexBase extends Vue {
      * @memberof IndexBase
      */
     @Emit() 
-    protected viewDatasChange(val: any):any {
+    public viewDatasChange(val: any):any {
         return val;
     }
 
@@ -90,7 +90,7 @@ export default class IndexBase extends Vue {
      * @type {string}
      * @memberof IndexBase
      */
-    @Prop() protected viewdata!: string;
+    @Prop() public viewdata!: string;
 
     /**
      * 传入视图参数
@@ -98,7 +98,7 @@ export default class IndexBase extends Vue {
      * @type {string}
      * @memberof IndexBase
      */
-    @Prop() protected viewparam!: string;
+    @Prop() public viewparam!: string;
 
     /**
      * 视图默认使用
@@ -106,7 +106,7 @@ export default class IndexBase extends Vue {
      * @type {boolean}
      * @memberof IndexBase
      */
-    @Prop({ default: true }) protected viewDefaultUsage!: boolean;
+    @Prop({ default: true }) public viewDefaultUsage!: boolean;
 
 	/**
 	 * 视图标识
@@ -114,7 +114,7 @@ export default class IndexBase extends Vue {
 	 * @type {string}
 	 * @memberof IndexBase
 	 */
-	protected viewtag: string = '045e3ba6825a802770d6eca089a6484d';
+	public viewtag: string = '045e3ba6825a802770d6eca089a6484d';
 
 	/**
 	 * 自定义视图导航上下文集合
@@ -122,7 +122,7 @@ export default class IndexBase extends Vue {
 	 * @type {*}
 	 * @memberof IndexBase
 	 */
-    protected customViewNavContexts:any ={
+    public customViewNavContexts:any ={
     };
 
 	/**
@@ -131,7 +131,7 @@ export default class IndexBase extends Vue {
 	 * @type {*}
 	 * @memberof IndexBase
 	 */
-    protected customViewParams:any ={
+    public customViewParams:any ={
     };
 
     /**
@@ -140,7 +140,7 @@ export default class IndexBase extends Vue {
      * @type {*}
      * @memberof IndexBase
      */
-    protected model: any = {
+    public model: any = {
         srfCaption: 'app.views.index.caption',
         srfTitle: 'app.views.index.title',
         srfSubTitle: 'app.views.index.subtitle',
@@ -188,7 +188,7 @@ export default class IndexBase extends Vue {
      * @type {*}
      * @memberof IndexBase
      */
-    protected containerModel: any = {
+    public containerModel: any = {
         view_appmenu: { name: 'appmenu', type: 'APPMENU' },
     };
 
@@ -211,11 +211,11 @@ export default class IndexBase extends Vue {
     /**
      * 视图状态订阅对象
      *
-     * @private
+     * @public
      * @type {Subject<{action: string, data: any}>}
      * @memberof IndexBase
      */
-    protected viewState: Subject<ViewState> = new Subject();
+    public viewState: Subject<ViewState> = new Subject();
 
 
 
@@ -223,10 +223,10 @@ export default class IndexBase extends Vue {
     /**
      * 引擎初始化
      *
-     * @private
+     * @public
      * @memberof IndexBase
      */
-    private engineInit(): void {
+    public engineInit(): void {
     }
 
     /**
@@ -235,7 +235,7 @@ export default class IndexBase extends Vue {
      * @type {*}
      * @memberof IndexBase
      */
-    protected context:any = {};
+    public context:any = {};
 
     /**
      * 视图参数
@@ -243,15 +243,15 @@ export default class IndexBase extends Vue {
      * @type {*}
      * @memberof IndexBase
      */
-    protected viewparams:any = {};
+    public viewparams:any = {};
 
     /**
      * 解析视图参数
      *
-     * @private
+     * @public
      * @memberof IndexBase
      */
-    private parseViewParam(): void {
+    public parseViewParam(): void {
         for(let key in this.context){
             delete this.context[key];
         }
@@ -317,14 +317,14 @@ export default class IndexBase extends Vue {
 		// 直接值直接赋值
 		if(curNavData.isRawValue){
 			if(Object.is(curNavData.value,"null") || Object.is(curNavData.value,"")){
-                Object.defineProperty(tempData, item, {
+                Object.defineProperty(tempData, item.toLowerCase(), {
                     value: null,
                     writable : true,
                     enumerable : true,
                     configurable : true
                 });
             }else{
-                Object.defineProperty(tempData, item, {
+                Object.defineProperty(tempData, item.toLowerCase(), {
                     value: curNavData.value,
                     writable : true,
                     enumerable : true,
@@ -334,7 +334,7 @@ export default class IndexBase extends Vue {
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
 			if(this.context[(curNavData.value).toLowerCase()]){
-				Object.defineProperty(tempData, item, {
+				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
 					enumerable : true,
@@ -342,14 +342,14 @@ export default class IndexBase extends Vue {
 				});
 			}else{
 				if(this.viewparams[(curNavData.value).toLowerCase()]){
-					Object.defineProperty(tempData, item, {
+					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,
 						enumerable : true,
 						configurable : true
 					});
 				}else{
-					Object.defineProperty(tempData, item, {
+					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: null,
 						writable : true,
 						enumerable : true,
@@ -366,7 +366,7 @@ export default class IndexBase extends Vue {
      *
      * @memberof IndexBase
      */
-    protected created() {
+    public created() {
         this.afterCreated();
     }
 
@@ -375,7 +375,7 @@ export default class IndexBase extends Vue {
      *
      * @memberof IndexBase
      */    
-    protected afterCreated(){
+    public afterCreated(){
         const secondtag = this.$util.createUUID();
         this.$store.commit('viewaction/createdView', { viewtag: this.viewtag, secondtag: secondtag });
         this.viewtag = secondtag;
@@ -388,7 +388,7 @@ export default class IndexBase extends Vue {
      *
      * @memberof IndexBase
      */
-    protected beforeDestroy() {
+    public beforeDestroy() {
         this.$store.commit('viewaction/removeView', this.viewtag);
     }
 
@@ -397,7 +397,7 @@ export default class IndexBase extends Vue {
      *
      * @memberof IndexBase
      */
-    protected mounted() {
+    public mounted() {
         this.afterMounted();
     }
 
@@ -406,7 +406,7 @@ export default class IndexBase extends Vue {
      * 
      * @memberof IndexBase
      */
-    protected afterMounted(){
+    public afterMounted(){
         const _this: any = this;
         _this.engineInit();
         if (_this.loadModel && _this.loadModel instanceof Function) {
@@ -427,7 +427,7 @@ export default class IndexBase extends Vue {
      * @param {any[]} args
      * @memberof IndexBase
      */
-    protected closeView(args: any[]): void {
+    public closeView(args: any[]): void {
         let _view: any = this;
         if (_view.viewdata) {
             _view.$emit('viewdataschange', [args]);
@@ -440,11 +440,11 @@ export default class IndexBase extends Vue {
     /**
      * 菜单位置
      *
-     * @private
+     * @public
      * @type {string}
      * @memberof IndexBase
      */
-    private mode: string ='vertical';
+    public mode: string ='vertical';
 
     /**
      * 当前主题

app_web/src/pages/uaa/sys-permissiongrid-view/sys-permissiongrid-view.less

@@ -17,3 +17,10 @@
         // this is less
 
 
+.view-container.degridview{
+  >.view-card.view-no-caption{
+    >.ivu-card-body{
+      height: 100%;
+    }
+  }
+}
\ No newline at end of file

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

@@ -28,7 +28,7 @@ export default class SYS_PERMISSIONRedirectViewBase extends Vue {
      * @type {SYS_PERMISSIONService}
      * @memberof SYS_PERMISSIONRedirectViewBase
      */
-    protected appEntityService: SYS_PERMISSIONService = new SYS_PERMISSIONService;
+    public appEntityService: SYS_PERMISSIONService = new SYS_PERMISSIONService;
 
 
     /**
@@ -37,7 +37,7 @@ export default class SYS_PERMISSIONRedirectViewBase extends Vue {
      * @type {Array<*>}
      * @memberof SYS_PERMISSIONRedirectViewBase
      */    
-    protected counterServiceArray:Array<any> = [];
+    public counterServiceArray:Array<any> = [];
     
     /**
      * 数据变化
@@ -47,7 +47,7 @@ export default class SYS_PERMISSIONRedirectViewBase extends Vue {
      * @memberof SYS_PERMISSIONRedirectViewBase
      */
     @Emit() 
-    protected viewDatasChange(val: any):any {
+    public viewDatasChange(val: any):any {
         return val;
     }
 
@@ -57,7 +57,7 @@ export default class SYS_PERMISSIONRedirectViewBase extends Vue {
      * @type {string}
      * @memberof SYS_PERMISSIONRedirectViewBase
      */
-    @Prop() protected viewdata!: string;
+    @Prop() public viewdata!: string;
 
     /**
      * 传入视图参数
@@ -65,7 +65,7 @@ export default class SYS_PERMISSIONRedirectViewBase extends Vue {
      * @type {string}
      * @memberof SYS_PERMISSIONRedirectViewBase
      */
-    @Prop() protected viewparam!: string;
+    @Prop() public viewparam!: string;
 
     /**
      * 视图默认使用
@@ -73,7 +73,7 @@ export default class SYS_PERMISSIONRedirectViewBase extends Vue {
      * @type {boolean}
      * @memberof SYS_PERMISSIONRedirectViewBase
      */
-    @Prop({ default: true }) protected viewDefaultUsage!: boolean;
+    @Prop({ default: true }) public viewDefaultUsage!: boolean;
 
 	/**
 	 * 视图标识
@@ -81,7 +81,7 @@ export default class SYS_PERMISSIONRedirectViewBase extends Vue {
 	 * @type {string}
 	 * @memberof SYS_PERMISSIONRedirectViewBase
 	 */
-	protected viewtag: string = 'c1c2bc63580de24bac60af103a3fcc0f';
+	public viewtag: string = 'c1c2bc63580de24bac60af103a3fcc0f';
 
 	/**
 	 * 自定义视图导航上下文集合
@@ -89,7 +89,7 @@ export default class SYS_PERMISSIONRedirectViewBase extends Vue {
 	 * @type {*}
 	 * @memberof SYS_PERMISSIONRedirectViewBase
 	 */
-    protected customViewNavContexts:any ={
+    public customViewNavContexts:any ={
     };
 
 	/**
@@ -98,7 +98,7 @@ export default class SYS_PERMISSIONRedirectViewBase extends Vue {
 	 * @type {*}
 	 * @memberof SYS_PERMISSIONRedirectViewBase
 	 */
-    protected customViewParams:any ={
+    public customViewParams:any ={
     };
 
     /**
@@ -107,7 +107,7 @@ export default class SYS_PERMISSIONRedirectViewBase extends Vue {
      * @type {*}
      * @memberof SYS_PERMISSIONRedirectViewBase
      */
-    protected model: any = {
+    public model: any = {
         srfCaption: 'entities.sys_permission.views.redirectview.caption',
         srfTitle: 'entities.sys_permission.views.redirectview.title',
         srfSubTitle: 'entities.sys_permission.views.redirectview.subtitle',
@@ -155,7 +155,7 @@ export default class SYS_PERMISSIONRedirectViewBase extends Vue {
      * @type {*}
      * @memberof SYS_PERMISSIONRedirectViewBase
      */
-    protected containerModel: any = {
+    public containerModel: any = {
     };
 
     /**
@@ -177,21 +177,21 @@ export default class SYS_PERMISSIONRedirectViewBase extends Vue {
     /**
      * 视图状态订阅对象
      *
-     * @private
+     * @public
      * @type {Subject<{action: string, data: any}>}
      * @memberof SYS_PERMISSIONRedirectViewBase
      */
-    protected viewState: Subject<ViewState> = new Subject();
+    public viewState: Subject<ViewState> = new Subject();
 
 
 
     /**
      * 引擎初始化
      *
-     * @private
+     * @public
      * @memberof SYS_PERMISSIONRedirectViewBase
      */
-    private engineInit(): void {
+    public engineInit(): void {
     }
 
     /**
@@ -200,7 +200,7 @@ export default class SYS_PERMISSIONRedirectViewBase extends Vue {
      * @type {*}
      * @memberof SYS_PERMISSIONRedirectViewBase
      */
-    protected context:any = {};
+    public context:any = {};
 
     /**
      * 视图参数
@@ -208,15 +208,15 @@ export default class SYS_PERMISSIONRedirectViewBase extends Vue {
      * @type {*}
      * @memberof SYS_PERMISSIONRedirectViewBase
      */
-    protected viewparams:any = {};
+    public viewparams:any = {};
 
     /**
      * 解析视图参数
      *
-     * @private
+     * @public
      * @memberof SYS_PERMISSIONRedirectViewBase
      */
-    private parseViewParam(): void {
+    public parseViewParam(): void {
         for(let key in this.context){
             delete this.context[key];
         }
@@ -284,14 +284,14 @@ export default class SYS_PERMISSIONRedirectViewBase extends Vue {
 		// 直接值直接赋值
 		if(curNavData.isRawValue){
 			if(Object.is(curNavData.value,"null") || Object.is(curNavData.value,"")){
-                Object.defineProperty(tempData, item, {
+                Object.defineProperty(tempData, item.toLowerCase(), {
                     value: null,
                     writable : true,
                     enumerable : true,
                     configurable : true
                 });
             }else{
-                Object.defineProperty(tempData, item, {
+                Object.defineProperty(tempData, item.toLowerCase(), {
                     value: curNavData.value,
                     writable : true,
                     enumerable : true,
@@ -301,7 +301,7 @@ export default class SYS_PERMISSIONRedirectViewBase extends Vue {
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
 			if(this.context[(curNavData.value).toLowerCase()]){
-				Object.defineProperty(tempData, item, {
+				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
 					enumerable : true,
@@ -309,14 +309,14 @@ export default class SYS_PERMISSIONRedirectViewBase extends Vue {
 				});
 			}else{
 				if(this.viewparams[(curNavData.value).toLowerCase()]){
-					Object.defineProperty(tempData, item, {
+					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,
 						enumerable : true,
 						configurable : true
 					});
 				}else{
-					Object.defineProperty(tempData, item, {
+					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: null,
 						writable : true,
 						enumerable : true,
@@ -333,7 +333,7 @@ export default class SYS_PERMISSIONRedirectViewBase extends Vue {
      *
      * @memberof SYS_PERMISSIONRedirectViewBase
      */
-    protected created() {
+    public created() {
         this.afterCreated();
     }
 
@@ -342,7 +342,7 @@ export default class SYS_PERMISSIONRedirectViewBase extends Vue {
      *
      * @memberof SYS_PERMISSIONRedirectViewBase
      */    
-    protected afterCreated(){
+    public afterCreated(){
         const secondtag = this.$util.createUUID();
         this.$store.commit('viewaction/createdView', { viewtag: this.viewtag, secondtag: secondtag });
         this.viewtag = secondtag;
@@ -356,7 +356,7 @@ export default class SYS_PERMISSIONRedirectViewBase extends Vue {
      *
      * @memberof SYS_PERMISSIONRedirectViewBase
      */
-    protected beforeDestroy() {
+    public beforeDestroy() {
         this.$store.commit('viewaction/removeView', this.viewtag);
     }
 
@@ -365,7 +365,7 @@ export default class SYS_PERMISSIONRedirectViewBase extends Vue {
      *
      * @memberof SYS_PERMISSIONRedirectViewBase
      */
-    protected mounted() {
+    public mounted() {
         this.afterMounted();
     }
 
@@ -374,7 +374,7 @@ export default class SYS_PERMISSIONRedirectViewBase extends Vue {
      * 
      * @memberof SYS_PERMISSIONRedirectViewBase
      */
-    protected afterMounted(){
+    public afterMounted(){
         const _this: any = this;
         _this.engineInit();
         if (_this.loadModel && _this.loadModel instanceof Function) {
@@ -392,7 +392,7 @@ export default class SYS_PERMISSIONRedirectViewBase extends Vue {
      * @param {any[]} args
      * @memberof SYS_PERMISSIONRedirectViewBase
      */
-    protected closeView(args: any[]): void {
+    public closeView(args: any[]): void {
         let _view: any = this;
         if (_view.viewdata) {
             _view.$emit('viewdataschange', [args]);
@@ -407,7 +407,7 @@ export default class SYS_PERMISSIONRedirectViewBase extends Vue {
      *
      * @memberof SYS_PERMISSIONRedirectViewBase
      */
-    protected destroyed(){
+    public destroyed(){
         this.afterDestroyed();
     }
 
@@ -416,7 +416,7 @@ export default class SYS_PERMISSIONRedirectViewBase extends Vue {
      * 
      * @memberof SYS_PERMISSIONRedirectViewBase
      */
-    protected afterDestroyed(){
+    public afterDestroyed(){
         if(this.viewDefaultUsage){
             let localStoreLength = Object.keys(localStorage);
             if(localStoreLength.length > 0){

app_web/src/pages/uaa/sys-role-permissiongrid-view/sys-role-permissiongrid-view.less

@@ -17,3 +17,10 @@
         // this is less
 
 
+.view-container.degridview{
+  >.view-card.view-no-caption{
+    >.ivu-card-body{
+      height: 100%;
+    }
+  }
+}
\ No newline at end of file

app_web/src/pages/uaa/sys-rolegrid-view/sys-rolegrid-view.less

@@ -17,3 +17,10 @@
         // this is less
 
 
+.view-container.degridview{
+  >.view-card.view-no-caption{
+    >.ivu-card-body{
+      height: 100%;
+    }
+  }
+}
\ No newline at end of file

app_web/src/pages/uaa/sys-user-rolegrid-view/sys-user-rolegrid-view.less

@@ -17,3 +17,10 @@
         // this is less
 
 
+.view-container.degridview{
+  >.view-card.view-no-caption{
+    >.ivu-card-body{
+      height: 100%;
+    }
+  }
+}
\ No newline at end of file

app_web/src/pages/uaa/sys-usergrid-view/sys-usergrid-view.less

@@ -17,3 +17,10 @@
         // this is less
 
 
+.view-container.degridview{
+  >.view-card.view-no-caption{
+    >.ivu-card-body{
+      height: 100%;
+    }
+  }
+}
\ No newline at end of file

app_web/src/store/modules/view-action/state.ts

@@ -249,16 +249,6 @@ export const viewstate: any = {
                 'fb89f9af95f2caf92ccc1249025c9a1b',
             ],
         },
-        {
-            viewtag: '9b017760188bc666966521361d0ad5a1',
-            viewmodule: 'uaa',
-            viewname: 'SYS_USER_ROLECustomView',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
-                '1ee68b6d5d4c5c9413f6874e0ccabc43',
-            ],
-        },
         {
             viewtag: '9c0b351150648f7661be53c10eaabd67',
             viewmodule: 'uaa',

app_web/src/widgets/app/main-appmenu/main-appmenu-model.ts

@@ -9,11 +9,11 @@ export default class MainModel {
     /**
      * 菜单项集合
      *
-     * @private
+     * @public
      * @type {any[]}
      * @memberof MainModel
      */
-    private items: any[] = [
+    public items: any[] = [
         {
 	id: 'f59655c22753740bbcf200f5cfee8a54',
 	name: 'menuitem3',
@@ -109,11 +109,11 @@ export default class MainModel {
 	/**
 	 * 应用功能集合
 	 *
-	 * @private
+	 * @public
 	 * @type {any[]}
 	 * @memberof MainModel
 	 */
-	private funcs: any[] = [
+	public funcs: any[] = [
         {
             appfunctag: 'Auto1',
             appfuncyype: 'APPVIEW',

app_web/src/widgets/sys-permission/main-grid/main-grid-service.ts

@@ -45,12 +45,12 @@ export default class MainService extends ControlService {
     /**
      * 处理数据
      *
-     * @private
+     * @public
      * @param {Promise<any>} promise
      * @returns {Promise<any>}
      * @memberof MainService
      */
-    private doItems(promise: Promise<any>, deKeyField: string, deName: string): Promise<any> {
+    public doItems(promise: Promise<any>, deKeyField: string, deName: string): Promise<any> {
         return new Promise((resolve, reject) => {
             promise.then((response: any) => {
                 if (response && response.status === 200) {

app_web/src/widgets/sys-permission/main-grid/main-grid.less

@@ -53,7 +53,7 @@
         }
     }
     .el-table__body-wrapper{
-      height: calc(100% - 43px) !important;
+      height: calc(100% - 45px) !important;
     }
     .el-table__empty-block{
       height: auto !important;

app_web/src/widgets/sys-role-permission/main-grid/main-grid-service.ts

@@ -45,12 +45,12 @@ export default class MainService extends ControlService {
     /**
      * 处理数据
      *
-     * @private
+     * @public
      * @param {Promise<any>} promise
      * @returns {Promise<any>}
      * @memberof MainService
      */
-    private doItems(promise: Promise<any>, deKeyField: string, deName: string): Promise<any> {
+    public doItems(promise: Promise<any>, deKeyField: string, deName: string): Promise<any> {
         return new Promise((resolve, reject) => {
             promise.then((response: any) => {
                 if (response && response.status === 200) {

app_web/src/widgets/sys-role-permission/main-grid/main-grid.less

@@ -53,7 +53,7 @@
         }
     }
     .el-table__body-wrapper{
-      height: calc(100% - 43px) !important;
+      height: calc(100% - 45px) !important;
     }
     .el-table__empty-block{
       height: auto !important;