From 80de5b0e5e13a5ad1a1cf816bbbc223a9d392e74 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Sat, 31 Aug 2024 20:40:38 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BC=98=E5=8C=96=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=83=A8=E5=88=86=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/role/RoleAddModal.vue               |  2 +-
 .../{RoleEditDrawer.vue => RoleUpdateDrawer.vue}     |  3 ---
 src/views/system/role/index.vue                      | 12 ++++++------
 3 files changed, 7 insertions(+), 10 deletions(-)
 rename src/views/system/role/{RoleEditDrawer.vue => RoleUpdateDrawer.vue} (97%)

diff --git a/src/views/system/role/RoleAddModal.vue b/src/views/system/role/RoleAddModal.vue
index bd04fb5..0447666 100644
--- a/src/views/system/role/RoleAddModal.vue
+++ b/src/views/system/role/RoleAddModal.vue
@@ -8,7 +8,7 @@
       @close="reset"
   >
     <a-steps :current="current" class="mb-15" @change="onChangeCurrent">
-      <a-step>创建角色</a-step>
+      <a-step>基础信息</a-step>
       <a-step>功能权限</a-step>
       <a-step>数据权限</a-step>
     </a-steps>
diff --git a/src/views/system/role/RoleEditDrawer.vue b/src/views/system/role/RoleUpdateDrawer.vue
similarity index 97%
rename from src/views/system/role/RoleEditDrawer.vue
rename to src/views/system/role/RoleUpdateDrawer.vue
index 80385bd..5b51182 100644
--- a/src/views/system/role/RoleEditDrawer.vue
+++ b/src/views/system/role/RoleUpdateDrawer.vue
@@ -9,9 +9,6 @@
     @close="reset"
   >
     <a-form ref="formRef" :model="form" :rules="rules" size="large" auto-label-width>
-      <a-alert v-if="!form.disabled" type="warning" style="margin-bottom: 15px">
-        变更功能权限或数据权限后，关联在线用户会自动下线！
-      </a-alert>
       <fieldset>
         <legend>基础信息</legend>
         <a-form-item label="名称" field="name">
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index a4f9cde..55c0fda 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -50,22 +50,22 @@
       </template>
     </GiTable>
 
-    <RoleAddModal ref="RoleAddModalRef" @save-success="search"/>
-    <RoleEditDrawer ref="RoleEditDrawerRef" @save-success="search" />
+    <RoleAddModal ref="RoleAddModalRef" @save-success="search" />
+    <RoleUpdateDrawer ref="RoleUpdateDrawerRef" @save-success="search" />
     <RoleDetailDrawer ref="RoleDetailDrawerRef" />
   </div>
 </template>
 
 <script setup lang="ts">
-import RoleEditDrawer from './RoleEditDrawer.vue'
+import RoleUpdateDrawer from './RoleUpdateDrawer.vue'
 import RoleDetailDrawer from './RoleDetailDrawer.vue'
+import RoleAddModal from './RoleAddModal.vue'
 import { type RoleQuery, type RoleResp, deleteRole, listRole } from '@/apis'
 import type { TableInstanceColumns } from '@/components/GiTable/type'
 import { useTable } from '@/hooks'
 import { useDict } from '@/hooks/app'
 import { isMobile } from '@/utils'
 import has from '@/utils/has'
-import RoleAddModal from './RoleAddModal.vue'
 
 defineOptions({ name: 'SystemRole' })
 
@@ -121,7 +121,7 @@ const onDelete = (record: RoleResp) => {
   return handleDelete(() => deleteRole(record.id), { content: `是否确定删除 [${record.name}]？`, showModal: true })
 }
 
-const RoleEditDrawerRef = ref<InstanceType<typeof RoleEditDrawer>>()
+const RoleUpdateDrawerRef = ref<InstanceType<typeof RoleUpdateDrawer>>()
 const RoleAddModalRef = ref<InstanceType<typeof RoleAddModal>>()
 // 新增
 const onAdd = () => {
@@ -130,7 +130,7 @@ const onAdd = () => {
 
 // 修改
 const onUpdate = (record: RoleResp) => {
-  RoleEditDrawerRef.value?.onUpdate(record.id)
+  RoleUpdateDrawerRef.value?.onUpdate(record.id)
 }
 
 const RoleDetailDrawerRef = ref<InstanceType<typeof RoleDetailDrawer>>()