From 15574bd38d741e06e2b48b00ad2b9d2ab6888290 Mon Sep 17 00:00:00 2001
From: teukkk <mengyuan.lv@fit2cloud.com>
Date: Tue, 1 Jul 2025 16:21:46 +0800
Subject: [PATCH] fix: workspaceFormItem rules

---
 ui/src/components/workspace-dropdown/index.vue    |  2 +-
 ui/src/layout/layout-template/MainLayout.vue      |  2 +-
 .../component/DropdownMenu.vue                    |  2 +-
 ui/src/views/system-chat-user/group/index.vue     |  2 +-
 .../system/role/component/MemberFormContent.vue   |  2 +-
 ui/src/views/system/role/index.vue                |  2 +-
 .../system/user-manage/component/UserDrawer.vue   | 15 ++++++++++++++-
 ui/src/views/system/user-manage/index.vue         |  4 ++--
 ui/src/views/system/workspace/index.vue           |  8 ++------
 9 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/ui/src/components/workspace-dropdown/index.vue b/ui/src/components/workspace-dropdown/index.vue
index bf43b8c59..d5c2a5b64 100644
--- a/ui/src/components/workspace-dropdown/index.vue
+++ b/ui/src/components/workspace-dropdown/index.vue
@@ -40,7 +40,7 @@ import type { WorkspaceItem } from '@/api/type/workspace'
 
 const props = defineProps({
   data: {
-    type: Array,
+    type: Array<any>,
     default: () => [],
   },
   currentWorkspace: {
diff --git a/ui/src/layout/layout-template/MainLayout.vue b/ui/src/layout/layout-template/MainLayout.vue
index 4a5145b64..6fa6bd1dd 100644
--- a/ui/src/layout/layout-template/MainLayout.vue
+++ b/ui/src/layout/layout-template/MainLayout.vue
@@ -28,7 +28,7 @@ const {
 } = route as any
 
 const isShared = computed(() => {
-  return folderId === 'shared' || route.name.includes('ResourceManagement')
+  return folderId === 'shared' || route.name?.includes('ResourceManagement')
 })
 const { theme } = useStore()
 const isDefaultTheme = computed(() => {
diff --git a/ui/src/views/application-workflow/component/DropdownMenu.vue b/ui/src/views/application-workflow/component/DropdownMenu.vue
index 29b4b9151..79b50f0c6 100644
--- a/ui/src/views/application-workflow/component/DropdownMenu.vue
+++ b/ui/src/views/application-workflow/component/DropdownMenu.vue
@@ -177,7 +177,7 @@ const filter_menu_nodes = computed(() => {
   if (!search_text.value) return menuNodes;
   const searchTerm = search_text.value.toLowerCase();
   
-  return menuNodes.reduce((result, item) => {
+  return menuNodes.reduce((result: any[], item) => {
     const filteredList = item.list.filter(listItem => 
       listItem.label.toLowerCase().includes(searchTerm)
     );
diff --git a/ui/src/views/system-chat-user/group/index.vue b/ui/src/views/system-chat-user/group/index.vue
index 605e482a8..2467acb8e 100644
--- a/ui/src/views/system-chat-user/group/index.vue
+++ b/ui/src/views/system-chat-user/group/index.vue
@@ -310,7 +310,7 @@ async function refresh(group?: ListItem) {
    if (group) {
     current.value = group
   } else {
-    current.value = list.value.find(item => item.id === current.value.id)
+    current.value = list.value.find(item => item.id === current.value?.id)
   }
 }
 
diff --git a/ui/src/views/system/role/component/MemberFormContent.vue b/ui/src/views/system/role/component/MemberFormContent.vue
index c1bff3529..728920953 100644
--- a/ui/src/views/system/role/component/MemberFormContent.vue
+++ b/ui/src/views/system/role/component/MemberFormContent.vue
@@ -4,7 +4,7 @@
       <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-show="!model?.hidden?.(element)" v-model="element[model.path]"
+          <el-select v-if="!model?.hidden?.(element)" v-model="element[model.path]"
             :placeholder="model.selectProps?.placeholder ?? $t('common.selectPlaceholder')" clearable filterable
             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"
diff --git a/ui/src/views/system/role/index.vue b/ui/src/views/system/role/index.vue
index c45e0cdb7..7d964f5e0 100644
--- a/ui/src/views/system/role/index.vue
+++ b/ui/src/views/system/role/index.vue
@@ -202,7 +202,7 @@ async function refresh(role?: RoleItem) {
   if (role) {
     currentRole.value = role
   } else {
-    currentRole.value = customRoleList.value.find(item => item.id === currentRole.value.id)
+    currentRole.value = customRoleList.value.find(item => item.id === currentRole.value?.id)
   }
 }
 
diff --git a/ui/src/views/system/user-manage/component/UserDrawer.vue b/ui/src/views/system/user-manage/component/UserDrawer.vue
index 8cd1146dd..93bfb9df3 100644
--- a/ui/src/views/system/user-manage/component/UserDrawer.vue
+++ b/ui/src/views/system/user-manage/component/UserDrawer.vue
@@ -137,6 +137,20 @@ async function getWorkspaceFormItem() {
         path: 'workspace_ids',
         label: t('views.role.member.workspace'),
         hidden: (e) => adminRoleList.value.find(item => item.id === e.role_id),
+        rules: [
+          {
+            validator: (rule, value, callback) => {
+              const match = rule.field?.match(/\[(\d+)\]/);
+              const isAdmin = adminRoleList.value.some(role => role.id === list.value[parseInt(match?.[1] ?? '', 10)].role_id);
+              if (!isAdmin && (!value || value.length === 0)) {
+                callback(new Error(`${t('common.selectPlaceholder')}${t('views.role.member.workspace')}`));
+              } else {
+                callback();
+              }
+            },
+            trigger: 'change',
+          },
+        ],
         selectProps: {
           options:
             res.data?.map((item) => ({
@@ -275,7 +289,6 @@ const submit = async (formEl: FormInstance | undefined) => {
         ...userForm.value,
         role_setting: list.value
       }
-      console.log(list.value)
       if (isEdit.value) {
         userManageApi.putUserManage(userForm.value.id, params, loading).then((res) => {
           emit('refresh')
diff --git a/ui/src/views/system/user-manage/index.vue b/ui/src/views/system/user-manage/index.vue
index e288fc6a6..a8cebd633 100644
--- a/ui/src/views/system/user-manage/index.vue
+++ b/ui/src/views/system/user-manage/index.vue
@@ -125,7 +125,7 @@
           <template #default="{ row }">
             <span @click.stop>
               <el-switch
-                :disabled="row.role === 'ADMIN'"
+                :disabled="row.role === 'ADMIN' || row.id === user.userInfo?.id"
                 size="small"
                 v-model="row.is_active"
                 :before-change="() => changeState(row)"
@@ -153,7 +153,7 @@
             </span>
             <span>
               <el-button
-                :disabled="row.role === 'ADMIN'"
+                :disabled="row.role === 'ADMIN' || row.id === user.userInfo?.id"
                 type="primary"
                 text
                 @click.stop="deleteUserManage(row)"
diff --git a/ui/src/views/system/workspace/index.vue b/ui/src/views/system/workspace/index.vue
index aefd6530a..c4721e862 100644
--- a/ui/src/views/system/workspace/index.vue
+++ b/ui/src/views/system/workspace/index.vue
@@ -96,11 +96,7 @@
           <div class="flex align-center mb-16">
             <h4 class="medium">{{ currentWorkspace?.name }}</h4>
             <el-divider direction="vertical" class="mr-8 ml-8" />
-            <AppIcon
-              iconName="app-workspace"
-              style="font-size: 16px"
-              class="color-input-placeholder"
-            ></AppIcon>
+            <el-icon class="color-input-placeholder"><UserFilled /></el-icon>
             <span class="color-input-placeholder ml-4">
               {{ currentWorkspace?.user_count }}
             </span>
@@ -152,7 +148,7 @@ async function refresh(workspace?: WorkspaceItem) {
   if (workspace) {
     currentWorkspace.value = workspace
   } else {
-    currentWorkspace.value = list.value.find(item => item.id === currentWorkspace.value.id)
+    currentWorkspace.value = list.value.find(item => item.id === currentWorkspace.value?.id)
   }
 }