From d46935d1aba5a40cb3af7ab1a2434c3676c33480 Mon Sep 17 00:00:00 2001
From: haoxr <1490493387@qq.com>
Date: Sat, 17 Jun 2023 09:15:37 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20:recycle:=20=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 0675ba9b86e52bf1bba568c9bbbcbf8a8aff1dfe
---
 src/styles/index.scss              | 20 ++++++++++----------
 src/views/demo/api-doc.vue         | 10 +++++++++-
 src/views/demo/websocket.vue       |  2 +-
 src/views/system/dept/index.vue    |  2 +-
 src/views/system/dict/DictData.vue |  2 +-
 src/views/system/dict/index.vue    |  2 +-
 src/views/system/menu/index.vue    |  8 ++++----
 src/views/system/role/index.vue    |  2 +-
 8 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/src/styles/index.scss b/src/styles/index.scss
index 655cc381..cccbd99f 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -3,14 +3,14 @@
 @import "./dark";
 
 .app-container {
-  margin: 20px;
-
-  .search {
-    padding: 18px 0 0 10px;
-    margin-bottom: 10px;
-    background-color: var(--el-bg-color-overlay);
-    border: 1px solid var(--el-border-color-light);
-    border-radius: 4px;
-    box-shadow: var(--el-box-shadow-light);
-  }
+  padding: 10px;
+}
+
+.search-container {
+  padding: 18px 0 0 10px;
+  margin-bottom: 10px;
+  background-color: var(--el-bg-color-overlay);
+  border: 1px solid var(--el-border-color-light);
+  border-radius: 4px;
+  box-shadow: var(--el-box-shadow-light);
 }
diff --git a/src/views/demo/api-doc.vue b/src/views/demo/api-doc.vue
index acd7fd76..d9071833 100644
--- a/src/views/demo/api-doc.vue
+++ b/src/views/demo/api-doc.vue
@@ -14,6 +14,14 @@
 .app-container {
   display: flex;
   flex-direction: column;
-  height: calc(100vh - 124px);
+
+  /* 84 = navbar + tags-view = 50 + 34 */
+  height: calc(100vh - 50px);
+}
+
+.hasTagsView {
+  .app-container {
+    height: calc(100vh - 84px);
+  }
 }
 </style>
diff --git a/src/views/demo/websocket.vue b/src/views/demo/websocket.vue
index fae813d0..72f72074 100644
--- a/src/views/demo/websocket.vue
+++ b/src/views/demo/websocket.vue
@@ -86,7 +86,7 @@ onMounted(() => {});
     >
 
     <div>
-      <div class="search">
+      <div class="search-container">
         <el-form :inline="true">
           <el-form-item> <el-input v-model="inputVal" /></el-form-item>
           <el-form-item
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index dcf1ac3a..7f8f4f91 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -181,7 +181,7 @@ onMounted(() => {
 </script>
 <template>
   <div class="app-container">
-    <div class="search">
+    <div class="search-container">
       <el-form ref="queryFormRef" :model="queryParams" :inline="true">
         <el-form-item label="关键字" prop="keywords">
           <el-input
diff --git a/src/views/system/dict/DictData.vue b/src/views/system/dict/DictData.vue
index cc2e3a8f..605c3365 100644
--- a/src/views/system/dict/DictData.vue
+++ b/src/views/system/dict/DictData.vue
@@ -196,7 +196,7 @@ onMounted(() => {
 
 <template>
   <div class="app-container">
-    <div class="search">
+    <div class="search-container">
       <!-- 搜索表单 -->
       <el-form ref="queryFormRef" :model="queryParams" :inline="true">
         <el-form-item label="关键字" prop="name">
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index dced13a0..518f121a 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -194,7 +194,7 @@ onMounted(() => {
 
 <template>
   <div class="app-container">
-    <div class="search">
+    <div class="search-container">
       <el-form ref="queryFormRef" :model="queryParams" :inline="true">
         <el-form-item label="关键字" prop="name">
           <el-input
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 1f4f6f24..c5e56d97 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -83,8 +83,6 @@ function resetQuery() {
 
 /**
  * 行点击事件
- *
- * @param row
  */
 function onRowClick(row: MenuVO) {
   selectedRowMenuId.value = row.id;
@@ -130,7 +128,7 @@ function onMenuTypeChange() {
 }
 
 /**
- * 菜单提交
+ * 菜单保存提交
  */
 function submitForm() {
   menuFormRef.value.validate((isValid: boolean) => {
@@ -155,6 +153,7 @@ function submitForm() {
 
 /**
  * 删除菜单
+ * @param menuId 菜单ID
  */
 function handleDelete(menuId: number) {
   if (!menuId) {
@@ -198,6 +197,7 @@ function resetForm() {
   formData.perm = undefined;
   formData.component = undefined;
   formData.path = undefined;
+  formData.redirect = undefined;
 }
 
 onMounted(() => {
@@ -207,7 +207,7 @@ onMounted(() => {
 
 <template>
   <div class="app-container">
-    <div class="search">
+    <div class="search-container">
       <el-form ref="queryFormRef" :model="queryParams" :inline="true">
         <el-form-item label="关键字" prop="keywords">
           <el-input
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index f3fd62d5..b2a2a697 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -243,7 +243,7 @@ onMounted(() => {
 
 <template>
   <div class="app-container">
-    <div class="search">
+    <div class="search-container">
       <el-form ref="queryFormRef" :model="queryParams" :inline="true">
         <el-form-item prop="keywords" label="关键字">
           <el-input