fix: add members under the workspace

Author: 1myuan

ui/src/locales/lang/en-US/views/user-manage.ts

@@ -3,6 +3,7 @@ export default {
   createUser: 'Create User',
   editUser: 'Edit User',
   roleSetting: 'Role Setting',
+  addRole: 'Add role',
   setting: {
     updatePwd: 'Change Password',
   },

ui/src/locales/lang/zh-CN/views/user-manage.ts

@@ -3,6 +3,7 @@ export default {
   createUser: '创建用户',
   editUser: '编辑用户',
   roleSetting: '角色设置',
+  addRole: '添加角色',
   setting: {
     updatePwd: '修改用户密码',
   },

ui/src/locales/lang/zh-Hant/views/user-manage.ts

@@ -3,6 +3,7 @@ export default {
   createUser: '建立使用者',
   editUser: '編輯使用者',
   roleSetting: '角色設定',
+  addRole: '添加角色',
   setting: {
     updatePwd: '修改使用者密碼',
   },

ui/src/views/role/component/MemberFormContent.vue

@@ -26,7 +26,7 @@
       <el-icon class="mr-4">
         <Plus />
       </el-icon>
-      {{ $t('views.role.member.add') }}
+      {{ props.addText ?? $t('views.role.member.add') }}
     </el-button>
   </el-form>
 </template>
@@ -37,6 +37,7 @@ import type { FormItemModel } from '@/api/type/role'
 
 const props = defineProps<{
   models: FormItemModel[];
+  addText?: string;
 }>()
 
 const formRef = ref()

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

@@ -54,7 +54,7 @@
     </el-form>
     <h4 class="title-decoration-1 mb-16 mt-8">{{ $t('views.userManage.roleSetting') }}</h4>
     <MemberFormContent ref="memberFormContentRef" :models="formItemModel" v-model:form="list"
-      v-loading="memberFormContentLoading" />
+      v-loading="memberFormContentLoading" :addText="$t('views.userManage.addRole')" />
     <template #footer>
       <el-button @click.prevent="visible = false"> {{ $t('common.cancel') }}</el-button>
       <el-button type="primary" @click="submit(userFormRef)" :loading="loading">
@@ -201,6 +201,7 @@ watch(visible, (bool) => {
       nick_name: '',
     }
     isEdit.value = false
+    list.value = [{ role_id: '', workspace_ids: [] }]
     userFormRef.value?.clearValidate()
   }
 })
@@ -213,6 +214,7 @@ const open = (data: any) => {
     userForm.value.password = data.password
     userForm.value.phone = data.phone
     userForm.value.nick_name = data.nick_name
+    list.value = data.role_setting
     isEdit.value = true
   } else {
     //需要查询默认密码是啥zxl

ui/src/views/workspace/component/AddMemberDrawer.vue

@@ -27,6 +27,7 @@ import { t } from '@/locales'
 import { MsgSuccess } from '@/utils/message'
 import type { CreateWorkspaceMemberParamsItem, WorkspaceItem } from '@/api/type/workspace'
 import type { FormItemModel } from '@/api/type/role'
+import { RoleTypeEnum } from '@/enums/system'
 
 const props = defineProps<{
   currentWorkspace?: WorkspaceItem
@@ -83,7 +84,7 @@ async function getRoleFormItem() {
         },
       ],
       selectProps: {
-        options: res.data?.map(item => ({
+        options: res.data.filter(item => item.type !== RoleTypeEnum.ADMIN)?.map(item => ({
           label: item.name,
           value: item.id
         })) || [],