Added enable status to Role, Group and User

ui/src/pages/Login.vue

@@ -84,7 +84,12 @@
 import { getCaptchaSrc, login, verifyCaptcha } from '@/utils/auth'
 import backShape from '@/assets/svg/back-shape.svg'
 import { ElMessage } from 'element-plus'
-import { LOGIN_SUCCESS, LOGOUT_FAILED, PRODUCTION_NAME } from '@/constants/Common.constants'
+import {
+    LOGIN_SUCCESS,
+    LOGOUT_FAILED,
+    PRODUCTION_NAME,
+    USER_DISABLE
+} from '@/constants/Common.constants'
 import { setToken } from '@/utils/common'
 
 export default {
@@ -169,6 +174,13 @@ export default {
                         })
                         this.resetLogin()
                         break
+                    case USER_DISABLE:
+                        ElMessage.error({
+                            dangerouslyUseHTMLString: true,
+                            message: '<strong>该用户已被禁用</strong>，请联系管理员'
+                        })
+                        this.resetLogin()
+                        break
                     default:
                         ElMessage.error({
                             dangerouslyUseHTMLString: true,

ui/src/pages/power/GroupManagement.vue

@@ -49,6 +49,16 @@
                         />
                     </el-select>
                 </el-form-item>
+                <el-form-item label="状态">
+                    <el-switch
+                        v-model="groupForm.enable"
+                        inline-prompt
+                        active-text="启用"
+                        :active-value="1"
+                        inactive-text="禁用"
+                        :inactive-value="0"
+                    />
+                </el-form-item>
             </el-form>
         </template>
         <template #footer>
@@ -81,7 +91,8 @@ export default {
             roles: [],
             groupForm: {
                 inputGroupName: '',
-                selectedRoles: []
+                selectedRoles: [],
+                enable: 0
             },
             isAddNew: true,
             dialogTitle: '',
@@ -130,6 +141,7 @@ export default {
             if (this.isAddNew) {
                 this.groupForm.inputGroupName = ''
                 this.groupForm.selectedRoles = []
+                this.groupForm.enable = 0
                 this.dialogTitle = '添加用户组'
             } else {
                 this.dialogTitle = '编辑用户组'
@@ -157,6 +169,7 @@ export default {
             for (const role of row.roles) {
                 this.groupForm.selectedRoles.push(role.id)
             }
+            this.groupForm.enable = row.enable
             this.isAddNew = false
             this.dialogVisible = true
         },
@@ -193,7 +206,8 @@ export default {
                     const groupObject = {
                         id: '',
                         name: this.groupForm.inputGroupName,
-                        roles: []
+                        roles: [],
+                        enable: this.groupForm.enable
                     }
                     for (const roleId of this.groupForm.selectedRoles) {
                         const role = {

ui/src/pages/power/RoleManagement.vue

@@ -51,6 +51,16 @@
                         @check-change="handleSelectedPowerChange"
                     />
                 </el-form-item>
+                <el-form-item label="状态">
+                    <el-switch
+                        v-model="roleForm.enable"
+                        inline-prompt
+                        active-text="启用"
+                        :active-value="1"
+                        inactive-text="禁用"
+                        :inactive-value="0"
+                    />
+                </el-form-item>
             </el-form>
         </template>
         <template #footer>
@@ -88,7 +98,8 @@ export default {
             },
             roleForm: {
                 inputRoleName: '',
-                selectedPower: new Set()
+                selectedPower: new Set(),
+                enable: 0
             },
             isAddNew: true,
             defaultSelectedPower: [],
@@ -156,6 +167,7 @@ export default {
                 this.defaultSelectedPower = []
                 this.roleForm.inputRoleName = ''
                 this.roleForm.selectedPower.clear()
+                this.roleForm.enable = 0
                 this.dialogTitle = '添加角色'
             } else {
                 this.dialogTitle = '编辑角色'
@@ -209,6 +221,7 @@ export default {
             this.roleForm.inputRoleName = row.name
             this.editRoleId = row.id
             this.roleForm.selectedPower.clear()
+            this.roleForm.enable = row.enable
             this.defaultSelectedPower = []
             for (const operation of row.operations) {
                 this.defaultSelectedPower.push(operation.powerId)
@@ -256,7 +269,8 @@ export default {
                     const roleObject = {
                         id: '',
                         name: this.roleForm.inputRoleName,
-                        powers: []
+                        powers: [],
+                        enable: this.roleForm.enable
                     }
                     for (const powerId of this.roleForm.selectedPower) {
                         const power = {

ui/src/pages/power/UserManagement.vue

@@ -82,6 +82,16 @@
                         />
                     </el-select>
                 </el-form-item>
+                <el-form-item label="状态">
+                    <el-switch
+                        v-model="userForm.enable"
+                        inline-prompt
+                        active-text="启用"
+                        :active-value="1"
+                        inactive-text="禁用"
+                        :inactive-value="0"
+                    />
+                </el-form-item>
             </el-form>
         </template>
         <template #footer>
@@ -124,7 +134,8 @@ export default {
                 inputUsername: '',
                 inputPassword: '',
                 selectedRoles: [],
-                selectedGroups: []
+                selectedGroups: [],
+                enable: 0
             },
             isAddNew: true,
             dialogTitle: '',
@@ -230,6 +241,7 @@ export default {
                     this.userForm.selectedGroups.push(group.id)
                 }
             }
+            this.userForm.enable = row.enable
             this.isAddNew = false
             this.dialogVisible = true
         },
@@ -270,6 +282,7 @@ export default {
                 this.userForm.inputPassword = ''
                 this.userForm.selectedRoles = []
                 this.userForm.selectedGroups = []
+                this.userForm.enable = 0
                 this.dialogTitle = '添加用户'
             } else {
                 this.dialogTitle = '编辑用户'
@@ -288,7 +301,8 @@ export default {
                         username: this.userForm.inputUsername,
                         passwd: this.userForm.inputPassword,
                         roles: [],
-                        groups: []
+                        groups: [],
+                        enable: this.userForm.enable
                     }
                     if (this.editUserId !== '1') {
                         for (const roleId of this.userForm.selectedRoles) {