refactor: role setting

ui/src/router/modules/system.ts

@@ -38,7 +38,7 @@ const systemRouter = {
           new ComplexPermission(
             [RoleConst.ADMIN, RoleConst.WORKSPACE_MANAGE.getWorkspaceRole],
             [PermissionConst.ROLE_READ, PermissionConst.WORKSPACE_ROLE_READ],
-            [EditionConst.IS_EE],
+            [EditionConst.IS_EE, EditionConst.IS_PE],
             'OR',
           ),
         ],

ui/src/utils/dynamics-api/permission-api.ts

@@ -1,8 +1,8 @@
-import { PermissionConst, EditionConst, RoleConst } from '@/utils/permission/data'
-import { hasPermission } from '@/utils/permission/index'
+import {PermissionConst, EditionConst, RoleConst} from '@/utils/permission/data'
+import {hasPermission} from '@/utils/permission/index'
 import roleSystemApi from '@/api/system/role'
 import roleWorkspaceApi from '@/api/workspace/role'
-import { ComplexPermission } from '../permission/type'
+import {ComplexPermission} from '../permission/type'
 
 // 系统管理员 API
 const systemApiMap = {
@@ -19,19 +19,20 @@ const workspaceApiMap = {
  */
 
 export function loadPermissionApi(type: string) {
-  if (hasPermission(EditionConst.IS_EE, 'OR')) {
-    if (hasPermission(new ComplexPermission (
+  if (hasPermission([EditionConst.IS_EE, EditionConst.IS_PE], 'OR')) {
+    if (hasPermission(new ComplexPermission(
       [RoleConst.ADMIN],
       [PermissionConst.ROLE_READ],
       [],
-      'OR'),'OR')) {
+      'OR'), 'OR')) {
       // 加载系统管理员 API
       return systemApiMap[type]
-    } if (hasPermission(new ComplexPermission (
+    }
+    if (hasPermission(new ComplexPermission(
       [RoleConst.WORKSPACE_MANAGE.getWorkspaceRole],
       [PermissionConst.WORKSPACE_ROLE_READ.getWorkspacePermissionWorkspaceManageRole],
       [],
-      'OR'),'OR' )) {
+      'OR'), 'OR')) {
       // 加载企业版工作空间管理员 API
       return workspaceApiMap[type]
     }

ui/src/views/system/role/component/AddMemberDrawer.vue

@@ -21,17 +21,19 @@
 </template>
 
 <script setup lang="ts">
-import { onBeforeMount, ref } from 'vue'
-import type { CreateMemberParamsItem, FormItemModel } from '@/api/type/role'
+import {onBeforeMount, ref} from 'vue'
+import type {CreateMemberParamsItem, FormItemModel} from '@/api/type/role'
 import UserApi from '@/api/user/user'
 import WorkspaceApi from '@/api/workspace/workspace'
 import MemberFormContent from './MemberFormContent.vue'
-import { t } from '@/locales'
-import type { RoleItem } from '@/api/type/role'
-import { MsgSuccess } from '@/utils/message'
-import { RoleTypeEnum } from '@/enums/system'
-import { loadPermissionApi } from '@/utils/dynamics-api/permission-api'
+import {t} from '@/locales'
+import type {RoleItem} from '@/api/type/role'
+import {MsgSuccess} from '@/utils/message'
+import {RoleTypeEnum} from '@/enums/system'
+import {loadPermissionApi} from '@/utils/dynamics-api/permission-api'
+import useStore from "@/stores";
 
+const {user} = useStore()
 const props = defineProps<{
   currentRole?: RoleItem
 }>()
@@ -108,16 +110,18 @@ async function getWorkspaceFormItem() {
 function init() {
   if (props.currentRole?.type !== RoleTypeEnum.ADMIN) {
     formItemModel.value = [...userFormItem.value, ...workspaceFormItem.value]
-    list.value = [{ user_ids: [], workspace_ids: [] }]
+    list.value = [{user_ids: [], workspace_ids: []}]
   } else {
     formItemModel.value = [...userFormItem.value]
-    list.value = [{ user_ids: [] }]
+    list.value = [{user_ids: []}]
   }
 }
 
 onBeforeMount(async () => {
   await getUserFormItem()
-  await getWorkspaceFormItem()
+  if (user.isEE()) {
+    await getWorkspaceFormItem()
+  }
   init()
 })
 
@@ -131,16 +135,19 @@ function handleCancel() {
 }
 
 const memberFormContentRef = ref<InstanceType<typeof MemberFormContent>>()
+
 function handleAdd() {
   memberFormContentRef.value?.validate().then(async (valid: any) => {
     if (valid) {
       let params
       if (props.currentRole?.type === RoleTypeEnum.ADMIN) {
-        params = list.value.map((item) => ({ user_ids: item.user_ids, workspace_ids: ['None'] }))
+        params = list.value.map((item) => ({user_ids: item.user_ids, workspace_ids: ['None']}))
+      } else if (user.isPE()) {
+        params = list.value.map((item) => ({user_ids: item.user_ids, workspace_ids: ['default']}))
       }
       await loadPermissionApi('role').CreateMember(
         props.currentRole?.id as string,
-        { members: params ?? list.value },
+        {members: params ?? list.value},
         loading,
       )
       MsgSuccess(t('common.addSuccess'))
@@ -150,5 +157,5 @@ function handleAdd() {
   })
 }
 
-defineExpose({ open })
+defineExpose({open})
 </script>

ui/src/views/system/user-manage/component/UserDrawer.vue

@@ -53,11 +53,11 @@
         <span>{{ userForm.password }}</span>
       </el-form-item>
     </el-form>
-    <h4 class="title-decoration-1 mb-16 mt-8" v-if="user.isEE()">
+    <h4 class="title-decoration-1 mb-16 mt-8" v-if="user.isEE() || user.isPE()">
       {{ $t('views.userManage.roleSetting') }}</h4>
     <MemberFormContent ref="memberFormContentRef" :models="formItemModel" v-model:form="list"
                        v-loading="memberFormContentLoading"
-                       :addText="$t('views.userManage.addRole')" v-if="user.isEE()"/>
+                       :addText="$t('views.userManage.addRole')" v-if="user.isEE() || user.isPE()"/>
     <template #footer>
       <el-button @click.prevent="visible = false"> {{ $t('common.cancel') }}</el-button>
       <el-button type="primary" @click="submit(userFormRef)" :loading="loading">
@@ -152,9 +152,11 @@ async function getWorkspaceFormItem() {
 }
 
 onBeforeMount(async () => {
-  if (user.isEE()) {
+  if (user.isEE() || user.isPE()) {
     await getRoleFormItem();
-    await getWorkspaceFormItem();
+    if (user.isEE()) {
+      await getWorkspaceFormItem();
+    }
     formItemModel.value = [...roleFormItem.value, ...workspaceFormItem.value]
   }
   list.value = [{role_id: '', workspace_ids: []}]
@@ -262,10 +264,17 @@ const submit = async (formEl: FormInstance | undefined) => {
       if (memberFormContentRef.value) {
         await memberFormContentRef.value?.validate()
       }
+      if (user.isPE()) {
+        list.value = list.value.map(item => ({
+          ...item,
+          workspace_ids: adminRoleList.value.find(item1 => item1.id === item.role_id) ? ['None'] : ['default']
+        }))
+      }
       const params = {
         ...userForm.value,
         role_setting: list.value
       }
+      console.log(list.value)
       if (isEdit.value) {
         userManageApi.putUserManage(userForm.value.id, params, loading).then((res) => {
           emit('refresh')

ui/src/views/system/user-manage/index.vue

@@ -7,7 +7,7 @@
           v-hasPermission="[
               RoleConst.ADMIN,
               PermissionConst.USER_CREATE
-          ]"  
+          ]"
         >{{
             $t('views.userManage.createUser')
           }}
@@ -92,7 +92,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="role" :label="$t('views.role.member.role')" min-width="100"
-                         v-if="user.isEE()">
+                         v-if="user.isEE() || user.isPE()">
           <template #default="{ row }">
             <TagGroup :tags="row.role"/>
           </template>
@@ -129,7 +129,7 @@
                 size="small"
                 v-model="row.is_active"
                 :before-change="() => changeState(row)"
-                v-if="hasPermission([RoleConst.ADMIN,PermissionConst.USER_EDIT],'OR')"  
+                v-if="hasPermission([RoleConst.ADMIN,PermissionConst.USER_EDIT],'OR')"
               />
             </span>
             <el-divider direction="vertical"/>
@@ -146,7 +146,7 @@
                 text
                 @click.stop="editPwdUser(row)"
                 :title="$t('views.userManage.setting.updatePwd')"
-                v-if="hasPermission([RoleConst.ADMIN,PermissionConst.USER_EDIT],'OR')"  
+                v-if="hasPermission([RoleConst.ADMIN,PermissionConst.USER_EDIT],'OR')"
               >
                 <el-icon><Lock/></el-icon>
               </el-button>
@@ -158,7 +158,7 @@
                 text
                 @click.stop="deleteUserManage(row)"
                 :title="$t('common.delete')"
-                v-if="hasPermission([RoleConst.ADMIN,PermissionConst.USER_DELETE],'OR')"  
+                v-if="hasPermission([RoleConst.ADMIN,PermissionConst.USER_DELETE],'OR')"
               >
                 <el-icon><Delete/></el-icon>
               </el-button>