refactor: user manage

ui/src/api/type/role.ts

@@ -60,9 +60,11 @@ interface FormItemModel {
   path: string
   label?: string
   rules?: Arrayable<FormItemRule>,
-  selectProps: {
+  hidden?: (e: any) => boolean,
+  selectProps?: {
     options?: { label: string, value: string }[]
     placeholder?: string
+    multiple?: boolean
   }
 }
 

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

@@ -25,7 +25,6 @@
 <script setup lang="ts">
 import { onBeforeMount, ref } from 'vue'
 import type { CreateMemberParamsItem, FormItemModel } from '@/api/type/role'
-import RoleApi from '@/api/system/role'
 import UserApi from '@/api/user/user'
 import WorkspaceApi from '@/api/workspace/workspace'
 import MemberFormContent from './MemberFormContent.vue'

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

@@ -4,10 +4,10 @@
       <div v-for="(element, index) in form" :key="index" class="flex w-full">
         <el-form-item v-for="model of props.models" :key="model.path" :prop="`[${index}].${model.path}`"
           :rules="model.rules" :label="index === 0 && model.label ? model.label : ''" class="mr-8" style="flex: 1">
-          <el-select v-model="element[model.path]"
+          <el-select v-show="!model?.hidden?.(element)" v-model="element[model.path]"
-            :placeholder="model.selectProps.placeholder ?? $t('common.selectPlaceholder')" clearable filterable multiple
+            :placeholder="model.selectProps?.placeholder ?? $t('common.selectPlaceholder')" clearable filterable
-            style="width: 100%" collapse-tags collapse-tags-tooltip>
+            multiple style="width: 100%" collapse-tags collapse-tags-tooltip v-bind="model.selectProps">
-            <el-option v-for="opt in model.selectProps.options" :key="opt.value" :label="opt.label"
+            <el-option v-for="opt in model.selectProps?.options" :key="opt.value" :label="opt.label"
               :value="opt.value" />
           </el-select>
         </el-form-item>

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

@@ -45,16 +45,16 @@
         </el-input>
       </el-form-item>
       <el-form-item :label="$t('views.userManage.userForm.phone.label')">
-        <el-input
+        <el-input v-model="userForm.phone" :placeholder="$t('views.userManage.userForm.phone.placeholder')">
-          v-model="userForm.phone"
-          :placeholder="$t('views.userManage.userForm.phone.placeholder')"
-        >
         </el-input>
       </el-form-item>
       <el-form-item label="默认密码" v-if="!isEdit">
-        <span>{{userForm.password}}</span>
+        <span>{{ userForm.password }}</span>
       </el-form-item>
     </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" />
     <template #footer>
       <el-button @click.prevent="visible = false"> {{ $t('common.cancel') }}</el-button>
       <el-button type="primary" @click="submit(userFormRef)" :loading="loading">
@@ -64,11 +64,15 @@
   </el-drawer>
 </template>
 <script setup lang="ts">
-import {ref, reactive, watch} from 'vue'
+import { ref, reactive, watch, onBeforeMount } from 'vue'
-import type {FormInstance} from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import userManageApi from '@/api/user/user-manage'
-import {MsgSuccess} from '@/utils/message'
+import { MsgSuccess } from '@/utils/message'
-import {t} from '@/locales'
+import { t } from '@/locales'
+import type { FormItemModel } from '@/api/type/role'
+import WorkspaceApi from '@/api/workspace/workspace'
+import MemberFormContent from '@/views/role/component/MemberFormContent.vue'
+import { RoleTypeEnum } from '@/enums/system'
 
 const props = defineProps({
   title: String,
@@ -85,6 +89,69 @@ const userForm = ref<any>({
   nick_name: '',
 })
 
+const list = ref<any[]>([]);
+const memberFormContentLoading = ref(false);
+const formItemModel = ref<FormItemModel[]>([]);
+const roleFormItem = ref<FormItemModel[]>([]);
+const adminRoleList = ref<any[]>([])
+const workspaceFormItem = ref<FormItemModel[]>([])
+
+async function getRoleFormItem() {
+  try {
+    const res = await WorkspaceApi.getWorkspaceRoleList(memberFormContentLoading);
+    roleFormItem.value = [{
+      path: 'role_id',
+      label: t('views.role.member.role'),
+      rules: [
+        {
+          required: true,
+          message: `${t('common.selectPlaceholder')}${t('views.role.member.role')}`,
+        },
+      ],
+      selectProps: {
+        options: res.data?.map(item => ({
+          label: item.name,
+          value: item.id
+        })) || [],
+        placeholder: `${t('common.selectPlaceholder')}${t('views.role.member.role')}`,
+        multiple: false
+      }
+    }]
+    adminRoleList.value = res.data.filter(item => item.type === RoleTypeEnum.ADMIN)
+  } catch (e) {
+    console.error(e);
+  }
+}
+async function getWorkspaceFormItem() {
+  try {
+    const res = await WorkspaceApi.getWorkspaceList(memberFormContentLoading)
+    workspaceFormItem.value = [
+      {
+        path: 'workspace_ids',
+        label: t('views.role.member.workspace'),
+        hidden: (e) => adminRoleList.value.find(item => item.id === e.role_id),
+        selectProps: {
+          options:
+            res.data?.map((item) => ({
+              label: item.name,
+              value: item.id,
+            })) || [],
+          placeholder: `${t('common.selectPlaceholder')}${t('views.role.member.workspace')}`,
+        },
+      },
+    ]
+  } catch (e) {
+    console.error(e)
+  }
+}
+
+onBeforeMount(async () => {
+  await getRoleFormItem();
+  await getWorkspaceFormItem();
+  formItemModel.value = [...roleFormItem.value, ...workspaceFormItem.value]
+  list.value = [{ role_id: '', workspace_ids: [] }]
+})
+
 const rules = reactive({
   username: [
     {
@@ -157,18 +224,25 @@ const open = (data: any) => {
   visible.value = true
 }
 
+const memberFormContentRef = ref<InstanceType<typeof MemberFormContent>>()
 const submit = async (formEl: FormInstance | undefined) => {
   if (!formEl) return
   await formEl.validate((valid, fields) => {
     if (valid) {
+      memberFormContentRef.value?.validate().then(async (valid: any) => {
+        if (valid) {
+          const params = {
+            ...userForm.value,
+            role_setting: list.value
+          }
           if (isEdit.value) {
-        userManageApi.putUserManage(userForm.value.id, userForm.value, loading).then((res) => {
+            userManageApi.putUserManage(userForm.value.id, params, loading).then((res) => {
               emit('refresh')
               MsgSuccess(t('common.editSuccess'))
               visible.value = false
             })
           } else {
-        userManageApi.postUserManage(userForm.value, loading).then((res) => {
+            userManageApi.postUserManage(params, loading).then((res) => {
               emit('refresh')
               MsgSuccess(t('common.createSuccess'))
               visible.value = false
@@ -176,8 +250,10 @@ const submit = async (formEl: FormInstance | undefined) => {
           }
         }
       })
+    }
+  })
 }
 
-defineExpose({open})
+defineExpose({ open })
 </script>
 <style lang="scss" scoped></style>