From 6cfb2a248bef74643dfdfb01e041d7105637feb6 Mon Sep 17 00:00:00 2001
From: teukkk <mengyuan.lv@fit2cloud.com>
Date: Tue, 1 Jul 2025 11:04:53 +0800
Subject: [PATCH] fix: rename

---
 .../component/CreateOrUpdateGroupDialog.vue   |  2 +-
 ui/src/views/system-chat-user/group/index.vue |  8 +++-
 ui/src/views/system/role/index.vue            | 47 +++----------------
 ui/src/views/system/workspace/index.vue       | 26 +++++-----
 4 files changed, 28 insertions(+), 55 deletions(-)

diff --git a/ui/src/views/system-chat-user/group/component/CreateOrUpdateGroupDialog.vue b/ui/src/views/system-chat-user/group/component/CreateOrUpdateGroupDialog.vue
index 89d7f91ea..338f258f6 100644
--- a/ui/src/views/system-chat-user/group/component/CreateOrUpdateGroupDialog.vue
+++ b/ui/src/views/system-chat-user/group/component/CreateOrUpdateGroupDialog.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog :title="`${!form.id ? $t('common.create') : $t('common.rename')}${$t('views.chatUser.group.title')}`"
     v-model="dialogVisible" :close-on-click-modal="false" :close-on-press-escape="false" :destroy-on-close="true">
-    <el-form label-position="top" ref="formRef" :rules="rules" :model="form" require-asterisk-position="right">
+    <el-form label-position="top" ref="formRef" :rules="rules" :model="form" require-asterisk-position="right" @submit.prevent>
       <el-form-item :label="$t('views.chatUser.group.name')" prop="name">
         <el-input v-model="form.name" maxlength="64"
           :placeholder="`${$t('common.inputPlaceholder')}${$t('views.chatUser.group.name')}`" />
diff --git a/ui/src/views/system-chat-user/group/index.vue b/ui/src/views/system-chat-user/group/index.vue
index d1beb2a93..605e482a8 100644
--- a/ui/src/views/system-chat-user/group/index.vue
+++ b/ui/src/views/system-chat-user/group/index.vue
@@ -306,8 +306,12 @@ function deleteGroup(item: ListItem) {
 
 async function refresh(group?: ListItem) {
   await getUserGroupList()
-  // 创建角色后选中新建的角色
-  current.value = group ? group : current.value
+  // 创建后选中新建的
+   if (group) {
+    current.value = group
+  } else {
+    current.value = list.value.find(item => item.id === current.value.id)
+  }
 }
 
 const rightLoading = ref(false)
diff --git a/ui/src/views/system/role/index.vue b/ui/src/views/system/role/index.vue
index fc0c877c4..c45e0cdb7 100644
--- a/ui/src/views/system/role/index.vue
+++ b/ui/src/views/system/role/index.vue
@@ -26,46 +26,7 @@
                   @mouseleave="mouseId = ''"
                 >
                   <template #default="{ row }">
-                    <div class="flex-between">
-                      <span class="mr-8">{{ row.role_name }}</span>
-                      <div @click.stop v-show="mouseId === row.id">
-                        <el-dropdown :teleported="false">
-                          <el-button text>
-                            <el-icon class="color-secondary">
-                              <MoreFilled />
-                            </el-icon>
-                          </el-button>
-                          <template #dropdown>
-                            <el-dropdown-menu style="min-width: 80px">
-                              <el-dropdown-item @click.stop="createOrUpdateRole(row)" class="p-8"
-                                v-if="hasPermission(
-                                  new ComplexPermission(
-                                    [RoleConst.ADMIN],
-                                    [PermissionConst.ROLE_EDIT],
-                                    [],'OR'
-                                  ),'OR'
-                                  )"
-                              >
-                                <el-icon><EditPen /></el-icon>
-                                {{ $t('common.rename') }}
-                              </el-dropdown-item>
-                              <el-dropdown-item @click.stop="deleteRole(row)" class="border-t p-8"
-                                v-if="hasPermission(
-                                  new ComplexPermission(
-                                    [RoleConst.ADMIN],
-                                    [PermissionConst.ROLE_DELETE],
-                                    [],'OR'
-                                  ),'OR'
-                                  )"
-                              >
-                                <el-icon><Delete /></el-icon>
-                                {{ $t('common.delete') }}
-                              </el-dropdown-item>
-                            </el-dropdown-menu>
-                          </template>
-                        </el-dropdown>
-                      </div>
-                    </div>
+                      <span>{{ row.role_name }}</span>
                   </template>
                   <template #empty>
                     <span></span>
@@ -238,7 +199,11 @@ onMounted(async () => {
 async function refresh(role?: RoleItem) {
   await getRole()
   // 创建角色后选中新建的角色
-  currentRole.value = role ? role : currentRole.value
+  if (role) {
+    currentRole.value = role
+  } else {
+    currentRole.value = customRoleList.value.find(item => item.id === currentRole.value.id)
+  }
 }
 
 function filter(list: RoleItem[], filterText: string) {
diff --git a/ui/src/views/system/workspace/index.vue b/ui/src/views/system/workspace/index.vue
index 1415d0055..aefd6530a 100644
--- a/ui/src/views/system/workspace/index.vue
+++ b/ui/src/views/system/workspace/index.vue
@@ -54,10 +54,10 @@
                               @click.stop="createOrUpdateWorkspace(row)"
                               class="p-8"
                               v-if="
-                                hasPermission(
-                                  [RoleConst.ADMIN, PermissionConst.WORKSPACE_EDIT],
-                                  'OR',
-                                )
+                              hasPermission(
+                                [RoleConst.ADMIN, PermissionConst.WORKSPACE_EDIT],
+                                'OR',
+                              )
                               "
                             >
                               <el-icon><EditPen /></el-icon>
@@ -67,11 +67,11 @@
                               @click.stop="deleteWorkspace(row)"
                               class="border-t p-8"
                               v-if="
-                                row.id !== 'default' &&
-                                hasPermission(
-                                  [RoleConst.ADMIN, PermissionConst.WORKSPACE_DELETE],
-                                  'OR',
-                                )
+                              row.id !== 'default' &&
+                              hasPermission(
+                                [RoleConst.ADMIN, PermissionConst.WORKSPACE_DELETE],
+                                'OR',
+                              )
                               "
                             >
                               <el-icon><Delete /></el-icon>
@@ -148,8 +148,12 @@ onMounted(async () => {
 
 async function refresh(workspace?: WorkspaceItem) {
   await getWorkspace()
-  // 创建角色后选中新建的角色
-  currentWorkspace.value = workspace ? workspace : currentWorkspace.value
+  // 创建后选中新建的
+  if (workspace) {
+    currentWorkspace.value = workspace
+  } else {
+    currentWorkspace.value = list.value.find(item => item.id === currentWorkspace.value.id)
+  }
 }
 
 function filter(list: WorkspaceItem[], filterText: string) {