优化权限与角色管理功能

Author: vuecmf

src/model/DataModel.ts

@@ -54,9 +54,10 @@ export default class DataModel extends BaseModel{
     /**
      * 获取所有用户
      * @param table_name
+     * @param data  如 {username: 'zhangsan'}
      */
-    public getAllUsers = (table_name: string): Promise<AnyObject> => {
-        return this.request(table_name, 'get_all_users' )
+    public getAllUsers = (table_name: string, data:AnyObject): Promise<AnyObject> => {
+        return this.request(table_name, 'get_all_users',{data: data} )
     }
 
     /**
@@ -81,9 +82,10 @@ export default class DataModel extends BaseModel{
     /**
      * 获取所有角色
      * @param table_name
+     * @param data  如 {role_name: '管理员'}
      */
-    public getAllRoles = (table_name: string): Promise<AnyObject> => {
-        return this.request(table_name, 'get_all_roles' )
+    public getAllRoles = (table_name: string, data:AnyObject): Promise<AnyObject> => {
+        return this.request(table_name, 'get_all_roles',{data: data})
     }
 
     /**

src/service/event/AdminEvent.ts

@@ -74,8 +74,9 @@ export default class AdminEvent extends BaseEvent{
         this.current_user = selectRow
         this.dataService.assign_config.assigned_data = []
         this.dataService.assign_config.assign_dlg_title = '设置(' + this.current_user.username + ')角色'
+        const role_name = this.loginUserInfo != false ? this.loginUserInfo['role'] : '';
 
-        this.dataModel.getAllRoles(this.table_name).then((res:AnyObject) => {
+        this.dataModel.getAllRoles(this.table_name, {role_name: role_name}).then((res:AnyObject) => {
             if(res.status == 200 && res.data.code == 0){
                 res.data.data.forEach((item:AnyObject) => {
                     item.disabled = false
@@ -128,10 +129,15 @@ export default class AdminEvent extends BaseEvent{
     setUserPermission = (selectRow:AnyObject):void => {
         this.current_user = selectRow
         this.dataService.permission_config.current_user_or_role = this.current_user.username
+        const username = this.loginUserInfo != false ? this.loginUserInfo['username'] : '';
+        let login_data = {}
+        if(username != '' && this.loginUserInfo != false && this.loginUserInfo['role'] != '超级管理员') {
+            login_data = {
+                username: username
+            }
+        }
 
-        this.setPermission({
-            username: this.current_user.username
-        }, 'user')
+        this.setPermission({username: this.current_user.username }, login_data,'user')
     }
 
     /**

src/service/event/BaseEvent.ts

@@ -175,11 +175,12 @@ export default abstract class BaseEvent{
     /**
      * 打开设置权限对话框
      * @param permission_param 获取已有权限的参数
+     * @param login_data 当前登录用户信息
      * @param permission_type  权限类型 role = 角色， user = 用户
      */
-    setPermission = (permission_param:AnyObject, permission_type = 'role'):void => {
+    setPermission = (permission_param:AnyObject, login_data:AnyObject, permission_type = 'role'):void => {
         //获取所有权限列表
-        this.dataModel.getActionList(this.table_name, permission_param).then((res:AnyObject) => {
+        this.dataModel.getActionList(this.table_name, login_data).then((res:AnyObject) => {
             if(res.status == 200 && res.data.code == 0){
                 this.dataService.permission_config.permission_action_list = res.data.data
 

src/service/event/RolesEvent.ts

@@ -66,10 +66,15 @@ export default class RolesEvent extends BaseEvent{
     setRolePermission = (selectRow:AnyObject):void => {
         this.current_role = selectRow
         this.dataService.permission_config.current_user_or_role = this.current_role.role_name
+        let login_data = {}
 
-        this.setPermission({
-            role_name: this.current_role.role_name
-        })
+        if(this.current_role.pid > 0) {
+            login_data = {role_name: this.current_role.role_name}
+        }else if(this.current_role.pid == 0 && this.loginUserInfo != false && this.loginUserInfo['role'] != '超级管理员'){
+            login_data = {username: this.loginUserInfo['username']}
+        }
+
+        this.setPermission({role_name: this.current_role.role_name}, login_data)
     }
 
     /**
@@ -89,8 +94,9 @@ export default class RolesEvent extends BaseEvent{
         this.current_role = selectRow
         this.dataService.assign_config.assigned_data = []
         this.dataService.assign_config.assign_dlg_title = '设置(' + this.current_role.role_name + ')用户'
+        const username = this.loginUserInfo != false ? this.loginUserInfo['username'] : '';
 
-        this.dataModel.getAllUsers(this.table_name).then((res:AnyObject) => {
+        this.dataModel.getAllUsers(this.table_name,{username: username}).then((res:AnyObject) => {
             if(res.status == 200 && res.data.code == 0){
                 res.data.data.forEach((item:AnyObject) => {
                     item.disabled = false