Skip to content

I
ibzuaa
提交 4be48599 编写于 作者: laizhilong's avatar laizhilong
浏览文件
操作

Merge remote-tracking branch 'origin/master'

上级 bb7d8c11 06e256ca
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 9601 行增加 和 702 行删除
app_web/public/assets/json/view-config.json
浏览文件 @ 4be48599
...@@ -24,24 +24,24 @@ ...@@ -24,24 +24,24 @@
"viewtag": "12f53853382743f095a6af867669d8c1" "viewtag": "12f53853382743f095a6af867669d8c1"
}, },
"sysappeditview": { "sysappeditview": {
"title": "应用编辑视图", "title": "接入应用",
"caption": "应用", "caption": "接入应用",
"viewtype": "DEEDITVIEW", "viewtype": "DEEDITVIEW",
"viewmodule": "uaa", "viewmodule": "uaa",
"viewname": "SysAppEditView", "viewname": "SysAppEditView",
"viewtag": "137b8f036994965b8926455611848134" "viewtag": "137b8f036994965b8926455611848134"
}, },
"sys_rolepickupgridview": { "sysrolepickupgridview": {
"title": "角色选择表格视图", "title": "角色选择表格视图",
"caption": "系统角色", "caption": "系统角色",
"viewtype": "DEPICKUPGRIDVIEW", "viewtype": "DEPICKUPGRIDVIEW",
"viewmodule": "uaa", "viewmodule": "uaa",
"viewname": "SYS_ROLEPickupGridView", "viewname": "SysRolePickupGridView",
"viewtag": "1a3413067ee48ab30691eab9f345f517" "viewtag": "1a3413067ee48ab30691eab9f345f517"
}, },
"sysuserroleeditview": { "sysuserroleeditview": {
"title": "用户角色关系表编辑视图", "title": "用户",
"caption": "用户角色关系", "caption": "用户",
"viewtype": "DEEDITVIEW", "viewtype": "DEEDITVIEW",
"viewmodule": "uaa", "viewmodule": "uaa",
"viewname": "SysUserRoleEditView", "viewname": "SysUserRoleEditView",
...@@ -71,12 +71,12 @@ ...@@ -71,12 +71,12 @@
"viewname": "SYS_USER_ROLEPickupGridView", "viewname": "SYS_USER_ROLEPickupGridView",
"viewtag": "320dc0d5f5dc15c74cdfe3dbb820d2ac" "viewtag": "320dc0d5f5dc15c74cdfe3dbb820d2ac"
}, },
"sys_role_permissionmpickupview": { "sysrolepermissionmpickupview": {
"title": "角色权限关系表数据多项选择视图", "title": "角色权限关系表数据多项选择视图",
"caption": "角色权限关系", "caption": "角色权限关系",
"viewtype": "DEMPICKUPVIEW", "viewtype": "DEMPICKUPVIEW",
"viewmodule": "uaa", "viewmodule": "uaa",
"viewname": "SYS_ROLE_PERMISSIONMPickupView", "viewname": "SysRolePermissionMPickupView",
"viewtag": "3e133a839b837d9e47f80e161d66a861" "viewtag": "3e133a839b837d9e47f80e161d66a861"
}, },
"sys_permissiongridview": { "sys_permissiongridview": {
...@@ -87,20 +87,20 @@ ...@@ -87,20 +87,20 @@
"viewname": "SYS_PERMISSIONGridView", "viewname": "SYS_PERMISSIONGridView",
"viewtag": "42f3fa04c9dc77f235207bcbe6ac3888" "viewtag": "42f3fa04c9dc77f235207bcbe6ac3888"
}, },
"sys_roleeditview2": { "sysroleeditview2": {
"title": "角色编辑视图", "title": "角色",
"caption": "系统角色", "caption": "角色",
"viewtype": "DEEDITVIEW2", "viewtype": "DEEDITVIEW2",
"viewmodule": "uaa", "viewmodule": "uaa",
"viewname": "SYS_ROLEEditView2", "viewname": "SysRoleEditView2",
"viewtag": "4470edcdb57a14007444c0d9867e571c" "viewtag": "4470edcdb57a14007444c0d9867e571c"
}, },
"sys_role_permissionredirectview": { "sysrolepermissionredirectview": {
"title": "角色权限关系表数据重定向视图", "title": "角色权限关系表数据重定向视图",
"caption": "角色权限关系", "caption": "角色权限关系",
"viewtype": "DEREDIRECTVIEW", "viewtype": "DEREDIRECTVIEW",
"viewmodule": "uaa", "viewmodule": "uaa",
"viewname": "SYS_ROLE_PERMISSIONRedirectView", "viewname": "SysRolePermissionRedirectView",
"viewtag": "47fb02384b5797f4b095e247619515f4" "viewtag": "47fb02384b5797f4b095e247619515f4"
}, },
"sysrolepermissiongridview": { "sysrolepermissiongridview": {
...@@ -119,20 +119,20 @@ ...@@ -119,20 +119,20 @@
"viewname": "SYS_ROLE_PERMISSIONPickupGridView", "viewname": "SYS_ROLE_PERMISSIONPickupGridView",
"viewtag": "6baae51f242438b90446176f76405183" "viewtag": "6baae51f242438b90446176f76405183"
}, },
"sys_role_permissionpickupview": { "sysrolepermissionpickupview": {
"title": "角色权限关系表数据选择视图", "title": "角色权限关系表数据选择视图",
"caption": "角色权限关系", "caption": "角色权限关系",
"viewtype": "DEPICKUPVIEW", "viewtype": "DEPICKUPVIEW",
"viewmodule": "uaa", "viewmodule": "uaa",
"viewname": "SYS_ROLE_PERMISSIONPickupView", "viewname": "SysRolePermissionPickupView",
"viewtag": "6cd33d562ef19ad47dd26b312b9a020e" "viewtag": "6cd33d562ef19ad47dd26b312b9a020e"
}, },
"sys_roleeditview": { "sysroleeditview": {
"title": "角色编辑视图", "title": "角色",
"caption": "系统角色", "caption": "角色",
"viewtype": "DEEDITVIEW", "viewtype": "DEEDITVIEW",
"viewmodule": "uaa", "viewmodule": "uaa",
"viewname": "SYS_ROLEEditView", "viewname": "SysRoleEditView",
"viewtag": "6f5a41631520da5e33294a1225101e66" "viewtag": "6f5a41631520da5e33294a1225101e66"
}, },
"sys_userredirectview": { "sys_userredirectview": {
...@@ -199,12 +199,12 @@ ...@@ -199,12 +199,12 @@
"viewname": "SYS_USERPickupGridView", "viewname": "SYS_USERPickupGridView",
"viewtag": "936880f60b6ef17d39d5248b5fe390b4" "viewtag": "936880f60b6ef17d39d5248b5fe390b4"
}, },
"sys_usereditview": { "sysusereditview": {
"title": "用户表编辑视图", "title": "用户",
"caption": "系统用户", "caption": "用户",
"viewtype": "DEEDITVIEW", "viewtype": "DEEDITVIEW",
"viewmodule": "uaa", "viewmodule": "uaa",
"viewname": "SYS_USEREditView", "viewname": "SysUserEditView",
"viewtag": "9a896aa77c214ed87ab9be4fd6c6bec5" "viewtag": "9a896aa77c214ed87ab9be4fd6c6bec5"
}, },
"sys_permissionpickupgridview": { "sys_permissionpickupgridview": {
...@@ -279,12 +279,12 @@ ...@@ -279,12 +279,12 @@
"viewname": "SYS_USERPickupView", "viewname": "SYS_USERPickupView",
"viewtag": "d53cb0ce933245fae5f0623bac4fbf48" "viewtag": "d53cb0ce933245fae5f0623bac4fbf48"
}, },
"sys_role_permissioncustomview": { "sysrolepermissioncustomview": {
"title": "角色权限关系自定义视图", "title": "角色权限关系自定义视图",
"caption": "角色权限关系", "caption": "角色权限关系",
"viewtype": "DECUSTOMVIEW", "viewtype": "DECUSTOMVIEW",
"viewmodule": "uaa", "viewmodule": "uaa",
"viewname": "SYS_ROLE_PERMISSIONCustomView", "viewname": "SysRolePermissionCustomView",
"viewtag": "e791be173ed0f4bbe9cce942b6edde63" "viewtag": "e791be173ed0f4bbe9cce942b6edde63"
}, },
"sys_permissioneditview": { "sys_permissioneditview": {
...@@ -295,12 +295,12 @@ ...@@ -295,12 +295,12 @@
"viewname": "SYS_PERMISSIONEditView", "viewname": "SYS_PERMISSIONEditView",
"viewtag": "eb6498ba353f58d0af17bbd39702ccf7" "viewtag": "eb6498ba353f58d0af17bbd39702ccf7"
}, },
"sys_user_roleeditview2": { "sysuserroleeditview2": {
"title": "用户角色关系表编辑视图", "title": "用户",
"caption": "用户角色关系", "caption": "用户",
"viewtype": "DEEDITVIEW2", "viewtype": "DEEDITVIEW2",
"viewmodule": "uaa", "viewmodule": "uaa",
"viewname": "SYS_USER_ROLEEditView2", "viewname": "SysUserRoleEditView2",
"viewtag": "ede089b4741590173bd21b9df99c1cf0" "viewtag": "ede089b4741590173bd21b9df99c1cf0"
}, },
"sys_user_rolepickupview": { "sys_user_rolepickupview": {
......
app_web/src/authservice/auth-service.ts
浏览文件 @ 4be48599
...@@ -11,11 +11,20 @@ export default class AuthService { ...@@ -11,11 +11,20 @@ export default class AuthService {
/** /**
* Vue 状态管理器 * Vue 状态管理器
* *
* @private * @public
* @type {(any | null)} * @type {(any | null)}
* @memberof AuthService * @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. * Creates an instance of AuthService.
...@@ -52,10 +61,10 @@ export default class AuthService { ...@@ -52,10 +61,10 @@ export default class AuthService {
* 根据当前数据获取实体操作标识 * 根据当前数据获取实体操作标识
* *
* @param {string} name 实体名称 * @param {string} name 实体名称
* @returns {Promise<any>} * @returns {any}
* @memberof AuthService * @memberof AuthService
*/ */
public async getOPPrivs(data:any):Promise<any>{ public getOPPrivs(data: any): any {
return null; return null;
} }
...@@ -66,7 +75,7 @@ export default class AuthService { ...@@ -66,7 +75,7 @@ export default class AuthService {
* @returns {boolean} * @returns {boolean}
* @memberof AuthService * @memberof AuthService
*/ */
public getMenusPermission(item:any):boolean{ public getMenusPermission(item: any): boolean {
return true; return true;
} }
...@@ -77,7 +86,7 @@ export default class AuthService { ...@@ -77,7 +86,7 @@ export default class AuthService {
* @returns {boolean} * @returns {boolean}
* @memberof AuthService * @memberof AuthService
*/ */
public getResourcePermission(tag:any):boolean{ public getResourcePermission(tag: any): boolean {
return true; return true;
} }
......
app_web/src/authservice/sys-app/sys-app-auth-service-base.ts
浏览文件 @ 4be48599
import AuthService from '../auth-service'; import AuthService from '../auth-service';
import SysAppUIService from '@/uiservice/sys-app/sys-app-ui-service';
/** /**
* 应用权限服务对象基类 * 应用权限服务对象基类
...@@ -9,6 +10,13 @@ import AuthService from '../auth-service'; ...@@ -9,6 +10,13 @@ import AuthService from '../auth-service';
*/ */
export default class SysAppAuthServiceBase extends AuthService { export default class SysAppAuthServiceBase extends AuthService {
/**
* 所依赖UI服务
*
* @memberof SysAppAuthServiceBase
*/
public sysappUIService:any;
/** /**
* Creates an instance of SysAppAuthServiceBase. * Creates an instance of SysAppAuthServiceBase.
* *
...@@ -17,17 +25,23 @@ export default class SysAppAuthServiceBase extends AuthService { ...@@ -17,17 +25,23 @@ export default class SysAppAuthServiceBase extends AuthService {
*/ */
constructor(opts: any = {}) { constructor(opts: any = {}) {
super(opts); super(opts);
this.sysappUIService = new SysAppUIService(opts);
} }
/** /**
* 根据当前数据获取实体操作标识 * 根据当前数据获取实体操作标识
* *
* @param {string} name 实体名称 * @param {*} data 传入数据
* @returns {Promise<any>} * @returns {any}
* @memberof SysAppAuthServiceBase * @memberof SysAppAuthServiceBase
*/ */
public async getOPPrivs(data:any):Promise<any>{ public getOPPrivs(data:any):any{
return null; 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
浏览文件 @ 4be48599
import AuthService from '../auth-service'; 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'; ...@@ -9,6 +10,13 @@ import AuthService from '../auth-service';
*/ */
export default class SysAuthLogAuthServiceBase extends AuthService { export default class SysAuthLogAuthServiceBase extends AuthService {
/**
* 所依赖UI服务
*
* @memberof SysAuthLogAuthServiceBase
*/
public sysauthlogUIService:any;
/** /**
* Creates an instance of SysAuthLogAuthServiceBase. * Creates an instance of SysAuthLogAuthServiceBase.
* *
...@@ -17,17 +25,23 @@ export default class SysAuthLogAuthServiceBase extends AuthService { ...@@ -17,17 +25,23 @@ export default class SysAuthLogAuthServiceBase extends AuthService {
*/ */
constructor(opts: any = {}) { constructor(opts: any = {}) {
super(opts); super(opts);
this.sysauthlogUIService = new SysAuthLogUIService(opts);
} }
/** /**
* 根据当前数据获取实体操作标识 * 根据当前数据获取实体操作标识
* *
* @param {string} name 实体名称 * @param {*} data 传入数据
* @returns {Promise<any>} * @returns {any}
* @memberof SysAuthLogAuthServiceBase * @memberof SysAuthLogAuthServiceBase
*/ */
public async getOPPrivs(data:any):Promise<any>{ public getOPPrivs(data:any):any{
return null; 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
浏览文件 @ 4be48599
import AuthService from '../auth-service'; import AuthService from '../auth-service';
import SysPermissionUIService from '@/uiservice/sys-permission/sys-permission-ui-service';
/** /**
* 权限/资源权限服务对象基类 * 权限/资源权限服务对象基类
...@@ -9,6 +10,13 @@ import AuthService from '../auth-service'; ...@@ -9,6 +10,13 @@ import AuthService from '../auth-service';
*/ */
export default class SysPermissionAuthServiceBase extends AuthService { export default class SysPermissionAuthServiceBase extends AuthService {
/**
* 所依赖UI服务
*
* @memberof SysPermissionAuthServiceBase
*/
public syspermissionUIService:any;
/** /**
* Creates an instance of SysPermissionAuthServiceBase. * Creates an instance of SysPermissionAuthServiceBase.
* *
...@@ -17,17 +25,23 @@ export default class SysPermissionAuthServiceBase extends AuthService { ...@@ -17,17 +25,23 @@ export default class SysPermissionAuthServiceBase extends AuthService {
*/ */
constructor(opts: any = {}) { constructor(opts: any = {}) {
super(opts); super(opts);
this.syspermissionUIService = new SysPermissionUIService(opts);
} }
/** /**
* 根据当前数据获取实体操作标识 * 根据当前数据获取实体操作标识
* *
* @param {string} name 实体名称 * @param {*} data 传入数据
* @returns {Promise<any>} * @returns {any}
* @memberof SysPermissionAuthServiceBase * @memberof SysPermissionAuthServiceBase
*/ */
public async getOPPrivs(data:any):Promise<any>{ public getOPPrivs(data:any):any{
return null; 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
浏览文件 @ 4be48599
import AuthService from '../auth-service'; 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'; ...@@ -9,6 +10,13 @@ import AuthService from '../auth-service';
*/ */
export default class SysRolePermissionAuthServiceBase extends AuthService { export default class SysRolePermissionAuthServiceBase extends AuthService {
/**
* 所依赖UI服务
*
* @memberof SysRolePermissionAuthServiceBase
*/
public sysrolepermissionUIService:any;
/** /**
* Creates an instance of SysRolePermissionAuthServiceBase. * Creates an instance of SysRolePermissionAuthServiceBase.
* *
...@@ -17,17 +25,23 @@ export default class SysRolePermissionAuthServiceBase extends AuthService { ...@@ -17,17 +25,23 @@ export default class SysRolePermissionAuthServiceBase extends AuthService {
*/ */
constructor(opts: any = {}) { constructor(opts: any = {}) {
super(opts); super(opts);
this.sysrolepermissionUIService = new SysRolePermissionUIService(opts);
} }
/** /**
* 根据当前数据获取实体操作标识 * 根据当前数据获取实体操作标识
* *
* @param {string} name 实体名称 * @param {*} data 传入数据
* @returns {Promise<any>} * @returns {any}
* @memberof SysRolePermissionAuthServiceBase * @memberof SysRolePermissionAuthServiceBase
*/ */
public async getOPPrivs(data:any):Promise<any>{ public getOPPrivs(data:any):any{
return null; 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
浏览文件 @ 4be48599
import AuthService from '../auth-service'; import AuthService from '../auth-service';
import SysRoleUIService from '@/uiservice/sys-role/sys-role-ui-service';
/** /**
* 系统角色权限服务对象基类 * 系统角色权限服务对象基类
...@@ -9,6 +10,13 @@ import AuthService from '../auth-service'; ...@@ -9,6 +10,13 @@ import AuthService from '../auth-service';
*/ */
export default class SysRoleAuthServiceBase extends AuthService { export default class SysRoleAuthServiceBase extends AuthService {
/**
* 所依赖UI服务
*
* @memberof SysRoleAuthServiceBase
*/
public sysroleUIService:any;
/** /**
* Creates an instance of SysRoleAuthServiceBase. * Creates an instance of SysRoleAuthServiceBase.
* *
...@@ -17,17 +25,23 @@ export default class SysRoleAuthServiceBase extends AuthService { ...@@ -17,17 +25,23 @@ export default class SysRoleAuthServiceBase extends AuthService {
*/ */
constructor(opts: any = {}) { constructor(opts: any = {}) {
super(opts); super(opts);
this.sysroleUIService = new SysRoleUIService(opts);
} }
/** /**
* 根据当前数据获取实体操作标识 * 根据当前数据获取实体操作标识
* *
* @param {string} name 实体名称 * @param {*} data 传入数据
* @returns {Promise<any>} * @returns {any}
* @memberof SysRoleAuthServiceBase * @memberof SysRoleAuthServiceBase
*/ */
public async getOPPrivs(data:any):Promise<any>{ public getOPPrivs(data:any):any{
return null; 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
浏览文件 @ 4be48599
import AuthService from '../auth-service'; 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'; ...@@ -9,6 +10,13 @@ import AuthService from '../auth-service';
*/ */
export default class SysUserRoleAuthServiceBase extends AuthService { export default class SysUserRoleAuthServiceBase extends AuthService {
/**
* 所依赖UI服务
*
* @memberof SysUserRoleAuthServiceBase
*/
public sysuserroleUIService:any;
/** /**
* Creates an instance of SysUserRoleAuthServiceBase. * Creates an instance of SysUserRoleAuthServiceBase.
* *
...@@ -17,17 +25,23 @@ export default class SysUserRoleAuthServiceBase extends AuthService { ...@@ -17,17 +25,23 @@ export default class SysUserRoleAuthServiceBase extends AuthService {
*/ */
constructor(opts: any = {}) { constructor(opts: any = {}) {
super(opts); super(opts);
this.sysuserroleUIService = new SysUserRoleUIService(opts);
} }
/** /**
* 根据当前数据获取实体操作标识 * 根据当前数据获取实体操作标识
* *
* @param {string} name 实体名称 * @param {*} data 传入数据
* @returns {Promise<any>} * @returns {any}
* @memberof SysUserRoleAuthServiceBase * @memberof SysUserRoleAuthServiceBase
*/ */
public async getOPPrivs(data:any):Promise<any>{ public getOPPrivs(data:any):any{
return null; 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
浏览文件 @ 4be48599
import AuthService from '../auth-service'; import AuthService from '../auth-service';
import SysUserUIService from '@/uiservice/sys-user/sys-user-ui-service';
/** /**
* 系统用户权限服务对象基类 * 系统用户权限服务对象基类
...@@ -9,6 +10,13 @@ import AuthService from '../auth-service'; ...@@ -9,6 +10,13 @@ import AuthService from '../auth-service';
*/ */
export default class SysUserAuthServiceBase extends AuthService { export default class SysUserAuthServiceBase extends AuthService {
/**
* 所依赖UI服务
*
* @memberof SysUserAuthServiceBase
*/
public sysuserUIService:any;
/** /**
* Creates an instance of SysUserAuthServiceBase. * Creates an instance of SysUserAuthServiceBase.
* *
...@@ -17,17 +25,23 @@ export default class SysUserAuthServiceBase extends AuthService { ...@@ -17,17 +25,23 @@ export default class SysUserAuthServiceBase extends AuthService {
*/ */
constructor(opts: any = {}) { constructor(opts: any = {}) {
super(opts); super(opts);
this.sysuserUIService = new SysUserUIService(opts);
} }
/** /**
* 根据当前数据获取实体操作标识 * 根据当前数据获取实体操作标识
* *
* @param {string} name 实体名称 * @param {*} data 传入数据
* @returns {Promise<any>} * @returns {any}
* @memberof SysUserAuthServiceBase * @memberof SysUserAuthServiceBase
*/ */
public async getOPPrivs(data:any):Promise<any>{ public getOPPrivs(data:any):any{
return null; 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
浏览文件 @ 4be48599
...@@ -313,5 +313,4 @@ export default class AppRichTextEditor extends Vue { ...@@ -313,5 +313,4 @@ export default class AppRichTextEditor extends Vue {
} }
</script> </script>
<style lang="less"> <style lang="less">
@import './app-rich-text-editor.less';
</style> </style>
\ No newline at end of file
app_web/src/components/app-transfer/app-transfer.vue
浏览文件 @ 4be48599
...@@ -128,7 +128,7 @@ export default class AppTransfer extends Vue { ...@@ -128,7 +128,7 @@ export default class AppTransfer extends Vue {
* @type{Array<string>} * @type{Array<string>}
* @memberof AppTransfer * @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 { ...@@ -160,6 +160,7 @@ export default class AppTransfer extends Vue {
*/ */
public created() { public created() {
this.dataHandle(); 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
浏览文件 @ 4be48599
...@@ -5,6 +5,9 @@ ...@@ -5,6 +5,9 @@
top: 0; top: 0;
right: 20px; right: 20px;
} }
.ivu-input-number{
width: 100%;
}
.ivu-input-number-input{ .ivu-input-number-input{
text-align: right; text-align: right;
} }
......
app_web/src/index.d.ts 0 → 100644
浏览文件 @ 4be48599
import { UIServiceRegister } from '@/uiservice/ui-service-register';
import { AuthServiceRegister } from '@/authservice/auth-service-register';
import { UtilServiceRegister } from '@/utilservice/util-service-register';
import { EntityServiceRegister } from '@/service/entity-service-register';
import { CounterServiceRegister } from '@/counter/counter-service-register';
declare global {
interface Window {
uiServiceRegister: UIServiceRegister,
authServiceRegister: AuthServiceRegister,
utilServiceRegister: UtilServiceRegister,
entityServiceRegister: EntityServiceRegister,
counterServiceRegister: CounterServiceRegister
}
}
\ No newline at end of file
app_web/src/locale/lang/en-US.ts
浏览文件 @ 4be48599
...@@ -16,13 +16,23 @@ export default { ...@@ -16,13 +16,23 @@ export default {
success: "Success", success: "Success",
ok: "OK", ok: "OK",
cancel: "Cancel", cancel: "Cancel",
save: "Save",
codeNotExist: 'Code list does not exist', codeNotExist: 'Code list does not exist',
reqException: "Request exception", reqException: "Request exception",
sysException: "System abnormality", sysException: "System abnormality",
warning: "Warning", 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:{ local:{
new: "New" new: "New",
add: "Add",
}, },
gridpage: { gridpage: {
choicecolumns: "Choice columns", choicecolumns: "Choice columns",
...@@ -30,6 +40,50 @@ export default { ...@@ -30,6 +40,50 @@ export default {
show: "Show", show: "Show",
records: "records", records: "records",
totle: "totle", 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: { tabpage: {
sureclosetip: { sureclosetip: {
...@@ -54,6 +108,8 @@ export default { ...@@ -54,6 +108,8 @@ export default {
list: "list", list: "list",
dateSelectModalTitle: "select the time you wanted", dateSelectModalTitle: "select the time you wanted",
gotoDate: "goto", gotoDate: "goto",
from: "From",
to: "To",
}, },
// 非实体视图 // 非实体视图
views: { views: {
...@@ -75,6 +131,74 @@ export default { ...@@ -75,6 +131,74 @@ export default {
menuitem2: "接入应用", menuitem2: "接入应用",
}, },
}, },
formpage:{
error: "Error",
desc1: "Operation failed, failed to find current form item",
desc2: "Can't continue",
notconfig: {
loadaction: "View form loadAction parameter is not configured",
loaddraftaction: "View form loaddraftAction parameter is not configured",
actionname: "View form actionName parameter is not configured",
removeaction: "View form removeAction parameter is not configured",
},
saveerror: "Error saving data",
savecontent: "The data is inconsistent. The background data may have been modified. Do you want to reload the data?",
valuecheckex: "Value rule check exception",
savesuccess: "Saved successfully!",
deletesuccess: "Successfully deleted!",
workflow: {
starterror: "Workflow started successfully",
startsuccess: "Workflow failed to start",
submiterror: "Workflow submission failed",
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",
},
searchFrom: {
notConfig: {
loadAction: "View search form loadAction parameter is not configured",
loaddraftAction: "View search form loaddraftAction parameter is not configured",
},
},
wizardPanel: {
back: "Back",
next: "Next",
complete: "Complete",
},
}, },
entities: { entities: {
sysauthlog: sysauthlog_en_US, sysauthlog: sysauthlog_en_US,
......
app_web/src/locale/lang/zh-CN.ts
浏览文件 @ 4be48599
...@@ -16,13 +16,23 @@ export default { ...@@ -16,13 +16,23 @@ export default {
success: "成功", success: "成功",
ok: "确认", ok: "确认",
cancel: "取消", cancel: "取消",
save: "保存",
codeNotExist: "代码表不存在", codeNotExist: "代码表不存在",
reqException: "请求异常", reqException: "请求异常",
sysException: "系统异常", sysException: "系统异常",
warning: "警告", warning: "警告",
wrong: "错误",
rulesException: "值规则校验异常",
saveSuccess: "保存成功",
saveFailed: "保存失败",
deleteSuccess: "删除成功！",
deleteError: "删除失败！",
delDataFail: "删除数据失败",
noData: "暂无数据",
}, },
local:{ local:{
new: "新建" new: "新建",
add: "增加",
}, },
gridpage: { gridpage: {
choicecolumns: "选择列", choicecolumns: "选择列",
...@@ -30,6 +40,50 @@ export default { ...@@ -30,6 +40,50 @@ export default {
show: "显示", show: "显示",
records: "条", records: "条",
totle: "共", 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: { tabpage: {
sureclosetip: { sureclosetip: {
...@@ -54,6 +108,8 @@ export default { ...@@ -54,6 +108,8 @@ export default {
list: "列", list: "列",
dateSelectModalTitle: "选择要跳转的时间", dateSelectModalTitle: "选择要跳转的时间",
gotoDate: "跳转", gotoDate: "跳转",
from: "从",
to: "至",
}, },
// 非实体视图 // 非实体视图
views: { views: {
...@@ -75,6 +131,73 @@ export default { ...@@ -75,6 +131,73 @@ export default {
menuitem2: "接入应用", menuitem2: "接入应用",
}, },
}, },
formpage:{
desc1: "操作失败,未能找到当前表单项",
desc2: "无法继续操作",
notconfig: {
loadaction: "视图表单loadAction参数未配置",
loaddraftaction: "视图表单loaddraftAction参数未配置",
actionname: "视图表单'+actionName+'参数未配置",
removeaction: "视图表单removeAction参数未配置",
},
saveerror: "保存数据发生错误",
savecontent: "数据不一致，可能后台数据已经被修改,是否要重新加载数据？",
valuecheckex: "值规则校验异常",
savesuccess: "保存成功！",
deletesuccess: "删除成功！",
workflow: {
starterror: "工作流启动失败",
startsuccess: "工作流启动成功",
submiterror: "工作流提交失败",
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: "年",
},
searchFrom: {
notConfig: {
loadAction: "视图搜索表单loadAction参数未配置",
loaddraftAction: "视图搜索表单loaddraftAction参数未配置",
},
},
wizardPanel: {
back: "上一步",
next: "下一步",
complete: "完成",
},
}, },
entities: { entities: {
sysauthlog: sysauthlog_zh_CN, sysauthlog: sysauthlog_zh_CN,
......
app_web/src/locale/lanres/entities/sys-app/sys-app_en_US.ts
浏览文件 @ 4be48599
...@@ -13,8 +13,8 @@ export default { ...@@ -13,8 +13,8 @@ export default {
}, },
views: { views: {
editview: { editview: {
caption: "应用", caption: "接入应用",
title: "应用编辑视图", title: "接入应用",
}, },
gridview: { gridview: {
caption: "接入应用", caption: "接入应用",
......
app_web/src/locale/lanres/entities/sys-app/sys-app_zh_CN.ts
浏览文件 @ 4be48599
...@@ -12,8 +12,8 @@ export default { ...@@ -12,8 +12,8 @@ export default {
}, },
views: { views: {
editview: { editview: {
caption: "应用", caption: "接入应用",
title: "应用编辑视图", title: "接入应用",
}, },
gridview: { gridview: {
caption: "接入应用", caption: "接入应用",
......
app_web/src/locale/lanres/entities/sys-role/sys-role_en_US.ts
浏览文件 @ 4be48599
...@@ -13,12 +13,12 @@ export default { ...@@ -13,12 +13,12 @@ export default {
title: "角色选择表格视图", title: "角色选择表格视图",
}, },
editview2: { editview2: {
caption: "系统角色", caption: "角色",
title: "角色编辑视图", title: "角色",
}, },
editview: { editview: {
caption: "系统角色", caption: "角色",
title: "角色编辑视图", title: "角色",
}, },
pickupview: { pickupview: {
caption: "系统角色", caption: "系统角色",
......
app_web/src/locale/lanres/entities/sys-role/sys-role_zh_CN.ts
浏览文件 @ 4be48599
...@@ -12,12 +12,12 @@ export default { ...@@ -12,12 +12,12 @@ export default {
title: "角色选择表格视图", title: "角色选择表格视图",
}, },
editview2: { editview2: {
caption: "系统角色", caption: "角色",
title: "角色编辑视图", title: "角色",
}, },
editview: { editview: {
caption: "系统角色", caption: "角色",
title: "角色编辑视图", title: "角色",
}, },
pickupview: { pickupview: {
caption: "系统角色", caption: "系统角色",
......
app_web/src/locale/lanres/entities/sys-user-role/sys-user-role_en_US.ts
浏览文件 @ 4be48599
...@@ -18,8 +18,8 @@ export default { ...@@ -18,8 +18,8 @@ export default {
title: "用户角色关系表数据重定向视图", title: "用户角色关系表数据重定向视图",
}, },
editview: { editview: {
caption: "用户角色关系", caption: "用户",
title: "用户角色关系表编辑视图", title: "用户",
}, },
pickupgridview: { pickupgridview: {
caption: "用户角色关系", caption: "用户角色关系",
...@@ -30,8 +30,8 @@ export default { ...@@ -30,8 +30,8 @@ export default {
title: "用户角色关系表数据多项选择视图", title: "用户角色关系表数据多项选择视图",
}, },
editview2: { editview2: {
caption: "用户角色关系", caption: "用户",
title: "用户角色关系表编辑视图", title: "用户",
}, },
pickupview: { pickupview: {
caption: "用户角色关系", caption: "用户角色关系",
......
app_web/src/locale/lanres/entities/sys-user-role/sys-user-role_zh_CN.ts
浏览文件 @ 4be48599
...@@ -17,8 +17,8 @@ export default { ...@@ -17,8 +17,8 @@ export default {
title: "用户角色关系表数据重定向视图", title: "用户角色关系表数据重定向视图",
}, },
editview: { editview: {
caption: "用户角色关系", caption: "用户",
title: "用户角色关系表编辑视图", title: "用户",
}, },
pickupgridview: { pickupgridview: {
caption: "用户角色关系", caption: "用户角色关系",
...@@ -29,8 +29,8 @@ export default { ...@@ -29,8 +29,8 @@ export default {
title: "用户角色关系表数据多项选择视图", title: "用户角色关系表数据多项选择视图",
}, },
editview2: { editview2: {
caption: "用户角色关系", caption: "用户",
title: "用户角色关系表编辑视图", title: "用户",
}, },
pickupview: { pickupview: {
caption: "用户角色关系", caption: "用户角色关系",
......
app_web/src/locale/lanres/entities/sys-user/sys-user_en_US.ts
浏览文件 @ 4be48599
...@@ -52,8 +52,8 @@ export default { ...@@ -52,8 +52,8 @@ export default {
title: "用户表选择表格视图", title: "用户表选择表格视图",
}, },
editview: { editview: {
caption: "系统用户", caption: "用户",
title: "用户表编辑视图", title: "用户",
}, },
gridview: { gridview: {
caption: "用户", caption: "用户",
......
app_web/src/locale/lanres/entities/sys-user/sys-user_zh_CN.ts
浏览文件 @ 4be48599
...@@ -51,8 +51,8 @@ export default { ...@@ -51,8 +51,8 @@ export default {
title: "用户表选择表格视图", title: "用户表选择表格视图",
}, },
editview: { editview: {
caption: "系统用户", caption: "用户",
title: "用户表编辑视图", title: "用户",
}, },
gridview: { gridview: {
caption: "用户", caption: "用户",
......
app_web/src/mock/viewconfig/viewconfig.ts
浏览文件 @ 4be48599
...@@ -32,24 +32,24 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => { ...@@ -32,24 +32,24 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewtag": "12f53853382743f095a6af867669d8c1" "viewtag": "12f53853382743f095a6af867669d8c1"
}, },
"sysappeditview": { "sysappeditview": {
"title": "应用编辑视图", "title": "接入应用",
"caption": "应用", "caption": "接入应用",
"viewtype": "DEEDITVIEW", "viewtype": "DEEDITVIEW",
"viewmodule": "uaa", "viewmodule": "uaa",
"viewname": "SysAppEditView", "viewname": "SysAppEditView",
"viewtag": "137b8f036994965b8926455611848134" "viewtag": "137b8f036994965b8926455611848134"
}, },
"sys_rolepickupgridview": { "sysrolepickupgridview": {
"title": "角色选择表格视图", "title": "角色选择表格视图",
"caption": "系统角色", "caption": "系统角色",
"viewtype": "DEPICKUPGRIDVIEW", "viewtype": "DEPICKUPGRIDVIEW",
"viewmodule": "uaa", "viewmodule": "uaa",
"viewname": "SYS_ROLEPickupGridView", "viewname": "SysRolePickupGridView",
"viewtag": "1a3413067ee48ab30691eab9f345f517" "viewtag": "1a3413067ee48ab30691eab9f345f517"
}, },
"sysuserroleeditview": { "sysuserroleeditview": {
"title": "用户角色关系表编辑视图", "title": "用户",
"caption": "用户角色关系", "caption": "用户",
"viewtype": "DEEDITVIEW", "viewtype": "DEEDITVIEW",
"viewmodule": "uaa", "viewmodule": "uaa",
"viewname": "SysUserRoleEditView", "viewname": "SysUserRoleEditView",
...@@ -79,12 +79,12 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => { ...@@ -79,12 +79,12 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "SYS_USER_ROLEPickupGridView", "viewname": "SYS_USER_ROLEPickupGridView",
"viewtag": "320dc0d5f5dc15c74cdfe3dbb820d2ac" "viewtag": "320dc0d5f5dc15c74cdfe3dbb820d2ac"
}, },
"sys_role_permissionmpickupview": { "sysrolepermissionmpickupview": {
"title": "角色权限关系表数据多项选择视图", "title": "角色权限关系表数据多项选择视图",
"caption": "角色权限关系", "caption": "角色权限关系",
"viewtype": "DEMPICKUPVIEW", "viewtype": "DEMPICKUPVIEW",
"viewmodule": "uaa", "viewmodule": "uaa",
"viewname": "SYS_ROLE_PERMISSIONMPickupView", "viewname": "SysRolePermissionMPickupView",
"viewtag": "3e133a839b837d9e47f80e161d66a861" "viewtag": "3e133a839b837d9e47f80e161d66a861"
}, },
"sys_permissiongridview": { "sys_permissiongridview": {
...@@ -95,20 +95,20 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => { ...@@ -95,20 +95,20 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "SYS_PERMISSIONGridView", "viewname": "SYS_PERMISSIONGridView",
"viewtag": "42f3fa04c9dc77f235207bcbe6ac3888" "viewtag": "42f3fa04c9dc77f235207bcbe6ac3888"
}, },
"sys_roleeditview2": { "sysroleeditview2": {
"title": "角色编辑视图", "title": "角色",
"caption": "系统角色", "caption": "角色",
"viewtype": "DEEDITVIEW2", "viewtype": "DEEDITVIEW2",
"viewmodule": "uaa", "viewmodule": "uaa",
"viewname": "SYS_ROLEEditView2", "viewname": "SysRoleEditView2",
"viewtag": "4470edcdb57a14007444c0d9867e571c" "viewtag": "4470edcdb57a14007444c0d9867e571c"
}, },
"sys_role_permissionredirectview": { "sysrolepermissionredirectview": {
"title": "角色权限关系表数据重定向视图", "title": "角色权限关系表数据重定向视图",
"caption": "角色权限关系", "caption": "角色权限关系",
"viewtype": "DEREDIRECTVIEW", "viewtype": "DEREDIRECTVIEW",
"viewmodule": "uaa", "viewmodule": "uaa",
"viewname": "SYS_ROLE_PERMISSIONRedirectView", "viewname": "SysRolePermissionRedirectView",
"viewtag": "47fb02384b5797f4b095e247619515f4" "viewtag": "47fb02384b5797f4b095e247619515f4"
}, },
"sysrolepermissiongridview": { "sysrolepermissiongridview": {
...@@ -127,20 +127,20 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => { ...@@ -127,20 +127,20 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "SYS_ROLE_PERMISSIONPickupGridView", "viewname": "SYS_ROLE_PERMISSIONPickupGridView",
"viewtag": "6baae51f242438b90446176f76405183" "viewtag": "6baae51f242438b90446176f76405183"
}, },
"sys_role_permissionpickupview": { "sysrolepermissionpickupview": {
"title": "角色权限关系表数据选择视图", "title": "角色权限关系表数据选择视图",
"caption": "角色权限关系", "caption": "角色权限关系",
"viewtype": "DEPICKUPVIEW", "viewtype": "DEPICKUPVIEW",
"viewmodule": "uaa", "viewmodule": "uaa",
"viewname": "SYS_ROLE_PERMISSIONPickupView", "viewname": "SysRolePermissionPickupView",
"viewtag": "6cd33d562ef19ad47dd26b312b9a020e" "viewtag": "6cd33d562ef19ad47dd26b312b9a020e"
}, },
"sys_roleeditview": { "sysroleeditview": {
"title": "角色编辑视图", "title": "角色",
"caption": "系统角色", "caption": "角色",
"viewtype": "DEEDITVIEW", "viewtype": "DEEDITVIEW",
"viewmodule": "uaa", "viewmodule": "uaa",
"viewname": "SYS_ROLEEditView", "viewname": "SysRoleEditView",
"viewtag": "6f5a41631520da5e33294a1225101e66" "viewtag": "6f5a41631520da5e33294a1225101e66"
}, },
"sys_userredirectview": { "sys_userredirectview": {
...@@ -207,12 +207,12 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => { ...@@ -207,12 +207,12 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "SYS_USERPickupGridView", "viewname": "SYS_USERPickupGridView",
"viewtag": "936880f60b6ef17d39d5248b5fe390b4" "viewtag": "936880f60b6ef17d39d5248b5fe390b4"
}, },
"sys_usereditview": { "sysusereditview": {
"title": "用户表编辑视图", "title": "用户",
"caption": "系统用户", "caption": "用户",
"viewtype": "DEEDITVIEW", "viewtype": "DEEDITVIEW",
"viewmodule": "uaa", "viewmodule": "uaa",
"viewname": "SYS_USEREditView", "viewname": "SysUserEditView",
"viewtag": "9a896aa77c214ed87ab9be4fd6c6bec5" "viewtag": "9a896aa77c214ed87ab9be4fd6c6bec5"
}, },
"sys_permissionpickupgridview": { "sys_permissionpickupgridview": {
...@@ -287,12 +287,12 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => { ...@@ -287,12 +287,12 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "SYS_USERPickupView", "viewname": "SYS_USERPickupView",
"viewtag": "d53cb0ce933245fae5f0623bac4fbf48" "viewtag": "d53cb0ce933245fae5f0623bac4fbf48"
}, },
"sys_role_permissioncustomview": { "sysrolepermissioncustomview": {
"title": "角色权限关系自定义视图", "title": "角色权限关系自定义视图",
"caption": "角色权限关系", "caption": "角色权限关系",
"viewtype": "DECUSTOMVIEW", "viewtype": "DECUSTOMVIEW",
"viewmodule": "uaa", "viewmodule": "uaa",
"viewname": "SYS_ROLE_PERMISSIONCustomView", "viewname": "SysRolePermissionCustomView",
"viewtag": "e791be173ed0f4bbe9cce942b6edde63" "viewtag": "e791be173ed0f4bbe9cce942b6edde63"
}, },
"sys_permissioneditview": { "sys_permissioneditview": {
...@@ -303,12 +303,12 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => { ...@@ -303,12 +303,12 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "SYS_PERMISSIONEditView", "viewname": "SYS_PERMISSIONEditView",
"viewtag": "eb6498ba353f58d0af17bbd39702ccf7" "viewtag": "eb6498ba353f58d0af17bbd39702ccf7"
}, },
"sys_user_roleeditview2": { "sysuserroleeditview2": {
"title": "用户角色关系表编辑视图", "title": "用户",
"caption": "用户角色关系", "caption": "用户",
"viewtype": "DEEDITVIEW2", "viewtype": "DEEDITVIEW2",
"viewmodule": "uaa", "viewmodule": "uaa",
"viewname": "SYS_USER_ROLEEditView2", "viewname": "SysUserRoleEditView2",
"viewtag": "ede089b4741590173bd21b9df99c1cf0" "viewtag": "ede089b4741590173bd21b9df99c1cf0"
}, },
"sys_user_rolepickupview": { "sys_user_rolepickupview": {
......
app_web/src/pages/uaa/index/index-base.vue
浏览文件 @ 4be48599
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<div class="index_view index"> <div class="index_view index">
<app-studioaction :viewTitle="$t(model.srfCaption)" viewName="index"></app-studioaction> <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="index"></app-studioaction>
<layout :class="themeClasses" :style="themeStyle"> <layout :class="themeClasses" :style="themeStyle">
<layout> <layout id="movebox">
<sider :width="collapseChange ? 64 : 200" hide-trigger v-model="collapseChange"> <sider class="index_sider" :width="collapseChange ? 64 : 200" hide-trigger v-model="collapseChange" id= "left_move">
<div class="sider-top"> <div class="sider-top">
<div class="page-logo"> <div class="page-logo">
<span class="menuicon" v-if="isEnableAppSwitch" @click="contextMenuDragVisiable=!contextMenuDragVisiable"><Icon type="md-menu" /></span> <span class="menuicon" v-if="isEnableAppSwitch" @click="contextMenuDragVisiable=!contextMenuDragVisiable"><Icon type="md-menu" /></span>
...@@ -29,7 +29,8 @@ ...@@ -29,7 +29,8 @@
</view_appmenu> </view_appmenu>
<context-menu-drag v-if="isEnableAppSwitch" :contextMenuDragVisiable="contextMenuDragVisiable"></context-menu-drag> <context-menu-drag v-if="isEnableAppSwitch" :contextMenuDragVisiable="contextMenuDragVisiable"></context-menu-drag>
</sider> </sider>
<layout> <div v-show="!collapseChange" id="move_axis"></div>
<layout id="right_move">
<header class="index_header"> <header class="index_header">
<div class="header-left" > <div class="header-left" >
<div class="page-logo"> <div class="page-logo">
...@@ -46,7 +47,7 @@ ...@@ -46,7 +47,7 @@
<app-theme style="width:45px;display: flex;justify-content: center;"></app-theme> <app-theme style="width:45px;display: flex;justify-content: center;"></app-theme>
</div> </div>
</header> </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> <tab-page-exp v-if="Object.is(navModel,'tab')"></tab-page-exp>
<app-keep-alive :routerList="getRouterList"> <app-keep-alive :routerList="getRouterList">
<router-view :key="getRouterViewKey"></router-view> <router-view :key="getRouterViewKey"></router-view>
...@@ -495,6 +496,7 @@ export default class IndexBase extends Vue { ...@@ -495,6 +496,7 @@ export default class IndexBase extends Vue {
this.viewState.next({ tag: 'appmenu', action: 'load', data: {} }); this.viewState.next({ tag: 'appmenu', action: 'load', data: {} });
this.$viewTool.setIndexParameters([{ pathName: 'index', parameterName: 'index' }]); this.$viewTool.setIndexParameters([{ pathName: 'index', parameterName: 'index' }]);
this.$viewTool.setIndexViewParam(this.context); this.$viewTool.setIndexViewParam(this.context);
this.mouse_move();
} }
...@@ -686,6 +688,41 @@ export default class IndexBase extends Vue { ...@@ -686,6 +688,41 @@ export default class IndexBase extends Vue {
return this.$route.fullPath; 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> </script>
......
app_web/src/pages/uaa/index/index.less
浏览文件 @ 4be48599
...@@ -104,6 +104,18 @@ ...@@ -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:滚动条样式 ***/ /*** BRGIN:滚动条样式 ***/
::-webkit-scrollbar { ::-webkit-scrollbar {
background: transparent; background: transparent;
......
app_web/src/pages/uaa/index/page-register.ts
浏览文件 @ 4be48599
...@@ -4,17 +4,17 @@ export const PageComponents = { ...@@ -4,17 +4,17 @@ export const PageComponents = {
Vue.component('sys-rolepickup-view', () => import('@pages/uaa/sys-rolepickup-view/sys-rolepickup-view.vue')); Vue.component('sys-rolepickup-view', () => import('@pages/uaa/sys-rolepickup-view/sys-rolepickup-view.vue'));
Vue.component('sys-app-edit-view', () => import('@pages/uaa/sys-app-edit-view/sys-app-edit-view.vue')); Vue.component('sys-app-edit-view', () => import('@pages/uaa/sys-app-edit-view/sys-app-edit-view.vue'));
Vue.component('sys-usermpickup-view', () => import('@pages/uaa/sys-usermpickup-view/sys-usermpickup-view.vue')); Vue.component('sys-usermpickup-view', () => import('@pages/uaa/sys-usermpickup-view/sys-usermpickup-view.vue'));
Vue.component('sys-role-permissioncustom-view', () => import('@pages/uaa/sys-role-permissioncustom-view/sys-role-permissioncustom-view.vue')); Vue.component('sys-role-permission-custom-view', () => import('@pages/uaa/sys-role-permission-custom-view/sys-role-permission-custom-view.vue'));
Vue.component('sys-userpickup-grid-view', () => import('@pages/uaa/sys-userpickup-grid-view/sys-userpickup-grid-view.vue')); Vue.component('sys-userpickup-grid-view', () => import('@pages/uaa/sys-userpickup-grid-view/sys-userpickup-grid-view.vue'));
Vue.component('sys-roleedit-view', () => import('@pages/uaa/sys-roleedit-view/sys-roleedit-view.vue')); Vue.component('sys-role-edit-view', () => import('@pages/uaa/sys-role-edit-view/sys-role-edit-view.vue'));
Vue.component('sys-user-role-edit-view', () => import('@pages/uaa/sys-user-role-edit-view/sys-user-role-edit-view.vue')); Vue.component('sys-user-role-edit-view', () => import('@pages/uaa/sys-user-role-edit-view/sys-user-role-edit-view.vue'));
Vue.component('sys-rolempickup-view', () => import('@pages/uaa/sys-rolempickup-view/sys-rolempickup-view.vue')); Vue.component('sys-rolempickup-view', () => import('@pages/uaa/sys-rolempickup-view/sys-rolempickup-view.vue'));
Vue.component('sys-auth-log-grid-view', () => import('@pages/uaa/sys-auth-log-grid-view/sys-auth-log-grid-view.vue')); Vue.component('sys-auth-log-grid-view', () => import('@pages/uaa/sys-auth-log-grid-view/sys-auth-log-grid-view.vue'));
Vue.component('sys-userpickup-view', () => import('@pages/uaa/sys-userpickup-view/sys-userpickup-view.vue')); Vue.component('sys-userpickup-view', () => import('@pages/uaa/sys-userpickup-view/sys-userpickup-view.vue'));
Vue.component('sys-role-grid-view', () => import('@pages/uaa/sys-role-grid-view/sys-role-grid-view.vue')); Vue.component('sys-role-grid-view', () => import('@pages/uaa/sys-role-grid-view/sys-role-grid-view.vue'));
Vue.component('sys-useredit-view', () => import('@pages/uaa/sys-useredit-view/sys-useredit-view.vue')); Vue.component('sys-user-edit-view', () => import('@pages/uaa/sys-user-edit-view/sys-user-edit-view.vue'));
Vue.component('sys-user-rolegrid-view', () => import('@pages/uaa/sys-user-rolegrid-view/sys-user-rolegrid-view.vue')); Vue.component('sys-user-rolegrid-view', () => import('@pages/uaa/sys-user-rolegrid-view/sys-user-rolegrid-view.vue'));
Vue.component('sys-rolepickup-grid-view', () => import('@pages/uaa/sys-rolepickup-grid-view/sys-rolepickup-grid-view.vue')); Vue.component('sys-role-pickup-grid-view', () => import('@pages/uaa/sys-role-pickup-grid-view/sys-role-pickup-grid-view.vue'));
Vue.component('sys-user-grid-view', () => import('@pages/uaa/sys-user-grid-view/sys-user-grid-view.vue')); Vue.component('sys-user-grid-view', () => import('@pages/uaa/sys-user-grid-view/sys-user-grid-view.vue'));
} }
}; };
\ No newline at end of file
app_web/src/pages/uaa/index/router.ts
浏览文件 @ 4be48599
...@@ -104,7 +104,7 @@ const router = new Router({ ...@@ -104,7 +104,7 @@ const router = new Router({
], ],
requireAuth: true, requireAuth: true,
}, },
component: () => import('@pages/uaa/sys-role-permissioncustom-view/sys-role-permissioncustom-view.vue'), component: () => import('@pages/uaa/sys-role-permission-custom-view/sys-role-permission-custom-view.vue'),
}, },
{ {
path: 'syspermissions/:syspermission?/sysrolepermissions/:sysrolepermission?/customview/:customview?', path: 'syspermissions/:syspermission?/sysrolepermissions/:sysrolepermission?/customview/:customview?',
...@@ -119,7 +119,7 @@ const router = new Router({ ...@@ -119,7 +119,7 @@ const router = new Router({
], ],
requireAuth: true, requireAuth: true,
}, },
component: () => import('@pages/uaa/sys-role-permissioncustom-view/sys-role-permissioncustom-view.vue'), component: () => import('@pages/uaa/sys-role-permission-custom-view/sys-role-permission-custom-view.vue'),
}, },
{ {
path: 'sysrolepermissions/:sysrolepermission?/customview/:customview?', path: 'sysrolepermissions/:sysrolepermission?/customview/:customview?',
...@@ -133,7 +133,7 @@ const router = new Router({ ...@@ -133,7 +133,7 @@ const router = new Router({
], ],
requireAuth: true, requireAuth: true,
}, },
component: () => import('@pages/uaa/sys-role-permissioncustom-view/sys-role-permissioncustom-view.vue'), component: () => import('@pages/uaa/sys-role-permission-custom-view/sys-role-permission-custom-view.vue'),
}, },
{ {
path: 'sysusers/:sysuser?/pickupgridview/:pickupgridview?', path: 'sysusers/:sysuser?/pickupgridview/:pickupgridview?',
...@@ -161,7 +161,7 @@ const router = new Router({ ...@@ -161,7 +161,7 @@ const router = new Router({
], ],
requireAuth: true, requireAuth: true,
}, },
component: () => import('@pages/uaa/sys-roleedit-view/sys-roleedit-view.vue'), component: () => import('@pages/uaa/sys-role-edit-view/sys-role-edit-view.vue'),
}, },
{ {
path: 'sysusers/:sysuser?/sysuserroles/:sysuserrole?/editview/:editview?', path: 'sysusers/:sysuser?/sysuserroles/:sysuserrole?/editview/:editview?',
...@@ -275,7 +275,7 @@ const router = new Router({ ...@@ -275,7 +275,7 @@ const router = new Router({
], ],
requireAuth: true, requireAuth: true,
}, },
component: () => import('@pages/uaa/sys-useredit-view/sys-useredit-view.vue'), component: () => import('@pages/uaa/sys-user-edit-view/sys-user-edit-view.vue'),
}, },
{ {
path: 'sysusers/:sysuser?/sysuserroles/:sysuserrole?/gridview/:gridview?', path: 'sysusers/:sysuser?/sysuserroles/:sysuserrole?/gridview/:gridview?',
...@@ -333,7 +333,7 @@ const router = new Router({ ...@@ -333,7 +333,7 @@ const router = new Router({
], ],
requireAuth: true, requireAuth: true,
}, },
component: () => import('@pages/uaa/sys-rolepickup-grid-view/sys-rolepickup-grid-view.vue'), component: () => import('@pages/uaa/sys-role-pickup-grid-view/sys-role-pickup-grid-view.vue'),
}, },
{ {
path: 'sysusers/:sysuser?/gridview/:gridview?', path: 'sysusers/:sysuser?/gridview/:gridview?',
...@@ -362,16 +362,16 @@ const router = new Router({ ...@@ -362,16 +362,16 @@ const router = new Router({
component: () => import('@pages/uaa/sys-user-roleredirect-view/sys-user-roleredirect-view.vue'), component: () => import('@pages/uaa/sys-user-roleredirect-view/sys-user-roleredirect-view.vue'),
}, },
{ {
path: 'sys_role_permissionredirectview/:sys_role_permissionredirectview?', path: 'sysrolepermissionredirectview/:sysrolepermissionredirectview?',
meta: { meta: {
caption: 'entities.sysrolepermission.views.redirectview.title', caption: 'entities.sysrolepermission.views.redirectview.title',
info:'', info:'',
parameters: [ parameters: [
{ pathName: 'sys_role_permissionredirectview', parameterName: 'sys_role_permissionredirectview' }, { pathName: 'sysrolepermissionredirectview', parameterName: 'sysrolepermissionredirectview' },
], ],
requireAuth: true, requireAuth: true,
}, },
component: () => import('@pages/uaa/sys-role-permissionredirect-view/sys-role-permissionredirect-view.vue'), component: () => import('@pages/uaa/sys-role-permission-redirect-view/sys-role-permission-redirect-view.vue'),
}, },
{ {
path: 'sys_userredirectview/:sys_userredirectview?', path: 'sys_userredirectview/:sys_userredirectview?',
...@@ -449,7 +449,7 @@ const router = new Router({ ...@@ -449,7 +449,7 @@ const router = new Router({
], ],
requireAuth: true, requireAuth: true,
}, },
component: () => import('@pages/uaa/sys-rolepickup-grid-view/sys-rolepickup-grid-view.vue'), component: () => import('@pages/uaa/sys-role-pickup-grid-view/sys-role-pickup-grid-view.vue'),
}, },
{ {
path: '/sysusers/:sysuser?/sysuserroles/:sysuserrole?/editview/:editview?', path: '/sysusers/:sysuser?/sysuserroles/:sysuserrole?/editview/:editview?',
...@@ -516,7 +516,7 @@ const router = new Router({ ...@@ -516,7 +516,7 @@ const router = new Router({
], ],
requireAuth: true, requireAuth: true,
}, },
component: () => import('@pages/uaa/sys-roleedit-view/sys-roleedit-view.vue'), component: () => import('@pages/uaa/sys-role-edit-view/sys-role-edit-view.vue'),
}, },
{ {
path: '/sysroles/:sysrole?/pickupview/:pickupview?', path: '/sysroles/:sysrole?/pickupview/:pickupview?',
...@@ -555,7 +555,7 @@ const router = new Router({ ...@@ -555,7 +555,7 @@ const router = new Router({
], ],
requireAuth: true, requireAuth: true,
}, },
component: () => import('@pages/uaa/sys-useredit-view/sys-useredit-view.vue'), component: () => import('@pages/uaa/sys-user-edit-view/sys-user-edit-view.vue'),
}, },
{ {
path: '/sysroles/:sysrole?/gridview/:gridview?', path: '/sysroles/:sysrole?/gridview/:gridview?',
...@@ -634,7 +634,7 @@ const router = new Router({ ...@@ -634,7 +634,7 @@ const router = new Router({
], ],
requireAuth: true, requireAuth: true,
}, },
component: () => import('@pages/uaa/sys-role-permissioncustom-view/sys-role-permissioncustom-view.vue'), component: () => import('@pages/uaa/sys-role-permission-custom-view/sys-role-permission-custom-view.vue'),
}, },
{ {
path: '/syspermissions/:syspermission?/sysrolepermissions/:sysrolepermission?/customview/:customview?', path: '/syspermissions/:syspermission?/sysrolepermissions/:sysrolepermission?/customview/:customview?',
...@@ -648,7 +648,7 @@ const router = new Router({ ...@@ -648,7 +648,7 @@ const router = new Router({
], ],
requireAuth: true, requireAuth: true,
}, },
component: () => import('@pages/uaa/sys-role-permissioncustom-view/sys-role-permissioncustom-view.vue'), component: () => import('@pages/uaa/sys-role-permission-custom-view/sys-role-permission-custom-view.vue'),
}, },
{ {
path: '/sysrolepermissions/:sysrolepermission?/customview/:customview?', path: '/sysrolepermissions/:sysrolepermission?/customview/:customview?',
...@@ -661,7 +661,7 @@ const router = new Router({ ...@@ -661,7 +661,7 @@ const router = new Router({
], ],
requireAuth: true, requireAuth: true,
}, },
component: () => import('@pages/uaa/sys-role-permissioncustom-view/sys-role-permissioncustom-view.vue'), component: () => import('@pages/uaa/sys-role-permission-custom-view/sys-role-permission-custom-view.vue'),
}, },
{ {
path: '/sysusers/:sysuser?/sysuserroles/:sysuserrole?/gridview/:gridview?', path: '/sysusers/:sysuser?/sysuserroles/:sysuserrole?/gridview/:gridview?',
......
app_web/src/pages/uaa/sys-app-edit-view/sys-app-edit-view-base.vue
浏览文件 @ 4be48599
...@@ -266,15 +266,15 @@ export default class SysAppEditViewBase extends Vue { ...@@ -266,15 +266,15 @@ export default class SysAppEditViewBase extends Vue {
* @memberof SysAppEditView * @memberof SysAppEditView
*/ */
public toolBarModels: any = { 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: { } }, 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: { } }, 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
浏览文件 @ 4be48599
...@@ -325,27 +325,27 @@ export default class SysAppGridViewBase extends Vue { ...@@ -325,27 +325,27 @@ export default class SysAppGridViewBase extends Vue {
* @memberof SysAppGridView * @memberof SysAppGridView
*/ */
public toolBarModels: any = { 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: { } }, 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: { } }, 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: { } }, 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: { } }, 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
浏览文件 @ 4be48599
...@@ -266,15 +266,15 @@ export default class SYS_PERMISSIONEditViewBase extends Vue { ...@@ -266,15 +266,15 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
* @memberof SYS_PERMISSIONEditView * @memberof SYS_PERMISSIONEditView
*/ */
public toolBarModels: any = { 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: { } }, 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: { } }, 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
浏览文件 @ 4be48599
...@@ -278,15 +278,15 @@ export default class SYS_PERMISSIONEditView2Base extends Vue { ...@@ -278,15 +278,15 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
* @memberof SYS_PERMISSIONEditView2 * @memberof SYS_PERMISSIONEditView2
*/ */
public toolBarModels: any = { 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: { } }, 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: { } }, 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
浏览文件 @ 4be48599
...@@ -304,20 +304,20 @@ export default class SYS_PERMISSIONGridViewBase extends Vue { ...@@ -304,20 +304,20 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
* @memberof SYS_PERMISSIONGridView * @memberof SYS_PERMISSIONGridView
*/ */
public toolBarModels: any = { 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: { } }, 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: { } }, 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: { } }, 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-edit-view/sys-role-edit-view.less 0 → 100644
浏览文件 @ 4be48599
.view-card {
>.ivu-card-extra {
top: 5px;
right: 0px;
}
}
.sys-role-edit-view{
position: relative;
}
.toolbar-container {
button {
margin: 6px 0px 4px 4px;
.caption {
margin-left: 4px;
}
}
.seperator {
color: #dcdee2;
margin: 0 0px 0 4px;
}
}
// this is less
app_web/src/pages/uaa/sys-role-edit-view/sys-role-edit-view.vue 0 → 100644
浏览文件 @ 4be48599
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import SysRoleEditViewBase from './sys-role-edit-view-base.vue';
import view_form from '@widgets/sys-role/main-form/main-form.vue';
@Component({
components: {
view_form,
},
beforeRouteEnter: (to: any, from: any, next: any) => {
next((vm: any) => {
if(!Object.is(vm.navModel,"route")){
vm.initNavDataWithTab(vm.viewCacheData);
}
vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
});
},
})
export default class SysRoleEditView extends SysRoleEditViewBase {
}
</script>
\ No newline at end of file
app_web/src/pages/uaa/sys-role-edit-view2/sys-role-edit-view2.less 0 → 100644
浏览文件 @ 4be48599
.view-card {
>.ivu-card-extra {
top: 5px;
right: 0px;
}
}
.edit-view2 {
flex-direction: row !important;
.view-form {
overflow: auto;
}
}
.sys-role-edit-view2{
position: relative;
}
.toolbar-container {
button {
margin: 6px 0px 4px 4px;
.caption {
margin-left: 4px;
}
}
.seperator {
color: #dcdee2;
margin: 0 0px 0 4px;
}
}
// this is less
app_web/src/pages/uaa/sys-role-edit-view2/sys-role-edit-view2.vue 0 → 100644
浏览文件 @ 4be48599
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import SysRoleEditView2Base from './sys-role-edit-view2-base.vue';
import view_form from '@widgets/sys-role/main-form/main-form.vue';
import view_drbar from '@widgets/sys-role/default-drbar/default-drbar.vue';
@Component({
components: {
view_form,
view_drbar,
},
beforeRouteEnter: (to: any, from: any, next: any) => {
next((vm: any) => {
if(!Object.is(vm.navModel,"route")){
vm.initNavDataWithTab(vm.viewCacheData);
}
vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
});
},
})
export default class SysRoleEditView2 extends SysRoleEditView2Base {
}
</script>
\ No newline at end of file
app_web/src/pages/uaa/sys-role-grid-view/sys-role-grid-view-base.vue
浏览文件 @ 4be48599
...@@ -304,20 +304,20 @@ export default class SysRoleGridViewBase extends Vue { ...@@ -304,20 +304,20 @@ export default class SysRoleGridViewBase extends Vue {
* @memberof SysRoleGridView * @memberof SysRoleGridView
*/ */
public toolBarModels: any = { 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: { } }, 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: { } }, 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: { } }, 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-custom-view/sys-role-permission-custom-view.vue 0 → 100644
浏览文件 @ 4be48599
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import SysRolePermissionCustomViewBase from './sys-role-permission-custom-view-base.vue';
@Component({
components: {
},
beforeRouteEnter: (to: any, from: any, next: any) => {
next((vm: any) => {
if(!Object.is(vm.navModel,"route")){
vm.initNavDataWithTab(vm.viewCacheData);
}
vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
});
},
})
export default class SysRolePermissionCustomView extends SysRolePermissionCustomViewBase {
}
</script>
\ No newline at end of file
app_web/src/pages/uaa/sys-role-permission-grid-view/sys-role-permission-grid-view-base.vue
浏览文件 @ 4be48599
...@@ -301,20 +301,20 @@ export default class SysRolePermissionGridViewBase extends Vue { ...@@ -301,20 +301,20 @@ export default class SysRolePermissionGridViewBase extends Vue {
* @memberof SysRolePermissionGridView * @memberof SysRolePermissionGridView
*/ */
public toolBarModels: any = { 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: { } }, 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: { } }, 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: { } }, 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-mpickup-view/sys-role-permission-mpickup-view.less 0 → 100644
浏览文件 @ 4be48599
.sys-role-permission-mpickup-view{
position: relative;
}
.pickup-view {
>.translate-contant {
flex-grow: 1;
display: flex;
justify-content: flex-end;
height: calc(100% - 64px);
.translate-buttons {
width: 80px;
display: flex;
align-items: center;
text-align: center;
button {
margin-bottom: 5px;
}
}
.left, .right {
width: 300px;
}
.right {
border: 1px solid #e9e9e9;
.mpicker-select {
font-family: helvetica, sans-serif;
font-size: 16px;
text-align: justify;
word-spacing: -3.8pt;
line-height: 1.6;
font-weight: bold;
word-spacing: 10px;
height: 100%;
overflow: auto;
}
.mpicker-select > div {
padding: 3px 10px;
font-size: 14px;
color: rgba(0, 0, 0, 0.85);
font-weight: initial;
cursor: pointer;
min-height: 28px;
border: 1px solid #e9e9e9;
margin: 4px 4px;
transition: all .3s;
}
.mpicker-select > div:hover {
background: #ecf6fd;
}
.mpicker-select > .select{
color: #108ee9;
background: #ecf6fd;
}
}
.center{
width: calc(100% - 380px);
.pickupviewpanel {
width: 100%;
height: 100%;
}
}
}
>.footer {
height: 64px;
}
}
\ No newline at end of file
app_web/src/pages/uaa/sys-role-permission-mpickup-view/sys-role-permission-mpickup-view.vue 0 → 100644
浏览文件 @ 4be48599
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import SysRolePermissionMPickupViewBase from './sys-role-permission-mpickup-view-base.vue';
import view_pickupviewpanel from '@widgets/sys-role-permission/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel.vue';
@Component({
components: {
view_pickupviewpanel,
},
beforeRouteEnter: (to: any, from: any, next: any) => {
next((vm: any) => {
if(!Object.is(vm.navModel,"route")){
vm.initNavDataWithTab(vm.viewCacheData);
}
vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
});
},
})
export default class SysRolePermissionMPickupView extends SysRolePermissionMPickupViewBase {
}
</script>
\ No newline at end of file
app_web/src/pages/uaa/sys-role-permission-pickup-view/sys-role-permission-pickup-view.less 0 → 100644
浏览文件 @ 4be48599
.sys-role-permission-pickup-view{
position: relative;
}
.pickup-view {
>.pickupviewpanel {
flex-grow: 1;
display: flex;
justify-content: flex-end;
height: calc(100% - 64px);
}
>.footer {
height: 64px;
}
}
\ No newline at end of file
app_web/src/pages/uaa/sys-role-permission-pickup-view/sys-role-permission-pickup-view.vue 0 → 100644
浏览文件 @ 4be48599
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import SysRolePermissionPickupViewBase from './sys-role-permission-pickup-view-base.vue';
import view_pickupviewpanel from '@widgets/sys-role-permission/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel.vue';
@Component({
components: {
view_pickupviewpanel,
},
beforeRouteEnter: (to: any, from: any, next: any) => {
next((vm: any) => {
if(!Object.is(vm.navModel,"route")){
vm.initNavDataWithTab(vm.viewCacheData);
}
vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
});
},
})
export default class SysRolePermissionPickupView extends SysRolePermissionPickupViewBase {
}
</script>
\ No newline at end of file
app_web/src/pages/uaa/sys-role-permission-redirect-view/sys-role-permission-redirect-view.less 0 → 100644
浏览文件 @ 4be48599
.sys-role-permission-redirect-view{
position: relative;
}
.sys-role-permission-redirect-view{
display: block;
}
\ No newline at end of file
app_web/src/pages/uaa/sys-role-permission-redirect-view/sys-role-permission-redirect-view.vue 0 → 100644
浏览文件 @ 4be48599
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import SysRolePermissionRedirectViewBase from './sys-role-permission-redirect-view-base.vue';
@Component({
components: {
},
beforeRouteEnter: (to: any, from: any, next: any) => {
next((vm: any) => {
if(!Object.is(vm.navModel,"route")){
vm.initNavDataWithTab(vm.viewCacheData);
}
vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
});
},
})
export default class SysRolePermissionRedirectView extends SysRolePermissionRedirectViewBase {
}
</script>
\ No newline at end of file
app_web/src/pages/uaa/sys-role-permissionedit-view/sys-role-permissionedit-view-base.vue
浏览文件 @ 4be48599
...@@ -266,15 +266,15 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue { ...@@ -266,15 +266,15 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
* @memberof SYS_ROLE_PERMISSIONEditView * @memberof SYS_ROLE_PERMISSIONEditView
*/ */
public toolBarModels: any = { 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: { } }, 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: { } }, 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
浏览文件 @ 4be48599
...@@ -278,15 +278,15 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue { ...@@ -278,15 +278,15 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
* @memberof SYS_ROLE_PERMISSIONEditView2 * @memberof SYS_ROLE_PERMISSIONEditView2
*/ */
public toolBarModels: any = { 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: { } }, 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: { } }, 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-pickup-grid-view/sys-role-pickup-grid-view.less 0 → 100644
浏览文件 @ 4be48599
.sys-role-pickup-grid-view{
position: relative;
}
.sys-role-pickup-grid-view{
display: block;
}
\ No newline at end of file
app_web/src/pages/uaa/sys-role-pickup-grid-view/sys-role-pickup-grid-view.vue 0 → 100644
浏览文件 @ 4be48599
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import SysRolePickupGridViewBase from './sys-role-pickup-grid-view-base.vue';
import view_grid from '@widgets/sys-role/main-grid/main-grid.vue';
import view_searchform from '@widgets/sys-role/default-searchform/default-searchform.vue';
@Component({
components: {
view_grid,
view_searchform,
},
beforeRouteEnter: (to: any, from: any, next: any) => {
next((vm: any) => {
if(!Object.is(vm.navModel,"route")){
vm.initNavDataWithTab(vm.viewCacheData);
}
vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
});
},
})
export default class SysRolePickupGridView extends SysRolePickupGridViewBase {
}
</script>
\ No newline at end of file
app_web/src/pages/uaa/sys-roleedit-view/sys-roleedit-view-base.vue
浏览文件 @ 4be48599
...@@ -266,15 +266,15 @@ export default class SYS_ROLEEditViewBase extends Vue { ...@@ -266,15 +266,15 @@ export default class SYS_ROLEEditViewBase extends Vue {
* @memberof SYS_ROLEEditView * @memberof SYS_ROLEEditView
*/ */
public toolBarModels: any = { 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: { } }, 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: { } }, 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
浏览文件 @ 4be48599
...@@ -278,15 +278,15 @@ export default class SYS_ROLEEditView2Base extends Vue { ...@@ -278,15 +278,15 @@ export default class SYS_ROLEEditView2Base extends Vue {
* @memberof SYS_ROLEEditView2 * @memberof SYS_ROLEEditView2
*/ */
public toolBarModels: any = { 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: { } }, 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: { } }, 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-edit-view/sys-user-edit-view.less 0 → 100644
浏览文件 @ 4be48599
.view-card {
>.ivu-card-extra {
top: 5px;
right: 0px;
}
}
.sys-user-edit-view{
position: relative;
}
.toolbar-container {
button {
margin: 6px 0px 4px 4px;
.caption {
margin-left: 4px;
}
}
.seperator {
color: #dcdee2;
margin: 0 0px 0 4px;
}
}
// this is less
app_web/src/pages/uaa/sys-user-edit-view/sys-user-edit-view.vue 0 → 100644
浏览文件 @ 4be48599
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import SysUserEditViewBase from './sys-user-edit-view-base.vue';
import view_form from '@widgets/sys-user/main-form/main-form.vue';
@Component({
components: {
view_form,
},
beforeRouteEnter: (to: any, from: any, next: any) => {
next((vm: any) => {
if(!Object.is(vm.navModel,"route")){
vm.initNavDataWithTab(vm.viewCacheData);
}
vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
});
},
})
export default class SysUserEditView extends SysUserEditViewBase {
}
</script>
\ No newline at end of file
app_web/src/pages/uaa/sys-user-grid-view/sys-user-grid-view-base.vue
浏览文件 @ 4be48599
...@@ -304,20 +304,20 @@ export default class SysUserGridViewBase extends Vue { ...@@ -304,20 +304,20 @@ export default class SysUserGridViewBase extends Vue {
* @memberof SysUserGridView * @memberof SysUserGridView
*/ */
public toolBarModels: any = { 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: { } }, 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: { } }, 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: { } }, 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
浏览文件 @ 4be48599
...@@ -266,15 +266,15 @@ export default class SysUserRoleEditViewBase extends Vue { ...@@ -266,15 +266,15 @@ export default class SysUserRoleEditViewBase extends Vue {
* @memberof SysUserRoleEditView * @memberof SysUserRoleEditView
*/ */
public toolBarModels: any = { 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: { } }, 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: { } }, 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-role-edit-view2/sys-user-role-edit-view2.less 0 → 100644
浏览文件 @ 4be48599
.view-card {
>.ivu-card-extra {
top: 5px;
right: 0px;
}
}
.edit-view2 {
flex-direction: row !important;
.view-form {
overflow: auto;
}
}
.sys-user-role-edit-view2{
position: relative;
}
.toolbar-container {
button {
margin: 6px 0px 4px 4px;
.caption {
margin-left: 4px;
}
}
.seperator {
color: #dcdee2;
margin: 0 0px 0 4px;
}
}
// this is less
app_web/src/pages/uaa/sys-user-role-edit-view2/sys-user-role-edit-view2.vue 0 → 100644
浏览文件 @ 4be48599
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import SysUserRoleEditView2Base from './sys-user-role-edit-view2-base.vue';
import view_form from '@widgets/sys-user-role/main-form/main-form.vue';
import view_drbar from '@widgets/sys-user-role/default-drbar/default-drbar.vue';
@Component({
components: {
view_form,
view_drbar,
},
beforeRouteEnter: (to: any, from: any, next: any) => {
next((vm: any) => {
if(!Object.is(vm.navModel,"route")){
vm.initNavDataWithTab(vm.viewCacheData);
}
vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
});
},
})
export default class SysUserRoleEditView2 extends SysUserRoleEditView2Base {
}
</script>
\ No newline at end of file
app_web/src/pages/uaa/sys-user-roleedit-view2/sys-user-roleedit-view2-base.vue
浏览文件 @ 4be48599
...@@ -278,15 +278,15 @@ export default class SYS_USER_ROLEEditView2Base extends Vue { ...@@ -278,15 +278,15 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
* @memberof SYS_USER_ROLEEditView2 * @memberof SYS_USER_ROLEEditView2
*/ */
public toolBarModels: any = { 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: { } }, 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: { } }, 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
浏览文件 @ 4be48599
...@@ -301,20 +301,20 @@ export default class SYS_USER_ROLEGridViewBase extends Vue { ...@@ -301,20 +301,20 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
* @memberof SYS_USER_ROLEGridView * @memberof SYS_USER_ROLEGridView
*/ */
public toolBarModels: any = { 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: { } }, 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: { } }, 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: { } }, 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
浏览文件 @ 4be48599
...@@ -266,15 +266,15 @@ export default class SYS_USEREditViewBase extends Vue { ...@@ -266,15 +266,15 @@ export default class SYS_USEREditViewBase extends Vue {
* @memberof SYS_USEREditView * @memberof SYS_USEREditView
*/ */
public toolBarModels: any = { 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: { } }, 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: { } }, 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
浏览文件 @ 4be48599
...@@ -278,15 +278,15 @@ export default class SYS_USEREditView2Base extends Vue { ...@@ -278,15 +278,15 @@ export default class SYS_USEREditView2Base extends Vue {
* @memberof SYS_USEREditView2 * @memberof SYS_USEREditView2
*/ */
public toolBarModels: any = { 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: { } }, 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: { } }, 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/store/modules/view-action/state.ts
浏览文件 @ 4be48599
...@@ -47,7 +47,7 @@ export const viewstate: any = { ...@@ -47,7 +47,7 @@ export const viewstate: any = {
{ {
viewtag: '1a3413067ee48ab30691eab9f345f517', viewtag: '1a3413067ee48ab30691eab9f345f517',
viewmodule: 'uaa', viewmodule: 'uaa',
viewname: 'SYS_ROLEPickupGridView', viewname: 'SysRolePickupGridView',
viewaction: '', viewaction: '',
viewdatachange: false, viewdatachange: false,
refviews: [ refviews: [
...@@ -96,7 +96,7 @@ export const viewstate: any = { ...@@ -96,7 +96,7 @@ export const viewstate: any = {
{ {
viewtag: '3e133a839b837d9e47f80e161d66a861', viewtag: '3e133a839b837d9e47f80e161d66a861',
viewmodule: 'uaa', viewmodule: 'uaa',
viewname: 'SYS_ROLE_PERMISSIONMPickupView', viewname: 'SysRolePermissionMPickupView',
viewaction: '', viewaction: '',
viewdatachange: false, viewdatachange: false,
refviews: [ refviews: [
...@@ -116,7 +116,7 @@ export const viewstate: any = { ...@@ -116,7 +116,7 @@ export const viewstate: any = {
{ {
viewtag: '4470edcdb57a14007444c0d9867e571c', viewtag: '4470edcdb57a14007444c0d9867e571c',
viewmodule: 'uaa', viewmodule: 'uaa',
viewname: 'SYS_ROLEEditView2', viewname: 'SysRoleEditView2',
viewaction: '', viewaction: '',
viewdatachange: false, viewdatachange: false,
refviews: [ refviews: [
...@@ -127,7 +127,7 @@ export const viewstate: any = { ...@@ -127,7 +127,7 @@ export const viewstate: any = {
{ {
viewtag: '47fb02384b5797f4b095e247619515f4', viewtag: '47fb02384b5797f4b095e247619515f4',
viewmodule: 'uaa', viewmodule: 'uaa',
viewname: 'SYS_ROLE_PERMISSIONRedirectView', viewname: 'SysRolePermissionRedirectView',
viewaction: '', viewaction: '',
viewdatachange: false, viewdatachange: false,
refviews: [ refviews: [
...@@ -158,7 +158,7 @@ export const viewstate: any = { ...@@ -158,7 +158,7 @@ export const viewstate: any = {
{ {
viewtag: '6cd33d562ef19ad47dd26b312b9a020e', viewtag: '6cd33d562ef19ad47dd26b312b9a020e',
viewmodule: 'uaa', viewmodule: 'uaa',
viewname: 'SYS_ROLE_PERMISSIONPickupView', viewname: 'SysRolePermissionPickupView',
viewaction: '', viewaction: '',
viewdatachange: false, viewdatachange: false,
refviews: [ refviews: [
...@@ -168,7 +168,7 @@ export const viewstate: any = { ...@@ -168,7 +168,7 @@ export const viewstate: any = {
{ {
viewtag: '6f5a41631520da5e33294a1225101e66', viewtag: '6f5a41631520da5e33294a1225101e66',
viewmodule: 'uaa', viewmodule: 'uaa',
viewname: 'SYS_ROLEEditView', viewname: 'SysRoleEditView',
viewaction: '', viewaction: '',
viewdatachange: false, viewdatachange: false,
refviews: [ refviews: [
...@@ -259,7 +259,7 @@ export const viewstate: any = { ...@@ -259,7 +259,7 @@ export const viewstate: any = {
{ {
viewtag: '9a896aa77c214ed87ab9be4fd6c6bec5', viewtag: '9a896aa77c214ed87ab9be4fd6c6bec5',
viewmodule: 'uaa', viewmodule: 'uaa',
viewname: 'SYS_USEREditView', viewname: 'SysUserEditView',
viewaction: '', viewaction: '',
viewdatachange: false, viewdatachange: false,
refviews: [ refviews: [
...@@ -358,7 +358,7 @@ export const viewstate: any = { ...@@ -358,7 +358,7 @@ export const viewstate: any = {
{ {
viewtag: 'e791be173ed0f4bbe9cce942b6edde63', viewtag: 'e791be173ed0f4bbe9cce942b6edde63',
viewmodule: 'uaa', viewmodule: 'uaa',
viewname: 'SYS_ROLE_PERMISSIONCustomView', viewname: 'SysRolePermissionCustomView',
viewaction: '', viewaction: '',
viewdatachange: false, viewdatachange: false,
refviews: [ refviews: [
...@@ -376,7 +376,7 @@ export const viewstate: any = { ...@@ -376,7 +376,7 @@ export const viewstate: any = {
{ {
viewtag: 'ede089b4741590173bd21b9df99c1cf0', viewtag: 'ede089b4741590173bd21b9df99c1cf0',
viewmodule: 'uaa', viewmodule: 'uaa',
viewname: 'SYS_USER_ROLEEditView2', viewname: 'SysUserRoleEditView2',
viewaction: '', viewaction: '',
viewdatachange: false, viewdatachange: false,
refviews: [ refviews: [
......
app_web/src/widgets/sys-role/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel-base.vue
浏览文件 @ 4be48599
...@@ -173,7 +173,7 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr ...@@ -173,7 +173,7 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr
* @memberof MPickupViewpickupviewpanelBase * @memberof MPickupViewpickupviewpanelBase
*/ */
public view: any = { public view: any = {
viewname: 'sys-rolepickup-grid-view', viewname: 'sys-role-pickup-grid-view',
data: {}, data: {},
} }
......
app_web/src/widgets/sys-role/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-base.vue
浏览文件 @ 4be48599
...@@ -173,7 +173,7 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro ...@@ -173,7 +173,7 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro
* @memberof PickupViewpickupviewpanelBase * @memberof PickupViewpickupviewpanelBase
*/ */
public view: any = { public view: any = {
viewname: 'sys-rolepickup-grid-view', viewname: 'sys-role-pickup-grid-view',
data: {}, data: {},
} }
......
config.xml
浏览文件 @ 4be48599
此差异已折叠。
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或