From b6d0a6417093799cb2a72a8e573dff8246858ec8 Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Sat, 15 Jun 2024 11:45:32 +0800
Subject: [PATCH 01/35] =?UTF-8?q?docs:=20:memo:=20=E6=B7=BB=E5=8A=A0=20nod?=
 =?UTF-8?q?e=20=E4=B8=8D=E5=8F=AF=E7=94=A8=E7=89=88=E6=9C=AC=E5=A3=B0?=
 =?UTF-8?q?=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 986bea32..81ec1720 100644
--- a/README.md
+++ b/README.md
@@ -53,8 +53,8 @@
 
 | 环境                 | 名称版本                                                     | 下载地址                                                     |
 | -------------------- | :----------------------------------------------------------- | ------------------------------------------------------------ |
-| **开发工具**         | VSCode                                                       | [下载](https://code.visualstudio.com/Download)           |
-| **运行环境**         | Node ≥18                                                    | [下载](http://nodejs.cn/download)                        |
+| **开发工具**         | VSCode    | [下载](https://code.visualstudio.com/Download)           |
+| **运行环境**         | Node ≥18 (其中 20.6.0 版本不可用)    | [下载](http://nodejs.cn/download)                        |
 
 
 ## 项目启动

From 2d9193c47fd224f01f82b9c0b2bbeb5e7cb33584 Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Sun, 16 Jun 2024 10:12:16 +0800
Subject: [PATCH 02/35] =?UTF-8?q?feat:=20:sparkles:=20=E6=9B=B4=E6=8D=A2?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E5=88=86=E9=85=8D=E5=BC=B9=E7=AA=97=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E4=B8=BA=20drawer=20=E5=B9=B6=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=88=B6=E5=AD=90=E8=81=94=E5=8A=A8=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将权限分配弹窗从 dialog 更换为 drawer，提升用户体验。

添加父子联动开关以解决选择父节点时无需选择子节点的问题。

https://gitee.com/youlaiorg/vue3-element-admin/issues/I9T2BA #I9T2BA
---
 src/views/system/role/index.vue | 200 +++++++++++++++++++++-----------
 1 file changed, 135 insertions(+), 65 deletions(-)

diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 388f4b43..e62b10ea 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -22,7 +22,7 @@
 
     <el-card shadow="never" class="table-container">
       <template #header>
-        <el-button type="success" @click="openDialog()"
+        <el-button type="success" @click="handleOpenDialog()"
           ><i-ep-plus />新增</el-button
         >
         <el-button
@@ -60,7 +60,7 @@
               type="primary"
               size="small"
               link
-              @click="openMenuDialog(scope.row)"
+              @click="handleOpenAssignPermDialog(scope.row)"
             >
               <i-ep-position />分配权限
             </el-button>
@@ -68,7 +68,7 @@
               type="primary"
               size="small"
               link
-              @click="openDialog(scope.row.id)"
+              @click="handleOpenDialog(scope.row.id)"
             >
               <i-ep-edit />编辑
             </el-button>
@@ -98,7 +98,7 @@
       v-model="dialog.visible"
       :title="dialog.title"
       width="500px"
-      @close="closeDialog"
+      @close="handleCloseDialog"
     >
       <el-form
         ref="roleFormRef"
@@ -143,57 +143,93 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button type="primary" @click="handleSubmit">确 定</el-button>
-          <el-button @click="closeDialog">取 消</el-button>
+          <el-button @click="handleCloseDialog">取 消</el-button>
         </div>
       </template>
     </el-dialog>
 
-    <!-- 分配菜单弹窗  -->
-    <el-dialog
-      v-model="menuDialogVisible"
+    <!-- 分配权限弹窗 -->
+    <el-drawer
+      v-model="assignPermDialogVisible"
       :title="'【' + checkedRole.name + '】权限分配'"
-      width="800px"
+      size="500"
     >
-      <el-scrollbar v-loading="loading" max-height="600px">
-        <el-tree
-          ref="menuRef"
-          node-key="value"
-          show-checkbox
-          :data="menuList"
-          :default-expand-all="true"
+      <div class="flex-x-between">
+        <el-input
+          v-model="permKeywords"
+          clearable
+          class="w-[200px]"
+          placeholder="菜单权限名称"
         >
-          <template #default="{ data }">
-            {{ data.label }}
+          <template #prefix>
+            <i-ep-search />
           </template>
-        </el-tree>
-      </el-scrollbar>
+        </el-input>
+
+        <div class="flex-center">
+          <el-button type="primary" size="small" plain @click="togglePermTree"
+            ><i-ep-switch />{{ isExpanded ? "收缩" : "展开" }}</el-button
+          >
+          <el-checkbox
+            v-model="parentChildLinked"
+            @change="handleparentChildLinkedChange"
+            class="ml-5"
+            >父子联动
+          </el-checkbox>
+
+          <el-tooltip placement="bottom">
+            <template #content>
+              如果只需勾选菜单权限，不需要勾选子菜单或者按钮权限，请关闭父子联动
+            </template>
+            <i-ep-QuestionFilled
+              class="ml-1 color-[--el-color-primary] inline-block cursor-pointer"
+            />
+          </el-tooltip>
+        </div>
+      </div>
+
+      <el-tree
+        ref="permTreeRef"
+        node-key="value"
+        show-checkbox
+        :data="menuPermOptions"
+        :filter-node-method="handlePermFilter"
+        :default-expand-all="true"
+        :check-on-click-node="true"
+        :check-strictly="!parentChildLinked"
+        class="mt-5"
+      >
+        <template #default="{ data }">
+          {{ data.label }}
+        </template>
+      </el-tree>
 
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" @click="handleRoleMenuSubmit"
+          <el-button type="primary" @click="handleAssignPermSubmit"
             >确 定</el-button
           >
-          <el-button @click="menuDialogVisible = false">取 消</el-button>
+          <el-button @click="assignPermDialogVisible = false">取 消</el-button>
         </div>
       </template>
-    </el-dialog>
+    </el-drawer>
   </div>
 </template>
 
 <script setup lang="ts">
-import RoleAPI from "@/api/role";
-import MenuAPI from "@/api/menu";
-
-import { RolePageVO, RoleForm, RoleQuery } from "@/api/role/model";
-
 defineOptions({
   name: "Role",
   inheritAttrs: false,
 });
 
+import RoleAPI from "@/api/role";
+import MenuAPI from "@/api/menu";
+
+import { RolePageVO, RoleForm, RoleQuery } from "@/api/role/model";
+
 const queryFormRef = ref(ElForm);
 const roleFormRef = ref(ElForm);
-const menuRef = ref(ElTree);
+const permTreeRef = ref<InstanceType<typeof ElTree>>();
 
 const loading = ref(false);
 const ids = ref<number[]>([]);
@@ -204,13 +240,17 @@ const queryParams = reactive<RoleQuery>({
   pageSize: 10,
 });
 
+// 角色表格数据
 const roleList = ref<RolePageVO[]>();
+// 菜单权限下拉
+const menuPermOptions = ref<OptionType[]>([]);
 
+// 弹窗
 const dialog = reactive({
   title: "",
   visible: false,
 });
-
+// 角色表单
 const formData = reactive<RoleForm>({
   sort: 1,
   status: 1,
@@ -225,17 +265,20 @@ const rules = reactive({
   status: [{ required: true, message: "请选择状态", trigger: "blur" }],
 });
 
-const menuDialogVisible = ref(false);
-
-const menuList = ref<OptionType[]>([]);
-
+// 选中的角色
 interface CheckedRole {
   id?: number;
   name?: string;
 }
-let checkedRole: CheckedRole = reactive({});
+const checkedRole = ref<CheckedRole>({});
+const assignPermDialogVisible = ref(false);
 
-/** 查询 */
+const permKeywords = ref("");
+const isExpanded = ref(true);
+
+const parentChildLinked = ref(true);
+
+// 查询
 function handleQuery() {
   loading.value = true;
   RoleAPI.getPage(queryParams)
@@ -247,20 +290,20 @@ function handleQuery() {
       loading.value = false;
     });
 }
-/** 重置查询 */
+// 重置查询
 function handleResetQuery() {
   queryFormRef.value.resetFields();
   queryParams.pageNum = 1;
   handleQuery();
 }
 
-/** 行checkbox 选中事件 */
+// 行选中事件
 function handleSelectionChange(selection: any) {
   ids.value = selection.map((item: any) => item.id);
 }
 
-/** 打开角色表单弹窗 */
-function openDialog(roleId?: number) {
+// 打开弹窗
+function handleOpenDialog(roleId?: number) {
   dialog.visible = true;
   if (roleId) {
     dialog.title = "修改角色";
@@ -272,7 +315,7 @@ function openDialog(roleId?: number) {
   }
 }
 
-/** 角色保存提交 */
+// 角色保存提交
 function handleSubmit() {
   roleFormRef.value.validate((valid: any) => {
     if (valid) {
@@ -282,7 +325,7 @@ function handleSubmit() {
         RoleAPI.update(roleId, formData)
           .then(() => {
             ElMessage.success("修改成功");
-            closeDialog();
+            handleCloseDialog();
             handleResetQuery();
           })
           .finally(() => (loading.value = false));
@@ -290,7 +333,7 @@ function handleSubmit() {
         RoleAPI.add(formData)
           .then(() => {
             ElMessage.success("新增成功");
-            closeDialog();
+            handleCloseDialog();
             handleResetQuery();
           })
           .finally(() => (loading.value = false));
@@ -299,14 +342,10 @@ function handleSubmit() {
   });
 }
 
-/** 关闭表单弹窗 */
-function closeDialog() {
+// 关闭表单弹窗
+function handleCloseDialog() {
   dialog.visible = false;
-  resetForm();
-}
 
-/** 重置表单 */
-function resetForm() {
   roleFormRef.value.resetFields();
   roleFormRef.value.clearValidate();
 
@@ -315,7 +354,7 @@ function resetForm() {
   formData.status = 1;
 }
 
-/** 删除角色 */
+// 删除角色
 function handleDelete(roleId?: number) {
   const roleIds = [roleId || ids.value].join(",");
   if (!roleIds) {
@@ -338,26 +377,25 @@ function handleDelete(roleId?: number) {
   });
 }
 
-/** 打开分配菜单弹窗 */
-async function openMenuDialog(row: RolePageVO) {
+// 打开分配权限
+async function handleOpenAssignPermDialog(row: RolePageVO) {
   const roleId = row.id;
   if (roleId) {
-    checkedRole = {
-      id: roleId,
-      name: row.name,
-    };
-    menuDialogVisible.value = true;
+    assignPermDialogVisible.value = true;
     loading.value = true;
 
+    checkedRole.value.id = roleId;
+    checkedRole.value.name = row.name;
+
     // 获取所有的菜单
-    menuList.value = await MenuAPI.getOptions();
+    menuPermOptions.value = await MenuAPI.getOptions();
 
     // 回显角色已拥有的菜单
     RoleAPI.getRoleMenuIds(roleId)
       .then((data) => {
         const checkedMenuIds = data;
         checkedMenuIds.forEach((menuId) =>
-          menuRef.value.setChecked(menuId, true, false)
+          permTreeRef.value!.setChecked(menuId, true, false)
         );
       })
       .finally(() => {
@@ -366,19 +404,19 @@ async function openMenuDialog(row: RolePageVO) {
   }
 }
 
-/** 角色分配菜单保存提交 */
-function handleRoleMenuSubmit() {
-  const roleId = checkedRole.id;
+// 分配权限提交
+function handleAssignPermSubmit() {
+  const roleId = checkedRole.value.id;
   if (roleId) {
-    const checkedMenuIds: number[] = menuRef.value
-      .getCheckedNodes(false, true)
+    const checkedMenuIds: number[] = permTreeRef
+      .value!.getCheckedNodes(false, true)
       .map((node: any) => node.value);
 
     loading.value = true;
     RoleAPI.updateRoleMenus(roleId, checkedMenuIds)
       .then(() => {
         ElMessage.success("分配权限成功");
-        menuDialogVisible.value = false;
+        assignPermDialogVisible.value = false;
         handleResetQuery();
       })
       .finally(() => {
@@ -387,6 +425,38 @@ function handleRoleMenuSubmit() {
   }
 }
 
+// 切换菜单树展开状态
+function togglePermTree() {
+  isExpanded.value = !isExpanded.value;
+  if (permTreeRef.value) {
+    Object.values(permTreeRef.value.store.nodesMap).forEach((node: any) => {
+      if (isExpanded.value) {
+        node.expand();
+      } else {
+        node.collapse();
+      }
+    });
+  }
+}
+watch(permKeywords, (val) => {
+  permTreeRef.value!.filter(val);
+});
+
+// 权限筛选
+function handlePermFilter(
+  value: string,
+  data: {
+    [key: string]: any;
+  }
+) {
+  if (!value) return true;
+  return data.label.includes(value);
+}
+
+function handleparentChildLinkedChange(val: any) {
+  parentChildLinked.value = val;
+}
+
 onMounted(() => {
   handleQuery();
 });

From 69157d2c509f998d88acfa078162cf1617969fc1 Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Sun, 16 Jun 2024 10:14:11 +0800
Subject: [PATCH 03/35] =?UTF-8?q?docs:=20:memo:=20=E4=BC=98=E5=8C=96=20rou?=
 =?UTF-8?q?te=20meta=20=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/types/router.d.ts | 60 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 src/types/router.d.ts

diff --git a/src/types/router.d.ts b/src/types/router.d.ts
new file mode 100644
index 00000000..65c47ca3
--- /dev/null
+++ b/src/types/router.d.ts
@@ -0,0 +1,60 @@
+import "vue-router";
+
+declare module "vue-router" {
+  // https://router.vuejs.org/zh/guide/advanced/meta.html#typescript
+  // 可以通过扩展 RouteMeta 接口来输入 meta 字段
+  interface RouteMeta {
+    /**
+     * 菜单名称
+     * @example 'Dashboard'
+     */
+    title?: string;
+
+    /**
+     * 菜单图标
+     * @example 'el-icon-edit'
+     */
+    icon?: string;
+
+    /**
+     * 是否隐藏菜单项
+     * true 隐藏, false 显示
+     * @default false
+     */
+    hidden?: boolean;
+
+    /**
+     * 始终显示父级菜单，即使只有一个子菜单
+     * true 显示父级菜单, false 隐藏父级菜单，显示唯一子节点
+     * @default false
+     */
+    alwaysShow?: boolean;
+
+    /**
+     * 是否固定在页签上
+     * true 固定, false 不固定
+     * @default false
+     */
+    affix?: boolean;
+
+    /**
+     * 是否缓存页面
+     * true 缓存, false 不缓存
+     * @default false
+     */
+    keepAlive?: boolean;
+
+    /**
+     * 是否在面包屑导航中隐藏
+     * true 隐藏, false 显示
+     * @default false
+     */
+    breadcrumb?: boolean;
+
+    /**
+     * 拥有访问该菜单权限的角色编码集合
+     * @example ['admin', 'editor']
+     */
+    roles?: string[];
+  }
+}

From 3a8c90a49a797cc9a29e54fb88eab1e6703d7a1f Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Sun, 16 Jun 2024 10:15:44 +0800
Subject: [PATCH 04/35] =?UTF-8?q?chore:=20:hammer:=20=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=89=88=E6=9C=AC=E5=8F=B7=202.11.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f28faa98..573cb7da 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue3-element-admin",
-  "version": "2.11.3",
+  "version": "2.11.4",
   "private": true,
   "type": "module",
   "scripts": {

From e2cecf2905859c13362f44a917bf1d5a088384b6 Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Sun, 16 Jun 2024 10:26:10 +0800
Subject: [PATCH 05/35] =?UTF-8?q?chore:=20:hammer:=20router=20=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=A3=B0=E6=98=8E=E6=96=87=E4=BB=B6=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=A7=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/types/router.d.ts   | 60 -----------------------------------------
 src/typings/router.d.ts | 52 +++++++++++++++++++++++++++++------
 2 files changed, 44 insertions(+), 68 deletions(-)
 delete mode 100644 src/types/router.d.ts

diff --git a/src/types/router.d.ts b/src/types/router.d.ts
deleted file mode 100644
index 65c47ca3..00000000
--- a/src/types/router.d.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import "vue-router";
-
-declare module "vue-router" {
-  // https://router.vuejs.org/zh/guide/advanced/meta.html#typescript
-  // 可以通过扩展 RouteMeta 接口来输入 meta 字段
-  interface RouteMeta {
-    /**
-     * 菜单名称
-     * @example 'Dashboard'
-     */
-    title?: string;
-
-    /**
-     * 菜单图标
-     * @example 'el-icon-edit'
-     */
-    icon?: string;
-
-    /**
-     * 是否隐藏菜单项
-     * true 隐藏, false 显示
-     * @default false
-     */
-    hidden?: boolean;
-
-    /**
-     * 始终显示父级菜单，即使只有一个子菜单
-     * true 显示父级菜单, false 隐藏父级菜单，显示唯一子节点
-     * @default false
-     */
-    alwaysShow?: boolean;
-
-    /**
-     * 是否固定在页签上
-     * true 固定, false 不固定
-     * @default false
-     */
-    affix?: boolean;
-
-    /**
-     * 是否缓存页面
-     * true 缓存, false 不缓存
-     * @default false
-     */
-    keepAlive?: boolean;
-
-    /**
-     * 是否在面包屑导航中隐藏
-     * true 隐藏, false 显示
-     * @default false
-     */
-    breadcrumb?: boolean;
-
-    /**
-     * 拥有访问该菜单权限的角色编码集合
-     * @example ['admin', 'editor']
-     */
-    roles?: string[];
-  }
-}
diff --git a/src/typings/router.d.ts b/src/typings/router.d.ts
index f0ddb399..65c47ca3 100644
--- a/src/typings/router.d.ts
+++ b/src/typings/router.d.ts
@@ -4,21 +4,57 @@ declare module "vue-router" {
   // https://router.vuejs.org/zh/guide/advanced/meta.html#typescript
   // 可以通过扩展 RouteMeta 接口来输入 meta 字段
   interface RouteMeta {
-    /** 菜单名称 */
+    /**
+     * 菜单名称
+     * @example 'Dashboard'
+     */
     title?: string;
-    /** 菜单图标  */
+
+    /**
+     * 菜单图标
+     * @example 'el-icon-edit'
+     */
     icon?: string;
-    /** 菜单是否隐藏 */
+
+    /**
+     * 是否隐藏菜单项
+     * true 隐藏, false 显示
+     * @default false
+     */
     hidden?: boolean;
-    /** 只有一个子路由是否始终显示 */
+
+    /**
+     * 始终显示父级菜单，即使只有一个子菜单
+     * true 显示父级菜单, false 隐藏父级菜单，显示唯一子节点
+     * @default false
+     */
     alwaysShow?: boolean;
-    /** 是否固定页签 */
+
+    /**
+     * 是否固定在页签上
+     * true 固定, false 不固定
+     * @default false
+     */
     affix?: boolean;
-    /** 是否缓存页面 */
+
+    /**
+     * 是否缓存页面
+     * true 缓存, false 不缓存
+     * @default false
+     */
     keepAlive?: boolean;
-    /** 是否在面包屑上隐藏 */
+
+    /**
+     * 是否在面包屑导航中隐藏
+     * true 隐藏, false 显示
+     * @default false
+     */
     breadcrumb?: boolean;
-    /** 拥有菜单权限的角色编码集合 */
+
+    /**
+     * 拥有访问该菜单权限的角色编码集合
+     * @example ['admin', 'editor']
+     */
     roles?: string[];
   }
 }

From 1449b078b14b49aae730e52532bc617f38dab7c8 Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Mon, 17 Jun 2024 08:12:41 +0800
Subject: [PATCH 06/35] =?UTF-8?q?refactor:=20:recycle:=20aPI=20=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=E5=9F=BA=E7=A1=80=20URL=20=E6=8F=90=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth/index.ts | 16 +++++++----
 src/api/dept/index.ts | 41 ++++++++++++++++-----------
 src/api/dict/index.ts | 65 +++++++++++++++++++++++++++----------------
 src/api/menu/index.ts | 35 +++++++++++++++--------
 src/api/role/index.ts | 45 +++++++++++++++++++-----------
 src/api/user/index.ts | 58 +++++++++++++++++++++++---------------
 6 files changed, 163 insertions(+), 97 deletions(-)

diff --git a/src/api/auth/index.ts b/src/api/auth/index.ts
index 57cf1e7c..b8875c6b 100644
--- a/src/api/auth/index.ts
+++ b/src/api/auth/index.ts
@@ -1,12 +1,14 @@
 import request from "@/utils/request";
 import { CaptchaResult, LoginData, LoginResult } from "./model";
 
+const AUTH_BASE_URL = "/api/v1/auth";
+
 class AuthAPI {
   /**
    * 登录API
    *
-   * @param data {LoginData}
-   * @returns
+   * @param data 登录数据
+   * @returns 登录结果
    */
   static login(data: LoginData) {
     const formData = new FormData();
@@ -15,7 +17,7 @@ class AuthAPI {
     formData.append("captchaKey", data.captchaKey || "");
     formData.append("captchaCode", data.captchaCode || "");
     return request<any, LoginResult>({
-      url: "/api/v1/auth/login",
+      url: `${AUTH_BASE_URL}/login`,
       method: "post",
       data: formData,
       headers: {
@@ -26,20 +28,24 @@ class AuthAPI {
 
   /**
    * 注销API
+   *
+   * @returns 请求结果
    */
   static logout() {
     return request({
-      url: "/api/v1/auth/logout",
+      url: `${AUTH_BASE_URL}/logout`,
       method: "delete",
     });
   }
 
   /**
    * 获取验证码
+   *
+   * @returns 验证码结果
    */
   static getCaptcha() {
     return request<any, CaptchaResult>({
-      url: "/api/v1/auth/captcha",
+      url: `${AUTH_BASE_URL}/captcha`,
       method: "get",
     });
   }
diff --git a/src/api/dept/index.ts b/src/api/dept/index.ts
index 45f689a6..a4eff9b5 100644
--- a/src/api/dept/index.ts
+++ b/src/api/dept/index.ts
@@ -1,38 +1,44 @@
 import request from "@/utils/request";
 import { DeptForm, DeptQuery, DeptVO } from "./model";
 
+const DEPT_BASE_URL = "/api/v1/dept";
+
 class DeptAPI {
   /**
-   * 部门树形表格
+   * 获取部门树形表格列表
    *
-   * @param queryParams
+   * @param queryParams 查询参数（可选）
+   * @returns 部门树形表格数据
    */
   static getList(queryParams?: DeptQuery) {
     return request<any, DeptVO[]>({
-      url: "/api/v1/dept",
+      url: `${DEPT_BASE_URL}`,
       method: "get",
       params: queryParams,
     });
   }
 
   /**
-   * 部门下拉列表
+   * 获取部门下拉列表选项
+   *
+   * @returns 部门下拉列表选项
    */
   static getOptions() {
     return request<any, OptionType[]>({
-      url: "/api/v1/dept/options",
+      url: `${DEPT_BASE_URL}/options`,
       method: "get",
     });
   }
 
   /**
-   * 获取部门详情
+   * 获取部门详情表单数据
    *
-   * @param id
+   * @param id 部门ID
+   * @returns 部门详情表单数据
    */
   static getFormData(id: number) {
     return request<any, DeptForm>({
-      url: "/api/v1/dept/" + id + "/form",
+      url: `${DEPT_BASE_URL}/${id}/form`,
       method: "get",
     });
   }
@@ -40,25 +46,27 @@ class DeptAPI {
   /**
    * 新增部门
    *
-   * @param data
+   * @param data 部门表单数据
+   * @returns 请求结果
    */
   static add(data: DeptForm) {
     return request({
-      url: "/api/v1/dept",
+      url: `${DEPT_BASE_URL}`,
       method: "post",
       data: data,
     });
   }
 
   /**
-   *  修改部门
+   * 修改部门
    *
-   * @param id
-   * @param data
+   * @param id 部门ID
+   * @param data 部门表单数据
+   * @returns 请求结果
    */
   static update(id: number, data: DeptForm) {
     return request({
-      url: "/api/v1/dept/" + id,
+      url: `${DEPT_BASE_URL}/${id}`,
       method: "put",
       data: data,
     });
@@ -67,11 +75,12 @@ class DeptAPI {
   /**
    * 删除部门
    *
-   * @param ids
+   * @param ids 部门ID，多个以英文逗号(,)分隔
+   * @returns 请求结果
    */
   static deleteByIds(ids: string) {
     return request({
-      url: "/api/v1/dept/" + ids,
+      url: `${DEPT_BASE_URL}/${ids}`,
       method: "delete",
     });
   }
diff --git a/src/api/dict/index.ts b/src/api/dict/index.ts
index adef210f..a31c9c52 100644
--- a/src/api/dict/index.ts
+++ b/src/api/dict/index.ts
@@ -8,28 +8,32 @@ import {
   DictPageResult,
 } from "./model";
 
+const DICT_BASE_URL = "/api/v1/dict";
+
 class DictAPI {
   /**
-   * 字典类型分页列表
+   * 获取字典类型分页列表
    *
-   * @param queryParams
+   * @param queryParams 查询参数
+   * @returns 字典类型分页结果
    */
   static getDictTypePage(queryParams: DictTypeQuery) {
     return request<any, DictTypePageResult>({
-      url: "/api/v1/dict/types/page",
+      url: `${DICT_BASE_URL}/types/page`,
       method: "get",
       params: queryParams,
     });
   }
 
   /**
-   * 字典类型表单数据
+   * 获取字典类型表单数据
    *
-   * @param id
+   * @param id 字典类型ID
+   * @returns 字典类型表单数据
    */
   static getDictTypeForm(id: number) {
     return request<any, ResponseData<DictTypeForm>>({
-      url: "/api/v1/dict/types/" + id + "/form",
+      url: `${DICT_BASE_URL}/types/${id}/form`,
       method: "get",
     });
   }
@@ -37,11 +41,12 @@ class DictAPI {
   /**
    * 新增字典类型
    *
-   * @param data
+   * @param data 字典类型表单数据
+   * @returns 请求结果
    */
   static addDictType(data: DictTypeForm) {
     return request({
-      url: "/api/v1/dict/types",
+      url: `${DICT_BASE_URL}/types`,
       method: "post",
       data: data,
     });
@@ -50,12 +55,13 @@ class DictAPI {
   /**
    * 修改字典类型
    *
-   * @param id
-   * @param data
+   * @param id 字典类型ID
+   * @param data 字典类型表单数据
+   * @returns 请求结果
    */
   static updateDictType(id: number, data: DictTypeForm) {
     return request({
-      url: "/api/v1/dict/types/" + id,
+      url: `${DICT_BASE_URL}/types/${id}`,
       method: "put",
       data: data,
     });
@@ -63,10 +69,13 @@ class DictAPI {
 
   /**
    * 删除字典类型
+   *
+   * @param ids 字典类型ID，多个以英文逗号(,)分隔
+   * @returns 请求结果
    */
   static deleteDictTypes(ids: string) {
     return request({
-      url: "/api/v1/dict/types/" + ids,
+      url: `${DICT_BASE_URL}/types/${ids}`,
       method: "delete",
     });
   }
@@ -75,20 +84,24 @@ class DictAPI {
    * 获取字典类型的数据项
    *
    * @param typeCode 字典类型编码
+   * @returns 字典类型的数据项
    */
   static getDictOptions(typeCode: string) {
     return request<any, OptionType[]>({
-      url: "/api/v1/dict/" + typeCode + "/options",
+      url: `${DICT_BASE_URL}/${typeCode}/options`,
       method: "get",
     });
   }
 
   /**
-   * 字典分页列表
+   * 获取字典分页列表
+   *
+   * @param queryParams 查询参数
+   * @returns 字典分页结果
    */
   static getDictPage(queryParams: DictQuery) {
     return request<any, DictPageResult>({
-      url: "/api/v1/dict/page",
+      url: `${DICT_BASE_URL}/page`,
       method: "get",
       params: queryParams,
     });
@@ -97,11 +110,12 @@ class DictAPI {
   /**
    * 获取字典表单数据
    *
-   * @param id
+   * @param id 字典项ID
+   * @returns 字典表单数据
    */
   static getDictFormData(id: number) {
     return request<any, DictForm>({
-      url: "/api/v1/dict/" + id + "/form",
+      url: `${DICT_BASE_URL}/${id}/form`,
       method: "get",
     });
   }
@@ -109,11 +123,12 @@ class DictAPI {
   /**
    * 新增字典
    *
-   * @param data
+   * @param data 字典表单数据
+   * @returns 请求结果
    */
   static addDict(data: DictForm) {
     return request({
-      url: "/api/v1/dict",
+      url: `${DICT_BASE_URL}`,
       method: "post",
       data: data,
     });
@@ -122,12 +137,13 @@ class DictAPI {
   /**
    * 修改字典项
    *
-   * @param id
-   * @param data
+   * @param id 字典项ID
+   * @param data 字典表单数据
+   * @returns 请求结果
    */
   static updateDict(id: number, data: DictForm) {
     return request({
-      url: "/api/v1/dict/" + id,
+      url: `${DICT_BASE_URL}/${id}`,
       method: "put",
       data: data,
     });
@@ -136,11 +152,12 @@ class DictAPI {
   /**
    * 删除字典
    *
-   * @param ids 字典项ID，多个以英文逗号(,)分割
+   * @param ids 字典项ID，多个以英文逗号(,)分隔
+   * @returns 请求结果
    */
   static deleteDictByIds(ids: string) {
     return request({
-      url: "/api/v1/dict/" + ids,
+      url: `${DICT_BASE_URL}/${ids}`,
       method: "delete",
     });
   }
diff --git a/src/api/menu/index.ts b/src/api/menu/index.ts
index 9657fcb3..9a26294a 100644
--- a/src/api/menu/index.ts
+++ b/src/api/menu/index.ts
@@ -1,13 +1,17 @@
 import request from "@/utils/request";
 import { MenuQuery, MenuVO, MenuForm, RouteVO } from "./model";
 
+const MENU_BASE_URL = "/api/v1/menus";
+
 class MenuAPI {
   /**
    * 获取路由列表
+   *
+   * @returns 路由列表
    */
   static getRoutes() {
     return request<any, RouteVO[]>({
-      url: "/api/v1/menus/routes",
+      url: `${MENU_BASE_URL}/routes`,
       method: "get",
     });
   }
@@ -15,11 +19,12 @@ class MenuAPI {
   /**
    * 获取菜单树形列表
    *
-   * @param queryParams
+   * @param queryParams 查询参数
+   * @returns 菜单树形列表
    */
   static getList(queryParams: MenuQuery) {
     return request<any, MenuVO[]>({
-      url: "/api/v1/menus",
+      url: `${MENU_BASE_URL}`,
       method: "get",
       params: queryParams,
     });
@@ -27,10 +32,12 @@ class MenuAPI {
 
   /**
    * 获取菜单下拉数据源
+   *
+   * @returns 菜单下拉数据源
    */
   static getOptions() {
     return request<any, OptionType[]>({
-      url: "/api/v1/menus/options",
+      url: `${MENU_BASE_URL}/options`,
       method: "get",
     });
   }
@@ -38,11 +45,12 @@ class MenuAPI {
   /**
    * 获取菜单表单数据
    *
-   * @param id
+   * @param id 菜单ID
+   * @returns 菜单表单数据
    */
   static getFormData(id: number) {
     return request<any, MenuForm>({
-      url: "/api/v1/menus/" + id + "/form",
+      url: `${MENU_BASE_URL}/${id}/form`,
       method: "get",
     });
   }
@@ -50,11 +58,12 @@ class MenuAPI {
   /**
    * 添加菜单
    *
-   * @param data
+   * @param data 菜单表单数据
+   * @returns 请求结果
    */
   static add(data: MenuForm) {
     return request({
-      url: "/api/v1/menus",
+      url: `${MENU_BASE_URL}`,
       method: "post",
       data: data,
     });
@@ -63,12 +72,13 @@ class MenuAPI {
   /**
    * 修改菜单
    *
-   * @param id
-   * @param data
+   * @param id 菜单ID
+   * @param data 菜单表单数据
+   * @returns 请求结果
    */
   static update(id: string, data: MenuForm) {
     return request({
-      url: "/api/v1/menus/" + id,
+      url: `${MENU_BASE_URL}/${id}`,
       method: "put",
       data: data,
     });
@@ -78,10 +88,11 @@ class MenuAPI {
    * 删除菜单
    *
    * @param id 菜单ID
+   * @returns 请求结果
    */
   static deleteById(id: number) {
     return request({
-      url: "/api/v1/menus/" + id,
+      url: `${MENU_BASE_URL}/${id}`,
       method: "delete",
     });
   }
diff --git a/src/api/role/index.ts b/src/api/role/index.ts
index 148a2518..00d79ab2 100644
--- a/src/api/role/index.ts
+++ b/src/api/role/index.ts
@@ -1,15 +1,18 @@
 import request from "@/utils/request";
 import { RoleQuery, RolePageResult, RoleForm } from "./model";
 
+const ROLE_BASE_URL = "/api/v1/roles";
+
 class RoleAPI {
   /**
    * 获取角色分页数据
    *
-   * @param queryParams
+   * @param queryParams 查询参数
+   * @returns 角色分页数据
    */
   static getPage(queryParams?: RoleQuery) {
     return request<any, RolePageResult>({
-      url: "/api/v1/roles/page",
+      url: `${ROLE_BASE_URL}/page`,
       method: "get",
       params: queryParams,
     });
@@ -18,11 +21,12 @@ class RoleAPI {
   /**
    * 获取角色下拉数据源
    *
-   * @param queryParams
+   * @param queryParams 查询参数（可选）
+   * @returns 角色下拉数据源
    */
   static getOptions(queryParams?: RoleQuery) {
     return request<any, OptionType[]>({
-      url: "/api/v1/roles/options",
+      url: `${ROLE_BASE_URL}/options`,
       method: "get",
       params: queryParams,
     });
@@ -31,11 +35,12 @@ class RoleAPI {
   /**
    * 获取角色的菜单ID集合
    *
-   * @param queryParams
+   * @param roleId 角色ID
+   * @returns 角色的菜单ID集合
    */
   static getRoleMenuIds(roleId: number) {
     return request<any, number[]>({
-      url: "/api/v1/roles/" + roleId + "/menuIds",
+      url: `${ROLE_BASE_URL}/${roleId}/menuIds`,
       method: "get",
     });
   }
@@ -43,11 +48,13 @@ class RoleAPI {
   /**
    * 分配菜单权限给角色
    *
-   * @param queryParams
+   * @param roleId 角色ID
+   * @param data 菜单ID集合
+   * @returns 请求结果
    */
   static updateRoleMenus(roleId: number, data: number[]) {
     return request({
-      url: "/api/v1/roles/" + roleId + "/menus",
+      url: `${ROLE_BASE_URL}/${roleId}/menus`,
       method: "put",
       data: data,
     });
@@ -56,11 +63,12 @@ class RoleAPI {
   /**
    * 获取角色表单数据
    *
-   * @param id
+   * @param id 角色ID
+   * @returns 角色表单数据
    */
   static getFormData(id: number) {
     return request<any, RoleForm>({
-      url: "/api/v1/roles/" + id + "/form",
+      url: `${ROLE_BASE_URL}/${id}/form`,
       method: "get",
     });
   }
@@ -68,11 +76,12 @@ class RoleAPI {
   /**
    * 添加角色
    *
-   * @param data
+   * @param data 角色表单数据
+   * @returns 请求结果
    */
   static add(data: RoleForm) {
     return request({
-      url: "/api/v1/roles",
+      url: `${ROLE_BASE_URL}`,
       method: "post",
       data: data,
     });
@@ -81,12 +90,13 @@ class RoleAPI {
   /**
    * 更新角色
    *
-   * @param id
-   * @param data
+   * @param id 角色ID
+   * @param data 角色表单数据
+   * @returns 请求结果
    */
   static update(id: number, data: RoleForm) {
     return request({
-      url: "/api/v1/roles/" + id,
+      url: `${ROLE_BASE_URL}/${id}`,
       method: "put",
       data: data,
     });
@@ -95,11 +105,12 @@ class RoleAPI {
   /**
    * 批量删除角色，多个以英文逗号(,)分割
    *
-   * @param ids
+   * @param ids 角色ID字符串，多个以英文逗号(,)分割
+   * @returns 请求结果
    */
   static deleteByIds(ids: string) {
     return request({
-      url: "/api/v1/roles/" + ids,
+      url: `${ROLE_BASE_URL}/${ids}`,
       method: "delete",
     });
   }
diff --git a/src/api/user/index.ts b/src/api/user/index.ts
index 306bfb44..37f64488 100644
--- a/src/api/user/index.ts
+++ b/src/api/user/index.ts
@@ -1,13 +1,17 @@
 import request from "@/utils/request";
 import { UserForm, UserInfo, UserPageVO, UserQuery } from "./model";
 
+const USER_BASE_URL = "/api/v1/users";
+
 class UserAPI {
   /**
    * 登录成功后获取用户信息（昵称、头像、权限集合和角色集合）
+   *
+   * @returns 用户信息
    */
   static getInfo() {
     return request<any, UserInfo>({
-      url: "/api/v1/users/me",
+      url: `${USER_BASE_URL}/me`,
       method: "get",
     });
   }
@@ -15,11 +19,12 @@ class UserAPI {
   /**
    * 获取用户分页列表
    *
-   * @param queryParams
+   * @param queryParams 查询参数
+   * @returns 用户分页列表
    */
   static getPage(queryParams: UserQuery) {
     return request<any, PageResult<UserPageVO[]>>({
-      url: "/api/v1/users/page",
+      url: `${USER_BASE_URL}/page`,
       method: "get",
       params: queryParams,
     });
@@ -28,11 +33,12 @@ class UserAPI {
   /**
    * 获取用户表单详情
    *
-   * @param userId
+   * @param userId 用户ID
+   * @returns 用户表单详情
    */
   static getFormData(userId: number) {
     return request<any, UserForm>({
-      url: "/api/v1/users/" + userId + "/form",
+      url: `${USER_BASE_URL}/${userId}/form`,
       method: "get",
     });
   }
@@ -40,11 +46,12 @@ class UserAPI {
   /**
    * 添加用户
    *
-   * @param data
+   * @param data 用户表单数据
+   * @returns 请求结果
    */
   static add(data: UserForm) {
     return request({
-      url: "/api/v1/users",
+      url: `${USER_BASE_URL}`,
       method: "post",
       data: data,
     });
@@ -53,12 +60,13 @@ class UserAPI {
   /**
    * 修改用户
    *
-   * @param id
-   * @param data
+   * @param id 用户ID
+   * @param data 用户表单数据
+   * @returns 请求结果
    */
   static update(id: number, data: UserForm) {
     return request({
-      url: "/api/v1/users/" + id,
+      url: `${USER_BASE_URL}/${id}`,
       method: "put",
       data: data,
     });
@@ -67,25 +75,27 @@ class UserAPI {
   /**
    * 修改用户密码
    *
-   * @param id
-   * @param password
+   * @param id 用户ID
+   * @param password 新密码
+   * @returns 请求结果
    */
   static updatePassword(id: number, password: string) {
     return request({
-      url: "/api/v1/users/" + id + "/password",
+      url: `${USER_BASE_URL}/${id}/password`,
       method: "patch",
       params: { password: password },
     });
   }
 
   /**
-   * 删除用户
+   * 批量删除用户，多个以英文逗号(,)分割
    *
-   * @param ids
+   * @param ids 用户ID字符串，多个以英文逗号(,)分割
+   * @returns 请求结果
    */
   static deleteByIds(ids: string) {
     return request({
-      url: "/api/v1/users/" + ids,
+      url: `${USER_BASE_URL}/${ids}`,
       method: "delete",
     });
   }
@@ -93,11 +103,11 @@ class UserAPI {
   /**
    * 下载用户导入模板
    *
-   * @returns
+   * @returns 用户导入模板文件
    */
   static downloadTemplate() {
     return request({
-      url: "/api/v1/users/template",
+      url: `${USER_BASE_URL}/template`,
       method: "get",
       responseType: "arraybuffer",
     });
@@ -106,12 +116,12 @@ class UserAPI {
   /**
    * 导出用户
    *
-   * @param queryParams
-   * @returns
+   * @param queryParams 查询参数
+   * @returns 导出文件
    */
   static export(queryParams: UserQuery) {
     return request({
-      url: "/api/v1/users/export",
+      url: `${USER_BASE_URL}/export`,
       method: "get",
       params: queryParams,
       responseType: "arraybuffer",
@@ -121,13 +131,15 @@ class UserAPI {
   /**
    * 导入用户
    *
-   * @param file
+   * @param deptId 部门ID
+   * @param file 导入文件
+   * @returns 请求结果
    */
   static import(deptId: number, file: File) {
     const formData = new FormData();
     formData.append("file", file);
     return request({
-      url: "/api/v1/users/import",
+      url: `${USER_BASE_URL}/import`,
       method: "post",
       params: { deptId: deptId },
       data: formData,

From 2854b36598d47ce35fa7a1774bd2284fa124ffb9 Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Mon, 17 Jun 2024 08:14:17 +0800
Subject: [PATCH 07/35] =?UTF-8?q?perf:=20:zap:=20=E6=B7=BB=E5=8A=A0=20exce?=
 =?UTF-8?q?ljs=20=E8=87=B3=E9=A2=84=E5=8A=A0=E8=BD=BD=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vite.config.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vite.config.ts b/vite.config.ts
index 71c4e47e..10855be4 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -147,6 +147,7 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
         "@wangeditor/editor-for-vue",
         "vue-i18n",
         "path-browserify",
+        "exceljs",
         "element-plus/es/components/form/style/css",
         "element-plus/es/components/form-item/style/css",
         "element-plus/es/components/button/style/css",

From e2e70e647c20f0a2fbb21a3f90a3932a69894be6 Mon Sep 17 00:00:00 2001
From: cshaptx4869 <994774638@qq.com>
Date: Mon, 17 Jun 2024 11:23:39 +0800
Subject: [PATCH 08/35] =?UTF-8?q?feat(PageContent):=20:sparkles:=20?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=90=8E=E7=AB=AF=E6=96=87=E4=BB=B6=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CURD/PageContent.vue   | 52 ++++++++++++++++++++++-----
 src/components/CURD/types.ts          |  3 ++
 src/views/demo/curd/config/content.ts | 10 +++---
 src/views/demo/curd/index.vue         |  4 +--
 4 files changed, 53 insertions(+), 16 deletions(-)

diff --git a/src/components/CURD/PageContent.vue b/src/components/CURD/PageContent.vue
index 72482e7b..0d173cb6 100644
--- a/src/components/CURD/PageContent.vue
+++ b/src/components/CURD/PageContent.vue
@@ -29,11 +29,22 @@
                 删除
               </el-button>
             </template>
+            <!-- 导入 -->
+            <template v-else-if="item === 'import'">
+              <el-button
+                v-hasPerm="[`${contentConfig.pageName}:${item}`]"
+                type="default"
+                icon="upload"
+                @click="handleToolbar(item)"
+              >
+                导入
+              </el-button>
+            </template>
             <!-- 导出 -->
             <template v-else-if="item === 'export'">
               <el-button
                 v-hasPerm="[`${contentConfig.pageName}:${item}`]"
-                type="primary"
+                type="default"
                 icon="download"
                 @click="handleToolbar(item)"
               >
@@ -573,8 +584,8 @@ function handleSelectionChange(selection: any[]) {
 }
 
 // 刷新
-function handleRefresh() {
-  fetchPageData(lastFormData);
+function handleRefresh(isRestart = false) {
+  fetchPageData(lastFormData, isRestart);
 }
 
 // 删除
@@ -593,7 +604,7 @@ function handleDelete(id?: number | string) {
     if (props.contentConfig.deleteAction) {
       props.contentConfig.deleteAction(ids).then(() => {
         ElMessage.success("删除成功");
-        fetchPageData({}, true);
+        handleRefresh(true);
       });
     } else {
       ElMessage.error("未配置deleteAction");
@@ -693,6 +704,7 @@ function handleExports() {
 }
 
 // 导入表单
+let isFileImport = false;
 const uploadRef = ref<UploadInstance>();
 const importsModalVisible = ref(false);
 const importsFormRef = ref<FormInstance>();
@@ -705,8 +717,9 @@ const importsFormRules: FormRules = {
   files: [{ required: true, message: "请选择文件" }],
 };
 // 打开导入弹窗
-function handleOpenImportsModal() {
+function handleOpenImportsModal(isFile: boolean = false) {
   importsModalVisible.value = true;
+  isFileImport = isFile;
 }
 // 覆盖前一个文件
 function handleFileExceed(files: File[]) {
@@ -735,7 +748,13 @@ function handleDownloadTemplate() {
 // 导入确认
 const handleImportsSubmit = useThrottleFn(() => {
   importsFormRef.value?.validate((valid: boolean) => {
-    valid && handleImports();
+    if (valid) {
+      if (isFileImport) {
+        handleImport();
+      } else {
+        handleImports();
+      }
+    }
   });
 }, 3000);
 // 关闭导入弹窗
@@ -746,6 +765,19 @@ function handleCloseImportsModal() {
     importsFormRef.value?.clearValidate();
   });
 }
+// 文件导入
+function handleImport() {
+  const importAction = props.contentConfig.importAction;
+  if (importAction === undefined) {
+    ElMessage.error("未配置importAction");
+    return;
+  }
+  importAction(importsFormData.files[0].raw as File).then(() => {
+    ElMessage.success("导入数据成功");
+    handleCloseImportsModal();
+    handleRefresh(true);
+  });
+}
 // 导入
 function handleImports() {
   const importsAction = props.contentConfig.importsAction;
@@ -802,6 +834,7 @@ function handleImports() {
           importsAction(data).then(() => {
             ElMessage.success("导入数据成功");
             handleCloseImportsModal();
+            handleRefresh(true);
           });
         })
         .catch((error) => console.log(error));
@@ -832,6 +865,9 @@ function handleToolbar(name: string) {
     case "delete":
       handleDelete();
       break;
+    case "import":
+      handleOpenImportsModal(true);
+      break;
     case "export":
       emit("exportClick");
       break;
@@ -876,11 +912,11 @@ function handleModify(
 // 分页切换
 function handleSizeChange(value: number) {
   pagination.pageSize = value;
-  fetchPageData(lastFormData);
+  handleRefresh();
 }
 function handleCurrentChange(value: number) {
   pagination.currentPage = value;
-  fetchPageData(lastFormData);
+  handleRefresh();
 }
 
 // 远程数据筛选
diff --git a/src/components/CURD/types.ts b/src/components/CURD/types.ts
index 1cbdb561..c2082033 100644
--- a/src/components/CURD/types.ts
+++ b/src/components/CURD/types.ts
@@ -92,6 +92,8 @@ export interface IContentConfig<T = any> {
   exportAction?: (queryParams: T) => Promise<any>;
   // 前端全量导出的网络请求函数(需返回promise)
   exportsAction?: (queryParams: T) => Promise<IObject[]>;
+  // 后端导入的网络请求函数(需返回promise)
+  importAction?: (file: File) => Promise<any>;
   // 前端导入模板
   importsTemplate?: string | (() => Promise<any>);
   // 前端导入的网络请求函数(需返回promise)
@@ -102,6 +104,7 @@ export interface IContentConfig<T = any> {
   toolbar?: Array<
     | "add"
     | "delete"
+    | "import"
     | "export"
     | {
         auth: string;
diff --git a/src/views/demo/curd/config/content.ts b/src/views/demo/curd/config/content.ts
index 56a1a0b7..bda6a058 100644
--- a/src/views/demo/curd/config/content.ts
+++ b/src/views/demo/curd/config/content.ts
@@ -25,6 +25,9 @@ const contentConfig: IContentConfig<UserQuery> = {
     return UserAPI.getPage(params);
   },
   deleteAction: UserAPI.deleteByIds,
+  importAction(file) {
+    return UserAPI.import(1, file);
+  },
   exportAction: UserAPI.export,
   importsTemplate: UserAPI.downloadTemplate,
   importsAction(data) {
@@ -42,13 +45,8 @@ const contentConfig: IContentConfig<UserQuery> = {
   toolbar: [
     "add",
     "delete",
+    "import",
     "export",
-    {
-      name: "import",
-      icon: "upload",
-      text: "导入",
-      auth: "import",
-    },
     {
       name: "custom1",
       icon: "plus",
diff --git a/src/views/demo/curd/index.vue b/src/views/demo/curd/index.vue
index 75f71086..9060c666 100644
--- a/src/views/demo/curd/index.vue
+++ b/src/views/demo/curd/index.vue
@@ -113,8 +113,8 @@ async function handleEditClick(row: IObject) {
 // 其他工具栏
 function handleToolbarClick(name: string) {
   console.log(name);
-  if (name === "import") {
-    ElMessage.success("点击了导入按钮");
+  if (name === "custom1") {
+    ElMessage.success("点击了自定义1按钮");
   }
 }
 // 其他操作列

From 53ff0d3d3f39e9e1eca840d474c8c9a478a39fda Mon Sep 17 00:00:00 2001
From: cshaptx4869 <994774638@qq.com>
Date: Mon, 17 Jun 2024 11:39:49 +0800
Subject: [PATCH 09/35] =?UTF-8?q?refactor(PageContent):=20:recycle:=20?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF=E5=8F=82=E6=95=B0=E6=94=B9?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CURD/PageContent.vue   | 14 +++++++-------
 src/components/CURD/types.ts          |  4 ++--
 src/views/demo/curd/config/content.ts |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/components/CURD/PageContent.vue b/src/components/CURD/PageContent.vue
index 0d173cb6..90f04842 100644
--- a/src/components/CURD/PageContent.vue
+++ b/src/components/CURD/PageContent.vue
@@ -452,7 +452,7 @@
                 <div class="el-upload__tip">
                   *.xlsx / *.xls
                   <el-link
-                    v-if="contentConfig.importsTemplate"
+                    v-if="contentConfig.importTemplate"
                     type="primary"
                     icon="download"
                     :underline="false"
@@ -730,11 +730,11 @@ function handleFileExceed(files: File[]) {
 }
 // 下载导入模板
 function handleDownloadTemplate() {
-  const importsTemplate = props.contentConfig.importsTemplate;
-  if (typeof importsTemplate === "string") {
-    window.open(importsTemplate);
-  } else if (typeof importsTemplate === "function") {
-    importsTemplate().then((response) => {
+  const importTemplate = props.contentConfig.importTemplate;
+  if (typeof importTemplate === "string") {
+    window.open(importTemplate);
+  } else if (typeof importTemplate === "function") {
+    importTemplate().then((response) => {
       const fileData = response.data;
       const fileName = decodeURI(
         response.headers["content-disposition"].split(";")[1].split("=")[1]
@@ -742,7 +742,7 @@ function handleDownloadTemplate() {
       saveXlsx(fileData, fileName);
     });
   } else {
-    ElMessage.error("未配置importsTemplate");
+    ElMessage.error("未配置importTemplate");
   }
 }
 // 导入确认
diff --git a/src/components/CURD/types.ts b/src/components/CURD/types.ts
index c2082033..af0cd7f9 100644
--- a/src/components/CURD/types.ts
+++ b/src/components/CURD/types.ts
@@ -92,10 +92,10 @@ export interface IContentConfig<T = any> {
   exportAction?: (queryParams: T) => Promise<any>;
   // 前端全量导出的网络请求函数(需返回promise)
   exportsAction?: (queryParams: T) => Promise<IObject[]>;
+  // 导入模板
+  importTemplate?: string | (() => Promise<any>);
   // 后端导入的网络请求函数(需返回promise)
   importAction?: (file: File) => Promise<any>;
-  // 前端导入模板
-  importsTemplate?: string | (() => Promise<any>);
   // 前端导入的网络请求函数(需返回promise)
   importsAction?: (data: IObject[]) => Promise<any>;
   // 主键名(默认为id)
diff --git a/src/views/demo/curd/config/content.ts b/src/views/demo/curd/config/content.ts
index bda6a058..8a79fecb 100644
--- a/src/views/demo/curd/config/content.ts
+++ b/src/views/demo/curd/config/content.ts
@@ -29,7 +29,7 @@ const contentConfig: IContentConfig<UserQuery> = {
     return UserAPI.import(1, file);
   },
   exportAction: UserAPI.export,
-  importsTemplate: UserAPI.downloadTemplate,
+  importTemplate: UserAPI.downloadTemplate,
   importsAction(data) {
     // 模拟导入数据
     console.log("importsAction", data);

From edce9fcebadaf36a922b5a1c355cec424a2d7388 Mon Sep 17 00:00:00 2001
From: cshaptx4869 <994774638@qq.com>
Date: Mon, 17 Jun 2024 11:51:40 +0800
Subject: [PATCH 10/35] =?UTF-8?q?refactor(PageContent):=20:recycle:=20?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=9B=B8=E5=85=B3=E5=B1=9E=E6=80=A7=E5=92=8C?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=91=BD=E5=90=8D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CURD/PageContent.vue | 54 ++++++++++++++---------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/components/CURD/PageContent.vue b/src/components/CURD/PageContent.vue
index 90f04842..9d185e3e 100644
--- a/src/components/CURD/PageContent.vue
+++ b/src/components/CURD/PageContent.vue
@@ -416,28 +416,28 @@
     </el-dialog>
     <!-- 导入弹窗 -->
     <el-dialog
-      v-model="importsModalVisible"
+      v-model="importModalVisible"
       :align-center="true"
       title="导入数据"
       width="600px"
       style="padding-right: 0"
-      @close="handleCloseImportsModal"
+      @close="handleCloseImportModal"
     >
       <!-- 滚动 -->
       <el-scrollbar max-height="60vh">
         <!-- 表单 -->
         <el-form
-          ref="importsFormRef"
+          ref="importFormRef"
           label-width="auto"
           style="padding-right: var(--el-dialog-padding-primary)"
-          :model="importsFormData"
-          :rules="importsFormRules"
+          :model="importFormData"
+          :rules="importFormRules"
         >
           <el-form-item label="文件名" prop="files">
             <el-upload
               class="w-full"
               ref="uploadRef"
-              v-model:file-list="importsFormData.files"
+              v-model:file-list="importFormData.files"
               accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
               :drag="true"
               :limit="1"
@@ -471,12 +471,12 @@
         <div style="padding-right: var(--el-dialog-padding-primary)">
           <el-button
             type="primary"
-            :disabled="importsFormData.files.length === 0"
-            @click="handleImportsSubmit"
+            :disabled="importFormData.files.length === 0"
+            @click="handleImportSubmit"
           >
             确 定
           </el-button>
-          <el-button @click="handleCloseImportsModal">取 消</el-button>
+          <el-button @click="handleCloseImportModal">取 消</el-button>
         </div>
       </template>
     </el-dialog>
@@ -706,19 +706,19 @@ function handleExports() {
 // 导入表单
 let isFileImport = false;
 const uploadRef = ref<UploadInstance>();
-const importsModalVisible = ref(false);
-const importsFormRef = ref<FormInstance>();
-const importsFormData = reactive<{
+const importModalVisible = ref(false);
+const importFormRef = ref<FormInstance>();
+const importFormData = reactive<{
   files: UploadUserFile[];
 }>({
   files: [],
 });
-const importsFormRules: FormRules = {
+const importFormRules: FormRules = {
   files: [{ required: true, message: "请选择文件" }],
 };
 // 打开导入弹窗
-function handleOpenImportsModal(isFile: boolean = false) {
-  importsModalVisible.value = true;
+function handleOpenImportModal(isFile: boolean = false) {
+  importModalVisible.value = true;
   isFileImport = isFile;
 }
 // 覆盖前一个文件
@@ -746,8 +746,8 @@ function handleDownloadTemplate() {
   }
 }
 // 导入确认
-const handleImportsSubmit = useThrottleFn(() => {
-  importsFormRef.value?.validate((valid: boolean) => {
+const handleImportSubmit = useThrottleFn(() => {
+  importFormRef.value?.validate((valid: boolean) => {
     if (valid) {
       if (isFileImport) {
         handleImport();
@@ -758,11 +758,11 @@ const handleImportsSubmit = useThrottleFn(() => {
   });
 }, 3000);
 // 关闭导入弹窗
-function handleCloseImportsModal() {
-  importsModalVisible.value = false;
-  importsFormRef.value?.resetFields();
+function handleCloseImportModal() {
+  importModalVisible.value = false;
+  importFormRef.value?.resetFields();
   nextTick(() => {
-    importsFormRef.value?.clearValidate();
+    importFormRef.value?.clearValidate();
   });
 }
 // 文件导入
@@ -772,9 +772,9 @@ function handleImport() {
     ElMessage.error("未配置importAction");
     return;
   }
-  importAction(importsFormData.files[0].raw as File).then(() => {
+  importAction(importFormData.files[0].raw as File).then(() => {
     ElMessage.success("导入数据成功");
-    handleCloseImportsModal();
+    handleCloseImportModal();
     handleRefresh(true);
   });
 }
@@ -786,7 +786,7 @@ function handleImports() {
     return;
   }
   // 获取选择的文件
-  const file = importsFormData.files[0].raw as File;
+  const file = importFormData.files[0].raw as File;
   // 创建Workbook实例
   const workbook = new ExcelJS.Workbook();
   // 使用FileReader对象来读取文件内容
@@ -833,7 +833,7 @@ function handleImports() {
           }
           importsAction(data).then(() => {
             ElMessage.success("导入数据成功");
-            handleCloseImportsModal();
+            handleCloseImportModal();
             handleRefresh(true);
           });
         })
@@ -854,7 +854,7 @@ function handleToolbar(name: string) {
       handleOpenExportsModal();
       break;
     case "imports":
-      handleOpenImportsModal();
+      handleOpenImportModal();
       break;
     case "search":
       emit("searchClick");
@@ -866,7 +866,7 @@ function handleToolbar(name: string) {
       handleDelete();
       break;
     case "import":
-      handleOpenImportsModal(true);
+      handleOpenImportModal(true);
       break;
     case "export":
       emit("exportClick");

From d3b077dd1763a22cc9bf45851b609e6123186c15 Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Tue, 18 Jun 2024 08:14:34 +0800
Subject: [PATCH 11/35] =?UTF-8?q?docs:=20:memo:=20=E8=B7=AF=E7=94=B1=20nam?=
 =?UTF-8?q?e=20=20=E6=B3=A8=E9=87=8A=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/router/index.ts b/src/router/index.ts
index e1d92422..e94bb501 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -32,14 +32,14 @@ export const constantRoutes: RouteRecordRaw[] = [
       {
         path: "dashboard",
         component: () => import("@/views/dashboard/index.vue"),
-        name: "Dashboard", // 用于 keep-alive, 必须与SFC自动推导或者显示声明的组件name一致
-        // https://cn.vuejs.org/guide/built-ins/keep-alive.html#include-exclude
+        // 用于 keep-alive 功能，需要与 SFC 中自动推导或显式声明的组件名称一致
+        // 参考文档: https://cn.vuejs.org/guide/built-ins/keep-alive.html#include-exclude
+        name: "Dashboard",
         meta: {
           title: "dashboard",
           icon: "homepage",
           affix: true,
           keepAlive: true,
-          alwaysShow: false,
         },
       },
       {

From 28349efe147afab36531ba148eaac3a448fe6c71 Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Tue, 18 Jun 2024 08:16:40 +0800
Subject: [PATCH 12/35] =?UTF-8?q?fix:=20:bug:=20=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E8=B7=AF=E7=94=B1=E7=82=B9=E5=87=BB=E5=8D=A1=E6=AD=BB=EF=BC=8C?=
 =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=85=B3=E9=97=AD=20`vue-dev-tools`=20?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vite.config.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/vite.config.ts b/vite.config.ts
index 10855be4..ecd70d33 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -128,9 +128,9 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
         // 指定symbolId格式
         symbolId: "icon-[dir]-[name]",
       }),
-      VueDevTools({
+      /* VueDevTools({
         openInEditorHost: `http://localhost:${env.VITE_APP_PORT}`,
-      }),
+      }), */
     ],
     // 预加载项目必需的组件
     optimizeDeps: {
@@ -147,7 +147,6 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
         "@wangeditor/editor-for-vue",
         "vue-i18n",
         "path-browserify",
-        "exceljs",
         "element-plus/es/components/form/style/css",
         "element-plus/es/components/form-item/style/css",
         "element-plus/es/components/button/style/css",

From 9e14fa35fd2498931e58069fae2fe7c667202011 Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Tue, 18 Jun 2024 08:17:28 +0800
Subject: [PATCH 13/35] =?UTF-8?q?build:=20:package:=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7=20`npm`=20=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 573cb7da..11facc72 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
     "sockjs-client": "1.6.1",
     "sortablejs": "^1.15.2",
     "stompjs": "^2.3.3",
-    "vue": "^3.4.27",
+    "vue": "^3.4.29",
     "vue-i18n": "9.9.1",
     "vue-router": "^4.3.3"
   },
@@ -73,14 +73,14 @@
     "@iconify-json/ep": "^1.1.15",
     "@types/color": "^3.0.6",
     "@types/lodash": "^4.17.5",
-    "@types/node": "^20.14.2",
+    "@types/node": "^20.14.3",
     "@types/nprogress": "^0.2.3",
     "@types/path-browserify": "^1.0.2",
     "@types/sockjs-client": "^1.5.4",
     "@types/sortablejs": "^1.15.8",
     "@types/stompjs": "^2.3.9",
-    "@typescript-eslint/eslint-plugin": "^7.13.0",
-    "@typescript-eslint/parser": "^7.13.0",
+    "@typescript-eslint/eslint-plugin": "^7.13.1",
+    "@typescript-eslint/parser": "^7.13.1",
     "@vitejs/plugin-vue": "^5.0.5",
     "@vitejs/plugin-vue-jsx": "^3.1.0",
     "autoprefixer": "^10.4.19",
@@ -98,7 +98,7 @@
     "postcss-html": "^1.7.0",
     "postcss-scss": "^4.0.9",
     "prettier": "^3.3.2",
-    "sass": "^1.77.5",
+    "sass": "^1.77.6",
     "stylelint": "^16.6.1",
     "stylelint-config-html": "^1.1.0",
     "stylelint-config-recess-order": "^4.6.0",
@@ -111,10 +111,10 @@
     "unplugin-auto-import": "^0.17.6",
     "unplugin-icons": "^0.18.5",
     "unplugin-vue-components": "^0.26.0",
-    "vite": "^5.2.13",
+    "vite": "^5.3.1",
     "vite-plugin-mock-dev-server": "^1.5.0",
     "vite-plugin-svg-icons": "^2.0.1",
-    "vite-plugin-vue-devtools": "^7.2.1",
+    "vite-plugin-vue-devtools": "^7.3.0",
     "vue-tsc": "^2.0.21"
   },
   "repository": "https://gitee.com/youlaiorg/vue3-element-admin.git",

From fb88d842867df609dd4095e81c2af2489a30a4d2 Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Tue, 18 Jun 2024 08:19:37 +0800
Subject: [PATCH 14/35] =?UTF-8?q?build:=20:package:=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=89=88=E6=9C=AC=E5=8F=B7=202.11.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 11facc72..0cd539bc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue3-element-admin",
-  "version": "2.11.4",
+  "version": "2.11.5",
   "private": true,
   "type": "module",
   "scripts": {

From 239989f4aaf321324b9e199261a3ee0165df32a9 Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Tue, 18 Jun 2024 08:21:04 +0800
Subject: [PATCH 15/35] =?UTF-8?q?docs:=20:memo:=20=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.en-US.md | 4 ++--
 README.md       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.en-US.md b/README.en-US.md
index 5112d0ad..68cc3371 100644
--- a/README.en-US.md
+++ b/README.en-US.md
@@ -1,6 +1,6 @@
 <div align="center">
-    <img src="https://img.shields.io/badge/Vue-3.4.27-brightgreen.svg"/>
-    <img src="https://img.shields.io/badge/Vite-5.2.11-green.svg"/>
+    <img src="https://img.shields.io/badge/Vue-3.4.29-brightgreen.svg"/>
+    <img src="https://img.shields.io/badge/Vite-5.3.1-green.svg"/>
     <img src="https://img.shields.io/badge/Element Plus-2.7.5-blue.svg"/>
     <img src="https://img.shields.io/badge/license-MIT-green.svg"/>
     <a href="https://gitee.com/youlaiorg" target="_blank">
diff --git a/README.md b/README.md
index 81ec1720..5822d321 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 <div align="center">
-    <img src="https://img.shields.io/badge/Vue-3.4.27-brightgreen.svg"/>
-    <img src="https://img.shields.io/badge/Vite-5.2.11-green.svg"/>
+    <img src="https://img.shields.io/badge/Vue-3.4.29-brightgreen.svg"/>
+    <img src="https://img.shields.io/badge/Vite-5.3.1-green.svg"/>
     <img src="https://img.shields.io/badge/Element Plus-2.7.5-blue.svg"/>
     <img src="https://img.shields.io/badge/license-MIT-green.svg"/>
     <a href="https://gitee.com/youlaiorg" target="_blank">

From d5dfcb978ea9e2da23effcdd5083c8b9a7c942af Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Mon, 24 Jun 2024 08:21:46 +0800
Subject: [PATCH 16/35] =?UTF-8?q?refactor:=20:recycle:=20=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E9=87=8D=E6=9E=84=EF=BC=8C=E7=B3=BB=E7=BB=9F=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E6=A8=A1=E5=9D=97=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   4 +-
 mock/dict.mock.ts                             |  18 +-
 mock/menu.mock.ts                             |  12 +-
 src/api/auth.ts                               |  72 ++++
 src/api/auth/index.ts                         |  54 ---
 src/api/auth/model.ts                         |  59 ---
 src/api/{dept/index.ts => dept.ts}            |  53 ++-
 src/api/dept/model.ts                         |  71 ----
 src/api/dict.ts                               | 183 +++++++++
 src/api/dict/index.ts                         | 166 --------
 src/api/dict/model.ts                         | 142 -------
 src/api/{file/index.ts => file.ts}            |  11 +-
 src/api/file/model.ts                         |   7 -
 src/api/menu.ts                               | 209 ++++++++++
 src/api/menu/index.ts                         | 101 -----
 src/api/menu/model.ts                         | 188 ---------
 src/api/{role/index.ts => role.ts}            |  73 ++--
 src/api/role/model.ts                         |  78 ----
 src/api/{user/index.ts => user.ts}            | 113 +++++-
 src/api/user/model.ts                         | 115 ------
 src/components/Dictionary/index.vue           |  17 +-
 src/store/modules/permission.ts               |   2 +-
 src/store/modules/user.ts                     |   4 +-
 src/{typings => types}/auto-imports.d.ts      |   0
 src/{typings => types}/components.d.ts        |   1 +
 src/{typings => types}/env.d.ts               |   0
 src/{typings => types}/global.d.ts            |   0
 src/{typings => types}/router.d.ts            |   0
 src/{typings => types}/socket.d.ts            |   0
 src/views/demo/curd/config/add.ts             |   3 +-
 src/views/demo/curd/config/content.ts         |   4 +-
 src/views/demo/curd/config/edit.ts            |   2 +-
 src/views/demo/curd/index.vue                 |   4 +-
 src/views/demo/dict.vue                       |   4 +-
 src/views/login/index.vue                     |   2 +-
 src/views/system/dept/index.vue               |  68 ++--
 .../system/dict/components/dict-item.vue      | 308 ---------------
 src/views/system/dict/index.vue               | 361 ++++++++++--------
 src/views/system/menu/index.vue               |  76 ++--
 src/views/system/role/index.vue               |  23 +-
 .../system/user/components/user-import.vue    | 145 +++++++
 src/views/system/user/index.vue               | 308 +++++----------
 tsconfig.json                                 |   3 +-
 43 files changed, 1243 insertions(+), 1821 deletions(-)
 create mode 100644 src/api/auth.ts
 delete mode 100644 src/api/auth/index.ts
 delete mode 100644 src/api/auth/model.ts
 rename src/api/{dept/index.ts => dept.ts} (63%)
 delete mode 100644 src/api/dept/model.ts
 create mode 100644 src/api/dict.ts
 delete mode 100644 src/api/dict/index.ts
 delete mode 100644 src/api/dict/model.ts
 rename src/api/{file/index.ts => file.ts} (83%)
 delete mode 100644 src/api/file/model.ts
 create mode 100644 src/api/menu.ts
 delete mode 100644 src/api/menu/index.ts
 delete mode 100644 src/api/menu/model.ts
 rename src/api/{role/index.ts => role.ts} (64%)
 delete mode 100644 src/api/role/model.ts
 rename src/api/{user/index.ts => user.ts} (58%)
 delete mode 100644 src/api/user/model.ts
 rename src/{typings => types}/auto-imports.d.ts (100%)
 rename src/{typings => types}/components.d.ts (98%)
 rename src/{typings => types}/env.d.ts (100%)
 rename src/{typings => types}/global.d.ts (100%)
 rename src/{typings => types}/router.d.ts (100%)
 rename src/{typings => types}/socket.d.ts (100%)
 delete mode 100644 src/views/system/dict/components/dict-item.vue
 create mode 100644 src/views/system/user/components/user-import.vue

diff --git a/.env.development b/.env.development
index 548fc857..6268a702 100644
--- a/.env.development
+++ b/.env.development
@@ -5,9 +5,9 @@ VITE_APP_PORT = 3000
 VITE_APP_BASE_API = '/dev-api'
 
 # 线上接口地址
-VITE_APP_API_URL = http://vapi.youlai.tech
+# VITE_APP_API_URL = http://vapi.youlai.tech
 # 开发接口地址
-# VITE_APP_API_URL = http://localhost:8989
+VITE_APP_API_URL = http://localhost:8989
 
 # 是否启用 Mock 服务
 VITE_MOCK_DEV_SERVER = false
diff --git a/mock/dict.mock.ts b/mock/dict.mock.ts
index 178a75a2..ebaef2ec 100644
--- a/mock/dict.mock.ts
+++ b/mock/dict.mock.ts
@@ -92,7 +92,7 @@ export default defineMock([
     },
   },
 
-  // 新增字典类型
+  // 新增字典
   {
     url: "dict/types",
     method: ["POST"],
@@ -100,12 +100,12 @@ export default defineMock([
       return {
         code: "00000",
         data: null,
-        msg: "新增字典类型" + body.name + "成功",
+        msg: "新增字典" + body.name + "成功",
       };
     },
   },
 
-  // 获取字典类型表单数据
+  // 获取字典表单数据
   {
     url: "dict/types/:id/form",
     method: ["GET"],
@@ -118,7 +118,7 @@ export default defineMock([
     },
   },
 
-  // 修改字典类型
+  // 修改字典
   {
     url: "dict/types/:id",
     method: ["PUT"],
@@ -126,12 +126,12 @@ export default defineMock([
       return {
         code: "00000",
         data: null,
-        msg: "修改字典类型" + body.name + "成功",
+        msg: "修改字典" + body.name + "成功",
       };
     },
   },
 
-  // 删除字典类型
+  // 删除字典
   {
     url: "dict/types/:id",
     method: ["DELETE"],
@@ -139,7 +139,7 @@ export default defineMock([
       return {
         code: "00000",
         data: null,
-        msg: "删除字典类型" + params.id + "成功",
+        msg: "删除字典" + params.id + "成功",
       };
     },
   },
@@ -178,7 +178,7 @@ export default defineMock([
       return {
         code: "00000",
         data: null,
-        msg: "修改字典类型" + body.name + "成功",
+        msg: "修改字典" + body.name + "成功",
       };
     },
   },
@@ -197,7 +197,7 @@ export default defineMock([
   },
 ]);
 
-// 字典类型映射表数据
+// 字典映射表数据
 const dictTypeMap: Record<string, any> = {
   1: {
     id: 1,
diff --git a/mock/menu.mock.ts b/mock/menu.mock.ts
index 1e552cfe..59c3b918 100644
--- a/mock/menu.mock.ts
+++ b/mock/menu.mock.ts
@@ -720,7 +720,7 @@ export default defineMock([
                 {
                   id: 79,
                   parentId: 6,
-                  name: "字典类型新增",
+                  name: "字典新增",
                   type: "BUTTON",
                   path: "",
                   component: null,
@@ -734,7 +734,7 @@ export default defineMock([
                 {
                   id: 81,
                   parentId: 6,
-                  name: "字典类型编辑",
+                  name: "字典编辑",
                   type: "BUTTON",
                   path: "",
                   component: null,
@@ -748,7 +748,7 @@ export default defineMock([
                 {
                   id: 84,
                   parentId: 6,
-                  name: "字典类型删除",
+                  name: "字典删除",
                   type: "BUTTON",
                   path: "",
                   component: null,
@@ -1231,15 +1231,15 @@ export default defineMock([
               children: [
                 {
                   value: 79,
-                  label: "字典类型新增",
+                  label: "字典新增",
                 },
                 {
                   value: 81,
-                  label: "字典类型编辑",
+                  label: "字典编辑",
                 },
                 {
                   value: 84,
-                  label: "字典类型删除",
+                  label: "字典删除",
                 },
                 {
                   value: 85,
diff --git a/src/api/auth.ts b/src/api/auth.ts
new file mode 100644
index 00000000..eb904d87
--- /dev/null
+++ b/src/api/auth.ts
@@ -0,0 +1,72 @@
+import request from "@/utils/request";
+
+const AUTH_BASE_URL = "/api/v1/auth";
+
+class AuthAPI {
+  /** 登录 接口*/
+  static login(data: LoginData) {
+    const formData = new FormData();
+    formData.append("username", data.username);
+    formData.append("password", data.password);
+    formData.append("captchaKey", data.captchaKey);
+    formData.append("captchaCode", data.captchaCode);
+    return request<any, LoginResult>({
+      url: `${AUTH_BASE_URL}/login`,
+      method: "post",
+      data: formData,
+      headers: {
+        "Content-Type": "multipart/form-data",
+      },
+    });
+  }
+
+  /** 注销 接口*/
+  static logout() {
+    return request({
+      url: `${AUTH_BASE_URL}/logout`,
+      method: "delete",
+    });
+  }
+
+  /** 获取验证码 接口*/
+  static getCaptcha() {
+    return request<any, CaptchaResult>({
+      url: `${AUTH_BASE_URL}/captcha`,
+      method: "get",
+    });
+  }
+}
+
+export default AuthAPI;
+
+/** 登录请求参数 */
+export interface LoginData {
+  /** 用户名 */
+  username: string;
+  /** 密码 */
+  password: string;
+  /** 验证码缓存key */
+  captchaKey: string;
+  /** 验证码 */
+  captchaCode: string;
+}
+
+/** 登录响应 */
+export interface LoginResult {
+  /** 访问token */
+  accessToken?: string;
+  /** 过期时间(单位：毫秒) */
+  expires?: number;
+  /** 刷新token */
+  refreshToken?: string;
+  /** token 类型 */
+  tokenType?: string;
+}
+
+/** 验证码响应 */
+export interface CaptchaResult {
+  /** 验证码缓存key */
+  captchaKey: string;
+  /** 验证码图片Base64字符串 */
+  captchaBase64: string;
+}
diff --git a/src/api/auth/index.ts b/src/api/auth/index.ts
deleted file mode 100644
index b8875c6b..00000000
--- a/src/api/auth/index.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import request from "@/utils/request";
-import { CaptchaResult, LoginData, LoginResult } from "./model";
-
-const AUTH_BASE_URL = "/api/v1/auth";
-
-class AuthAPI {
-  /**
-   * 登录API
-   *
-   * @param data 登录数据
-   * @returns 登录结果
-   */
-  static login(data: LoginData) {
-    const formData = new FormData();
-    formData.append("username", data.username);
-    formData.append("password", data.password);
-    formData.append("captchaKey", data.captchaKey || "");
-    formData.append("captchaCode", data.captchaCode || "");
-    return request<any, LoginResult>({
-      url: `${AUTH_BASE_URL}/login`,
-      method: "post",
-      data: formData,
-      headers: {
-        "Content-Type": "multipart/form-data",
-      },
-    });
-  }
-
-  /**
-   * 注销API
-   *
-   * @returns 请求结果
-   */
-  static logout() {
-    return request({
-      url: `${AUTH_BASE_URL}/logout`,
-      method: "delete",
-    });
-  }
-
-  /**
-   * 获取验证码
-   *
-   * @returns 验证码结果
-   */
-  static getCaptcha() {
-    return request<any, CaptchaResult>({
-      url: `${AUTH_BASE_URL}/captcha`,
-      method: "get",
-    });
-  }
-}
-
-export default AuthAPI;
diff --git a/src/api/auth/model.ts b/src/api/auth/model.ts
deleted file mode 100644
index 0da661ed..00000000
--- a/src/api/auth/model.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * 登录请求参数
- */
-export interface LoginData {
-  /**
-   * 用户名
-   */
-  username: string;
-  /**
-   * 密码
-   */
-  password: string;
-
-  /**
-   * 验证码缓存key
-   */
-  captchaKey?: string;
-
-  /**
-   * 验证码
-   */
-  captchaCode?: string;
-}
-
-/**
- * 登录响应
- */
-export interface LoginResult {
-  /**
-   * 访问token
-   */
-  accessToken?: string;
-  /**
-   * 过期时间(单位：毫秒)
-   */
-  expires?: number;
-  /**
-   * 刷新token
-   */
-  refreshToken?: string;
-  /**
-   * token 类型
-   */
-  tokenType?: string;
-}
-
-/**
- * 验证码响应
- */
-export interface CaptchaResult {
-  /**
-   * 验证码缓存key
-   */
-  captchaKey: string;
-  /**
-   * 验证码图片Base64字符串
-   */
-  captchaBase64: string;
-}
diff --git a/src/api/dept/index.ts b/src/api/dept.ts
similarity index 63%
rename from src/api/dept/index.ts
rename to src/api/dept.ts
index a4eff9b5..b650c24c 100644
--- a/src/api/dept/index.ts
+++ b/src/api/dept.ts
@@ -1,11 +1,10 @@
 import request from "@/utils/request";
-import { DeptForm, DeptQuery, DeptVO } from "./model";
 
 const DEPT_BASE_URL = "/api/v1/dept";
 
 class DeptAPI {
   /**
-   * 获取部门树形表格列表
+   * 获取部门列表
    *
    * @param queryParams 查询参数（可选）
    * @returns 部门树形表格数据
@@ -18,11 +17,7 @@ class DeptAPI {
     });
   }
 
-  /**
-   * 获取部门下拉列表选项
-   *
-   * @returns 部门下拉列表选项
-   */
+  /** 获取部门下拉列表 */
   static getOptions() {
     return request<any, OptionType[]>({
       url: `${DEPT_BASE_URL}/options`,
@@ -87,3 +82,47 @@ class DeptAPI {
 }
 
 export default DeptAPI;
+
+/** 部门查询参数 */
+export interface DeptQuery {
+  /** 搜索关键字 */
+  keywords?: string;
+  /** 状态 */
+  status?: number;
+}
+
+/** 部门类型 */
+export interface DeptVO {
+  /** 子部门 */
+  children?: DeptVO[];
+  /** 创建时间 */
+  createTime?: Date;
+  /** 部门ID */
+  id?: number;
+  /** 部门名称 */
+  name?: string;
+  /** 部门编号 */
+  code?: string;
+  /** 父部门ID */
+  parentId?: number;
+  /** 排序 */
+  sort?: number;
+  /** 状态(1:启用；0:禁用) */
+  status?: number;
+  /** 修改时间 */
+  updateTime?: Date;
+}
+
+/** 部门表单类型 */
+export interface DeptForm {
+  /** 部门ID(新增不填) */
+  id?: number;
+  /** 部门名称 */
+  name?: string;
+  /** 父部门ID */
+  parentId: number;
+  /** 排序 */
+  sort?: number;
+  /** 状态(1:启用；0：禁用) */
+  status?: number;
+}
diff --git a/src/api/dept/model.ts b/src/api/dept/model.ts
deleted file mode 100644
index 408c39c4..00000000
--- a/src/api/dept/model.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * 部门查询参数
- */
-export interface DeptQuery {
-  keywords?: string;
-  status?: number;
-}
-
-/**
- * 部门类型
- */
-export interface DeptVO {
-  /**
-   * 子部门
-   */
-  children?: DeptVO[];
-  /**
-   * 创建时间
-   */
-  createTime?: Date;
-  /**
-   * 部门ID
-   */
-  id?: number;
-  /**
-   * 部门名称
-   */
-  name?: string;
-  /**
-   * 父部门ID
-   */
-  parentId?: number;
-  /**
-   * 排序
-   */
-  sort?: number;
-  /**
-   * 状态(1:启用；0:禁用)
-   */
-  status?: number;
-  /**
-   * 修改时间
-   */
-  updateTime?: Date;
-}
-
-/**
- * 部门表单类型
- */
-export interface DeptForm {
-  /**
-   * 部门ID(新增不填)
-   */
-  id?: number;
-  /**
-   * 部门名称
-   */
-  name?: string;
-  /**
-   * 父部门ID
-   */
-  parentId: number;
-  /**
-   * 排序
-   */
-  sort?: number;
-  /**
-   * 状态(1:启用；0：禁用)
-   */
-  status?: number;
-}
diff --git a/src/api/dict.ts b/src/api/dict.ts
new file mode 100644
index 00000000..b9512005
--- /dev/null
+++ b/src/api/dict.ts
@@ -0,0 +1,183 @@
+import request from "@/utils/request";
+
+const DICT_BASE_URL = "/api/v1/dict";
+
+class DictAPI {
+  /**
+   * 获取字典分页列表
+   *
+   * @param queryParams 查询参数
+   * @returns 字典分页结果
+   */
+  static getPage(queryParams: DictPageQuery) {
+    return request<any, PageResult<DictPageVO[]>>({
+      url: `${DICT_BASE_URL}/page`,
+      method: "get",
+      params: queryParams,
+    });
+  }
+
+  /**
+   * 获取字典表单数据
+   *
+   * @param id 字典ID
+   * @returns 字典表单数据
+   */
+  static getFormData(id: number) {
+    return request<any, ResponseData<DictForm>>({
+      url: `${DICT_BASE_URL}/${id}/form`,
+      method: "get",
+    });
+  }
+
+  /**
+   * 新增字典
+   *
+   * @param data 字典表单数据
+   * @returns 请求结果
+   */
+  static add(data: DictForm) {
+    return request({
+      url: `${DICT_BASE_URL}`,
+      method: "post",
+      data: data,
+    });
+  }
+
+  /**
+   * 修改字典
+   *
+   * @param id 字典ID
+   * @param data 字典表单数据
+   * @returns 请求结果
+   */
+  static update(id: number, data: DictForm) {
+    return request({
+      url: `${DICT_BASE_URL}/${id}`,
+      method: "put",
+      data: data,
+    });
+  }
+
+  /**
+   * 删除字典
+   *
+   * @param ids 字典ID，多个以英文逗号(,)分隔
+   * @returns 请求结果
+   */
+  static deleteByIds(ids: string) {
+    return request({
+      url: `${DICT_BASE_URL}/${ids}`,
+      method: "delete",
+    });
+  }
+
+  /**
+   * 获取字典的数据项
+   *
+   * @param typeCode 字典编码
+   * @returns 字典数据项
+   */
+  static getOptions(code: string) {
+    return request<any, OptionType[]>({
+      url: `${DICT_BASE_URL}/${code}/options`,
+      method: "get",
+    });
+  }
+}
+
+export default DictAPI;
+
+/**
+ * 字典查询参数
+ */
+export interface DictPageQuery extends PageQuery {
+  /**
+   * 关键字(字典名称/编码)
+   */
+  keywords?: string;
+}
+
+/**
+ * 字典分页对象
+ */
+export interface DictPageVO {
+  /**
+   * 字典ID
+   */
+  id: number;
+  /**
+   * 字典名称
+   */
+  name: string;
+  /**
+   * 字典编码
+   */
+  code: string;
+  /**
+   * 字典状态（1-启用，0-禁用）
+   */
+  status: number;
+  /**
+   * 字典项列表
+   */
+  dictItems: DictItem[];
+}
+
+/**
+ * 字典项
+ */
+export interface DictItem {
+  /**
+   * 字典项ID
+   */
+  id?: number;
+  /**
+   * 字典项名称
+   */
+  name?: string;
+  /**
+   * 字典项值
+   */
+  value?: string;
+  /**
+   * 排序
+   */
+  sort?: number;
+  /**
+   * 状态（1-启用，0-禁用）
+   */
+  status?: number;
+}
+
+// TypeScript 类型声明
+
+/**
+ * 字典
+ */
+export interface DictForm {
+  /**
+   * 字典ID
+   */
+  id?: number;
+  /**
+   * 字典名称
+   */
+  name?: string;
+  /**
+   * 字典编码
+   */
+  code?: string;
+  /**
+   * 字典状态（1-启用，0-禁用）
+   */
+  status?: number;
+  /**
+   * 备注
+   */
+  remark?: string;
+  /**
+   * 字典数据项列表
+   */
+  dictItems?: DictItem[];
+}
diff --git a/src/api/dict/index.ts b/src/api/dict/index.ts
deleted file mode 100644
index a31c9c52..00000000
--- a/src/api/dict/index.ts
+++ /dev/null
@@ -1,166 +0,0 @@
-import request from "@/utils/request";
-import {
-  DictTypeQuery,
-  DictTypePageResult,
-  DictTypeForm,
-  DictQuery,
-  DictForm,
-  DictPageResult,
-} from "./model";
-
-const DICT_BASE_URL = "/api/v1/dict";
-
-class DictAPI {
-  /**
-   * 获取字典类型分页列表
-   *
-   * @param queryParams 查询参数
-   * @returns 字典类型分页结果
-   */
-  static getDictTypePage(queryParams: DictTypeQuery) {
-    return request<any, DictTypePageResult>({
-      url: `${DICT_BASE_URL}/types/page`,
-      method: "get",
-      params: queryParams,
-    });
-  }
-
-  /**
-   * 获取字典类型表单数据
-   *
-   * @param id 字典类型ID
-   * @returns 字典类型表单数据
-   */
-  static getDictTypeForm(id: number) {
-    return request<any, ResponseData<DictTypeForm>>({
-      url: `${DICT_BASE_URL}/types/${id}/form`,
-      method: "get",
-    });
-  }
-
-  /**
-   * 新增字典类型
-   *
-   * @param data 字典类型表单数据
-   * @returns 请求结果
-   */
-  static addDictType(data: DictTypeForm) {
-    return request({
-      url: `${DICT_BASE_URL}/types`,
-      method: "post",
-      data: data,
-    });
-  }
-
-  /**
-   * 修改字典类型
-   *
-   * @param id 字典类型ID
-   * @param data 字典类型表单数据
-   * @returns 请求结果
-   */
-  static updateDictType(id: number, data: DictTypeForm) {
-    return request({
-      url: `${DICT_BASE_URL}/types/${id}`,
-      method: "put",
-      data: data,
-    });
-  }
-
-  /**
-   * 删除字典类型
-   *
-   * @param ids 字典类型ID，多个以英文逗号(,)分隔
-   * @returns 请求结果
-   */
-  static deleteDictTypes(ids: string) {
-    return request({
-      url: `${DICT_BASE_URL}/types/${ids}`,
-      method: "delete",
-    });
-  }
-
-  /**
-   * 获取字典类型的数据项
-   *
-   * @param typeCode 字典类型编码
-   * @returns 字典类型的数据项
-   */
-  static getDictOptions(typeCode: string) {
-    return request<any, OptionType[]>({
-      url: `${DICT_BASE_URL}/${typeCode}/options`,
-      method: "get",
-    });
-  }
-
-  /**
-   * 获取字典分页列表
-   *
-   * @param queryParams 查询参数
-   * @returns 字典分页结果
-   */
-  static getDictPage(queryParams: DictQuery) {
-    return request<any, DictPageResult>({
-      url: `${DICT_BASE_URL}/page`,
-      method: "get",
-      params: queryParams,
-    });
-  }
-
-  /**
-   * 获取字典表单数据
-   *
-   * @param id 字典项ID
-   * @returns 字典表单数据
-   */
-  static getDictFormData(id: number) {
-    return request<any, DictForm>({
-      url: `${DICT_BASE_URL}/${id}/form`,
-      method: "get",
-    });
-  }
-
-  /**
-   * 新增字典
-   *
-   * @param data 字典表单数据
-   * @returns 请求结果
-   */
-  static addDict(data: DictForm) {
-    return request({
-      url: `${DICT_BASE_URL}`,
-      method: "post",
-      data: data,
-    });
-  }
-
-  /**
-   * 修改字典项
-   *
-   * @param id 字典项ID
-   * @param data 字典表单数据
-   * @returns 请求结果
-   */
-  static updateDict(id: number, data: DictForm) {
-    return request({
-      url: `${DICT_BASE_URL}/${id}`,
-      method: "put",
-      data: data,
-    });
-  }
-
-  /**
-   * 删除字典
-   *
-   * @param ids 字典项ID，多个以英文逗号(,)分隔
-   * @returns 请求结果
-   */
-  static deleteDictByIds(ids: string) {
-    return request({
-      url: `${DICT_BASE_URL}/${ids}`,
-      method: "delete",
-    });
-  }
-}
-
-export default DictAPI;
diff --git a/src/api/dict/model.ts b/src/api/dict/model.ts
deleted file mode 100644
index 315da6d7..00000000
--- a/src/api/dict/model.ts
+++ /dev/null
@@ -1,142 +0,0 @@
-/**
- * 字典类型查询参数
- */
-export interface DictTypeQuery extends PageQuery {
-  /**
-   * 关键字(字典类型名称/编码)
-   */
-  keywords?: string;
-}
-
-/**
- * 字典类型分页对象
- */
-export interface DictTypePageVO {
-  /**
-   * 字典类型ID
-   */
-  id: number;
-  /**
-   * 类型编码
-   */
-  code: string;
-  /**
-   * 类型名称
-   */
-  name: string;
-  /**
-   * 状态(1:启用;0:禁用)
-   */
-  status?: number;
-  /**
-   * 备注
-   */
-  remark?: string;
-}
-
-/**
- * 字典分页项类型声明
- */
-export type DictTypePageResult = PageResult<DictTypePageVO[]>;
-
-/**
- * 字典表单类型声明
- */
-export interface DictTypeForm {
-  /**
-   * 字典类型ID
-   */
-  id?: number;
-  /**
-   * 类型名称
-   */
-  name?: string;
-  /**
-   * 类型编码
-   */
-  code?: string;
-  /**
-   * 类型状态：1:启用;0:禁用
-   */
-  status: number;
-  /**
-   * 备注
-   */
-  remark?: string;
-}
-
-/**
- * 字典查询参数
- */
-export interface DictQuery extends PageQuery {
-  /**
-   * 字典项名称
-   */
-  name?: string;
-  /**
-   * 字典类型编码
-   */
-  typeCode?: string;
-}
-
-/**
- * 字典分页对象
- */
-export interface DictPageVO {
-  /**
-   * 字典ID
-   */
-  id?: number;
-  /**
-   * 字典名称
-   */
-  name?: string;
-  /**
-   * 状态(1:启用;0:禁用)
-   */
-  status?: number;
-  /**
-   * 字典值
-   */
-  value?: string;
-}
-
-/**
- * 字典分页
- */
-export type DictPageResult = PageResult<DictPageVO[]>;
-
-/**
- * 字典表单
- */
-export interface DictForm {
-  /**
-   * 字典ID
-   */
-  id?: number;
-  /**
-   * 字典名称
-   */
-  name?: string;
-  /**
-   * 排序
-   */
-  sort?: number;
-  /**
-   * 状态(1:启用;0:禁用)
-   */
-  status?: number;
-  /**
-   * 类型编码
-   */
-  typeCode?: string;
-  /**
-   * 值
-   */
-  value?: string;
-
-  /**
-   * 备注
-   */
-  remark?: string;
-}
diff --git a/src/api/file/index.ts b/src/api/file.ts
similarity index 83%
rename from src/api/file/index.ts
rename to src/api/file.ts
index 82364624..3203195b 100644
--- a/src/api/file/index.ts
+++ b/src/api/file.ts
@@ -1,5 +1,4 @@
 import request from "@/utils/request";
-import { FileInfo } from "./model";
 
 class FileAPI {
   /**
@@ -35,3 +34,13 @@ class FileAPI {
 }
 
 export default FileAPI;
+
+/**
+ * 文件API类型声明
+ */
+export interface FileInfo {
+  /** 文件名 */
+  name: string;
+  /** 文件路径 */
+  url: string;
+}
diff --git a/src/api/file/model.ts b/src/api/file/model.ts
deleted file mode 100644
index 22b2be55..00000000
--- a/src/api/file/model.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * 文件API类型声明
- */
-export interface FileInfo {
-  name: string;
-  url: string;
-}
diff --git a/src/api/menu.ts b/src/api/menu.ts
new file mode 100644
index 00000000..31065f16
--- /dev/null
+++ b/src/api/menu.ts
@@ -0,0 +1,209 @@
+import request from "@/utils/request";
+// 菜单基础URL
+const MENU_BASE_URL = "/api/v1/menus";
+
+class MenuAPI {
+  /**
+   * 获取路由列表
+   *
+   * @returns 路由列表
+   */
+  static getRoutes() {
+    return request<any, RouteVO[]>({
+      url: `${MENU_BASE_URL}/routes`,
+      method: "get",
+    });
+  }
+
+  /**
+   * 获取菜单树形列表
+   *
+   * @param queryParams 查询参数
+   * @returns 菜单树形列表
+   */
+  static getList(queryParams: MenuQuery) {
+    return request<any, MenuVO[]>({
+      url: `${MENU_BASE_URL}`,
+      method: "get",
+      params: queryParams,
+    });
+  }
+
+  /**
+   * 获取菜单下拉数据源
+   *
+   * @returns 菜单下拉数据源
+   */
+  static getOptions() {
+    return request<any, OptionType[]>({
+      url: `${MENU_BASE_URL}/options`,
+      method: "get",
+    });
+  }
+
+  /**
+   * 获取菜单表单数据
+   *
+   * @param id 菜单ID
+   * @returns 菜单表单数据
+   */
+  static getFormData(id: number) {
+    return request<any, MenuForm>({
+      url: `${MENU_BASE_URL}/${id}/form`,
+      method: "get",
+    });
+  }
+
+  /**
+   * 添加菜单
+   *
+   * @param data 菜单表单数据
+   * @returns 请求结果
+   */
+  static add(data: MenuForm) {
+    return request({
+      url: `${MENU_BASE_URL}`,
+      method: "post",
+      data: data,
+    });
+  }
+
+  /**
+   * 修改菜单
+   *
+   * @param id 菜单ID
+   * @param data 菜单表单数据
+   * @returns 请求结果
+   */
+  static update(id: string, data: MenuForm) {
+    return request({
+      url: `${MENU_BASE_URL}/${id}`,
+      method: "put",
+      data: data,
+    });
+  }
+
+  /**
+   * 删除菜单
+   *
+   * @param id 菜单ID
+   * @returns 请求结果
+   */
+  static deleteById(id: number) {
+    return request({
+      url: `${MENU_BASE_URL}/${id}`,
+      method: "delete",
+    });
+  }
+}
+
+export default MenuAPI;
+
+import { MenuTypeEnum } from "@/enums/MenuTypeEnum";
+
+/** 菜单查询参数 */
+export interface MenuQuery {
+  /** 搜索关键字 */
+  keywords?: string;
+}
+
+/** 菜单视图对象 */
+export interface MenuVO {
+  /** 子菜单 */
+  children?: MenuVO[];
+  /** 组件路径 */
+  component?: string;
+  /** ICON */
+  icon?: string;
+  /** 菜单ID */
+  id?: number;
+  /** 菜单名称 */
+  name?: string;
+  /** 父菜单ID */
+  parentId?: number;
+  /** 按钮权限标识 */
+  perm?: string;
+  /** 跳转路径 */
+  redirect?: string;
+  /** 路由名称 */
+  routeName?: string;
+  /** 路由相对路径 */
+  routePath?: string;
+  /** 菜单排序(数字越小排名越靠前) */
+  sort?: number;
+  /** 菜单 */
+  type?: MenuTypeEnum;
+  /** 菜单是否可见(1:显示;0:隐藏) */
+  visible?: number;
+}
+
+/** 菜单表单对象 */
+export interface MenuForm {
+  /** 菜单ID */
+  id?: string;
+  /** 父菜单ID */
+  parentId?: number;
+  /** 菜单名称 */
+  name?: string;
+  /** 菜单是否可见(1-是 0-否) */
+  visible: number;
+  /** ICON */
+  icon?: string;
+  /** 排序 */
+  sort?: number;
+  /** 路由名称 */
+  routeName?: string;
+  /** 路由路径 */
+  routePath?: string;
+  /** 组件路径 */
+  component?: string;
+  /** 跳转路由路径 */
+  redirect?: string;
+  /** 菜单 */
+  type?: MenuTypeEnum;
+  /** 权限标识 */
+  perm?: string;
+  /** 【菜单】是否开启页面缓存 */
+  keepAlive?: number;
+  /** 【目录】只有一个子路由是否始终显示 */
+  alwaysShow?: number;
+  /** 参数 */
+  params?: KeyValue[];
+}
+
+interface KeyValue {
+  key: string;
+  value: string;
+}
+
+/** RouteVO，路由对象 */
+export interface RouteVO {
+  /** 子路由列表 */
+  children: RouteVO[];
+  /** 组件路径 */
+  component?: string;
+  /** 路由属性 */
+  meta?: Meta;
+  /** 路由名称 */
+  name?: string;
+  /** 路由路径 */
+  path?: string;
+  /** 跳转链接 */
+  redirect?: string;
+}
+
+/** Meta，路由属性 */
+export interface Meta {
+  /** 【目录】只有一个子路由是否始终显示 */
+  alwaysShow?: boolean;
+  /** 是否隐藏(true-是 false-否) */
+  hidden?: boolean;
+  /** ICON */
+  icon?: string;
+  /** 【菜单】是否开启页面缓存 */
+  keepAlive?: boolean;
+  /** 拥有路由权限的角色编码 */
+  roles?: string[];
+  /** 路由title */
+  title?: string;
+}
diff --git a/src/api/menu/index.ts b/src/api/menu/index.ts
deleted file mode 100644
index 9a26294a..00000000
--- a/src/api/menu/index.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-import request from "@/utils/request";
-import { MenuQuery, MenuVO, MenuForm, RouteVO } from "./model";
-
-const MENU_BASE_URL = "/api/v1/menus";
-
-class MenuAPI {
-  /**
-   * 获取路由列表
-   *
-   * @returns 路由列表
-   */
-  static getRoutes() {
-    return request<any, RouteVO[]>({
-      url: `${MENU_BASE_URL}/routes`,
-      method: "get",
-    });
-  }
-
-  /**
-   * 获取菜单树形列表
-   *
-   * @param queryParams 查询参数
-   * @returns 菜单树形列表
-   */
-  static getList(queryParams: MenuQuery) {
-    return request<any, MenuVO[]>({
-      url: `${MENU_BASE_URL}`,
-      method: "get",
-      params: queryParams,
-    });
-  }
-
-  /**
-   * 获取菜单下拉数据源
-   *
-   * @returns 菜单下拉数据源
-   */
-  static getOptions() {
-    return request<any, OptionType[]>({
-      url: `${MENU_BASE_URL}/options`,
-      method: "get",
-    });
-  }
-
-  /**
-   * 获取菜单表单数据
-   *
-   * @param id 菜单ID
-   * @returns 菜单表单数据
-   */
-  static getFormData(id: number) {
-    return request<any, MenuForm>({
-      url: `${MENU_BASE_URL}/${id}/form`,
-      method: "get",
-    });
-  }
-
-  /**
-   * 添加菜单
-   *
-   * @param data 菜单表单数据
-   * @returns 请求结果
-   */
-  static add(data: MenuForm) {
-    return request({
-      url: `${MENU_BASE_URL}`,
-      method: "post",
-      data: data,
-    });
-  }
-
-  /**
-   * 修改菜单
-   *
-   * @param id 菜单ID
-   * @param data 菜单表单数据
-   * @returns 请求结果
-   */
-  static update(id: string, data: MenuForm) {
-    return request({
-      url: `${MENU_BASE_URL}/${id}`,
-      method: "put",
-      data: data,
-    });
-  }
-
-  /**
-   * 删除菜单
-   *
-   * @param id 菜单ID
-   * @returns 请求结果
-   */
-  static deleteById(id: number) {
-    return request({
-      url: `${MENU_BASE_URL}/${id}`,
-      method: "delete",
-    });
-  }
-}
-
-export default MenuAPI;
diff --git a/src/api/menu/model.ts b/src/api/menu/model.ts
deleted file mode 100644
index a9e846f5..00000000
--- a/src/api/menu/model.ts
+++ /dev/null
@@ -1,188 +0,0 @@
-import { MenuTypeEnum } from "@/enums/MenuTypeEnum";
-
-/**
- * 菜单查询参数类型
- */
-export interface MenuQuery {
-  keywords?: string;
-}
-
-/**
- * 菜单视图对象类型
- */
-export interface MenuVO {
-  /**
-   * 子菜单
-   */
-  children?: MenuVO[];
-  /**
-   * 组件路径
-   */
-  component?: string;
-  /**
-   * ICON
-   */
-  icon?: string;
-  /**
-   * 菜单ID
-   */
-  id?: number;
-  /**
-   * 菜单名称
-   */
-  name?: string;
-  /**
-   * 父菜单ID
-   */
-  parentId?: number;
-  /**
-   * 按钮权限标识
-   */
-  perm?: string;
-  /**
-   * 跳转路径
-   */
-  redirect?: string;
-  /**
-   * 路由名称
-   */
-  routeName?: string;
-  /**
-   * 路由相对路径
-   */
-  routePath?: string;
-  /**
-   * 菜单排序(数字越小排名越靠前)
-   */
-  sort?: number;
-  /**
-   * 菜单类型
-   */
-  type?: MenuTypeEnum;
-  /**
-   * 菜单是否可见(1:显示;0:隐藏)
-   */
-  visible?: number;
-}
-
-/**
- * 菜单表单对象类型
- */
-export interface MenuForm {
-  /**
-   * 菜单ID
-   */
-  id?: string;
-  /**
-   * 父菜单ID
-   */
-  parentId?: number;
-  /**
-   * 菜单名称
-   */
-  name?: string;
-  /**
-   * 菜单是否可见(1:是;0:否;)
-   */
-  visible: number;
-  icon?: string;
-  /**
-   * 排序
-   */
-  sort?: number;
-  /**
-   * 组件路径
-   */
-  component?: string;
-  /**
-   * 路由路径
-   */
-  path?: string;
-  /**
-   * 跳转路由路径
-   */
-  redirect?: string;
-
-  /**
-   * 菜单类型
-   */
-  type?: MenuTypeEnum;
-
-  /**
-   * 权限标识
-   */
-  perm?: string;
-  /**
-   * 【菜单】是否开启页面缓存
-   */
-  keepAlive?: number;
-
-  /**
-   * 【目录】只有一个子路由是否始终显示
-   */
-  alwaysShow?: number;
-
-  params?: KeyValue[];
-}
-
-interface KeyValue {
-  key: string;
-  value: string;
-}
-
-/**
- * RouteVO，路由对象
- */
-export interface RouteVO {
-  /**
-   * 子路由列表
-   */
-  children: RouteVO[];
-  /**
-   * 组件路径
-   */
-  component?: string;
-  meta?: Meta;
-  /**
-   * 路由名称
-   */
-  name?: string;
-  /**
-   * 路由路径
-   */
-  path?: string;
-  /**
-   * 跳转链接
-   */
-  redirect?: string;
-}
-
-/**
- * Meta，路由属性类型
- */
-export interface Meta {
-  /**
-   * 【目录】只有一个子路由是否始终显示
-   */
-  alwaysShow?: boolean;
-  /**
-   * 是否隐藏(true-是 false-否)
-   */
-  hidden?: boolean;
-  /**
-   * ICON
-   */
-  icon?: string;
-  /**
-   * 【菜单】是否开启页面缓存
-   */
-  keepAlive?: boolean;
-  /**
-   * 拥有路由权限的角色编码
-   */
-  roles?: string[];
-  /**
-   * 路由title
-   */
-  title?: string;
-}
diff --git a/src/api/role/index.ts b/src/api/role.ts
similarity index 64%
rename from src/api/role/index.ts
rename to src/api/role.ts
index 00d79ab2..bfbbac21 100644
--- a/src/api/role/index.ts
+++ b/src/api/role.ts
@@ -1,34 +1,22 @@
 import request from "@/utils/request";
-import { RoleQuery, RolePageResult, RoleForm } from "./model";
 
 const ROLE_BASE_URL = "/api/v1/roles";
 
 class RoleAPI {
-  /**
-   * 获取角色分页数据
-   *
-   * @param queryParams 查询参数
-   * @returns 角色分页数据
-   */
-  static getPage(queryParams?: RoleQuery) {
-    return request<any, RolePageResult>({
+  /** 获取角色分页数据 */
+  static getPage(queryParams?: RolePageQuery) {
+    return request<any, PageResult<RolePageVO[]>>({
       url: `${ROLE_BASE_URL}/page`,
       method: "get",
       params: queryParams,
     });
   }
 
-  /**
-   * 获取角色下拉数据源
-   *
-   * @param queryParams 查询参数（可选）
-   * @returns 角色下拉数据源
-   */
-  static getOptions(queryParams?: RoleQuery) {
+  /** 获取角色下拉数据源 */
+  static getOptions() {
     return request<any, OptionType[]>({
       url: `${ROLE_BASE_URL}/options`,
       method: "get",
-      params: queryParams,
     });
   }
 
@@ -46,7 +34,7 @@ class RoleAPI {
   }
 
   /**
-   * 分配菜单权限给角色
+   * 分配菜单权限
    *
    * @param roleId 角色ID
    * @param data 菜单ID集合
@@ -73,12 +61,7 @@ class RoleAPI {
     });
   }
 
-  /**
-   * 添加角色
-   *
-   * @param data 角色表单数据
-   * @returns 请求结果
-   */
+  /** 添加角色 */
   static add(data: RoleForm) {
     return request({
       url: `${ROLE_BASE_URL}`,
@@ -92,7 +75,6 @@ class RoleAPI {
    *
    * @param id 角色ID
    * @param data 角色表单数据
-   * @returns 请求结果
    */
   static update(id: number, data: RoleForm) {
     return request({
@@ -106,7 +88,6 @@ class RoleAPI {
    * 批量删除角色，多个以英文逗号(,)分割
    *
    * @param ids 角色ID字符串，多个以英文逗号(,)分割
-   * @returns 请求结果
    */
   static deleteByIds(ids: string) {
     return request({
@@ -117,3 +98,43 @@ class RoleAPI {
 }
 
 export default RoleAPI;
+
+/** 角色分页查询参数 */
+export interface RolePageQuery extends PageQuery {
+  /** 搜索关键字 */
+  keywords?: string;
+}
+
+/** 角色分页对象 */
+export interface RolePageVO {
+  /** 角色编码 */
+  code?: string;
+  /** 角色ID */
+  id?: number;
+  /** 角色名称 */
+  name?: string;
+  /** 排序 */
+  sort?: number;
+  /** 角色状态 */
+  status?: number;
+  /** 创建时间 */
+  createTime?: Date;
+  /** 修改时间 */
+  updateTime?: Date;
+}
+
+/** 角色表单对象 */
+export interface RoleForm {
+  /** 角色ID */
+  id?: number;
+  /** 角色编码 */
+  code: string;
+  /** 数据权限 */
+  dataScope?: number;
+  /** 角色名称 */
+  name: string;
+  /** 排序 */
+  sort?: number;
+  /** 角色状态(1-正常；0-停用) */
+  status?: number;
+}
diff --git a/src/api/role/model.ts b/src/api/role/model.ts
deleted file mode 100644
index 2d259c7f..00000000
--- a/src/api/role/model.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * 角色查询参数
- */
-export interface RoleQuery extends PageQuery {
-  keywords?: string;
-}
-
-/**
- * 角色分页对象
- */
-export interface RolePageVO {
-  /**
-   * 角色编码
-   */
-  code?: string;
-
-  /**
-   * 角色ID
-   */
-  id?: number;
-  /**
-   * 角色名称
-   */
-  name?: string;
-  /**
-   * 排序
-   */
-  sort?: number;
-  /**
-   * 角色状态
-   */
-  status?: number;
-  /**
-   * 创建时间
-   */
-  createTime?: Date;
-  /**
-   * 修改时间
-   */
-  updateTime?: Date;
-}
-
-/**
- * 角色分页
- */
-export type RolePageResult = PageResult<RolePageVO[]>;
-
-/**
- * 角色表单对象
- */
-export interface RoleForm {
-  /**
-   * 角色ID
-   */
-  id?: number;
-
-  /**
-   * 角色编码
-   */
-  code: string;
-  /**
-   * 数据权限
-   */
-  dataScope?: number;
-
-  /**
-   * 角色名称
-   */
-  name: string;
-  /**
-   * 排序
-   */
-  sort?: number;
-  /**
-   * 角色状态(1-正常；0-停用)
-   */
-  status?: number;
-}
diff --git a/src/api/user/index.ts b/src/api/user.ts
similarity index 58%
rename from src/api/user/index.ts
rename to src/api/user.ts
index 37f64488..e4d29d55 100644
--- a/src/api/user/index.ts
+++ b/src/api/user.ts
@@ -1,13 +1,12 @@
 import request from "@/utils/request";
-import { UserForm, UserInfo, UserPageVO, UserQuery } from "./model";
 
 const USER_BASE_URL = "/api/v1/users";
 
 class UserAPI {
   /**
-   * 登录成功后获取用户信息（昵称、头像、权限集合和角色集合）
+   * 获取当前登录用户信息
    *
-   * @returns 用户信息
+   * @returns 登录用户昵称、头像信息，包括角色和权限
    */
   static getInfo() {
     return request<any, UserInfo>({
@@ -20,9 +19,8 @@ class UserAPI {
    * 获取用户分页列表
    *
    * @param queryParams 查询参数
-   * @returns 用户分页列表
    */
-  static getPage(queryParams: UserQuery) {
+  static getPage(queryParams: UserPageQuery) {
     return request<any, PageResult<UserPageVO[]>>({
       url: `${USER_BASE_URL}/page`,
       method: "get",
@@ -47,7 +45,6 @@ class UserAPI {
    * 添加用户
    *
    * @param data 用户表单数据
-   * @returns 请求结果
    */
   static add(data: UserForm) {
     return request({
@@ -62,7 +59,6 @@ class UserAPI {
    *
    * @param id 用户ID
    * @param data 用户表单数据
-   * @returns 请求结果
    */
   static update(id: number, data: UserForm) {
     return request({
@@ -77,7 +73,6 @@ class UserAPI {
    *
    * @param id 用户ID
    * @param password 新密码
-   * @returns 请求结果
    */
   static updatePassword(id: number, password: string) {
     return request({
@@ -91,7 +86,6 @@ class UserAPI {
    * 批量删除用户，多个以英文逗号(,)分割
    *
    * @param ids 用户ID字符串，多个以英文逗号(,)分割
-   * @returns 请求结果
    */
   static deleteByIds(ids: string) {
     return request({
@@ -100,11 +94,7 @@ class UserAPI {
     });
   }
 
-  /**
-   * 下载用户导入模板
-   *
-   * @returns 用户导入模板文件
-   */
+  /** 下载用户导入模板 */
   static downloadTemplate() {
     return request({
       url: `${USER_BASE_URL}/template`,
@@ -117,9 +107,8 @@ class UserAPI {
    * 导出用户
    *
    * @param queryParams 查询参数
-   * @returns 导出文件
    */
-  static export(queryParams: UserQuery) {
+  static export(queryParams: UserPageQuery) {
     return request({
       url: `${USER_BASE_URL}/export`,
       method: "get",
@@ -133,7 +122,6 @@ class UserAPI {
    *
    * @param deptId 部门ID
    * @param file 导入文件
-   * @returns 请求结果
    */
   static import(deptId: number, file: File) {
     const formData = new FormData();
@@ -151,3 +139,94 @@ class UserAPI {
 }
 
 export default UserAPI;
+
+/** 登录用户信息 */
+export interface UserInfo {
+  /** 用户ID */
+  userId?: number;
+
+  /** 用户名 */
+  username?: string;
+
+  /** 昵称 */
+  nickname?: string;
+
+  /** 头像URL */
+  avatar?: string;
+
+  /** 角色 */
+  roles: string[];
+
+  /** 权限 */
+  perms: string[];
+}
+
+/**
+ * 用户分页查询对象
+ */
+export interface UserPageQuery extends PageQuery {
+  /** 搜索关键字 */
+  keywords?: string;
+
+  /** 用户状态 */
+  status?: number;
+
+  /** 部门ID */
+  deptId?: number;
+
+  /** 开始时间 */
+  startTime?: string;
+
+  /** 结束时间 */
+  endTime?: string;
+}
+
+/** 用户分页对象 */
+export interface UserPageVO {
+  /** 用户头像URL */
+  avatar?: string;
+  /** 创建时间 */
+  createTime?: Date;
+  /** 部门名称 */
+  deptName?: string;
+  /** 用户邮箱 */
+  email?: string;
+  /** 性别 */
+  genderLabel?: string;
+  /** 用户ID */
+  id?: number;
+  /** 手机号 */
+  mobile?: string;
+  /** 用户昵称 */
+  nickname?: string;
+  /** 角色名称，多个使用英文逗号(,)分割 */
+  roleNames?: string;
+  /** 用户状态(1:启用;0:禁用) */
+  status?: number;
+  /** 用户名 */
+  username?: string;
+}
+
+/** 用户表单类型 */
+export interface UserForm {
+  /** 用户头像 */
+  avatar?: string;
+  /** 部门ID */
+  deptId?: number;
+  /** 邮箱 */
+  email?: string;
+  /** 性别 */
+  gender?: number;
+  /** 用户ID */
+  id?: number;
+  /** 手机号 */
+  mobile?: string;
+  /** 昵称 */
+  nickname?: string;
+  /** 角色ID集合 */
+  roleIds?: number[];
+  /** 用户状态(1:正常;0:禁用) */
+  status?: number;
+  /** 用户名 */
+  username?: string;
+}
diff --git a/src/api/user/model.ts b/src/api/user/model.ts
deleted file mode 100644
index c0060f27..00000000
--- a/src/api/user/model.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-/**
- * 登录用户信息
- */
-export interface UserInfo {
-  userId?: number;
-  username?: string;
-  nickname?: string;
-  avatar?: string;
-  roles: string[];
-  perms: string[];
-}
-
-/**
- * 用户查询对象类型
- */
-export interface UserQuery extends PageQuery {
-  keywords?: string;
-  status?: number;
-  deptId?: number;
-  startTime?: string;
-  endTime?: string;
-}
-
-/**
- * 用户分页对象
- */
-export interface UserPageVO {
-  /**
-   * 用户头像地址
-   */
-  avatar?: string;
-  /**
-   * 创建时间
-   */
-  createTime?: Date;
-  /**
-   * 部门名称
-   */
-  deptName?: string;
-  /**
-   * 用户邮箱
-   */
-  email?: string;
-  /**
-   * 性别
-   */
-  genderLabel?: string;
-  /**
-   * 用户ID
-   */
-  id?: number;
-  /**
-   * 手机号
-   */
-  mobile?: string;
-  /**
-   * 用户昵称
-   */
-  nickname?: string;
-  /**
-   * 角色名称，多个使用英文逗号(,)分割
-   */
-  roleNames?: string;
-  /**
-   * 用户状态(1:启用;0:禁用)
-   */
-  status?: number;
-  /**
-   * 用户名
-   */
-  username?: string;
-}
-
-/**
- * 用户表单类型
- */
-export interface UserForm {
-  /**
-   * 用户头像
-   */
-  avatar?: string;
-  /**
-   * 部门ID
-   */
-  deptId?: number;
-  /**
-   * 邮箱
-   */
-  email?: string;
-  /**
-   * 性别
-   */
-  gender?: number;
-  /**
-   * 用户ID
-   */
-  id?: number;
-  mobile?: string;
-  /**
-   * 昵称
-   */
-  nickname?: string;
-  /**
-   * 角色ID集合
-   */
-  roleIds?: number[];
-  /**
-   * 用户状态(1:正常;0:禁用)
-   */
-  status?: number;
-  /**
-   * 用户名
-   */
-  username?: string;
-}
diff --git a/src/components/Dictionary/index.vue b/src/components/Dictionary/index.vue
index a3804ff3..763c2c6f 100644
--- a/src/components/Dictionary/index.vue
+++ b/src/components/Dictionary/index.vue
@@ -20,9 +20,9 @@ import DictAPI from "@/api/dict";
 
 const props = defineProps({
   /**
-   * 字典类型编码(eg: 性别-gender)
+   * 字典编码(eg: 性别-gender)
    */
-  typeCode: {
+  code: {
     type: String,
     required: true,
   },
@@ -39,14 +39,17 @@ const props = defineProps({
   },
 });
 
-const emits = defineEmits(["update:modelValue"]); // 父组件监听事件，同步子组件值的变化给父组件
+const emits = defineEmits(["update:modelValue"]);
 
-const options: Ref<OptionType[]> = ref([]); // 字典下拉数据源
+const options: Ref<OptionType[]> = ref([]);
 
 const selectedValue = ref<string | number | undefined>();
 
 watch([options, () => props.modelValue], ([newOptions, newModelValue]) => {
-  if (newOptions.length === 0) return; // 下拉数据源加载未完成不回显
+  if (newOptions.length === 0) {
+    // 下拉数据源加载未完成不回显
+    return;
+  }
   if (newModelValue == undefined) {
     selectedValue.value = undefined;
     return;
@@ -65,8 +68,8 @@ function handleChange(val?: string | number | undefined) {
 }
 
 onBeforeMount(() => {
-  // 根据字典类型编码(typeCode)获取字典选项
-  DictAPI.getDictOptions(props.typeCode).then((data) => {
+  // 根据字典编码获取字典项
+  DictAPI.getOptions(props.code).then((data) => {
     options.value = data;
   });
 });
diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts
index 9ed99d7e..f2e6f932 100644
--- a/src/store/modules/permission.ts
+++ b/src/store/modules/permission.ts
@@ -2,7 +2,7 @@ import { RouteRecordRaw } from "vue-router";
 import { constantRoutes } from "@/router";
 import { store } from "@/store";
 import MenuAPI from "@/api/menu";
-import { RouteVO } from "@/api/menu/model";
+import { RouteVO } from "@/api/menu/types";
 
 const modules = import.meta.glob("../../views/**/**.vue");
 const Layout = () => import("@/layout/index.vue");
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index abdbcb38..cdbecf5b 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -3,8 +3,8 @@ import UserAPI from "@/api/user";
 import { resetRouter } from "@/router";
 import { store } from "@/store";
 
-import { LoginData } from "@/api/auth/model";
-import { UserInfo } from "@/api/user/model";
+import { LoginData } from "@/api/auth";
+import { UserInfo } from "@/api/user";
 import { TOKEN_KEY } from "@/enums/CacheEnum";
 
 export const useUserStore = defineStore("user", () => {
diff --git a/src/typings/auto-imports.d.ts b/src/types/auto-imports.d.ts
similarity index 100%
rename from src/typings/auto-imports.d.ts
rename to src/types/auto-imports.d.ts
diff --git a/src/typings/components.d.ts b/src/types/components.d.ts
similarity index 98%
rename from src/typings/components.d.ts
rename to src/types/components.d.ts
index 80a3a983..03f1fe22 100644
--- a/src/typings/components.d.ts
+++ b/src/types/components.d.ts
@@ -13,6 +13,7 @@ declare module "vue" {
     Breadcrumb: (typeof import("./../components/Breadcrumb/index.vue"))["default"];
     CURD: (typeof import("./../components/CURD/index.vue"))["default"];
     DeptTree: (typeof import("./../views/system/user/components/dept-tree.vue"))["default"];
+    UserImport: (typeof import("./../views/system/user/components/user-import.vue"))["default"];
     Dictionary: (typeof import("./../components/Dictionary/index.vue"))["default"];
     DictItem: (typeof import("./../views/system/dict/components/dict-item.vue"))["default"];
     ElBacktop: (typeof import("element-plus/es"))["ElBacktop"];
diff --git a/src/typings/env.d.ts b/src/types/env.d.ts
similarity index 100%
rename from src/typings/env.d.ts
rename to src/types/env.d.ts
diff --git a/src/typings/global.d.ts b/src/types/global.d.ts
similarity index 100%
rename from src/typings/global.d.ts
rename to src/types/global.d.ts
diff --git a/src/typings/router.d.ts b/src/types/router.d.ts
similarity index 100%
rename from src/typings/router.d.ts
rename to src/types/router.d.ts
diff --git a/src/typings/socket.d.ts b/src/types/socket.d.ts
similarity index 100%
rename from src/typings/socket.d.ts
rename to src/types/socket.d.ts
diff --git a/src/views/demo/curd/config/add.ts b/src/views/demo/curd/config/add.ts
index ea1438bd..023548c4 100644
--- a/src/views/demo/curd/config/add.ts
+++ b/src/views/demo/curd/config/add.ts
@@ -1,7 +1,6 @@
 import DeptAPI from "@/api/dept";
 import RoleAPI from "@/api/role";
-import UserAPI from "@/api/user";
-import type { UserForm } from "@/api/user/model";
+import UserAPI, { UserForm } from "@/api/user";
 import type { IModalConfig } from "@/components/CURD/types";
 
 const modalConfig: IModalConfig<UserForm> = {
diff --git a/src/views/demo/curd/config/content.ts b/src/views/demo/curd/config/content.ts
index 8a79fecb..9416c50b 100644
--- a/src/views/demo/curd/config/content.ts
+++ b/src/views/demo/curd/config/content.ts
@@ -1,9 +1,9 @@
 import UserAPI from "@/api/user";
 import RoleAPI from "@/api/role";
-import type { UserQuery } from "@/api/user/model";
+import type { UserPageQuery } from "@/api/user";
 import type { IContentConfig } from "@/components/CURD/types";
 
-const contentConfig: IContentConfig<UserQuery> = {
+const contentConfig: IContentConfig<UserPageQuery> = {
   pageName: "sys:user",
   table: {
     border: true,
diff --git a/src/views/demo/curd/config/edit.ts b/src/views/demo/curd/config/edit.ts
index 20550f47..983546a4 100644
--- a/src/views/demo/curd/config/edit.ts
+++ b/src/views/demo/curd/config/edit.ts
@@ -1,7 +1,7 @@
 import DeptAPI from "@/api/dept";
 import RoleAPI from "@/api/role";
 import UserAPI from "@/api/user";
-import type { UserForm } from "@/api/user/model";
+import type { UserForm } from "@/api/user";
 import type { IModalConfig } from "@/components/CURD/types";
 import { DeviceEnum } from "@/enums/DeviceEnum";
 import { useAppStore } from "@/store";
diff --git a/src/views/demo/curd/index.vue b/src/views/demo/curd/index.vue
index 9060c666..66433559 100644
--- a/src/views/demo/curd/index.vue
+++ b/src/views/demo/curd/index.vue
@@ -49,7 +49,7 @@
         @submit-click="handleSubmitClick"
       >
         <template #gender="scope">
-          <dictionary v-model="scope.formData[scope.prop]" type-code="gender" />
+          <dictionary v-model="scope.formData[scope.prop]" code="gender" />
         </template>
       </page-modal>
 
@@ -60,7 +60,7 @@
         @submit-click="handleSubmitClick"
       >
         <template #gender="scope">
-          <dictionary v-model="scope.formData[scope.prop]" type-code="gender" />
+          <dictionary v-model="scope.formData[scope.prop]" code="gender" />
         </template>
       </page-modal>
     </template>
diff --git a/src/views/demo/dict.vue b/src/views/demo/dict.vue
index fcb6e060..eed01000 100644
--- a/src/views/demo/dict.vue
+++ b/src/views/demo/dict.vue
@@ -15,14 +15,14 @@ const numberValue = ref(1); // 性别(值为Number)
     >
     <el-form>
       <el-form-item label="性别">
-        <dictionary v-model="stringValue" type-code="gender" />
+        <dictionary v-model="stringValue" code="gender" />
         <el-link :underline="false" type="primary" class="ml-5"
           >值为String: const value = ref("1");
         </el-link>
       </el-form-item>
 
       <el-form-item label="性别">
-        <dictionary v-model="numberValue" type-code="gender" />
+        <dictionary v-model="numberValue" code="gender" />
         <el-link :underline="false" type="success" class="ml-5"
           >值为Number: const value = ref(1);
         </el-link>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 34952d2b..42561365 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -116,7 +116,7 @@
 <script setup lang="ts">
 import { useSettingsStore, useUserStore } from "@/store";
 import AuthAPI from "@/api/auth";
-import { LoginData } from "@/api/auth/model";
+import { LoginData } from "@/api/auth/types";
 import type { FormInstance } from "element-plus";
 import { LocationQuery, useRoute } from "vue-router";
 import router from "@/router";
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index c1d6f002..d956aca0 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -38,7 +38,7 @@
         <el-button
           v-hasPerm="['sys:dept:add']"
           type="success"
-          @click="openDialog(0, undefined)"
+          @click="handleOpenDialog(0, undefined)"
           ><i-ep-plus />新增</el-button
         >
         <el-button
@@ -60,6 +60,7 @@
       >
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column prop="name" label="部门名称" min-width="200" />
+        <el-table-column prop="code" label="部门编号" width="200" />
         <el-table-column prop="status" label="状态" width="100">
           <template #default="scope">
             <el-tag v-if="scope.row.status == 1" type="success">正常</el-tag>
@@ -76,7 +77,7 @@
               type="primary"
               link
               size="small"
-              @click.stop="openDialog(scope.row.id, undefined)"
+              @click.stop="handleOpenDialog(scope.row.id, undefined)"
               ><i-ep-plus />新增
             </el-button>
             <el-button
@@ -84,7 +85,7 @@
               type="primary"
               link
               size="small"
-              @click.stop="openDialog(scope.row.parentId, scope.row.id)"
+              @click.stop="handleOpenDialog(scope.row.parentId, scope.row.id)"
               ><i-ep-edit />编辑
             </el-button>
             <el-button
@@ -105,7 +106,7 @@
       v-model="dialog.visible"
       :title="dialog.title"
       width="600px"
-      @closed="closeDialog"
+      @closed="handleCloseDialog"
     >
       <el-form
         ref="deptFormRef"
@@ -126,6 +127,9 @@
         <el-form-item label="部门名称" prop="name">
           <el-input v-model="formData.name" placeholder="请输入部门名称" />
         </el-form-item>
+        <el-form-item label="部门编号" prop="code">
+          <el-input v-model="formData.code" placeholder="请输入部门编号" />
+        </el-form-item>
         <el-form-item label="显示排序" prop="sort">
           <el-input-number
             v-model="formData.sort"
@@ -145,7 +149,7 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button type="primary" @click="handleSubmit"> 确 定 </el-button>
-          <el-button @click="closeDialog"> 取 消 </el-button>
+          <el-button @click="handleCloseDialog"> 取 消 </el-button>
         </div>
       </template>
     </el-dialog>
@@ -158,8 +162,7 @@ defineOptions({
   inheritAttrs: false,
 });
 
-import DeptAPI from "@/api/dept";
-import { DeptVO, DeptForm, DeptQuery } from "@/api/dept/model";
+import DeptAPI, { DeptVO, DeptForm, DeptQuery } from "@/api/dept";
 
 const queryFormRef = ref(ElForm);
 const deptFormRef = ref(ElForm);
@@ -183,12 +186,15 @@ const formData = reactive<DeptForm>({
 });
 
 const rules = reactive({
-  parentId: [{ required: true, message: "上级部门不能为空", trigger: "blur" }],
+  parentId: [
+    { required: true, message: "上级部门不能为空", trigger: "change" },
+  ],
   name: [{ required: true, message: "部门名称不能为空", trigger: "blur" }],
+  code: [{ required: true, message: "部门编号不能为空", trigger: "blur" }],
   sort: [{ required: true, message: "显示排序不能为空", trigger: "blur" }],
 });
 
-/** 查询 */
+/** 查询部门 */
 function handleQuery() {
   loading.value = true;
   DeptAPI.getList(queryParams).then((data) => {
@@ -197,7 +203,7 @@ function handleQuery() {
   });
 }
 
-/**重置查询 */
+/** 重置查询 */
 function handleResetQuery() {
   queryFormRef.value.resetFields();
   handleQuery();
@@ -208,27 +214,23 @@ function handleSelectionChange(selection: any) {
   ids.value = selection.map((item: any) => item.id);
 }
 
-/** 获取部门下拉数据  */
-async function loadDeptOptions() {
-  DeptAPI.getOptions().then((data) => {
-    deptOptions.value = [
-      {
-        value: 0,
-        label: "顶级部门",
-        children: data,
-      },
-    ];
-  });
-}
-
 /**
- * 打开弹窗
+ * 打开部门弹窗
  *
  * @param parentId 父部门ID
  * @param deptId 部门ID
  */
-async function openDialog(parentId?: number, deptId?: number) {
-  await loadDeptOptions();
+async function handleOpenDialog(parentId?: number, deptId?: number) {
+  // 加载部门下拉数据
+  const data = await DeptAPI.getOptions();
+  deptOptions.value = [
+    {
+      value: 0,
+      label: "顶级部门",
+      children: data,
+    },
+  ];
+
   dialog.visible = true;
   if (deptId) {
     dialog.title = "修改部门";
@@ -241,17 +243,17 @@ async function openDialog(parentId?: number, deptId?: number) {
   }
 }
 
-/** 表单提交 */
+/** 提交部门表单 */
 function handleSubmit() {
   deptFormRef.value.validate((valid: any) => {
     if (valid) {
-      const deptId = formData.id;
       loading.value = true;
+      const deptId = formData.id;
       if (deptId) {
         DeptAPI.update(deptId, formData)
           .then(() => {
             ElMessage.success("修改成功");
-            closeDialog();
+            handleCloseDialog();
             handleQuery();
           })
           .finally(() => (loading.value = false));
@@ -259,7 +261,7 @@ function handleSubmit() {
         DeptAPI.add(formData)
           .then(() => {
             ElMessage.success("新增成功");
-            closeDialog();
+            handleCloseDialog();
             handleQuery();
           })
           .finally(() => (loading.value = false));
@@ -290,13 +292,9 @@ function handleDelete(deptId?: number) {
 }
 
 /** 关闭弹窗 */
-function closeDialog() {
+function handleCloseDialog() {
   dialog.visible = false;
-  resetForm();
-}
 
-/** 重置表单  */
-function resetForm() {
   deptFormRef.value.resetFields();
   deptFormRef.value.clearValidate();
 
diff --git a/src/views/system/dict/components/dict-item.vue b/src/views/system/dict/components/dict-item.vue
deleted file mode 100644
index 547ea3a3..00000000
--- a/src/views/system/dict/components/dict-item.vue
+++ /dev/null
@@ -1,308 +0,0 @@
-<!-- 字典数据 -->
-<template>
-  <div class="app-container">
-    <div class="search-container">
-      <!-- 搜索表单 -->
-      <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-        <el-form-item label="关键字" prop="name">
-          <el-input
-            v-model="queryParams.name"
-            placeholder="字典名称"
-            clearable
-          />
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="handleQuery"
-            ><i-ep-search />搜索</el-button
-          >
-          <el-button @click="handleResetQuery"> <i-ep-refresh />重置</el-button>
-        </el-form-item>
-      </el-form>
-    </div>
-    <el-card shadow="never">
-      <template #header>
-        <el-button
-          v-hasPerm="['sys:dict:add']"
-          type="success"
-          @click="openDialog()"
-          ><i-ep-plus />新增</el-button
-        >
-        <el-button
-          v-hasPerm="['sys:dict:delete']"
-          type="danger"
-          :disabled="ids.length === 0"
-          @click="handleDelete()"
-          ><i-ep-delete />删除</el-button
-        >
-      </template>
-
-      <!-- 数据表格 -->
-      <el-table
-        v-loading="loading"
-        :data="dictList"
-        border
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="50" />
-        <el-table-column label="字典名称" prop="name" />
-        <el-table-column label="字典值" prop="value" />
-        <el-table-column label="状态" align="center">
-          <template #default="scope">
-            <el-tag v-if="scope.row.status === 1" type="success">启用</el-tag>
-            <el-tag v-else type="info">禁用</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column fixed="right" label="操作" align="center">
-          <template #default="scope">
-            <el-button
-              v-hasPerm="['sys:dict:edit']"
-              type="primary"
-              link
-              @click="openDialog(scope.row.id)"
-              ><i-ep-edit />编辑</el-button
-            >
-            <el-button
-              v-hasPerm="['sys:dict:delete']"
-              type="primary"
-              link
-              @click.stop="handleDelete(scope.row.id)"
-              ><i-ep-delete />删除</el-button
-            >
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <pagination
-        v-if="total > 0"
-        v-model:total="total"
-        v-model:page="queryParams.pageNum"
-        v-model:limit="queryParams.pageSize"
-        @pagination="handleQuery"
-      />
-    </el-card>
-
-    <!-- 表单弹窗 -->
-    <el-dialog
-      v-model="dialog.visible"
-      :title="dialog.title"
-      width="500px"
-      @close="closeDialog"
-    >
-      <el-form
-        ref="dataFormRef"
-        :model="formData"
-        :rules="rules"
-        label-width="100px"
-      >
-        <el-form-item label="字典名称">{{ typeName }}</el-form-item>
-        <el-form-item label="字典名称" prop="name">
-          <el-input v-model="formData.name" placeholder="请输入字典名称" />
-        </el-form-item>
-        <el-form-item label="字典值" prop="value">
-          <el-input v-model="formData.value" placeholder="字典值" />
-        </el-form-item>
-        <el-form-item label="排序" prop="sort">
-          <el-input-number
-            v-model="formData.sort"
-            controls-position="right"
-            :min="0"
-          />
-        </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-radio-group v-model="formData.status">
-            <el-radio :label="1">正常</el-radio>
-            <el-radio :label="0">停用</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="formData.remark" type="textarea" />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="handleSubmit">确 定</el-button>
-          <el-button @click="closeDialog">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-
-<script setup lang="ts">
-defineOptions({
-  name: "DictData",
-  inheritAttrs: false,
-});
-
-import DictAPI from "@/api/dict";
-import { DictPageVO, DictForm, DictQuery } from "@/api/dict/model";
-
-const props = defineProps({
-  typeCode: {
-    type: String,
-    default: () => {
-      return "";
-    },
-  },
-  typeName: {
-    type: String,
-    default: () => {
-      return "";
-    },
-  },
-});
-
-watch(
-  () => props.typeCode,
-  (newVal: string) => {
-    queryParams.typeCode = newVal;
-    formData.typeCode = newVal;
-    handleResetQuery();
-  }
-);
-
-const queryFormRef = ref(ElForm);
-const dataFormRef = ref(ElForm);
-
-const loading = ref(false);
-const ids = ref<number[]>([]);
-const total = ref(0);
-
-const queryParams = reactive<DictQuery>({
-  pageNum: 1,
-  pageSize: 10,
-  typeCode: props.typeCode,
-});
-
-const dictList = ref<DictPageVO[]>();
-
-const dialog = reactive({
-  title: "",
-  visible: false,
-});
-
-const formData = reactive<DictForm>({
-  status: 1,
-  typeCode: props.typeCode,
-  sort: 1,
-});
-
-const rules = reactive({
-  name: [{ required: true, message: "请输入字典名称", trigger: "blur" }],
-  value: [{ required: true, message: "请输入字典值", trigger: "blur" }],
-});
-
-/** 查询 */
-function handleQuery() {
-  if (queryParams.typeCode) {
-    loading.value = true;
-    DictAPI.getDictPage(queryParams)
-      .then((data) => {
-        dictList.value = data.list;
-        total.value = data.total;
-      })
-      .finally(() => (loading.value = false));
-  }
-}
-
-/** 重置查询 */
-function handleResetQuery() {
-  queryFormRef.value.resetFields();
-  queryParams.pageNum = 1;
-  handleQuery();
-}
-
-/**
- * 行checkbox change事件
- *
- * @param selection
- */
-function handleSelectionChange(selection: any) {
-  ids.value = selection.map((item: any) => item.id);
-}
-
-/**
- * 打开字典表单弹窗
- *
- * @param dictId 字典ID
- */
-function openDialog(dictId?: number) {
-  dialog.visible = true;
-  if (dictId) {
-    dialog.title = "修改字典";
-    DictAPI.getDictFormData(dictId).then((data) => {
-      Object.assign(formData, data);
-    });
-  } else {
-    dialog.title = "新增字典";
-  }
-}
-
-/** 字典表单提交 */
-function handleSubmit() {
-  dataFormRef.value.validate((isValid: boolean) => {
-    if (isValid) {
-      loading.value = false;
-      const dictId = formData.id;
-      if (dictId) {
-        DictAPI.updateDict(dictId, formData)
-          .then(() => {
-            ElMessage.success("修改成功");
-            closeDialog();
-            handleResetQuery();
-          })
-          .finally(() => (loading.value = false));
-      } else {
-        DictAPI.addDict(formData)
-          .then(() => {
-            ElMessage.success("新增成功");
-            closeDialog();
-            handleResetQuery();
-          })
-          .finally(() => (loading.value = false));
-      }
-    }
-  });
-}
-
-/** 关闭弹窗 */
-function closeDialog() {
-  dialog.visible = false;
-  resetForm();
-}
-
-/** 重置表单 */
-function resetForm() {
-  dataFormRef.value.resetFields();
-  dataFormRef.value.clearValidate();
-
-  formData.id = undefined;
-  formData.status = 1;
-  formData.sort = 1;
-  formData.typeCode = props.typeCode;
-}
-
-/** 删除字典 */
-function handleDelete(dictId?: number) {
-  const dictIds = [dictId || ids.value].join(",");
-  if (!dictIds) {
-    ElMessage.warning("请勾选删除项");
-    return;
-  }
-
-  ElMessageBox.confirm("确认删除已选中的数据项?", "警告", {
-    confirmButtonText: "确定",
-    cancelButtonText: "取消",
-    type: "warning",
-  }).then(() => {
-    DictAPI.deleteDictByIds(dictIds).then(() => {
-      ElMessage.success("删除成功");
-      handleResetQuery();
-    });
-  });
-}
-
-onMounted(() => {
-  handleQuery();
-});
-</script>
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 65cfd16d..2b0a91e4 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -1,5 +1,4 @@
-<!--字典类型-->
-
+<!-- 分类字典 -->
 <template>
   <div class="app-container">
     <div class="search-container">
@@ -7,7 +6,7 @@
         <el-form-item label="关键字" prop="name">
           <el-input
             v-model="queryParams.keywords"
-            placeholder="字典类型名称/编码"
+            placeholder="字典名称"
             clearable
             @keyup.enter="handleQuery"
           />
@@ -16,68 +15,67 @@
           <el-button type="primary" @click="handleQuery()"
             ><i-ep-search />搜索</el-button
           >
-          <el-button @click="handleResetQuery()"
+          <el-button @click="handleResetClick()"
             ><i-ep-refresh />重置</el-button
           >
         </el-form-item>
       </el-form>
     </div>
 
-    <el-card shadow="never" class="table-container">
-      <template #header>
-        <el-button
-          v-hasPerm="['sys:dict_type:add']"
-          type="success"
-          @click="openDialog()"
+    <el-card shadow="never">
+      <div class="mb-[10px]">
+        <el-button type="success" @click="handleAddClick()"
           ><i-ep-plus />新增</el-button
         >
         <el-button
           type="danger"
           :disabled="ids.length === 0"
-          @click="handleDelete()"
+          @click="handleDeleteClick()"
           ><i-ep-delete />删除</el-button
         >
-      </template>
+      </div>
+
       <el-table
         v-loading="loading"
         highlight-current-row
-        :data="dictTypeList"
+        :data="tableData"
         border
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="字典类型名称" prop="name" width="200" />
-        <el-table-column label="字典类型编码" prop="code" width="200" />
-        <el-table-column label="状态" align="center" width="100">
-          <template #default="scope">
-            <el-tag v-if="scope.row.status === 1" type="success">启用</el-tag>
-            <el-tag v-else type="info">禁用</el-tag>
+
+        <el-table-column type="expand" label="字典项列表" width="100">
+          <template #default="props">
+            <el-table :data="props.row.dictItems">
+              <el-table-column label="字典项键" prop="name" width="200" />
+              <el-table-column label="字典项值" prop="value" align="center" />
+              <el-table-column label="排序" prop="sort" align="center" />
+            </el-table>
+          </template>
+        </el-table-column>
+        <el-table-column label="字典名称" prop="name" />
+        <el-table-column label="字典编码" prop="code" />
+        <el-table-column label="状态" prop="status">
+          <template #default="scope">
+            <el-tag :type="scope.row.status === 1 ? 'success' : 'info'">
+              {{ scope.row.status === 1 ? "启用" : "禁用" }}
+            </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="备注" prop="remark" align="center" />
         <el-table-column fixed="right" label="操作" align="center" width="220">
           <template #default="scope">
             <el-button
               type="primary"
               link
               size="small"
-              @click.stop="openDictDialog(scope.row)"
-              ><i-ep-Collection />字典数据</el-button
-            >
-            <el-button
-              v-hasPerm="['sys:dict_type:edit']"
-              type="primary"
-              link
-              size="small"
-              @click.stop="openDialog(scope.row.id)"
+              @click.stop="handleEditClick(scope.row.id, scope.row.name)"
               ><i-ep-edit />编辑</el-button
             >
             <el-button
-              v-hasPerm="['sys:dict_type:delete']"
-              type="primary"
+              type="danger"
               link
               size="small"
-              @click.stop="handleDelete(scope.row.id)"
+              @click.stop="handleDeleteClick(scope.row.id)"
               ><i-ep-delete />删除</el-button
             >
           </template>
@@ -93,71 +91,128 @@
       />
     </el-card>
 
-    <el-dialog
+    <!--字典弹窗-->
+    <el-drawer
       v-model="dialog.visible"
       :title="dialog.title"
-      width="500px"
-      @close="closeDialog"
+      size="70%"
+      @close="handleCloseDialog"
     >
       <el-form
         ref="dataFormRef"
         :model="formData"
-        :rules="rules"
-        label-width="80px"
+        :rules="computedRules"
+        label-width="100px"
+        :inline="true"
       >
-        <el-form-item label="字典名称" prop="name">
-          <el-input v-model="formData.name" placeholder="请输入字典名称" />
-        </el-form-item>
-        <el-form-item label="字典编码" prop="code">
-          <el-input v-model="formData.code" placeholder="请输入字典编码" />
-        </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-radio-group v-model="formData.status">
-            <el-radio :label="1">正常</el-radio>
-            <el-radio :label="0">停用</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input
-            v-model="formData.remark"
-            type="textarea"
-            placeholder="字典类型备注"
-            :autosize="{ minRows: 2, maxRows: 4 }"
-          />
-        </el-form-item>
+        <el-card shadow="never">
+          <el-form-item label="字典名称" prop="name">
+            <el-input v-model="formData.name" placeholder="请输入字典名称" />
+          </el-form-item>
+          <el-form-item label="字典编码" prop="code">
+            <el-input v-model="formData.code" placeholder="请输入字典编码" />
+          </el-form-item>
+
+          <el-form-item label="状态">
+            <el-radio-group v-model="formData.status">
+              <el-radio :value="1">启用</el-radio>
+              <el-radio :value="0">禁用</el-radio>
+            </el-radio-group>
+          </el-form-item>
+
+          <el-form-item label="备注">
+            <el-input v-model="formData.remark" />
+          </el-form-item>
+        </el-card>
+
+        <el-card shadow="never" class="mt-5">
+          <template #header>
+            <div class="flex-x-between">
+              <span>字典项</span>
+              <el-button
+                type="primary"
+                size="small"
+                @click.stop="handleAddAttrClick"
+                ><i-ep-plus />新增字典</el-button
+              >
+            </div>
+          </template>
+          <el-table
+            v-loading="loading"
+            highlight--currentrow
+            :data="formData.dictItems"
+            @selection-change="handleSelectionChange"
+          >
+            <el-table-column label="字典项名称" width="200">
+              <template #default="scope">
+                <el-form-item :prop="'dictItems.' + scope.$index + '.name'">
+                  <el-input v-model="scope.row.name" />
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column label="字典项值" width="200">
+              <template #default="scope">
+                <el-form-item :prop="'dictItems.' + scope.$index + '.value'">
+                  <el-input v-model="scope.row.value" />
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column label="排序">
+              <template #default="scope">
+                <el-form-item :prop="'dictItems.' + scope.$index + '.sort'">
+                  <el-input v-model="scope.row.sort" />
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column label="状态" prop="status">
+              <template #default="scope">
+                <el-form-item :prop="'dictItems.' + scope.$index + '.status'">
+                  <el-switch
+                    v-model="scope.row.status"
+                    :active-value="1"
+                    :inactive-value="0"
+                  />
+                </el-form-item>
+              </template>
+            </el-table-column>
+
+            <el-table-column
+              fixed="right"
+              label="操作"
+              align="center"
+              width="120"
+            >
+              <template #default="scope">
+                <el-button
+                  type="danger"
+                  link
+                  size="small"
+                  @click.stop="handleDeleteAttrClick(scope.$index)"
+                  ><i-ep-delete />删除</el-button
+                >
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
       </el-form>
+
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" @click="handleSubmit">确 定</el-button>
-          <el-button @click="closeDialog">取 消</el-button>
+          <el-button type="primary" @click="handleSubmitClick">确 定</el-button>
+          <el-button @click="handleCloseDialog">取 消</el-button>
         </div>
       </template>
-    </el-dialog>
-
-    <!--字典数据弹窗-->
-    <el-dialog
-      v-model="dictDataDialog.visible"
-      :title="dictDataDialog.title"
-      width="1000px"
-      @close="closeDictDialog"
-    >
-      <dict-item
-        v-model:typeCode="selectedDictType.typeCode"
-        v-model:typeName="selectedDictType.typeName"
-      />
-    </el-dialog>
+    </el-drawer>
   </div>
 </template>
 
 <script setup lang="ts">
 defineOptions({
-  name: "DictType",
-  inheritAttrs: false,
+  name: "Dict",
+  inherititems: false,
 });
 
-import DictAPI from "@/api/dict";
-
-import { DictTypePageVO, DictTypeQuery, DictTypeForm } from "@/api/dict/model";
+import DictAPI, { DictPageQuery, DictPageVO, DictForm } from "@/api/dict";
 
 const queryFormRef = ref(ElForm);
 const dataFormRef = ref(ElForm);
@@ -166,33 +221,42 @@ const loading = ref(false);
 const ids = ref<number[]>([]);
 const total = ref(0);
 
-const queryParams = reactive<DictTypeQuery>({
+const queryParams = reactive<DictPageQuery>({
   pageNum: 1,
   pageSize: 10,
 });
 
-const dictTypeList = ref<DictTypePageVO[]>();
+const tableData = ref<DictPageVO[]>();
 
+// 字典弹窗
 const dialog = reactive({
   title: "",
   visible: false,
 });
 
-const formData = reactive<DictTypeForm>({
-  status: 1,
+const formData = reactive<DictForm>({});
+
+const computedRules = computed(() => {
+  const rules: Partial<Record<string, any>> = {
+    name: [{ required: true, message: "请输入字典名称", trigger: "blur" }],
+    code: [{ required: true, message: "请输入字典编码", trigger: "blur" }],
+  };
+  if (formData.dictItems) {
+    formData.dictItems.forEach((attr, index) => {
+      rules[`dictItems.${index}.name`] = [
+        { required: true, message: "请输入字典项名称", trigger: "blur" },
+      ];
+    });
+  }
+  return rules;
 });
 
-const rules = reactive({
-  name: [{ required: true, message: "请输入字典类型名称", trigger: "blur" }],
-  code: [{ required: true, message: "请输入字典类型编码", trigger: "blur" }],
-});
-
-/** 查询 */
+// 查询
 function handleQuery() {
   loading.value = true;
-  DictAPI.getDictTypePage(queryParams)
+  DictAPI.getPage(queryParams)
     .then((data) => {
-      dictTypeList.value = data.list;
+      tableData.value = data.list;
       total.value = data.total;
     })
     .finally(() => {
@@ -200,56 +264,57 @@ function handleQuery() {
     });
 }
 
-/**
- * 重置查询
- */
-function handleResetQuery() {
+// 重置查询
+function handleResetClick() {
   queryFormRef.value.resetFields();
   queryParams.pageNum = 1;
   handleQuery();
 }
 
-/** 行复选框选中  */
+// 行选择
 function handleSelectionChange(selection: any) {
   ids.value = selection.map((item: any) => item.id);
 }
 
-/**
- * 打开字典类型表单弹窗
- *
- * @param dicTypeId 字典类型ID
- */
-function openDialog(dicTypeId?: number) {
+// 新增字典
+function handleAddClick() {
   dialog.visible = true;
-  if (dicTypeId) {
-    dialog.title = "修改字典类型";
-    DictAPI.getDictTypeForm(dicTypeId).then((data) => {
-      Object.assign(formData, data);
-    });
-  } else {
-    dialog.title = "新增字典类型";
-  }
+  dialog.title = "新增字典";
 }
 
-/** 字典类型表单提交 */
-function handleSubmit() {
+/**
+ * 编辑字典
+ *
+ * @param id 字典ID
+ */
+function handleEditClick(id: number, name: string) {
+  dialog.visible = true;
+  dialog.title = "【" + name + "】字典修改";
+  DictAPI.getFormData(id).then((data) => {
+    Object.assign(formData, data);
+  });
+}
+
+// 提交字典表单
+function handleSubmitClick() {
   dataFormRef.value.validate((isValid: boolean) => {
+    console.log("isValid", isValid);
     if (isValid) {
-      loading.value = false;
-      const dictTypeId = formData.id;
-      if (dictTypeId) {
-        DictAPI.updateDictType(dictTypeId, formData)
+      loading.value = true;
+      const id = formData.id;
+      if (id) {
+        DictAPI.update(id, formData)
           .then(() => {
             ElMessage.success("修改成功");
-            closeDialog();
+            handleCloseDialog();
             handleQuery();
           })
           .finally(() => (loading.value = false));
       } else {
-        DictAPI.addDictType(formData)
+        DictAPI.add(formData)
           .then(() => {
             ElMessage.success("新增成功");
-            closeDialog();
+            handleCloseDialog();
             handleQuery();
           })
           .finally(() => (loading.value = false));
@@ -258,63 +323,57 @@ function handleSubmit() {
   });
 }
 
-/** 关闭字典类型弹窗 */
-function closeDialog() {
+/** 关闭字典弹窗 */
+function handleCloseDialog() {
   dialog.visible = false;
-  resetForm();
-}
 
-/**  重置字典类型表单 */
-function resetForm() {
   dataFormRef.value.resetFields();
   dataFormRef.value.clearValidate();
 
   formData.id = undefined;
-  formData.status = 1;
 }
-
-/** 删除字典类型 */
-function handleDelete(dictTypeId?: number) {
-  const dictTypeIds = [dictTypeId || ids.value].join(",");
-  if (!dictTypeIds) {
+/**
+ * 删除字典
+ *
+ * @param id 字典ID
+ */
+function handleDeleteClick(id?: number) {
+  const attrGroupIds = [id || ids.value].join(",");
+  if (!attrGroupIds) {
     ElMessage.warning("请勾选删除项");
     return;
   }
-
   ElMessageBox.confirm("确认删除已选中的数据项?", "警告", {
     confirmButtonText: "确定",
     cancelButtonText: "取消",
     type: "warning",
   }).then(() => {
-    DictAPI.deleteDictTypes(dictTypeIds).then(() => {
+    DictAPI.deleteByIds(attrGroupIds).then(() => {
       ElMessage.success("删除成功");
-      handleResetQuery();
+      handleResetClick();
     });
   });
 }
 
-const dictDataDialog = reactive({
-  title: "",
-  visible: false,
-});
-
-const selectedDictType = reactive({ typeCode: "", typeName: "" }); // 当前选中的字典类型
-
-/** 打开字典数据弹窗 */
-function openDictDialog(row: DictTypePageVO) {
-  dictDataDialog.visible = true;
-  dictDataDialog.title = "【" + row.name + "】字典数据";
-
-  selectedDictType.typeCode = row.code;
-  selectedDictType.typeName = row.name;
+// 新增字典
+function handleAddAttrClick() {
+  formData.dictItems = formData.dictItems ?? [];
+  formData.dictItems.push({ sort: 1, status: 1 });
 }
-
-/**  关闭字典数据弹窗 */
-function closeDictDialog() {
-  dictDataDialog.visible = false;
+// 删除字典
+function handleDeleteAttrClick(index: number) {
+  if (formData.dictItems && formData.dictItems.length > 0) {
+    formData.dictItems.splice(index, 1);
+  }
 }
 
 onMounted(() => {
   handleQuery();
 });
 </script>
+
+<style scoped lang="scss">
+.el-form--inline .el-form-item {
+  margin-top: 18px;
+}
+</style>
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index f818fc01..9f0ef2f7 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -27,7 +27,7 @@
         <el-button
           v-hasPerm="['sys:menu:add']"
           type="success"
-          @click="handleDialogOpen(0)"
+          @click="handleOpenDialog(0)"
         >
           <template #icon><i-ep-plus /></template>
           新增</el-button
@@ -84,11 +84,18 @@
           </template>
         </el-table-column>
 
+        <el-table-column
+          label="路由名称"
+          align="left"
+          width="150"
+          prop="routeName"
+        />
+
         <el-table-column
           label="路由路径"
           align="left"
           width="150"
-          prop="path"
+          prop="routePath"
         />
 
         <el-table-column
@@ -122,7 +129,7 @@
               type="primary"
               link
               size="small"
-              @click.stop="handleDialogOpen(scope.row.id)"
+              @click.stop="handleOpenDialog(scope.row.id)"
             >
               <i-ep-plus />新增
             </el-button>
@@ -132,7 +139,7 @@
               type="primary"
               link
               size="small"
-              @click.stop="handleDialogOpen(undefined, scope.row.id)"
+              @click.stop="handleOpenDialog(undefined, scope.row.id)"
             >
               <i-ep-edit />编辑
             </el-button>
@@ -150,19 +157,17 @@
       </el-table>
     </el-card>
 
-    <el-dialog
+    <el-drawer
       v-model="dialog.visible"
       :title="dialog.title"
-      destroy-on-close
-      append-to-body
-      width="1000px"
-      @close="closeDialog"
+      @close="handleCloseDialog"
+      size="50%"
     >
       <el-form
         ref="menuFormRef"
         :model="formData"
         :rules="rules"
-        label-width="160px"
+        label-width="100px"
       >
         <el-form-item label="父级菜单" prop="parentId">
           <el-tree-select
@@ -196,7 +201,10 @@
           label="外链地址"
           prop="path"
         >
-          <el-input v-model="formData.path" placeholder="请输入外链完整路径" />
+          <el-input
+            v-model="formData.routePath"
+            placeholder="请输入外链完整路径"
+          />
         </el-form-item>
 
         <el-form-item
@@ -204,8 +212,29 @@
             formData.type == MenuTypeEnum.CATALOG ||
             formData.type == MenuTypeEnum.MENU
           "
-          label=""
-          prop="path"
+          prop="routeName"
+        >
+          <template #label>
+            <div>
+              路由名称
+              <el-tooltip placement="bottom" effect="light">
+                <template #content>
+                  如果需要开启缓存，需保证页面 defineOptions 中的 name
+                  与此处一致，建议使用驼峰。
+                </template>
+                <i-ep-QuestionFilled class="inline-block" />
+              </el-tooltip>
+            </div>
+          </template>
+          <el-input v-model="formData.routeName" placeholder="User" />
+        </el-form-item>
+
+        <el-form-item
+          v-if="
+            formData.type == MenuTypeEnum.CATALOG ||
+            formData.type == MenuTypeEnum.MENU
+          "
+          prop="routePath"
         >
           <template #label>
             <div>
@@ -222,10 +251,10 @@
           </template>
           <el-input
             v-if="formData.type == MenuTypeEnum.CATALOG"
-            v-model="formData.path"
+            v-model="formData.routePath"
             placeholder="system"
           />
-          <el-input v-else v-model="formData.path" placeholder="user" />
+          <el-input v-else v-model="formData.routePath" placeholder="user" />
         </el-form-item>
 
         <el-form-item
@@ -405,10 +434,10 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="closeDialog">取 消</el-button>
+          <el-button @click="handleCloseDialog">取 消</el-button>
         </div>
       </template>
-    </el-dialog>
+    </el-drawer>
   </div>
 </template>
 
@@ -418,8 +447,7 @@ defineOptions({
   inheritAttrs: false,
 });
 
-import MenuAPI from "@/api/menu";
-import { MenuQuery, MenuForm, MenuVO } from "@/api/menu/model";
+import MenuAPI, { MenuQuery, MenuForm, MenuVO } from "@/api/menu";
 import { MenuTypeEnum } from "@/enums/MenuTypeEnum";
 
 const queryFormRef = ref(ElForm);
@@ -458,7 +486,7 @@ const rules = reactive({
   parentId: [{ required: true, message: "请选择顶级菜单", trigger: "blur" }],
   name: [{ required: true, message: "请输入菜单名称", trigger: "blur" }],
   type: [{ required: true, message: "请选择菜单类型", trigger: "blur" }],
-  path: [{ required: true, message: "请输入路由路径", trigger: "blur" }],
+  routePath: [{ required: true, message: "请输入路由路径", trigger: "blur" }],
   component: [{ required: true, message: "请输入组件路径", trigger: "blur" }],
   visible: [{ required: true, message: "请输入路由路径", trigger: "blur" }],
 });
@@ -496,7 +524,7 @@ function handleRowClick(row: MenuVO) {
  * @param parentId 父菜单ID
  * @param menuId 菜单ID
  */
-function handleDialogOpen(parentId?: number, menuId?: number) {
+function handleOpenDialog(parentId?: number, menuId?: number) {
   MenuAPI.getOptions()
     .then((data) => {
       menuOptions.value = [{ value: 0, label: "顶级菜单", children: data }];
@@ -541,13 +569,13 @@ function submitForm() {
       if (menuId) {
         MenuAPI.update(menuId, formData.value).then(() => {
           ElMessage.success("修改成功");
-          closeDialog();
+          handleCloseDialog();
           handleQuery();
         });
       } else {
         MenuAPI.add(formData.value).then(() => {
           ElMessage.success("新增成功");
-          closeDialog();
+          handleCloseDialog();
           handleQuery();
         });
       }
@@ -577,7 +605,7 @@ function handleDelete(menuId: number) {
 }
 
 // 关闭弹窗
-function closeDialog() {
+function handleCloseDialog() {
   dialog.visible = false;
   menuFormRef.value.resetFields();
   menuFormRef.value.clearValidate();
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index e62b10ea..d332e135 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -195,7 +195,6 @@
         :data="menuPermOptions"
         :filter-node-method="handlePermFilter"
         :default-expand-all="true"
-        :check-on-click-node="true"
         :check-strictly="!parentChildLinked"
         class="mt-5"
       >
@@ -222,11 +221,9 @@ defineOptions({
   inheritAttrs: false,
 });
 
-import RoleAPI from "@/api/role";
+import RoleAPI, { RolePageVO, RoleForm, RolePageQuery } from "@/api/role";
 import MenuAPI from "@/api/menu";
 
-import { RolePageVO, RoleForm, RoleQuery } from "@/api/role/model";
-
 const queryFormRef = ref(ElForm);
 const roleFormRef = ref(ElForm);
 const permTreeRef = ref<InstanceType<typeof ElTree>>();
@@ -235,7 +232,7 @@ const loading = ref(false);
 const ids = ref<number[]>([]);
 const total = ref(0);
 
-const queryParams = reactive<RoleQuery>({
+const queryParams = reactive<RolePageQuery>({
   pageNum: 1,
   pageSize: 10,
 });
@@ -315,7 +312,7 @@ function handleOpenDialog(roleId?: number) {
   }
 }
 
-// 角色保存提交
+/** 提交角色表单 */
 function handleSubmit() {
   roleFormRef.value.validate((valid: any) => {
     if (valid) {
@@ -342,7 +339,7 @@ function handleSubmit() {
   });
 }
 
-// 关闭表单弹窗
+/** 关闭表单弹窗 */
 function handleCloseDialog() {
   dialog.visible = false;
 
@@ -354,7 +351,7 @@ function handleCloseDialog() {
   formData.status = 1;
 }
 
-// 删除角色
+/** 删除角色 */
 function handleDelete(roleId?: number) {
   const roleIds = [roleId || ids.value].join(",");
   if (!roleIds) {
@@ -377,7 +374,7 @@ function handleDelete(roleId?: number) {
   });
 }
 
-// 打开分配权限
+/** 打开分配菜单权限弹窗 */
 async function handleOpenAssignPermDialog(row: RolePageVO) {
   const roleId = row.id;
   if (roleId) {
@@ -404,7 +401,7 @@ async function handleOpenAssignPermDialog(row: RolePageVO) {
   }
 }
 
-// 分配权限提交
+/** 分配菜单权限提交 */
 function handleAssignPermSubmit() {
   const roleId = checkedRole.value.id;
   if (roleId) {
@@ -425,7 +422,7 @@ function handleAssignPermSubmit() {
   }
 }
 
-// 切换菜单树展开状态
+/** 展开/收缩 菜单权限树  */
 function togglePermTree() {
   isExpanded.value = !isExpanded.value;
   if (permTreeRef.value) {
@@ -438,11 +435,12 @@ function togglePermTree() {
     });
   }
 }
+// 菜单权限筛选
 watch(permKeywords, (val) => {
   permTreeRef.value!.filter(val);
 });
 
-// 权限筛选
+/** 权限筛选  */
 function handlePermFilter(
   value: string,
   data: {
@@ -453,6 +451,7 @@ function handlePermFilter(
   return data.label.includes(value);
 }
 
+/** 父子菜单节点是否联动 change*/
 function handleparentChildLinkedChange(val: any) {
   parentChildLinked.value = val;
 }
diff --git a/src/views/system/user/components/user-import.vue b/src/views/system/user/components/user-import.vue
new file mode 100644
index 00000000..016dac52
--- /dev/null
+++ b/src/views/system/user/components/user-import.vue
@@ -0,0 +1,145 @@
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    :align-center="true"
+    title="导入数据"
+    width="600px"
+    @close="handleClose"
+  >
+    <el-scrollbar max-height="60vh">
+      <el-form
+        ref="importFormRef"
+        label-width="auto"
+        style="padding-right: var(--el-dialog-padding-primary)"
+        :model="importFormData"
+        :rules="importFormRules"
+      >
+        <el-form-item label="文件名" prop="files">
+          <el-upload
+            class="w-full"
+            ref="uploadRef"
+            v-model:file-list="importFormData.files"
+            accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
+            :drag="true"
+            :limit="1"
+            :auto-upload="false"
+            :on-exceed="handleFileExceed"
+          >
+            <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+            <div class="el-upload__text">
+              将文件拖到此处，或<em>点击上传</em>
+            </div>
+            <template #tip>
+              <div class="el-upload__tip">
+                *.xlsx / *.xls
+                <el-link
+                  type="primary"
+                  icon="download"
+                  :underline="false"
+                  @click="handleDownloadTemplate"
+                >
+                  下载模板
+                </el-link>
+              </div>
+            </template>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+    </el-scrollbar>
+    <template #footer>
+      <div style="padding-right: var(--el-dialog-padding-primary)">
+        <el-button
+          type="primary"
+          :disabled="importFormData.files.length === 0"
+          @click="handleSubmit"
+        >
+          确 定
+        </el-button>
+        <el-button @click="handleClose">取 消</el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { type UploadUserFile } from "element-plus";
+
+import UserAPI from "@/api/user";
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+});
+
+const emit = defineEmits(["update:visible", "import-success"]);
+
+const dialogVisible = computed({
+  get: () => props.visible,
+  set: (val) => {
+    emit("update:visible", val);
+  },
+});
+
+const importFormRef = ref(null);
+const uploadRef = ref(null);
+
+const importFormData = reactive<{
+  files: UploadUserFile[];
+}>({
+  files: [],
+});
+
+const importFormRules = {
+  files: [{ required: true, message: "文件不能为空", trigger: "blur" }],
+};
+
+const handleClose = () => {
+  dialogVisible.value = false;
+};
+
+const handleSubmit = async () => {
+  if (!importFormData.files.length) {
+    ElMessage.warning("请选择文件");
+    return;
+  }
+
+  try {
+    await UserAPI.import(1, importFormData.files[0].raw as File);
+    ElMessage.success("上传成功");
+    emit("import-success");
+    handleClose();
+  } catch (error) {
+    ElMessage.error("上传失败");
+  }
+};
+
+const handleFileExceed = () => {
+  ElMessage.warning("只能上传一个文件");
+};
+
+const handleDownloadTemplate = () => {
+  UserAPI.downloadTemplate().then((response: any) => {
+    const fileData = response.data;
+    const fileName = decodeURI(
+      response.headers["content-disposition"].split(";")[1].split("=")[1]
+    );
+    const fileType =
+      "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8";
+
+    const blob = new Blob([fileData], { type: fileType });
+    const downloadUrl = window.URL.createObjectURL(blob);
+
+    const downloadLink = document.createElement("a");
+    downloadLink.href = downloadUrl;
+    downloadLink.download = fileName;
+
+    document.body.appendChild(downloadLink);
+    downloadLink.click();
+
+    document.body.removeChild(downloadLink);
+    window.URL.revokeObjectURL(downloadUrl);
+  });
+};
+</script>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index f337f7a1..6124a205 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -59,12 +59,12 @@
 
         <el-card shadow="never" class="table-container">
           <template #header>
-            <div class="flex justify-between">
+            <div class="flex-x-between">
               <div>
                 <el-button
                   v-hasPerm="['sys:user:add']"
                   type="success"
-                  @click="openDialog('user-form')"
+                  @click="handleOpenDialog()"
                   ><i-ep-plus />新增</el-button
                 >
                 <el-button
@@ -76,19 +76,10 @@
                 >
               </div>
               <div>
-                <el-dropdown split-button>
-                  导入
-                  <template #dropdown>
-                    <el-dropdown-menu>
-                      <el-dropdown-item @click="downloadTemplate">
-                        <i-ep-download />下载模板</el-dropdown-item
-                      >
-                      <el-dropdown-item @click="openDialog('user-import')">
-                        <i-ep-top />导入数据</el-dropdown-item
-                      >
-                    </el-dropdown-menu>
-                  </template>
-                </el-dropdown>
+                <el-button class="ml-3" @click="handleOpenImportDialog"
+                  ><template #icon><i-ep-upload /></template>导入</el-button
+                >
+
                 <el-button class="ml-3" @click="handleExport"
                   ><template #icon><i-ep-download /></template>导出</el-button
                 >
@@ -162,7 +153,7 @@
                   type="primary"
                   size="small"
                   link
-                  @click="resetPassword(scope.row)"
+                  @click="hancleResetPassword(scope.row)"
                   ><i-ep-refresh-left />重置密码</el-button
                 >
                 <el-button
@@ -170,12 +161,12 @@
                   type="primary"
                   link
                   size="small"
-                  @click="openDialog('user-form', scope.row.id)"
+                  @click="handleOpenDialog(scope.row.id)"
                   ><i-ep-edit />编辑</el-button
                 >
                 <el-button
                   v-hasPerm="['sys:user:delete']"
-                  type="primary"
+                  type="danger"
                   link
                   size="small"
                   @click="handleDelete(scope.row.id)"
@@ -196,17 +187,15 @@
       </el-col>
     </el-row>
 
-    <!-- 弹窗 -->
-    <el-dialog
+    <!-- 用户表单弹窗 -->
+    <el-drawer
       v-model="dialog.visible"
       :title="dialog.title"
-      :width="dialog.width"
       append-to-body
-      @close="closeDialog"
+      @close="handleCloseDialog"
     >
       <!-- 用户新增/编辑表单 -->
       <el-form
-        v-if="dialog.type === 'user-form'"
         ref="userFormRef"
         :model="formData"
         :rules="rules"
@@ -228,7 +217,7 @@
           <el-tree-select
             v-model="formData.deptId"
             placeholder="请选择所属部门"
-            :data="deptList"
+            :data="deptOptions"
             filterable
             check-strictly
             :render-after-expand="false"
@@ -236,13 +225,13 @@
         </el-form-item>
 
         <el-form-item label="性别" prop="gender">
-          <dictionary v-model="formData.gender" type-code="gender" />
+          <dictionary v-model="formData.gender" code="gender" />
         </el-form-item>
 
         <el-form-item label="角色" prop="roleIds">
           <el-select v-model="formData.roleIds" multiple placeholder="请选择">
             <el-option
-              v-for="item in roleList"
+              v-for="item in roleOptions"
               :key="item.value"
               :label="item.label"
               :value="item.value"
@@ -274,55 +263,19 @@
         </el-form-item>
       </el-form>
 
-      <!-- 用户导入表单 -->
-      <el-form
-        v-else-if="dialog.type === 'user-import'"
-        :model="importData"
-        label-width="100px"
-      >
-        <el-form-item label="部门">
-          <el-tree-select
-            v-model="importData.deptId"
-            placeholder="请选择部门"
-            :data="deptList"
-            filterable
-            check-strictly
-          />
-        </el-form-item>
-
-        <el-form-item label="Excel文件">
-          <el-upload
-            ref="uploadRef"
-            action=""
-            drag
-            accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-            :limit="1"
-            :auto-upload="false"
-            :file-list="importData.fileList"
-            :on-change="handleFileChange"
-            :on-exceed="handleFileExceed"
-          >
-            <el-icon class="el-icon--upload">
-              <i-ep-upload-filled />
-            </el-icon>
-            <div class="el-upload__text">
-              将文件拖到此处，或
-              <em>点击上传</em>
-            </div>
-            <template #tip>
-              <div>xls/xlsx files</div>
-            </template>
-          </el-upload>
-        </el-form-item>
-      </el-form>
-      <!-- 弹窗底部操作按钮 -->
       <template #footer>
         <div class="dialog-footer">
           <el-button type="primary" @click="handleSubmit">确 定</el-button>
-          <el-button @click="closeDialog">取 消</el-button>
+          <el-button @click="handleCloseDialog">取 消</el-button>
         </div>
       </template>
-    </el-dialog>
+    </el-drawer>
+
+    <!-- 用户导入弹窗 -->
+    <user-import
+      v-model:visible="importDialogVisible"
+      @import-success="handleOpenImportDialogSuccess"
+    />
   </div>
 </template>
 
@@ -332,30 +285,28 @@ defineOptions({
   inheritAttrs: false,
 });
 
-import UserAPI from "@/api/user";
+import UserAPI, { UserForm, UserPageQuery, UserPageVO } from "@/api/user";
 import DeptAPI from "@/api/dept";
 import RoleAPI from "@/api/role";
 
-import { UserForm, UserQuery, UserPageVO } from "@/api/user/model";
-import type { UploadInstance } from "element-plus";
-import { genFileId } from "element-plus";
+const queryFormRef = ref(ElForm);
+const userFormRef = ref(ElForm);
 
-const queryFormRef = ref(ElForm); // 查询表单
-const userFormRef = ref(ElForm); // 用户表单
-const uploadRef = ref<UploadInstance>(); // 上传组件
-
-const loading = ref(false); //  加载状态
-const removeIds = ref([]); // 删除用户ID集合 用于批量删除
-const queryParams = reactive<UserQuery>({
+const loading = ref(false);
+const removeIds = ref([]);
+const total = ref(0);
+const pageData = ref<UserPageVO[]>();
+/** 部门下拉选项 */
+const deptOptions = ref<OptionType[]>();
+/** 角色下拉选项 */
+const roleOptions = ref<OptionType[]>();
+/** 用户查询参数  */
+const queryParams = reactive<UserPageQuery>({
   pageNum: 1,
   pageSize: 10,
 });
-const dateTimeRange = ref("");
-const total = ref(0); // 数据总数
-const pageData = ref<UserPageVO[]>(); // 用户分页数据
-const deptList = ref<OptionType[]>(); // 部门下拉数据源
-const roleList = ref<OptionType[]>(); // 角色下拉数据源
 
+const dateTimeRange = ref("");
 watch(dateTimeRange, (newVal) => {
   if (newVal) {
     queryParams.startTime = newVal[0];
@@ -363,27 +314,21 @@ watch(dateTimeRange, (newVal) => {
   }
 });
 
-// 弹窗对象
+/**  用户弹窗对象  */
 const dialog = reactive({
   visible: false,
-  type: "user-form",
-  width: 800,
   title: "",
 });
 
+/** 导入弹窗显示状态 */
+const importDialogVisible = ref(false);
+
 // 用户表单数据
 const formData = reactive<UserForm>({
   status: 1,
 });
 
-// 用户导入数据
-const importData = reactive({
-  deptId: undefined,
-  file: undefined,
-  fileList: [],
-});
-
-// 校验规则
+/** 用户表单校验规则  */
 const rules = reactive({
   username: [{ required: true, message: "用户名不能为空", trigger: "blur" }],
   nickname: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
@@ -436,7 +381,7 @@ function handleSelectionChange(selection: any) {
 }
 
 /** 重置密码 */
-function resetPassword(row: { [key: string]: any }) {
+function hancleResetPassword(row: { [key: string]: any }) {
   ElMessageBox.prompt(
     "请输入用户「" + row.username + "」的新密码",
     "重置密码",
@@ -456,110 +401,63 @@ function resetPassword(row: { [key: string]: any }) {
   });
 }
 
-/** 加载角色下拉数据源 */
-async function loadRoleOptions() {
-  RoleAPI.getOptions().then((data) => {
-    roleList.value = data;
-  });
-}
-
-/** 加载部门下拉数据源 */
-async function loadDeptOptions() {
-  DeptAPI.getOptions().then((data) => {
-    deptList.value = data;
-  });
-}
-
 /**
  * 打开弹窗
  *
- * @param type 弹窗类型  用户表单：user-form | 用户导入：user-import
  * @param id 用户ID
  */
-async function openDialog(type: string, id?: number) {
+async function handleOpenDialog(id?: number) {
   dialog.visible = true;
-  dialog.type = type;
+  // 加载角色下拉数据源
+  roleOptions.value = await RoleAPI.getOptions();
+  // 加载部门下拉数据源
+  deptOptions.value = await DeptAPI.getOptions();
 
-  if (dialog.type === "user-form") {
-    // 用户表单弹窗
-    await loadDeptOptions();
-    await loadRoleOptions();
-    if (id) {
-      dialog.title = "修改用户";
-      UserAPI.getFormData(id).then((data) => {
-        Object.assign(formData, { ...data });
-      });
-    } else {
-      dialog.title = "新增用户";
-    }
-  } else if (dialog.type === "user-import") {
-    // 用户导入弹窗
-    dialog.title = "导入用户";
-    dialog.width = 600;
-    loadDeptOptions();
+  if (id) {
+    dialog.title = "修改用户";
+    UserAPI.getFormData(id).then((data) => {
+      Object.assign(formData, { ...data });
+    });
+  } else {
+    dialog.title = "新增用户";
   }
 }
 
-/**
- * 关闭弹窗
- *
- * @param type 弹窗类型  用户表单：user-form | 用户导入：user-import
- */
-function closeDialog() {
+/** 关闭弹窗 */
+function handleCloseDialog() {
   dialog.visible = false;
-  if (dialog.type === "user-form") {
-    userFormRef.value.resetFields();
-    userFormRef.value.clearValidate();
+  userFormRef.value.resetFields();
+  userFormRef.value.clearValidate();
 
-    formData.id = undefined;
-    formData.status = 1;
-  } else if (dialog.type === "user-import") {
-    importData.file = undefined;
-    importData.fileList = [];
-  }
+  formData.id = undefined;
+  formData.status = 1;
 }
 
 /** 表单提交 */
 const handleSubmit = useThrottleFn(() => {
-  if (dialog.type === "user-form") {
-    userFormRef.value.validate((valid: any) => {
-      if (valid) {
-        const userId = formData.id;
-        loading.value = true;
-        if (userId) {
-          UserAPI.update(userId, formData)
-            .then(() => {
-              ElMessage.success("修改用户成功");
-              closeDialog();
-              handleResetQuery();
-            })
-            .finally(() => (loading.value = false));
-        } else {
-          UserAPI.add(formData)
-            .then(() => {
-              ElMessage.success("新增用户成功");
-              closeDialog();
-              handleResetQuery();
-            })
-            .finally(() => (loading.value = false));
-        }
+  userFormRef.value.validate((valid: any) => {
+    if (valid) {
+      const userId = formData.id;
+      loading.value = true;
+      if (userId) {
+        UserAPI.update(userId, formData)
+          .then(() => {
+            ElMessage.success("修改用户成功");
+            handleCloseDialog();
+            handleResetQuery();
+          })
+          .finally(() => (loading.value = false));
+      } else {
+        UserAPI.add(formData)
+          .then(() => {
+            ElMessage.success("新增用户成功");
+            handleCloseDialog();
+            handleResetQuery();
+          })
+          .finally(() => (loading.value = false));
       }
-    });
-  } else if (dialog.type === "user-import") {
-    if (!importData?.deptId) {
-      ElMessage.warning("请选择部门");
-      return false;
     }
-    if (!importData?.file) {
-      ElMessage.warning("上传Excel文件不能为空");
-      return false;
-    }
-    UserAPI.import(importData?.deptId, importData?.file).then((data) => {
-      ElMessage.success("导入用户成功");
-      closeDialog();
-      handleResetQuery();
-    });
-  }
+  });
 }, 3000);
 
 /** 删除用户 */
@@ -581,44 +479,14 @@ function handleDelete(id?: number) {
     });
   });
 }
-
-/** 下载导入模板 */
-function downloadTemplate() {
-  UserAPI.downloadTemplate().then((response: any) => {
-    const fileData = response.data;
-    const fileName = decodeURI(
-      response.headers["content-disposition"].split(";")[1].split("=")[1]
-    );
-    const fileType =
-      "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8";
-
-    const blob = new Blob([fileData], { type: fileType });
-    const downloadUrl = window.URL.createObjectURL(blob);
-
-    const downloadLink = document.createElement("a");
-    downloadLink.href = downloadUrl;
-    downloadLink.download = fileName;
-
-    document.body.appendChild(downloadLink);
-    downloadLink.click();
-
-    document.body.removeChild(downloadLink);
-    window.URL.revokeObjectURL(downloadUrl);
-  });
+/** 打开导入弹窗 */
+function handleOpenImportDialog() {
+  importDialogVisible.value = true;
 }
 
-/** Excel文件 Change */
-function handleFileChange(file: any) {
-  importData.file = file.raw;
-}
-
-/** Excel文件 Exceed  */
-function handleFileExceed(files: any) {
-  uploadRef.value!.clearFiles();
-  const file = files[0];
-  file.uid = genFileId();
-  uploadRef.value!.handleStart(file);
-  importData.file = file;
+/** 导入用户成功 */
+function handleOpenImportDialogSuccess() {
+  handleQuery();
 }
 
 /** 导出用户 */
diff --git a/tsconfig.json b/tsconfig.json
index 6d1e993c..9acc1fad 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -25,9 +25,8 @@
     "jsxFragmentFactory": "Fragment"
   },
   "include": [
-    "src/**/*.ts",
     "src/**/*.vue",
-    "src/typings/**/*.d.ts",
+    "src/types/**/*.d.ts",
     "mock/**/*.ts",
     "vite.config.ts"
   ],

From 87305aaf8f5e4db1c142d03e3a306d32e4aa19fb Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Tue, 25 Jun 2024 00:18:51 +0800
Subject: [PATCH 17/35] =?UTF-8?q?chore:=20:hammer:=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=AF=BC=E5=85=A5=E7=B1=BB=E5=9E=8B=E5=A3=B0?=
 =?UTF-8?q?=E6=98=8E=E6=96=87=E4=BB=B6=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vite.config.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vite.config.ts b/vite.config.ts
index ecd70d33..4a6b65c0 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -100,7 +100,7 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
         vueTemplate: true,
         // 指定自动导入函数TS类型声明文件路径 (false:关闭自动生成)
         dts: false,
-        // dts: "src/typings/auto-imports.d.ts",
+        // dts: "src/types/auto-imports.d.ts",
       }),
       Components({
         resolvers: [
@@ -116,7 +116,7 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
         dirs: ["src/components", "src/**/components"],
         // 指定自动导入组件TS类型声明文件路径 (false:关闭自动生成)
         dts: false,
-        // dts: "src/typings/components.d.ts",
+        // dts: "src/types/components.d.ts",
       }),
       Icons({
         // 自动安装图标库

From 339db4be8ed5600dd073d18b9044baae970b6db9 Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Tue, 25 Jun 2024 00:20:03 +0800
Subject: [PATCH 18/35] =?UTF-8?q?refactor:=20:recycle:=20=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E6=8E=A5=E5=8F=A3=E9=87=8D=E6=9E=84mock=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=90=8C=E6=AD=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mock/dept.mock.ts |   6 +
 mock/dict.mock.ts | 197 +++++++--------------
 mock/menu.mock.ts | 434 ++++++++++++++++++++++++++++++----------------
 3 files changed, 349 insertions(+), 288 deletions(-)

diff --git a/mock/dept.mock.ts b/mock/dept.mock.ts
index eac3aa83..e9b6d1bb 100644
--- a/mock/dept.mock.ts
+++ b/mock/dept.mock.ts
@@ -36,6 +36,7 @@ export default defineMock([
           id: 1,
           parentId: 0,
           name: "有来技术",
+          code: "YOULAI",
           sort: 1,
           status: 1,
           children: [
@@ -43,6 +44,7 @@ export default defineMock([
               id: 2,
               parentId: 1,
               name: "研发部门",
+              code: "RD001",
               sort: 1,
               status: 1,
               children: [],
@@ -53,6 +55,7 @@ export default defineMock([
               id: 3,
               parentId: 1,
               name: "测试部门",
+              code: "QA001",
               sort: 1,
               status: 1,
               children: [],
@@ -126,6 +129,7 @@ const deptMap: Record<string, any> = {
   1: {
     id: 1,
     name: "有来技术",
+    code: "YOULAI",
     parentId: 0,
     status: 1,
     sort: 1,
@@ -133,6 +137,7 @@ const deptMap: Record<string, any> = {
   2: {
     id: 2,
     name: "研发部门",
+    code: "RD001",
     parentId: 1,
     status: 1,
     sort: 1,
@@ -140,6 +145,7 @@ const deptMap: Record<string, any> = {
   3: {
     id: 3,
     name: "测试部门",
+    code: "QA001",
     parentId: 1,
     status: 1,
     sort: 1,
diff --git a/mock/dict.mock.ts b/mock/dict.mock.ts
index ebaef2ec..63b4b2c1 100644
--- a/mock/dict.mock.ts
+++ b/mock/dict.mock.ts
@@ -5,11 +5,11 @@ export default defineMock([
     url: "dict/:code/options",
     method: ["GET"],
     body: ({ params }) => {
-      const typeCode = params.code;
+      const code = params.code;
 
       let list = null;
 
-      if (typeCode == "gender") {
+      if (code == "gender") {
         list = [
           {
             value: "1",
@@ -21,7 +21,7 @@ export default defineMock([
           },
           {
             value: "0",
-            label: "未知",
+            label: "保密",
           },
         ];
       }
@@ -35,7 +35,7 @@ export default defineMock([
   },
 
   {
-    url: "dict/types/page",
+    url: "dict/page",
     method: ["GET"],
     body: {
       code: "00000",
@@ -46,104 +46,37 @@ export default defineMock([
             name: "性别",
             code: "gender",
             status: 1,
-          },
-          {
-            id: 2,
-            name: "状态",
-            code: "status",
-            status: 1,
+            dictItems: [
+              {
+                id: 1,
+                name: "男",
+                value: "1",
+                sort: 1,
+                status: 1,
+              },
+              {
+                id: 2,
+                name: "女",
+                value: "2",
+                sort: 2,
+                status: 1,
+              },
+              {
+                id: 3,
+                name: "保密",
+                value: "0",
+                sort: 3,
+                status: 1,
+              },
+            ],
           },
         ],
-        total: 2,
+        total: 1,
       },
       msg: "一切ok",
     },
   },
 
-  {
-    url: "dict/page",
-    method: ["GET"],
-    body: {
-      code: "00000",
-      data: {
-        list: [
-          {
-            id: 1,
-            name: "男",
-            value: "1",
-            status: 1,
-          },
-          {
-            id: 2,
-            name: "女",
-            value: "2",
-            status: 1,
-          },
-          {
-            id: 3,
-            name: "未知",
-            value: "0",
-            status: 1,
-          },
-        ],
-        total: 3,
-      },
-      msg: "一切ok",
-    },
-  },
-
-  // 新增字典
-  {
-    url: "dict/types",
-    method: ["POST"],
-    body({ body }) {
-      return {
-        code: "00000",
-        data: null,
-        msg: "新增字典" + body.name + "成功",
-      };
-    },
-  },
-
-  // 获取字典表单数据
-  {
-    url: "dict/types/:id/form",
-    method: ["GET"],
-    body: ({ params }) => {
-      return {
-        code: "00000",
-        data: dictTypeMap[params.id],
-        msg: "一切ok",
-      };
-    },
-  },
-
-  // 修改字典
-  {
-    url: "dict/types/:id",
-    method: ["PUT"],
-    body({ body }) {
-      return {
-        code: "00000",
-        data: null,
-        msg: "修改字典" + body.name + "成功",
-      };
-    },
-  },
-
-  // 删除字典
-  {
-    url: "dict/types/:id",
-    method: ["DELETE"],
-    body({ params }) {
-      return {
-        code: "00000",
-        data: null,
-        msg: "删除字典" + params.id + "成功",
-      };
-    },
-  },
-
   // 新增字典
   {
     url: "dict",
@@ -197,51 +130,39 @@ export default defineMock([
   },
 ]);
 
-// 字典映射表数据
-const dictTypeMap: Record<string, any> = {
-  1: {
-    id: 1,
-    name: "性别",
-    code: "gender",
-    status: 1,
-    remark: null,
-  },
-  2: {
-    id: 2,
-    name: "状态",
-    code: "status",
-    status: 1,
-    remark: null,
-  },
-};
-
 // 字典映射表数据
 const dictMap: Record<string, any> = {
   1: {
-    id: 1,
-    typeCode: "gender",
-    name: "男",
-    value: "1",
-    status: 1,
-    sort: 1,
-    remark: null,
-  },
-  2: {
-    id: 2,
-    typeCode: "gender",
-    name: "女",
-    value: "2",
-    status: 1,
-    sort: 2,
-    remark: null,
-  },
-  3: {
-    id: 3,
-    typeCode: "gender",
-    name: "未知",
-    value: "0",
-    status: 1,
-    sort: 1,
-    remark: null,
+    code: "00000",
+    data: {
+      id: 1,
+      name: "性别",
+      code: "gender",
+      status: 1,
+      dictItems: [
+        {
+          id: 1,
+          name: "男",
+          value: "1",
+          sort: 1,
+          status: 1,
+        },
+        {
+          id: 2,
+          name: "女",
+          value: "2",
+          sort: 2,
+          status: 1,
+        },
+        {
+          id: 3,
+          name: "未知",
+          value: "0",
+          sort: 3,
+          status: 1,
+        },
+      ],
+    },
+    msg: "一切ok",
   },
 };
diff --git a/mock/menu.mock.ts b/mock/menu.mock.ts
index 59c3b918..993bc63d 100644
--- a/mock/menu.mock.ts
+++ b/mock/menu.mock.ts
@@ -454,7 +454,8 @@ export default defineMock([
           parentId: 0,
           name: "系统管理",
           type: "CATALOG",
-          path: "/system",
+          routeName: "",
+          routePath: "/system",
           component: "Layout",
           sort: 1,
           visible: 1,
@@ -467,7 +468,8 @@ export default defineMock([
               parentId: 1,
               name: "用户管理",
               type: "MENU",
-              path: "user",
+              routeName: "User",
+              routePath: "user",
               component: "system/user/index",
               sort: 1,
               visible: 1,
@@ -475,12 +477,28 @@ export default defineMock([
               redirect: null,
               perm: null,
               children: [
+                {
+                  id: 105,
+                  parentId: 2,
+                  name: "用户查询",
+                  type: "BUTTON",
+                  routeName: null,
+                  routePath: "",
+                  component: null,
+                  sort: 0,
+                  visible: 1,
+                  icon: "",
+                  redirect: null,
+                  perm: "sys:user:query",
+                  children: [],
+                },
                 {
                   id: 31,
                   parentId: 2,
                   name: "用户新增",
                   type: "BUTTON",
-                  path: "",
+                  routeName: null,
+                  routePath: "",
                   component: null,
                   sort: 1,
                   visible: 1,
@@ -494,7 +512,8 @@ export default defineMock([
                   parentId: 2,
                   name: "用户编辑",
                   type: "BUTTON",
-                  path: "",
+                  routeName: null,
+                  routePath: "",
                   component: null,
                   sort: 2,
                   visible: 1,
@@ -508,7 +527,8 @@ export default defineMock([
                   parentId: 2,
                   name: "用户删除",
                   type: "BUTTON",
-                  path: "",
+                  routeName: null,
+                  routePath: "",
                   component: null,
                   sort: 3,
                   visible: 1,
@@ -522,7 +542,8 @@ export default defineMock([
                   parentId: 2,
                   name: "重置密码",
                   type: "BUTTON",
-                  path: "",
+                  routeName: null,
+                  routePath: "",
                   component: null,
                   sort: 4,
                   visible: 1,
@@ -531,6 +552,36 @@ export default defineMock([
                   perm: "sys:user:password:reset",
                   children: [],
                 },
+                {
+                  id: 106,
+                  parentId: 2,
+                  name: "用户导入",
+                  type: "BUTTON",
+                  routeName: null,
+                  routePath: "",
+                  component: null,
+                  sort: 5,
+                  visible: 1,
+                  icon: "",
+                  redirect: null,
+                  perm: "sys:user:import",
+                  children: [],
+                },
+                {
+                  id: 107,
+                  parentId: 2,
+                  name: "用户导出",
+                  type: "BUTTON",
+                  routeName: null,
+                  routePath: "",
+                  component: null,
+                  sort: 6,
+                  visible: 1,
+                  icon: "",
+                  redirect: null,
+                  perm: "sys:user:export",
+                  children: [],
+                },
               ],
             },
             {
@@ -538,7 +589,8 @@ export default defineMock([
               parentId: 1,
               name: "角色管理",
               type: "MENU",
-              path: "role",
+              routeName: "Role",
+              routePath: "role",
               component: "system/role/index",
               sort: 2,
               visible: 1,
@@ -551,7 +603,8 @@ export default defineMock([
                   parentId: 3,
                   name: "角色新增",
                   type: "BUTTON",
-                  path: "",
+                  routeName: null,
+                  routePath: "",
                   component: null,
                   sort: 1,
                   visible: 1,
@@ -565,7 +618,8 @@ export default defineMock([
                   parentId: 3,
                   name: "角色编辑",
                   type: "BUTTON",
-                  path: "",
+                  routeName: null,
+                  routePath: "",
                   component: null,
                   sort: 2,
                   visible: 1,
@@ -579,7 +633,8 @@ export default defineMock([
                   parentId: 3,
                   name: "角色删除",
                   type: "BUTTON",
-                  path: "",
+                  routeName: null,
+                  routePath: "",
                   component: null,
                   sort: 3,
                   visible: 1,
@@ -595,7 +650,8 @@ export default defineMock([
               parentId: 1,
               name: "菜单管理",
               type: "MENU",
-              path: "menu",
+              routeName: "Menu",
+              routePath: "menu",
               component: "system/menu/index",
               sort: 3,
               visible: 1,
@@ -608,7 +664,8 @@ export default defineMock([
                   parentId: 4,
                   name: "菜单新增",
                   type: "BUTTON",
-                  path: "",
+                  routeName: null,
+                  routePath: "",
                   component: null,
                   sort: 1,
                   visible: 1,
@@ -617,26 +674,13 @@ export default defineMock([
                   perm: "sys:menu:add",
                   children: [],
                 },
-                {
-                  id: 74,
-                  parentId: 4,
-                  name: "菜单编辑",
-                  type: "BUTTON",
-                  path: "",
-                  component: null,
-                  sort: 3,
-                  visible: 1,
-                  icon: "",
-                  redirect: null,
-                  perm: "sys:menu:edit",
-                  children: [],
-                },
                 {
                   id: 75,
                   parentId: 4,
                   name: "菜单删除",
                   type: "BUTTON",
-                  path: "",
+                  routeName: null,
+                  routePath: "",
                   component: null,
                   sort: 3,
                   visible: 1,
@@ -645,6 +689,21 @@ export default defineMock([
                   perm: "sys:menu:delete",
                   children: [],
                 },
+                {
+                  id: 74,
+                  parentId: 4,
+                  name: "菜单编辑",
+                  type: "BUTTON",
+                  routeName: null,
+                  routePath: "",
+                  component: null,
+                  sort: 3,
+                  visible: 1,
+                  icon: "",
+                  redirect: null,
+                  perm: "sys:menu:edit",
+                  children: [],
+                },
               ],
             },
             {
@@ -652,7 +711,8 @@ export default defineMock([
               parentId: 1,
               name: "部门管理",
               type: "MENU",
-              path: "dept",
+              routeName: "Dept",
+              routePath: "dept",
               component: "system/dept/index",
               sort: 4,
               visible: 1,
@@ -665,7 +725,8 @@ export default defineMock([
                   parentId: 5,
                   name: "部门新增",
                   type: "BUTTON",
-                  path: "",
+                  routeName: null,
+                  routePath: "",
                   component: null,
                   sort: 1,
                   visible: 1,
@@ -679,7 +740,8 @@ export default defineMock([
                   parentId: 5,
                   name: "部门编辑",
                   type: "BUTTON",
-                  path: "",
+                  routeName: null,
+                  routePath: "",
                   component: null,
                   sort: 2,
                   visible: 1,
@@ -693,7 +755,8 @@ export default defineMock([
                   parentId: 5,
                   name: "部门删除",
                   type: "BUTTON",
-                  path: "",
+                  routeName: null,
+                  routePath: "",
                   component: null,
                   sort: 3,
                   visible: 1,
@@ -709,7 +772,8 @@ export default defineMock([
               parentId: 1,
               name: "字典管理",
               type: "MENU",
-              path: "dict",
+              routeName: "Dict",
+              routePath: "dict",
               component: "system/dict/index",
               sort: 5,
               visible: 1,
@@ -720,9 +784,10 @@ export default defineMock([
                 {
                   id: 79,
                   parentId: 6,
-                  name: "字典新增",
+                  name: "字典类型新增",
                   type: "BUTTON",
-                  path: "",
+                  routeName: null,
+                  routePath: "",
                   component: null,
                   sort: 1,
                   visible: 1,
@@ -734,9 +799,10 @@ export default defineMock([
                 {
                   id: 81,
                   parentId: 6,
-                  name: "字典编辑",
+                  name: "字典类型编辑",
                   type: "BUTTON",
-                  path: "",
+                  routeName: null,
+                  routePath: "",
                   component: null,
                   sort: 2,
                   visible: 1,
@@ -748,9 +814,10 @@ export default defineMock([
                 {
                   id: 84,
                   parentId: 6,
-                  name: "字典删除",
+                  name: "字典类型删除",
                   type: "BUTTON",
-                  path: "",
+                  routeName: null,
+                  routePath: "",
                   component: null,
                   sort: 3,
                   visible: 1,
@@ -764,7 +831,8 @@ export default defineMock([
                   parentId: 6,
                   name: "字典数据新增",
                   type: "BUTTON",
-                  path: "",
+                  routeName: null,
+                  routePath: "",
                   component: null,
                   sort: 4,
                   visible: 1,
@@ -778,7 +846,8 @@ export default defineMock([
                   parentId: 6,
                   name: "字典数据编辑",
                   type: "BUTTON",
-                  path: "",
+                  routeName: null,
+                  routePath: "",
                   component: null,
                   sort: 5,
                   visible: 1,
@@ -792,7 +861,8 @@ export default defineMock([
                   parentId: 6,
                   name: "字典数据删除",
                   type: "BUTTON",
-                  path: "",
+                  routeName: null,
+                  routePath: "",
                   component: null,
                   sort: 6,
                   visible: 1,
@@ -810,7 +880,8 @@ export default defineMock([
           parentId: 0,
           name: "接口文档",
           type: "CATALOG",
-          path: "/api",
+          routeName: null,
+          routePath: "/api",
           component: "Layout",
           sort: 7,
           visible: 1,
@@ -823,7 +894,8 @@ export default defineMock([
               parentId: 40,
               name: "Apifox",
               type: "MENU",
-              path: "apifox",
+              routeName: null,
+              routePath: "apifox",
               component: "demo/api/apifox",
               sort: 1,
               visible: 1,
@@ -832,34 +904,6 @@ export default defineMock([
               perm: null,
               children: [],
             },
-            {
-              id: 103,
-              parentId: 40,
-              name: "Swagger",
-              type: "MENU",
-              path: "swagger",
-              component: "demo/api/swagger",
-              sort: 2,
-              visible: 0,
-              icon: "api",
-              redirect: "",
-              perm: null,
-              children: [],
-            },
-            {
-              id: 104,
-              parentId: 40,
-              name: "Knife4j",
-              type: "MENU",
-              path: "knife4j",
-              component: "demo/api/knife4j",
-              sort: 3,
-              visible: 0,
-              icon: "api",
-              redirect: "",
-              perm: null,
-              children: [],
-            },
           ],
         },
         {
@@ -867,12 +911,13 @@ export default defineMock([
           parentId: 0,
           name: "平台文档",
           type: "CATALOG",
-          path: "/doc",
+          routeName: null,
+          routePath: "/doc",
           component: "Layout",
           sort: 8,
           visible: 1,
           icon: "document",
-          redirect: null,
+          redirect: "https://juejin.cn/post/7228990409909108793",
           perm: null,
           children: [
             {
@@ -880,7 +925,8 @@ export default defineMock([
               parentId: 26,
               name: "平台文档(内嵌)",
               type: "EXTLINK",
-              path: "internal-doc",
+              routeName: null,
+              routePath: "internal-doc",
               component: "demo/internal-doc",
               sort: 1,
               visible: 1,
@@ -894,7 +940,8 @@ export default defineMock([
               parentId: 26,
               name: "平台文档(外链)",
               type: "EXTLINK",
-              path: "https://juejin.cn/post/7228990409909108793",
+              routeName: null,
+              routePath: "https://juejin.cn/post/7228990409909108793",
               component: "",
               sort: 2,
               visible: 1,
@@ -910,12 +957,13 @@ export default defineMock([
           parentId: 0,
           name: "多级菜单",
           type: "CATALOG",
-          path: "/multi-level",
+          routeName: null,
+          routePath: "/multi-level",
           component: "Layout",
           sort: 9,
           visible: 1,
           icon: "cascader",
-          redirect: "/multi-level/multi-level1",
+          redirect: "",
           perm: null,
           children: [
             {
@@ -923,12 +971,13 @@ export default defineMock([
               parentId: 20,
               name: "菜单一级",
               type: "MENU",
-              path: "multi-level1",
+              routeName: null,
+              routePath: "multi-level1",
               component: "demo/multi-level/level1",
               sort: 1,
               visible: 1,
               icon: "",
-              redirect: "/multi-level/multi-level2",
+              redirect: "",
               perm: null,
               children: [
                 {
@@ -936,12 +985,13 @@ export default defineMock([
                   parentId: 21,
                   name: "菜单二级",
                   type: "MENU",
-                  path: "multi-level2",
+                  routeName: null,
+                  routePath: "multi-level2",
                   component: "demo/multi-level/children/level2",
                   sort: 1,
                   visible: 1,
                   icon: "",
-                  redirect: "/multi-level/multi-level2/multi-level3-1",
+                  redirect: null,
                   perm: null,
                   children: [
                     {
@@ -949,7 +999,8 @@ export default defineMock([
                       parentId: 22,
                       name: "菜单三级-1",
                       type: "MENU",
-                      path: "multi-level3-1",
+                      routeName: null,
+                      routePath: "multi-level3-1",
                       component: "demo/multi-level/children/children/level3-1",
                       sort: 1,
                       visible: 1,
@@ -963,7 +1014,8 @@ export default defineMock([
                       parentId: 22,
                       name: "菜单三级-2",
                       type: "MENU",
-                      path: "multi-level3-2",
+                      routeName: null,
+                      routePath: "multi-level3-2",
                       component: "demo/multi-level/children/children/level3-2",
                       sort: 2,
                       visible: 1,
@@ -983,7 +1035,8 @@ export default defineMock([
           parentId: 0,
           name: "组件封装",
           type: "CATALOG",
-          path: "/component",
+          routeName: null,
+          routePath: "/component",
           component: "Layout",
           sort: 10,
           visible: 1,
@@ -991,14 +1044,45 @@ export default defineMock([
           redirect: "",
           perm: null,
           children: [
+            {
+              id: 108,
+              parentId: 36,
+              name: "增删改查",
+              type: "MENU",
+              routeName: null,
+              routePath: "curd",
+              component: "demo/curd/index",
+              sort: 0,
+              visible: 1,
+              icon: "",
+              redirect: "",
+              perm: null,
+              children: [],
+            },
+            {
+              id: 109,
+              parentId: 36,
+              name: "列表选择器",
+              type: "MENU",
+              routeName: null,
+              routePath: "table-select",
+              component: "demo/table-select/index",
+              sort: 1,
+              visible: 1,
+              icon: "",
+              redirect: "",
+              perm: null,
+              children: [],
+            },
             {
               id: 37,
               parentId: 36,
               name: "富文本编辑器",
               type: "MENU",
-              path: "wang-editor",
+              routeName: null,
+              routePath: "wang-editor",
               component: "demo/wang-editor",
-              sort: 1,
+              sort: 2,
               visible: 1,
               icon: "",
               redirect: "",
@@ -1010,22 +1094,9 @@ export default defineMock([
               parentId: 36,
               name: "图片上传",
               type: "MENU",
-              path: "upload",
+              routeName: null,
+              routePath: "upload",
               component: "demo/upload",
-              sort: 2,
-              visible: 1,
-              icon: "",
-              redirect: "",
-              perm: null,
-              children: [],
-            },
-            {
-              id: 39,
-              parentId: 36,
-              name: "图标选择器",
-              type: "MENU",
-              path: "icon-selector",
-              component: "demo/icon-selector",
               sort: 3,
               visible: 1,
               icon: "",
@@ -1038,7 +1109,8 @@ export default defineMock([
               parentId: 36,
               name: "字典组件",
               type: "MENU",
-              path: "dict-demo",
+              routeName: null,
+              routePath: "dict-demo",
               component: "demo/dict",
               sort: 4,
               visible: 1,
@@ -1048,30 +1120,63 @@ export default defineMock([
               children: [],
             },
             {
-              id: 93,
+              id: 39,
               parentId: 36,
-              name: "签名",
+              name: "图标选择器",
               type: "MENU",
-              path: "signature",
-              component: "demo/signature",
-              sort: 6,
+              routeName: null,
+              routePath: "icon-selector",
+              component: "demo/icon-selector",
+              sort: 4,
               visible: 1,
               icon: "",
               redirect: "",
               perm: null,
               children: [],
             },
+          ],
+        },
+        {
+          id: 110,
+          parentId: 0,
+          name: "路由参数",
+          type: "CATALOG",
+          routeName: null,
+          routePath: "/route-param",
+          component: "Layout",
+          sort: 11,
+          visible: 1,
+          icon: "el-icon-ElementPlus",
+          redirect: null,
+          perm: null,
+          children: [
             {
-              id: 94,
-              parentId: 36,
-              name: "表格",
+              id: 111,
+              parentId: 110,
+              name: "参数(type=1)",
               type: "MENU",
-              path: "table",
-              component: "demo/table",
-              sort: 7,
+              routeName: null,
+              routePath: "route-param-type1",
+              component: "demo/route-param",
+              sort: 1,
               visible: 1,
-              icon: "",
-              redirect: "",
+              icon: "el-icon-Star",
+              redirect: null,
+              perm: null,
+              children: [],
+            },
+            {
+              id: 112,
+              parentId: 110,
+              name: "参数(type=2)",
+              type: "MENU",
+              routeName: null,
+              routePath: "route-param-type2",
+              component: "demo/route-param",
+              sort: 2,
+              visible: 1,
+              icon: "el-icon-StarFilled",
+              redirect: null,
               perm: null,
               children: [],
             },
@@ -1082,9 +1187,10 @@ export default defineMock([
           parentId: 0,
           name: "功能演示",
           type: "CATALOG",
-          path: "/function",
+          routeName: null,
+          routePath: "/function",
           component: "Layout",
-          sort: 11,
+          sort: 12,
           visible: 1,
           icon: "menu",
           redirect: "",
@@ -1095,11 +1201,12 @@ export default defineMock([
               parentId: 89,
               name: "Icons",
               type: "MENU",
-              path: "icon-demo",
+              routeName: null,
+              routePath: "icon-demo",
               component: "demo/icons",
               sort: 2,
               visible: 1,
-              icon: "el-icon-edit",
+              icon: "el-icon-Notification",
               redirect: "",
               perm: null,
               children: [],
@@ -1109,7 +1216,8 @@ export default defineMock([
               parentId: 89,
               name: "Websocket",
               type: "MENU",
-              path: "/function/websocket",
+              routeName: null,
+              routePath: "/function/websocket",
               component: "demo/websocket",
               sort: 3,
               visible: 1,
@@ -1123,7 +1231,8 @@ export default defineMock([
               parentId: 89,
               name: "敬请期待...",
               type: "CATALOG",
-              path: "other",
+              routeName: null,
+              routePath: "other/:id",
               component: "demo/other",
               sort: 4,
               visible: 1,
@@ -1153,6 +1262,10 @@ export default defineMock([
               value: 2,
               label: "用户管理",
               children: [
+                {
+                  value: 105,
+                  label: "用户查询",
+                },
                 {
                   value: 31,
                   label: "用户新增",
@@ -1169,6 +1282,14 @@ export default defineMock([
                   value: 88,
                   label: "重置密码",
                 },
+                {
+                  value: 106,
+                  label: "用户导入",
+                },
+                {
+                  value: 107,
+                  label: "用户导出",
+                },
               ],
             },
             {
@@ -1197,14 +1318,14 @@ export default defineMock([
                   value: 73,
                   label: "菜单新增",
                 },
-                {
-                  value: 74,
-                  label: "菜单编辑",
-                },
                 {
                   value: 75,
                   label: "菜单删除",
                 },
+                {
+                  value: 74,
+                  label: "菜单编辑",
+                },
               ],
             },
             {
@@ -1231,15 +1352,15 @@ export default defineMock([
               children: [
                 {
                   value: 79,
-                  label: "字典新增",
+                  label: "字典类型新增",
                 },
                 {
                   value: 81,
-                  label: "字典编辑",
+                  label: "字典类型编辑",
                 },
                 {
                   value: 84,
-                  label: "字典删除",
+                  label: "字典类型删除",
                 },
                 {
                   value: 85,
@@ -1265,14 +1386,6 @@ export default defineMock([
               value: 41,
               label: "Apifox",
             },
-            {
-              value: 103,
-              label: "Swagger",
-            },
-            {
-              value: 104,
-              label: "Knife4j",
-            },
           ],
         },
         {
@@ -1319,6 +1432,14 @@ export default defineMock([
           value: 36,
           label: "组件封装",
           children: [
+            {
+              value: 108,
+              label: "增删改查",
+            },
+            {
+              value: 109,
+              label: "列表选择器",
+            },
             {
               value: 37,
               label: "富文本编辑器",
@@ -1327,21 +1448,27 @@ export default defineMock([
               value: 38,
               label: "图片上传",
             },
-            {
-              value: 39,
-              label: "图标选择器",
-            },
             {
               value: 95,
               label: "字典组件",
             },
             {
-              value: 93,
-              label: "签名",
+              value: 39,
+              label: "图标选择器",
+            },
+          ],
+        },
+        {
+          value: 110,
+          label: "路由参数",
+          children: [
+            {
+              value: 111,
+              label: "参数(type=1)",
             },
             {
-              value: 94,
-              label: "表格",
+              value: 112,
+              label: "参数(type=2)",
             },
           ],
         },
@@ -1428,7 +1555,8 @@ const menuMap: Record<string, any> = {
     parentId: 0,
     name: "系统管理",
     type: "CATALOG",
-    path: "/system",
+    routeName: "",
+    routePath: "/system",
     component: "Layout",
     perm: null,
     visible: 1,
@@ -1437,13 +1565,15 @@ const menuMap: Record<string, any> = {
     redirect: "/system/user",
     keepAlive: null,
     alwaysShow: null,
+    params: null,
   },
   2: {
     id: 2,
     parentId: 1,
     name: "用户管理",
     type: "MENU",
-    path: "user",
+    routeName: "User",
+    routePath: "user",
     component: "system/user/index",
     perm: null,
     visible: 1,
@@ -1458,7 +1588,8 @@ const menuMap: Record<string, any> = {
     parentId: 1,
     name: "角色管理",
     type: "MENU",
-    path: "role",
+    routeName: "Role",
+    routePath: "role",
     component: "system/role/index",
     perm: null,
     visible: 1,
@@ -1473,7 +1604,8 @@ const menuMap: Record<string, any> = {
     parentId: 1,
     name: "菜单管理",
     type: "MENU",
-    path: "menu",
+    routeName: "Menu",
+    routePath: "menu",
     component: "system/menu/index",
     perm: null,
     visible: 1,
@@ -1488,7 +1620,8 @@ const menuMap: Record<string, any> = {
     parentId: 1,
     name: "部门管理",
     type: "MENU",
-    path: "dept",
+    routeName: "Dept",
+    routePath: "dept",
     component: "system/dept/index",
     perm: null,
     visible: 1,
@@ -1503,7 +1636,8 @@ const menuMap: Record<string, any> = {
     parentId: 1,
     name: "字典管理",
     type: "MENU",
-    path: "dict",
+    routeName: "Dict",
+    routePath: "dict",
     component: "system/dict/index",
     perm: null,
     visible: 1,

From 5ec0b03a8e338c04920b374c1f1983fc207a5cd5 Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Tue, 25 Jun 2024 00:21:18 +0800
Subject: [PATCH 19/35] =?UTF-8?q?refactor:=20:recycle:=20=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/dept/index.vue |  2 +-
 src/views/system/dict/index.vue |  4 ----
 src/views/system/menu/index.vue |  6 ++----
 src/views/system/role/index.vue | 12 ++++++------
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index d956aca0..e9234e33 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -90,7 +90,7 @@
             </el-button>
             <el-button
               v-hasPerm="['sys:dept:delete']"
-              type="primary"
+              type="danger"
               link
               size="small"
               @click.stop="handleDelete(scope.row.id)"
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 2b0a91e4..9e69f0b7 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -119,10 +119,6 @@
               <el-radio :value="0">禁用</el-radio>
             </el-radio-group>
           </el-form-item>
-
-          <el-form-item label="备注">
-            <el-input v-model="formData.remark" />
-          </el-form-item>
         </el-card>
 
         <el-card shadow="never" class="mt-5">
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 9f0ef2f7..e67ad2ad 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -208,10 +208,7 @@
         </el-form-item>
 
         <el-form-item
-          v-if="
-            formData.type == MenuTypeEnum.CATALOG ||
-            formData.type == MenuTypeEnum.MENU
-          "
+          v-if="formData.type == MenuTypeEnum.MENU"
           prop="routeName"
         >
           <template #label>
@@ -486,6 +483,7 @@ const rules = reactive({
   parentId: [{ required: true, message: "请选择顶级菜单", trigger: "blur" }],
   name: [{ required: true, message: "请输入菜单名称", trigger: "blur" }],
   type: [{ required: true, message: "请选择菜单类型", trigger: "blur" }],
+  routeName: [{ required: true, message: "请输入路由名称", trigger: "blur" }],
   routePath: [{ required: true, message: "请输入路由路径", trigger: "blur" }],
   component: [{ required: true, message: "请输入组件路径", trigger: "blur" }],
   visible: [{ required: true, message: "请输入路由路径", trigger: "blur" }],
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index d332e135..968a1173 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -73,7 +73,7 @@
               <i-ep-edit />编辑
             </el-button>
             <el-button
-              type="primary"
+              type="danger"
               size="small"
               link
               @click="handleDelete(scope.row.id)"
@@ -275,7 +275,7 @@ const isExpanded = ref(true);
 
 const parentChildLinked = ref(true);
 
-// 查询
+/** 查询 */
 function handleQuery() {
   loading.value = true;
   RoleAPI.getPage(queryParams)
@@ -287,19 +287,19 @@ function handleQuery() {
       loading.value = false;
     });
 }
-// 重置查询
+/** 重置查询 */
 function handleResetQuery() {
   queryFormRef.value.resetFields();
   queryParams.pageNum = 1;
   handleQuery();
 }
 
-// 行选中事件
+/** 行选中 */
 function handleSelectionChange(selection: any) {
   ids.value = selection.map((item: any) => item.id);
 }
 
-// 打开弹窗
+/** 打开角色弹窗 */
 function handleOpenDialog(roleId?: number) {
   dialog.visible = true;
   if (roleId) {
@@ -339,7 +339,7 @@ function handleSubmit() {
   });
 }
 
-/** 关闭表单弹窗 */
+/** 关闭角色弹窗 */
 function handleCloseDialog() {
   dialog.visible = false;
 

From 2f0772efb127d0f432c1ec6c33c4a9eee3e0fca2 Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Tue, 25 Jun 2024 00:22:13 +0800
Subject: [PATCH 20/35] =?UTF-8?q?docs:=20:memo:=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E4=BE=A7=E8=BE=B9=E6=A0=8F=E8=8F=9C=E5=8D=95=E9=A1=B9=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Sidebar/components/SidebarMenuItem.vue    | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/layout/components/Sidebar/components/SidebarMenuItem.vue b/src/layout/components/Sidebar/components/SidebarMenuItem.vue
index 625b02e9..e45ec8d1 100644
--- a/src/layout/components/Sidebar/components/SidebarMenuItem.vue
+++ b/src/layout/components/Sidebar/components/SidebarMenuItem.vue
@@ -1,6 +1,7 @@
 <template>
+  <!-- 如果菜单项没有隐藏则显示 -->
   <div v-if="!item.meta || !item.meta.hidden">
-    <!-- 显示具有单个子路由的菜单项或没有子路由的父路由 -->
+    <!-- 显示只有一个子路由或没有子路由的菜单项 -->
     <template
       v-if="
         hasOneShowingChild(item.children, item as RouteRecordRaw) &&
@@ -59,7 +60,7 @@ import { RouteRecordRaw } from "vue-router";
 
 const props = defineProps({
   /**
-   * 路由(eg:user)123
+   * 当前路由项对象
    */
   item: {
     type: Object,
@@ -67,47 +68,46 @@ const props = defineProps({
   },
 
   /**
-   * 父层级完整路由路径(eg:/system)
+   * 父层级完整路由路径
    */
   basePath: {
     type: String,
     required: true,
   },
+  /**
+   * 是否为嵌套路由
+   */
   isNest: {
     type: Boolean,
     default: false,
   },
 });
 
-const onlyOneChild = ref(); // 临时变量，唯一子路由
+const onlyOneChild = ref();
 
 /**
- * 判断当前路由是否只有一个子路由
- *
- * 1：如果只有一个子路由： 返回 true
- * 2：如果无子路由 ：返回 true
+ * 判断当前路由是否只有一个显示的子路由
  *
  * @param children 子路由数组
- * @param parent 当前路由
+ * @param parent 父级路由对象
+ * @returns 布尔值，表示是否只有一个显示的子路由
  */
 function hasOneShowingChild(
   children: RouteRecordRaw[] = [],
   parent: RouteRecordRaw
 ) {
-  // 子路由集合
+  // 筛选出需要显示的子路由
   const showingChildren = children.filter((route: RouteRecordRaw) => {
     if (route.meta?.hidden) {
-      // 过滤不显示的子路由
       return false;
     } else {
       route.meta!.hidden = false;
-      // 临时变量（多个子路由 onlyOneChild 变量是用不上的）
       onlyOneChild.value = route;
       return true;
     }
   });
 
-  // 如果只有一个子路由, 返回 true
+  // 如果只有一个或没有显示的子路由
   if (showingChildren.length === 1) {
     return true;
   }
@@ -121,9 +121,10 @@ function hasOneShowingChild(
 }
 
 /**
- *  解析路由路径(相对路径 → 绝对路径)
+ * 解析路由路径，将相对路径转换为绝对路径
  *
  * @param routePath 路由路径
+ * @returns 绝对路径
  */
 function resolvePath(routePath: string) {
   if (isExternal(routePath)) {

From b60d11ed4d36e822093007afca575def1c43143e Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Tue, 25 Jun 2024 00:23:40 +0800
Subject: [PATCH 21/35] =?UTF-8?q?chore:=20:hammer:=20=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7=E5=8D=87=E7=BA=A7=202.12.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0cd539bc..ed6f20f5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue3-element-admin",
-  "version": "2.11.5",
+  "version": "2.12.0",
   "private": true,
   "type": "module",
   "scripts": {

From 3767d2d4b27ae24a4ea9ae4492a144a02e247a59 Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Tue, 25 Jun 2024 00:29:17 +0800
Subject: [PATCH 22/35] =?UTF-8?q?docs:=20:memo:=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=B2=BE=E7=AE=80=E7=89=88=20git=20=E4=BB=93=E5=BA=93=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 5822d321..5566178c 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@
 
 - **基础设施**：动态路由、按钮权限、国际化、代码规范、Git 提交规范、常用组件封装。
 
-- **持续更新**：自2021年起，该项目持续开源更新，实时更新工具和依赖，积累了广泛的用户群体。
+- **持续更新**：项目持续开源更新，实时更新工具和依赖。
 
 
 
@@ -44,10 +44,11 @@
 
 ## 项目地址
 
-| 项目 | Gitee                                                        | Github                                                       | GitCode                                                      |
-| ---- | ------------------------------------------------------------ | ------------------------------------------------------------ | ------------------------------------------------------------ |
+| 项目 | Gitee                                                        | Github                                                       | 
+| ---- | ------------------------------------------------------------ | ------------------------------------------------------------ | 
 | 前端 | [vue3-element-admin](https://gitee.com/youlaiorg/vue3-element-admin) | [vue3-element-admin](https://github.com/youlaitech/vue3-element-admin) | [vue3-element-admin](https://gitcode.net/youlai/vue3-element-admin) |
-| 后端 | [youlai-boot](https://gitee.com/youlaiorg/youlai-boot)       | [youlai-boot](https://github.com/haoxianrui/youlai-boot.git) | [youlai-boot](https://gitcode.net/youlai/youlai-boot)        |
+| 精简版 | [vue3-element-admin-thin](https://gitee.com/cshaptx4869/vue3-element-admin-thin) | [vue3-element-admin-thin](https://github.com/youlaitech/vue3-element-admin-thin) |
+| 后端 | [youlai-boot](https://gitee.com/youlaiorg/youlai-boot)       | [youlai-boot](https://github.com/haoxianrui/youlai-boot.git) |
 
 ## 环境准备
 

From 1ee3460ca9118ba1ed5fff65c88db1c024c3e1a2 Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Tue, 25 Jun 2024 00:34:50 +0800
Subject: [PATCH 23/35] =?UTF-8?q?chore:=20:hammer:=20=E8=B0=83=E6=95=B4=20?=
 =?UTF-8?q?API=20=E5=9C=B0=E5=9D=80=E9=BB=98=E8=AE=A4=E7=BA=BF=E4=B8=8A?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.development b/.env.development
index 6268a702..548fc857 100644
--- a/.env.development
+++ b/.env.development
@@ -5,9 +5,9 @@ VITE_APP_PORT = 3000
 VITE_APP_BASE_API = '/dev-api'
 
 # 线上接口地址
-# VITE_APP_API_URL = http://vapi.youlai.tech
+VITE_APP_API_URL = http://vapi.youlai.tech
 # 开发接口地址
-VITE_APP_API_URL = http://localhost:8989
+# VITE_APP_API_URL = http://localhost:8989
 
 # 是否启用 Mock 服务
 VITE_MOCK_DEV_SERVER = false

From 8e41161ba84a703bb54ee2e8e70dc8da414a7be2 Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Tue, 25 Jun 2024 07:33:09 +0800
Subject: [PATCH 24/35] =?UTF-8?q?docs:=20:memo:=20=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7=E8=AF=B4=E6=98=8E=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md | 39 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4b8a4ba..fd2cef30 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,46 @@
 
+# 2.11.5 (2024/6/18)
+
+## ✨ feat
+
+- 支持后端文件导入([#142](https://github.com/youlaitech/vue3-element-admin/pull/142)) [@cshaptx4869](https://github.com/cshaptx4869) 
+
+
+## 🐛 fix
+- vue-dev-tools 插件导致菜单路由切换卡死，暂时关闭 ([28349e](https://github.com/youlaitech/vue3-element-admin/commit/28349efe147afab36531ba148eaac3a448fe6c71)) [@haoxianrui](https://github.com/haoxianrui)
+
+
+
+# 2.11.4 (2024/6/16)
+
+## ✨ feat
+
+- 操作栏增加render配置参数([#138](https://github.com/youlaitech/vue3-element-admin/pull/140)) [@cshaptx4869](https://github.com/cshaptx4869) 
+- 左侧工具栏增加type配置参数([#141](https://github.com/youlaitech/vue3-element-admin/pull/141)) [@diamont1001](https://github.com/diamont1001)
+
+## ♻️ refactor
+- 更换权限分配弹窗类型为 drawer 并添加父子联动开关([2d9193](https://github.com/youlaitech/vue3-element-admin/commit/2d9193c47fd224f01f82b9c0b2bbeb5e7cb33584)) [@haoxianrui](https://github.com/haoxianrui)
+
+
+
+# 2.11.3 (2024/6/11)
+
+## ✨ feat
+
+- 支持默认工具栏的导入([#138](https://github.com/youlaitech/vue3-element-admin/pull/138)) [@cshaptx4869](https://github.com/cshaptx4869) 
+-  添加CURD导入示例([19e7bb](https://github.com/youlaitech/vue3-element-admin/commit/eab91effd6a01d5a3d9257249c8d06aa252b3bf8)) [@cshaptx4869](https://github.com/cshaptx4869)
+
+## ♻️ refactor
+- 修改导出全量数据选项文本([904fec](https://github.com/youlaitech/vue3-element-admin/commit/904fecad65217650482fcdbb10ffb7f3d27eb9ea)) [@cshaptx4869](https://github.com/cshaptx4869)
+
+## 🐛 fix
+- 菜单列表未适配el-icon导致图标不显示问题修复([e72b68](https://github.com/youlaitech/vue3-element-admin/commit/e72b68337562b5a7ea24ad55bbe00023e1266b40)) [@haoxianrui](https://github.com/haoxianrui)
+
 # 2.11.2 (2024/6/8)
 
 ## ✨ feat
 
-- 支持表格远程筛选([#131](https://github.com/youlaitech/vue3-element-admin/pull/119)) [@cshaptx4869](https://github.com/cshaptx4869) 
+- 支持表格远程筛选([#131](https://github.com/youlaitech/vue3-element-admin/pull/131)) [@cshaptx4869](https://github.com/cshaptx4869) 
 - 支持标签输入框([#132](https://github.com/youlaitech/vue3-element-admin/pull/132)) [@cshaptx4869](https://github.com/cshaptx4869)
 - 表单项支持tips配置([#133](https://github.com/youlaitech/vue3-element-admin/pull/133)) [@cshaptx4869](https://github.com/cshaptx4869) 
 - 前端导出支持全量数据([#134](https://github.com/youlaitech/vue3-element-admin/pull/134)) [@cshaptx4869](https://github.com/cshaptx4869) 

From 34599901c77f4f9381be95b56c9dcd2fec414465 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=91=E7=BF=94?= <971366405@qq.com>
Date: Tue, 25 Jun 2024 11:57:28 +0800
Subject: [PATCH 25/35] =?UTF-8?q?feat(tagView):=20:sparkles:=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=85=B3=E9=97=AD=E5=BD=93=E5=89=8DtagView=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

增加关闭当前tagView方法
---
 src/layout/components/TagsView/index.vue | 32 ++++-------------
 src/store/modules/tagsView.ts            | 44 +++++++++++++++++++++++-
 2 files changed, 49 insertions(+), 27 deletions(-)

diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 7d2096fe..031d8641 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -9,7 +9,7 @@
         ref="tagRef"
         v-for="tag in visitedViews"
         :key="tag.fullPath"
-        :class="'tags-item ' + (isActive(tag) ? 'active' : '')"
+        :class="'tags-item ' + (tagsViewStore.isActive(tag) ? 'active' : '')"
         :to="{ path: tag.path, query: tag.query }"
         @click.middle="!isAffix(tag) ? closeSelectedTag(tag) : ''"
         @contextmenu.prevent="openContentMenu(tag, $event)"
@@ -190,10 +190,6 @@ function moveToCurrentTag() {
   });
 }
 
-function isActive(tag: TagView) {
-  return tag.path === route.path;
-}
-
 function isAffix(tag: TagView) {
   return tag?.affix;
 }
@@ -228,26 +224,10 @@ function refreshSelectedTag(view: TagView) {
   });
 }
 
-function toLastView(visitedViews: TagView[], view?: TagView) {
-  const latestView = visitedViews.slice(-1)[0];
-  if (latestView && latestView.fullPath) {
-    router.push(latestView.fullPath);
-  } else {
-    // now the default is to redirect to the home page if there is no tags-view,
-    // you can adjust it according to your needs.
-    if (view?.name === "Dashboard") {
-      // to reload home page
-      router.replace("/redirect" + view.fullPath);
-    } else {
-      router.push("/");
-    }
-  }
-}
-
 function closeSelectedTag(view: TagView) {
   tagsViewStore.delView(view).then((res: any) => {
-    if (isActive(view)) {
-      toLastView(res.visitedViews, view);
+    if (tagsViewStore.isActive(view)) {
+      tagsViewStore.toLastView(res.visitedViews, view);
     }
   });
 }
@@ -255,14 +235,14 @@ function closeSelectedTag(view: TagView) {
 function closeLeftTags() {
   tagsViewStore.delLeftViews(selectedTag.value).then((res: any) => {
     if (!res.visitedViews.find((item: any) => item.path === route.path)) {
-      toLastView(res.visitedViews);
+      tagsViewStore.toLastView(res.visitedViews);
     }
   });
 }
 function closeRightTags() {
   tagsViewStore.delRightViews(selectedTag.value).then((res: any) => {
     if (!res.visitedViews.find((item: any) => item.path === route.path)) {
-      toLastView(res.visitedViews);
+      tagsViewStore.toLastView(res.visitedViews);
     }
   });
 }
@@ -276,7 +256,7 @@ function closeOtherTags() {
 
 function closeAllTags(view: TagView) {
   tagsViewStore.delAllViews().then((res: any) => {
-    toLastView(res.visitedViews, view);
+    tagsViewStore.toLastView(res.visitedViews, view);
   });
 }
 
diff --git a/src/store/modules/tagsView.ts b/src/store/modules/tagsView.ts
index 9e66c10e..a92e4fe8 100644
--- a/src/store/modules/tagsView.ts
+++ b/src/store/modules/tagsView.ts
@@ -1,7 +1,8 @@
 export const useTagsViewStore = defineStore("tagsView", () => {
   const visitedViews = ref<TagView[]>([]);
   const cachedViews = ref<string[]>([]);
-
+  const router = useRouter();
+  const route = useRoute();
   /**
    * 添加已访问视图到已访问视图列表中
    */
@@ -189,6 +190,44 @@ export const useTagsViewStore = defineStore("tagsView", () => {
     });
   }
 
+  /**
+   * 关闭当前tagView
+   */
+  function closeCurrentView() {
+    const tags: TagView = {
+      name: route.name as string,
+      title: route.meta.title as string,
+      path: route.path,
+      fullPath: route.fullPath,
+      affix: route.meta?.affix,
+      keepAlive: route.meta?.keepAlive,
+      query: route.query,
+    };
+    delView(tags).then((res: any) => {
+      if (isActive(tags)) {
+        toLastView(res.visitedViews, tags);
+      }
+    });
+  }
+  function isActive(tag: TagView) {
+    return tag.path === route.path;
+  }
+
+  function toLastView(visitedViews: TagView[], view?: TagView) {
+    const latestView = visitedViews.slice(-1)[0];
+    if (latestView && latestView.fullPath) {
+      router.push(latestView.fullPath);
+    } else {
+      // now the default is to redirect to the home page if there is no tags-view,
+      // you can adjust it according to your needs.
+      if (view?.name === "Dashboard") {
+        // to reload home page
+        router.replace("/redirect" + view.fullPath);
+      } else {
+        router.push("/");
+      }
+    }
+  }
   return {
     visitedViews,
     cachedViews,
@@ -207,5 +246,8 @@ export const useTagsViewStore = defineStore("tagsView", () => {
     delAllViews,
     delAllVisitedViews,
     delAllCachedViews,
+    closeCurrentView,
+    isActive,
+    toLastView,
   };
 });

From 035497f76015e5ab0ffc0071a3e246fdd5538135 Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Tue, 25 Jun 2024 21:00:23 +0800
Subject: [PATCH 26/35] =?UTF-8?q?fix:=20:bug:=20=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

IA879P #IA879P
---
 src/store/modules/permission.ts | 3 +--
 src/views/login/index.vue       | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts
index f2e6f932..25306e68 100644
--- a/src/store/modules/permission.ts
+++ b/src/store/modules/permission.ts
@@ -1,8 +1,7 @@
 import { RouteRecordRaw } from "vue-router";
 import { constantRoutes } from "@/router";
 import { store } from "@/store";
-import MenuAPI from "@/api/menu";
-import { RouteVO } from "@/api/menu/types";
+import MenuAPI, { RouteVO } from "@/api/menu";
 
 const modules = import.meta.glob("../../views/**/**.vue");
 const Layout = () => import("@/layout/index.vue");
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 42561365..6ac0c3ac 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -115,8 +115,7 @@
 
 <script setup lang="ts">
 import { useSettingsStore, useUserStore } from "@/store";
-import AuthAPI from "@/api/auth";
-import { LoginData } from "@/api/auth/types";
+import AuthAPI, { LoginData } from "@/api/auth";
 import type { FormInstance } from "element-plus";
 import { LocationQuery, useRoute } from "vue-router";
 import router from "@/router";

From 1dcd4ab0cd41ca2a5f69876616d37fd16b0f72fc Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Tue, 25 Jun 2024 22:02:57 +0800
Subject: [PATCH 27/35] =?UTF-8?q?refactor:=20:recycle:=20=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E4=BC=98=E5=8C=96=20loading=20=E5=92=8C=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/dept/index.vue | 20 ++++++++++++++------
 src/views/system/dict/index.vue | 23 ++++++++++++++---------
 src/views/system/menu/index.vue | 24 ++++++++++++++++--------
 src/views/system/role/index.vue | 23 ++++++++++++++---------
 src/views/system/user/index.vue | 22 +++++++++++++++-------
 5 files changed, 73 insertions(+), 39 deletions(-)

diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index e9234e33..ec6722ca 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -283,12 +283,20 @@ function handleDelete(deptId?: number) {
     confirmButtonText: "确定",
     cancelButtonText: "取消",
     type: "warning",
-  }).then(() => {
-    DeptAPI.deleteByIds(deptIds).then(() => {
-      ElMessage.success("删除成功");
-      handleResetQuery();
-    });
-  });
+  }).then(
+    () => {
+      loading.value = true;
+      DeptAPI.deleteByIds(deptIds)
+        .then(() => {
+          ElMessage.success("删除成功");
+          handleResetQuery();
+        })
+        .finally(() => (loading.value = false));
+    },
+    () => {
+      ElMessage.info("已取消删除");
+    }
+  );
 }
 
 /** 关闭弹窗 */
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 9e69f0b7..273560ce 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -30,7 +30,7 @@
         <el-button
           type="danger"
           :disabled="ids.length === 0"
-          @click="handleDeleteClick()"
+          @click="handleDelete()"
           ><i-ep-delete />删除</el-button
         >
       </div>
@@ -75,7 +75,7 @@
               type="danger"
               link
               size="small"
-              @click.stop="handleDeleteClick(scope.row.id)"
+              @click.stop="handleDelete(scope.row.id)"
               ><i-ep-delete />删除</el-button
             >
           </template>
@@ -333,7 +333,7 @@ function handleCloseDialog() {
  *
  * @param id 字典ID
  */
-function handleDeleteClick(id?: number) {
+function handleDelete(id?: number) {
   const attrGroupIds = [id || ids.value].join(",");
   if (!attrGroupIds) {
     ElMessage.warning("请勾选删除项");
@@ -343,12 +343,17 @@ function handleDeleteClick(id?: number) {
     confirmButtonText: "确定",
     cancelButtonText: "取消",
     type: "warning",
-  }).then(() => {
-    DictAPI.deleteByIds(attrGroupIds).then(() => {
-      ElMessage.success("删除成功");
-      handleResetClick();
-    });
-  });
+  }).then(
+    () => {
+      DictAPI.deleteByIds(attrGroupIds).then(() => {
+        ElMessage.success("删除成功");
+        handleResetClick();
+      });
+    },
+    () => {
+      ElMessage.info("已取消删除");
+    }
+  );
 }
 
 // 新增字典
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index e67ad2ad..d4dbace2 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -592,14 +592,22 @@ function handleDelete(menuId: number) {
     confirmButtonText: "确定",
     cancelButtonText: "取消",
     type: "warning",
-  })
-    .then(() => {
-      MenuAPI.deleteById(menuId).then(() => {
-        ElMessage.success("删除成功");
-        handleQuery();
-      });
-    })
-    .catch(() => ElMessage.info("已取消删除"));
+  }).then(
+    () => {
+      loading.value = true;
+      MenuAPI.deleteById(menuId)
+        .then(() => {
+          ElMessage.success("删除成功");
+          handleQuery();
+        })
+        .finally(() => {
+          loading.value = false;
+        });
+    },
+    () => {
+      ElMessage.info("已取消删除");
+    }
+  );
 }
 
 // 关闭弹窗
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 968a1173..b64ffa95 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -363,15 +363,20 @@ function handleDelete(roleId?: number) {
     confirmButtonText: "确定",
     cancelButtonText: "取消",
     type: "warning",
-  }).then(() => {
-    loading.value = true;
-    RoleAPI.deleteByIds(roleIds)
-      .then(() => {
-        ElMessage.success("删除成功");
-        handleResetQuery();
-      })
-      .finally(() => (loading.value = false));
-  });
+  }).then(
+    () => {
+      loading.value = true;
+      RoleAPI.deleteByIds(roleIds)
+        .then(() => {
+          ElMessage.success("删除成功");
+          handleResetQuery();
+        })
+        .finally(() => (loading.value = false));
+    },
+    () => {
+      ElMessage.info("已取消删除");
+    }
+  );
 }
 
 /** 打开分配菜单权限弹窗 */
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 6124a205..544c620e 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -375,7 +375,7 @@ function handleResetQuery() {
   handleQuery();
 }
 
-/** 行选中 */
+/** 行复选框选中记录选中ID集合 */
 function handleSelectionChange(selection: any) {
   removeIds.value = selection.map((item: any) => item.id);
 }
@@ -472,12 +472,20 @@ function handleDelete(id?: number) {
     confirmButtonText: "确定",
     cancelButtonText: "取消",
     type: "warning",
-  }).then(function () {
-    UserAPI.deleteByIds(userIds).then(() => {
-      ElMessage.success("删除成功");
-      handleResetQuery();
-    });
-  });
+  }).then(
+    function () {
+      loading.value = true;
+      UserAPI.deleteByIds(userIds)
+        .then(() => {
+          ElMessage.success("删除成功");
+          handleResetQuery();
+        })
+        .finally(() => (loading.value = false));
+    },
+    function () {
+      ElMessage.info("已取消删除");
+    }
+  );
 }
 /** 打开导入弹窗 */
 function handleOpenImportDialog() {

From 956a3e56e684ca3274cdbc116fe4175121b91d97 Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Tue, 25 Jun 2024 22:40:04 +0800
Subject: [PATCH 28/35] =?UTF-8?q?docs:=20:memo:=20=E5=AE=8C=E5=96=84=20app?=
 =?UTF-8?q?=20=E7=8A=B6=E6=80=81=E7=AE=A1=E7=90=86=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/app.ts | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/store/modules/app.ts b/src/store/modules/app.ts
index 747f9945..46f37386 100644
--- a/src/store/modules/app.ts
+++ b/src/store/modules/app.ts
@@ -7,19 +7,23 @@ import { store } from "@/store";
 import { DeviceEnum } from "@/enums/DeviceEnum";
 import { SidebarStatusEnum } from "@/enums/SidebarStatusEnum";
 
-// setup
 export const useAppStore = defineStore("app", () => {
-  // state
+  // 设备类型
   const device = useStorage("device", DeviceEnum.DESKTOP);
+  // 布局大小
   const size = useStorage("size", defaultSettings.size);
+  // 语言
   const language = useStorage("language", defaultSettings.language);
+  // 侧边栏状态
   const sidebarStatus = useStorage("sidebarStatus", SidebarStatusEnum.CLOSED);
-
   const sidebar = reactive({
     opened: sidebarStatus.value === SidebarStatusEnum.OPENED,
     withoutAnimation: false,
   });
+
+  // 顶部菜单激活路径
   const activeTopMenuPath = useStorage("activeTopMenuPath", "");
+
   /**
    * 根据语言标识读取对应的语言包
    */
@@ -31,7 +35,7 @@ export const useAppStore = defineStore("app", () => {
     }
   });
 
-  // actions
+  // 切换侧边栏
   function toggleSidebar() {
     sidebar.opened = !sidebar.opened;
     sidebarStatus.value = sidebar.opened
@@ -39,20 +43,28 @@ export const useAppStore = defineStore("app", () => {
       : SidebarStatusEnum.CLOSED;
   }
 
+  // 关闭侧边栏
   function closeSideBar() {
     sidebar.opened = false;
     sidebarStatus.value = SidebarStatusEnum.CLOSED;
   }
 
+  // 打开侧边栏
   function openSideBar() {
     sidebar.opened = true;
     sidebarStatus.value = SidebarStatusEnum.OPENED;
   }
 
+  // 切换设备
   function toggleDevice(val: string) {
     device.value = val;
   }
 
+  /**
+   * 改变布局大小
+   *
+   * @param val 布局大小 default | small | large
+   */
   function changeSize(val: string) {
     size.value = val;
   }

From 054306236339a2cac4d340c03e85823c5318de2d Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Tue, 25 Jun 2024 22:55:19 +0800
Subject: [PATCH 29/35] =?UTF-8?q?fix:=20:bug:=20=E6=B7=B7=E5=90=88?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E6=B8=85=E7=90=86activeTopMenuPath=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98=E5=AF=BC=E8=87=B4=E9=A1=B6=E9=83=A8=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=BF=80=E6=B4=BB=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Sidebar/components/SidebarMixTopMenu.vue    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue b/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue
index 8a03e7d8..f05865f5 100644
--- a/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue
+++ b/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue
@@ -41,9 +41,14 @@ const appStore = useAppStore();
 const permissionStore = usePermissionStore();
 const router = useRouter();
 
+// 避免 activeTopMenuPath 缓存被清理，从当前路由路径获取顶部菜单路径，eg. /system/user → /system
+const activeTopMenuPath = useRoute().path.replace(/\/[^\/]+$/, "") || "/";
+appStore.activeTopMenu(activeTopMenuPath);
+
+// 激活的顶部菜单路径
 const activePath = computed(() => appStore.activeTopMenuPath);
 
-// 顶部菜单集合
+// 混合模式顶部菜单集合
 const mixTopMenus = ref<RouteRecordRaw[]>([]);
 
 /**

From a4dc581eb375c7896c516ea2b67271fd6bf10b66 Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Tue, 25 Jun 2024 22:58:15 +0800
Subject: [PATCH 30/35] =?UTF-8?q?docs:=20:memo:=20=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E6=B3=A8=E9=87=8A=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/role/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index b64ffa95..daec88ba 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -294,7 +294,7 @@ function handleResetQuery() {
   handleQuery();
 }
 
-/** 行选中 */
+/** 行复选框选中记录选中ID集合 */
 function handleSelectionChange(selection: any) {
   ids.value = selection.map((item: any) => item.id);
 }
@@ -440,12 +440,12 @@ function togglePermTree() {
     });
   }
 }
-// 菜单权限筛选
+
+/** 权限筛选  */
 watch(permKeywords, (val) => {
   permTreeRef.value!.filter(val);
 });
 
-/** 权限筛选  */
 function handlePermFilter(
   value: string,
   data: {

From 71b2cc141025b5c9dab09c7e2d26a84cec61cb7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=9D=E5=85=88=E7=91=9E?= <1490493387@qq.com>
Date: Wed, 26 Jun 2024 18:29:53 +0800
Subject: [PATCH 31/35] =?UTF-8?q?fix:=20:bug:=20api=E4=B8=8B=E7=9A=84ts?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=B1=BB=E5=9E=8B=E6=97=A0=E6=B3=95=E8=AF=86?=
 =?UTF-8?q?=E5=88=AB=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tsconfig.json | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/tsconfig.json b/tsconfig.json
index 9acc1fad..441cb931 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -12,23 +12,17 @@
     "lib": ["esnext", "dom"],
     "baseUrl": ".",
     "allowJs": true,
+    "skipLibCheck": true,
+    "allowSyntheticDefaultImports": true,
+    "forceConsistentCasingInFileNames": true,
+    "jsx": "preserve",
+    "jsxFactory": "h",
+    "jsxFragmentFactory": "Fragment",
     "paths": {
       "@/*": ["src/*"]
     },
-    "types": ["vite/client", "unplugin-icons/types/vue", "element-plus/global"],
-    "skipLibCheck": true /* Skip type checking all .d.ts files. */,
-    "allowSyntheticDefaultImports": true /* 允许默认导入 */,
-    "forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */,
-
-    "jsx": "preserve",
-    "jsxFactory": "h",
-    "jsxFragmentFactory": "Fragment"
+    "types": ["vite/client", "unplugin-icons/types/vue", "element-plus/global"]
   },
-  "include": [
-    "src/**/*.vue",
-    "src/types/**/*.d.ts",
-    "mock/**/*.ts",
-    "vite.config.ts"
-  ],
+  "include": ["mock/**/*.ts", "src/**/*.ts", "src/**/*.vue", "vite.config.ts"],
   "exclude": ["node_modules", "dist", "**/*.js"]
 }

From 41c98d3c40e63de6a8709b1b2dcdeca057a80adc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=9D=E5=85=88=E7=91=9E?= <1490493387@qq.com>
Date: Wed, 26 Jun 2024 18:30:51 +0800
Subject: [PATCH 32/35] =?UTF-8?q?fix:=20:bug:=20=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7=E7=B1=BB=E5=9E=8B=E7=BC=BA=E5=A4=B1=E8=A1=A5?=
 =?UTF-8?q?=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/dept.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/api/dept.ts b/src/api/dept.ts
index b650c24c..9bd46739 100644
--- a/src/api/dept.ts
+++ b/src/api/dept.ts
@@ -119,6 +119,8 @@ export interface DeptForm {
   id?: number;
   /** 部门名称 */
   name?: string;
+  /** 部门编号 */
+  code?: string;
   /** 父部门ID */
   parentId: number;
   /** 排序 */

From 743793be7e576299998d8df5c7983a93f21a0c81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=9D=E5=85=88=E7=91=9E?= <1490493387@qq.com>
Date: Wed, 26 Jun 2024 18:33:23 +0800
Subject: [PATCH 33/35] =?UTF-8?q?refactor:=20:recycle:=20=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E8=A1=A8=E5=8D=95=E7=B1=BB=E5=9E=8B=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=E5=92=8C=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=E4=B8=BA=E5=A4=96=E9=83=A8?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...-bg-dark.jpg => login-background-dark.jpg} | Bin
 ...ogin-bg.jpg => login-background-light.jpg} | Bin
 src/styles/login.scss                         |  84 ++++++++++++++
 src/views/login/index.vue                     | 107 +++++++-----------
 4 files changed, 125 insertions(+), 66 deletions(-)
 rename src/assets/images/{login-bg-dark.jpg => login-background-dark.jpg} (100%)
 rename src/assets/images/{login-bg.jpg => login-background-light.jpg} (100%)
 create mode 100644 src/styles/login.scss

diff --git a/src/assets/images/login-bg-dark.jpg b/src/assets/images/login-background-dark.jpg
similarity index 100%
rename from src/assets/images/login-bg-dark.jpg
rename to src/assets/images/login-background-dark.jpg
diff --git a/src/assets/images/login-bg.jpg b/src/assets/images/login-background-light.jpg
similarity index 100%
rename from src/assets/images/login-bg.jpg
rename to src/assets/images/login-background-light.jpg
diff --git a/src/styles/login.scss b/src/styles/login.scss
new file mode 100644
index 00000000..84dc054e
--- /dev/null
+++ b/src/styles/login.scss
@@ -0,0 +1,84 @@
+.login-container {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  height: 100%;
+  overflow-y: auto;
+  background: url("@/assets/images/login-background-light.jpg") no-repeat center
+    right;
+
+  .top-bar {
+    position: absolute;
+    top: 1rem;
+    left: 1rem;
+    display: flex;
+    justify-content: flex-end;
+    width: 100%;
+  }
+
+  .lang-select {
+    margin-left: 0.5rem;
+    cursor: pointer;
+  }
+
+  .login-card {
+    width: 400px;
+    background: transparent;
+    border: none;
+    border-radius: 4%;
+
+    @media (width <= 640px) {
+      width: 340px;
+    }
+
+    .input-wrapper {
+      display: flex;
+      align-items: center;
+      width: 100%;
+    }
+
+    .captcha-image {
+      height: 48px;
+      cursor: pointer;
+      border-top-right-radius: 6px;
+      border-bottom-right-radius: 6px;
+    }
+  }
+
+  .icp-info {
+    position: absolute;
+    bottom: 4px;
+    font-size: 12px;
+    text-align: center;
+  }
+
+  .el-form-item {
+    background: var(--el-input-bg-color);
+    border: 1px solid var(--el-border-color);
+    border-radius: 5px;
+  }
+
+  .el-input {
+    .el-input__wrapper {
+      padding: 0;
+      background-color: transparent;
+      box-shadow: none;
+
+      &.is-focus,
+      &:hover {
+        box-shadow: none !important;
+      }
+
+      input:-webkit-autofill {
+        /* 通过延时渲染背景色变相去除背景颜色 */
+        transition: background-color 1000s ease-in-out 0s;
+      }
+    }
+  }
+}
+
+html.dark .login-container {
+  background: url("@/assets/images/login-background-dark.jpg") no-repeat center
+    right;
+}
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 6ac0c3ac..172b74e0 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="login-container">
-    <!-- 顶部 -->
-    <div class="absolute-lt flex-x-end p-3 w-full">
+    <!-- 顶部工具栏 -->
+    <div class="top-bar">
       <el-switch
         v-model="isDark"
         inline-prompt
@@ -9,10 +9,10 @@
         inactive-icon="Sunny"
         @change="toggleTheme"
       />
-      <lang-select class="ml-2 cursor-pointer" />
+      <lang-select class="lang-select" />
     </div>
     <!-- 登录表单 -->
-    <el-card class="!border-none !bg-transparent !rounded-4% w-100 <sm:w-85">
+    <el-card class="login-card">
       <div class="text-center relative">
         <h2>{{ defaultSettings.title }}</h2>
         <el-tag class="ml-2 absolute-rt">{{ defaultSettings.version }}</el-tag>
@@ -26,7 +26,7 @@
       >
         <!-- 用户名 -->
         <el-form-item prop="username">
-          <div class="flex-y-center w-full">
+          <div class="input-wrapper">
             <svg-icon icon-class="user" class="mx-2" />
             <el-input
               ref="username"
@@ -46,7 +46,7 @@
           placement="right"
         >
           <el-form-item prop="password">
-            <div class="flex-y-center w-full">
+            <div class="input-wrapper">
               <svg-icon icon-class="lock" class="mx-2" />
               <el-input
                 v-model="loginData.password"
@@ -54,7 +54,7 @@
                 type="password"
                 name="password"
                 @keyup="checkCapslock"
-                @keyup.enter="handleLogin"
+                @keyup.enter="handleLoginSubmit"
                 size="large"
                 class="h-[48px] pr-2"
                 show-password
@@ -65,7 +65,7 @@
 
         <!-- 验证码 -->
         <el-form-item prop="captchaCode">
-          <div class="flex-y-center w-full">
+          <div class="input-wrapper">
             <svg-icon icon-class="captcha" class="mx-2" />
             <el-input
               v-model="loginData.captchaCode"
@@ -73,13 +73,13 @@
               size="large"
               class="flex-1"
               :placeholder="$t('login.captchaCode')"
-              @keyup.enter="handleLogin"
+              @keyup.enter="handleLoginSubmit"
             />
 
             <el-image
               @click="getCaptcha"
               :src="captchaBase64"
-              class="rounded-tr-md rounded-br-md cursor-pointer h-[48px]"
+              class="captcha-image"
             />
           </div>
         </el-form-item>
@@ -90,7 +90,7 @@
           type="primary"
           size="large"
           class="w-full"
-          @click.prevent="handleLogin"
+          @click.prevent="handleLoginSubmit"
           >{{ $t("login.login") }}
         </el-button>
 
@@ -103,7 +103,7 @@
     </el-card>
 
     <!-- ICP备案 -->
-    <div class="absolute bottom-1 text-[10px] text-center" v-show="icpVisible">
+    <div class="icp-info" v-show="icpVisible">
       <p>
         Copyright © 2021 - 2024 youlai.tech All Rights Reserved. 有来技术
         版权所有
@@ -114,34 +114,48 @@
 </template>
 
 <script setup lang="ts">
+// 外部库和依赖
+import { LocationQuery, useRoute } from "vue-router";
+
+// 内部依赖
 import { useSettingsStore, useUserStore } from "@/store";
 import AuthAPI, { LoginData } from "@/api/auth";
-import type { FormInstance } from "element-plus";
-import { LocationQuery, useRoute } from "vue-router";
 import router from "@/router";
 import defaultSettings from "@/settings";
 import { ThemeEnum } from "@/enums/ThemeEnum";
 
+// 类型定义
+import type { FormInstance } from "element-plus";
+
+// 导入 login.scss 文件
+import "@/styles/login.scss";
+
+// 使用导入的依赖和库
 const userStore = useUserStore();
 const settingsStore = useSettingsStore();
 const route = useRoute();
-
-// Internationalization
+// 窗口高度
+const { height } = useWindowSize();
+// 国际化 Internationalization
 const { t } = useI18n();
 
-// Reactive states
+// 是否暗黑模式
 const isDark = ref(settingsStore.theme === ThemeEnum.DARK);
+// 是否显示 ICP 备案信息
 const icpVisible = ref(true);
-const loading = ref(false); // 按钮loading
-const isCapslock = ref(false); // 是否大写锁定
-const captchaBase64 = ref(); // 验证码图片Base64字符串
-const loginFormRef = ref<FormInstance>(); // 登录表单ref
-const { height } = useWindowSize();
+// 按钮 loading 状态
+const loading = ref(false);
+// 是否大写锁定
+const isCapslock = ref(false);
+// 验证码图片Base64字符串
+const captchaBase64 = ref();
+// 登录表单ref
+const loginFormRef = ref<FormInstance>();
 
 const loginData = ref<LoginData>({
   username: "admin",
   password: "123456",
-});
+} as LoginData);
 
 const loginRules = computed(() => {
   return {
@@ -182,8 +196,8 @@ function getCaptcha() {
   });
 }
 
-// 登录
-function handleLogin() {
+/** 登录表单提交 */
+function handleLoginSubmit() {
   loginFormRef.value?.validate((valid: boolean) => {
     if (valid) {
       loading.value = true;
@@ -203,7 +217,7 @@ function handleLogin() {
   });
 }
 
-// 解析 redirect 字符串 为 path 和  queryParams
+/** 解析 redirect 字符串 为 path 和  queryParams */
 function parseRedirect(): {
   path: string;
   queryParams: Record<string, string>;
@@ -251,43 +265,4 @@ onMounted(() => {
 });
 </script>
 
-<style lang="scss" scoped>
-html.dark .login-container {
-  background: url("@/assets/images/login-bg-dark.jpg") no-repeat center right;
-}
-
-.login-container {
-  overflow-y: auto;
-  background: url("@/assets/images/login-bg.jpg") no-repeat center right;
-
-  @apply wh-full flex-center;
-
-  .login-form {
-    padding: 30px 10px;
-  }
-}
-
-.el-form-item {
-  background: var(--el-input-bg-color);
-  border: 1px solid var(--el-border-color);
-  border-radius: 5px;
-}
-
-:deep(.el-input) {
-  .el-input__wrapper {
-    padding: 0;
-    background-color: transparent;
-    box-shadow: none;
-
-    &.is-focus,
-    &:hover {
-      box-shadow: none !important;
-    }
-
-    input:-webkit-autofill {
-      /* 通过延时渲染背景色变相去除背景颜色 */
-      transition: background-color 1000s ease-in-out 0s;
-    }
-  }
-}
-</style>
+<style lang="scss" scoped></style>

From 8729a1fb683d575786e86a19abf0f58046bc5f4b Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Wed, 26 Jun 2024 20:58:16 +0800
Subject: [PATCH 34/35] =?UTF-8?q?fix:=20:bug:=20=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E9=A1=B5=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96=E5=90=8E=E5=BC=95?=
 =?UTF-8?q?=E5=8F=91=E7=9A=84=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/login.scss | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/styles/login.scss b/src/styles/login.scss
index 84dc054e..19778763 100644
--- a/src/styles/login.scss
+++ b/src/styles/login.scss
@@ -10,11 +10,13 @@
 
   .top-bar {
     position: absolute;
-    top: 1rem;
-    left: 1rem;
+    top: 0;
+    left: 0;
     display: flex;
+    align-items: center;
     justify-content: flex-end;
     width: 100%;
+    padding: 12px;
   }
 
   .lang-select {

From 593e098b2e0ecbc21d824a049f78c85d71192aa0 Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Thu, 27 Jun 2024 08:24:53 +0800
Subject: [PATCH 35/35] =?UTF-8?q?refactor:=20:recycle:=20=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E7=95=8C=E9=9D=A2=E6=A0=B7=E5=BC=8F=E7=B2=BE=E7=AE=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/login.scss     | 7 +------
 src/views/login/index.vue | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/styles/login.scss b/src/styles/login.scss
index 19778763..ede34896 100644
--- a/src/styles/login.scss
+++ b/src/styles/login.scss
@@ -16,12 +16,7 @@
     align-items: center;
     justify-content: flex-end;
     width: 100%;
-    padding: 12px;
-  }
-
-  .lang-select {
-    margin-left: 0.5rem;
-    cursor: pointer;
+    padding: 10px;
   }
 
   .login-card {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 172b74e0..87eca0eb 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -9,7 +9,7 @@
         inactive-icon="Sunny"
         @change="toggleTheme"
       />
-      <lang-select class="lang-select" />
+      <lang-select class="ml-2 cursor-pointer" />
     </div>
     <!-- 登录表单 -->
     <el-card class="login-card">