From 545934cf68e9a7c813cb96c4387f9336c87d341d Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Tue, 16 Apr 2024 20:24:34 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E8=A7=86?=
 =?UTF-8?q?=E5=9B=BE=E7=BB=84=E4=BB=B6=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dept/{AddDeptModal.vue => DeptAddModal.vue}       |  0
 src/views/system/dept/index.vue                       | 10 +++++-----
 .../dict/{AddDictModal.vue => DictAddModal.vue}       |  0
 src/views/system/dict/index.vue                       | 11 +++++------
 .../{AddDictItemModal.vue => DictItemAddModal.vue}    |  0
 src/views/system/dict/item/index.vue                  | 10 +++++-----
 .../menu/{AddMenuModal.vue => MenuAddModal.vue}       |  0
 src/views/system/menu/index.vue                       | 10 +++++-----
 .../role/{AddRoleModal.vue => RoleAddModal.vue}       |  0
 src/views/system/role/index.vue                       | 10 +++++-----
 10 files changed, 25 insertions(+), 26 deletions(-)
 rename src/views/system/dept/{AddDeptModal.vue => DeptAddModal.vue} (100%)
 rename src/views/system/dict/{AddDictModal.vue => DictAddModal.vue} (100%)
 rename src/views/system/dict/item/{AddDictItemModal.vue => DictItemAddModal.vue} (100%)
 rename src/views/system/menu/{AddMenuModal.vue => MenuAddModal.vue} (100%)
 rename src/views/system/role/{AddRoleModal.vue => RoleAddModal.vue} (100%)

diff --git a/src/views/system/dept/AddDeptModal.vue b/src/views/system/dept/DeptAddModal.vue
similarity index 100%
rename from src/views/system/dept/AddDeptModal.vue
rename to src/views/system/dept/DeptAddModal.vue
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 679c60d..3f3f7fc 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -76,16 +76,16 @@
       </GiTable>
     </a-card>
 
-    <AddDeptModal ref="AddDeptModalRef" @save-success="search" />
+    <DeptAddModal ref="DeptAddModalRef" @save-success="search" />
   </div>
 </template>
 
 <script setup lang="ts">
 import { listDept, deleteDept, exportDept, type DeptResp, type DeptQuery } from '@/apis'
+import DeptAddModal from './DeptAddModal.vue'
 import { Message } from '@arco-design/web-vue'
 import type GiTable from '@/components/GiTable/index.vue'
 import type { TableInstanceColumns } from '@/components/GiTable/type'
-import AddDeptModal from './AddDeptModal.vue'
 import { DisEnableStatusList } from '@/constant/common'
 import { useDownload } from '@/hooks'
 import { isMobile } from '@/utils'
@@ -152,15 +152,15 @@ const onExport = () => {
   useDownload(() => exportDept(queryForm))
 }
 
-const AddDeptModalRef = ref<InstanceType<typeof AddDeptModal>>()
+const DeptAddModalRef = ref<InstanceType<typeof DeptAddModal>>()
 // 新增
 const onAdd = (id?: string) => {
-  AddDeptModalRef.value?.onAdd(id)
+  DeptAddModalRef.value?.onAdd(id)
 }
 
 // 修改
 const onUpdate = (item: DeptResp) => {
-  AddDeptModalRef.value?.onUpdate(item.id)
+  DeptAddModalRef.value?.onUpdate(item.id)
 }
 
 onMounted(() => {
diff --git a/src/views/system/dict/AddDictModal.vue b/src/views/system/dict/DictAddModal.vue
similarity index 100%
rename from src/views/system/dict/AddDictModal.vue
rename to src/views/system/dict/DictAddModal.vue
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index ad422a5..4ed742e 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -48,14 +48,14 @@
       </GiTable>
     </a-card>
 
-    <AddDictModal ref="AddDictModalRef" @save-success="search" />
+    <DictAddModal ref="DictAddModalRef" @save-success="search" />
     <DictItemModal ref="DictItemModalRef" />
   </div>
 </template>
 
 <script setup lang="ts">
 import { listDict, deleteDict, type DictResp } from '@/apis'
-import AddDictModal from './AddDictModal.vue'
+import DictAddModal from './DictAddModal.vue'
 import DictItemModal from '@/views/system/dict/item/index.vue'
 import type { TableInstanceColumns } from '@/components/GiTable/type'
 import { useTable } from '@/hooks'
@@ -97,7 +97,6 @@ const {
 // 重置
 const reset = () => {
   queryForm.description = undefined
-  queryForm.status = undefined
   search()
 }
 
@@ -106,15 +105,15 @@ const onDelete = (item: DictResp) => {
   return handleDelete(() => deleteDict(item.id), { content: `是否确定删除字典 [${item.name}]？`, showModal: true })
 }
 
-const AddDictModalRef = ref<InstanceType<typeof AddDictModal>>()
+const DictAddModalRef = ref<InstanceType<typeof DictAddModal>>()
 // 新增
 const onAdd = () => {
-  AddDictModalRef.value?.onAdd()
+  DictAddModalRef.value?.onAdd()
 }
 
 // 修改
 const onUpdate = (item: DictResp) => {
-  AddDictModalRef.value?.onUpdate(item.id)
+  DictAddModalRef.value?.onUpdate(item.id)
 }
 
 const DictItemModalRef = ref<InstanceType<typeof DictItemModal>>()
diff --git a/src/views/system/dict/item/AddDictItemModal.vue b/src/views/system/dict/item/DictItemAddModal.vue
similarity index 100%
rename from src/views/system/dict/item/AddDictItemModal.vue
rename to src/views/system/dict/item/DictItemAddModal.vue
diff --git a/src/views/system/dict/item/index.vue b/src/views/system/dict/item/index.vue
index ef8c590..6591054 100644
--- a/src/views/system/dict/item/index.vue
+++ b/src/views/system/dict/item/index.vue
@@ -57,13 +57,13 @@
       </template>
     </GiTable>
 
-    <AddDictItemModal ref="AddDictItemModalRef" @save-success="search" />
+    <DictItemAddModal ref="DictItemAddModalRef" @save-success="search" />
   </a-modal>
 </template>
 
 <script lang="ts" setup>
 import { listDictItem, deleteDictItem, type DictItemResp } from '@/apis'
-import AddDictItemModal from './AddDictItemModal.vue'
+import DictItemAddModal from './DictItemAddModal.vue'
 import type { TableInstanceColumns } from '@/components/GiTable/type'
 import { useTable } from '@/hooks'
 import { isMobile } from '@/utils'
@@ -137,15 +137,15 @@ const onDelete = (item: DictItemResp) => {
   return handleDelete(() => deleteDictItem(item.id), { content: `是否确定删除 [${item.label}]？`, showModal: false })
 }
 
-const AddDictItemModalRef = ref<InstanceType<typeof AddDictItemModal>>()
+const DictItemAddModalRef = ref<InstanceType<typeof DictItemAddModal>>()
 // 新增
 const onAdd = () => {
-  AddDictItemModalRef.value?.onAdd(dictId.value)
+  DictItemAddModalRef.value?.onAdd(dictId.value)
 }
 
 // 修改
 const onUpdate = (item: DictItemResp) => {
-  AddDictItemModalRef.value?.onUpdate(item.id)
+  DictItemAddModalRef.value?.onUpdate(item.id)
 }
 </script>
 
diff --git a/src/views/system/menu/AddMenuModal.vue b/src/views/system/menu/MenuAddModal.vue
similarity index 100%
rename from src/views/system/menu/AddMenuModal.vue
rename to src/views/system/menu/MenuAddModal.vue
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index d13bd74..60d7f5b 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -88,16 +88,16 @@
       </GiTable>
     </a-card>
 
-    <AddMenuModal ref="AddMenuModalRef" :menus="dataList" @save-success="search"></AddMenuModal>
+    <MenuAddModal ref="MenuAddModalRef" :menus="dataList" @save-success="search" />
   </div>
 </template>
 
 <script setup lang="ts">
 import { listMenu, deleteMenu, type MenuResp, type MenuQuery } from '@/apis'
+import MenuAddModal from './MenuAddModal.vue'
 import { Message } from '@arco-design/web-vue'
 import type GiTable from '@/components/GiTable/index.vue'
 import type { TableInstanceColumns } from '@/components/GiTable/type'
-import AddMenuModal from './AddMenuModal.vue'
 import { DisEnableStatusList } from '@/constant/common'
 import { isMobile } from '@/utils'
 
@@ -168,15 +168,15 @@ const onExpanded = () => {
   tableRef.value?.tableRef?.expandAll(isExpanded.value)
 }
 
-const AddMenuModalRef = ref<InstanceType<typeof AddMenuModal>>()
+const MenuAddModalRef = ref<InstanceType<typeof MenuAddModal>>()
 // 新增
 const onAdd = (id?: string) => {
-  AddMenuModalRef.value?.onAdd(id)
+  MenuAddModalRef.value?.onAdd(id)
 }
 
 // 修改
 const onUpdate = (item: MenuResp) => {
-  AddMenuModalRef.value?.onUpdate(item.id)
+  MenuAddModalRef.value?.onUpdate(item.id)
 }
 
 onMounted(() => {
diff --git a/src/views/system/role/AddRoleModal.vue b/src/views/system/role/RoleAddModal.vue
similarity index 100%
rename from src/views/system/role/AddRoleModal.vue
rename to src/views/system/role/RoleAddModal.vue
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 17d66be..fd0fa25 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -62,7 +62,7 @@
         </template>
       </GiTable>
 
-      <AddRoleModal ref="AddRoleModalRef" @save-success="search" />
+      <RoleAddModal ref="RoleAddModalRef" @save-success="search" />
       <RoleDetailDrawer ref="RoleDetailDrawerRef" />
     </a-card>
   </div>
@@ -70,7 +70,7 @@
 
 <script setup lang="ts">
 import { listRole, deleteRole, type RoleResp } from '@/apis'
-import AddRoleModal from './AddRoleModal.vue'
+import RoleAddModal from './RoleAddModal.vue'
 import RoleDetailDrawer from './RoleDetailDrawer.vue'
 import type { TableInstanceColumns } from '@/components/GiTable/type'
 import { useTable } from '@/hooks'
@@ -129,15 +129,15 @@ const onDelete = (item: RoleResp) => {
   return handleDelete(() => deleteRole(item.id), { content: `是否确定删除角色 [${item.name}]？`, showModal: true })
 }
 
-const AddRoleModalRef = ref<InstanceType<typeof AddRoleModal>>()
+const RoleAddModalRef = ref<InstanceType<typeof RoleAddModal>>()
 // 新增
 const onAdd = () => {
-  AddRoleModalRef.value?.onAdd()
+  RoleAddModalRef.value?.onAdd()
 }
 
 // 修改
 const onUpdate = (item: RoleResp) => {
-  AddRoleModalRef.value?.onUpdate(item.id)
+  RoleAddModalRef.value?.onUpdate(item.id)
 }
 
 const RoleDetailDrawerRef = ref<InstanceType<typeof RoleDetailDrawer>>()