From f7c3d76d37ccb0ea85f1d1fe15290c4140f9d0a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?piexlMax=28=E5=A5=87=E6=B7=BC?=
 <qimiaojiangjizhao@gmail.com>
Date: Thu, 19 Jun 2025 15:33:05 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E9=87=8D=E6=9E=84=E8=8F=9C=E5=8D=95=E8=A1=A8=E5=8D=95=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E5=B9=B6=E6=9B=B4=E6=96=B0element-plus=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/package.json                      |   2 +-
 web/src/view/superAdmin/menu/menu.vue | 731 +++++++++++++++-----------
 2 files changed, 430 insertions(+), 303 deletions(-)

diff --git a/web/package.json b/web/package.json
index 8c059b93..7d0a7810 100644
--- a/web/package.json
+++ b/web/package.json
@@ -25,7 +25,7 @@
     "chokidar": "^4.0.0",
     "core-js": "^3.38.1",
     "echarts": "5.5.1",
-    "element-plus": "^2.8.5",
+    "element-plus": "^2.10.2",
     "highlight.js": "^11.10.0",
     "install": "^0.13.0",
     "marked": "14.1.1",
diff --git a/web/src/view/superAdmin/menu/menu.vue b/web/src/view/superAdmin/menu/menu.vue
index 48007233..f0f1b3b9 100644
--- a/web/src/view/superAdmin/menu/menu.vue
+++ b/web/src/view/superAdmin/menu/menu.vue
@@ -119,315 +119,394 @@
       </template>
 
       <warning-bar title="新增菜单，需要在角色管理内配置权限才可使用" />
-      <el-form
-        v-if="dialogFormVisible"
-        ref="menuForm"
-        :inline="true"
-        :model="form"
-        :rules="rules"
-        label-position="top"
-      >
-        <el-row class="w-full">
-          <el-col :span="16">
-            <el-form-item label="文件路径" prop="component">
-              <components-cascader
-                :component="form.component"
-                @change="fmtComponent"
-              />
-              <span style="font-size: 12px; margin-right: 12px"
-                >如果菜单包含子菜单，请创建router-view二级路由页面或者</span
-              >
-              <el-button
-                style="margin-top: 4px"
-                @click="form.component = 'view/routerHolder.vue'"
-              >
-                点我设置
-              </el-button>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="展示名称" prop="meta.title">
-              <el-input v-model="form.meta.title" autocomplete="off" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row class="w-full">
-          <el-col :span="8">
-            <el-form-item label="路由Name" prop="path">
-              <el-input
-                v-model="form.name"
-                autocomplete="off"
-                placeholder="唯一英文字符串"
-                @change="changeName"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item prop="path">
-              <template #label>
-                <span style="display: inline-flex; align-items: center">
-                  <span>路由Path</span>
-                  <el-checkbox
-                    v-model="checkFlag"
-                    style="margin-left: 12px; height: auto"
-                    >添加参数</el-checkbox
+      
+      <!-- 基础信息区域 -->
+      <div class="border-b border-gray-200">
+        <h3 class="font-semibold text-gray-700 mb-4">基础信息</h3>
+        <el-form
+          v-if="dialogFormVisible"
+          ref="menuForm"
+          :inline="true"
+          :model="form"
+          :rules="rules"
+          label-position="top"
+        >
+          <el-row class="w-full">
+            <el-col :span="24">
+              <el-form-item label="文件路径" prop="component">
+                <components-cascader
+                  :component="form.component"
+                  @change="fmtComponent"
+                />
+                <div class="form-tip">
+                  <el-icon><InfoFilled /></el-icon>
+                  <span>如果菜单包含子菜单，请创建router-view二级路由页面或者</span>
+                  <el-button
+                    size="small"
+                    type="text"
+                    @click="form.component = 'view/routerHolder.vue'"
                   >
-                </span>
-              </template>
-
-              <el-input
-                v-model="form.path"
-                :disabled="!checkFlag"
-                autocomplete="off"
-                placeholder="建议只在后方拼接参数"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="是否隐藏">
-              <el-select
-                v-model="form.hidden"
-                style="width: 100%"
-                placeholder="是否在列表隐藏"
-              >
-                <el-option :value="false" label="否" />
-                <el-option :value="true" label="是" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row class="w-full">
-          <el-col :span="8">
-            <el-form-item label="父节点ID">
-              <el-cascader
-                v-model="form.parentId"
-                style="width: 100%"
-                :disabled="!isEdit"
-                :options="menuOption"
-                :props="{
-                  checkStrictly: true,
-                  label: 'title',
-                  value: 'ID',
-                  disabled: 'disabled',
-                  emitPath: false
-                }"
-                :show-all-levels="false"
-                filterable
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="图标" prop="meta.icon">
-              <icon v-model="form.meta.icon" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="排序标记" prop="sort">
-              <el-input v-model.number="form.sort" autocomplete="off" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row class="w-full">
-          <el-col :span="8">
-            <el-form-item prop="meta.activeName">
-              <template #label>
-                <div>
-                  <span> 高亮菜单 </span>
-                  <el-tooltip
-                    content="注：当到达此路由时候，指定左侧菜单指定name会处于活跃状态（亮起），可为空，为空则为本路由Name。"
-                    placement="top"
-                    effect="light"
-                  >
-                    <el-icon><QuestionFilled /></el-icon>
-                  </el-tooltip>
+                    点我设置
+                  </el-button>
                 </div>
-              </template>
-              <el-input
-                v-model="form.meta.activeName"
-                :placeholder="form.name"
-                autocomplete="off"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="KeepAlive" prop="meta.keepAlive">
-              <el-select
-                v-model="form.meta.keepAlive"
-                style="width: 100%"
-                placeholder="是否keepAlive缓存页面"
-              >
-                <el-option :value="false" label="否" />
-                <el-option :value="true" label="是" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="CloseTab" prop="meta.closeTab">
-              <el-select
-                v-model="form.meta.closeTab"
-                style="width: 100%"
-                placeholder="是否自动关闭tab"
-              >
-                <el-option :value="false" label="否" />
-                <el-option :value="true" label="是" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row class="w-full">
-          <el-col :span="8">
-            <el-form-item>
-              <template #label>
-                <div>
-                  <span> 是否为基础页面 </span>
-                  <el-tooltip
-                    content="此项选择为是，则不会展示左侧菜单以及顶部信息。"
-                    placement="top"
-                    effect="light"
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row class="w-full">
+            <el-col :span="12">
+              <el-form-item label="展示名称" prop="meta.title">
+                <el-input 
+                  v-model="form.meta.title" 
+                  autocomplete="off" 
+                  placeholder="请输入菜单展示名称"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="路由Name" prop="path">
+                <el-input
+                  v-model="form.name"
+                  autocomplete="off"
+                  placeholder="唯一英文字符串"
+                  @change="changeName"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+       
+      <!-- 路由配置区域 -->
+      <div class="border-b border-gray-200">
+        <h3 class="font-semibold text-gray-700 mb-4">路由配置</h3>
+        <el-form
+          :inline="true"
+          :model="form"
+          :rules="rules"
+          label-position="top"
+        >
+           <el-row class="w-full">
+             <el-col :span="12">
+               <el-form-item label="父节点ID">
+                 <el-cascader
+                   v-model="form.parentId"
+                   style="width: 100%"
+                   :disabled="!isEdit"
+                   :options="menuOption"
+                   :props="{
+                     checkStrictly: true,
+                     label: 'title',
+                     value: 'ID',
+                     disabled: 'disabled',
+                     emitPath: false
+                   }"
+                   :show-all-levels="false"
+                   filterable
+                   placeholder="请选择父节点"
+                 />
+               </el-form-item>
+             </el-col>
+             <el-col :span="12">
+               <el-form-item prop="path">
+                 <template #label>
+                  <div class="inline-flex items-center h-4">
+                     <span>路由Path</span>
+                     <el-checkbox
+                       class="ml-2"
+                       v-model="checkFlag"
+                       >添加参数</el-checkbox
+                     >
+                    </div>
+                 </template>
+                 <el-input
+                   v-model="form.path"
+                   :disabled="!checkFlag"
+                   autocomplete="off"
+                   placeholder="建议只在后方拼接参数"
+                 />
+               </el-form-item>
+             </el-col>
+           </el-row>
+        </el-form>
+      </div>
+       
+      <!-- 显示设置区域 -->
+      <div class="border-b border-gray-200">
+        <h3 class="font-semibold text-gray-700 mb-4">显示设置</h3>
+        <el-form
+          :inline="true"
+          :model="form"
+          :rules="rules"
+          label-position="top"
+        >
+           <el-row class="w-full">
+              <el-col :span="8">
+                <el-form-item label="图标" prop="meta.icon">
+                  <icon v-model="form.meta.icon" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="排序标记" prop="sort">
+                  <el-input 
+                    v-model.number="form.sort" 
+                    autocomplete="off" 
+                    placeholder="请输入排序数字"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="是否隐藏">
+                  <el-select
+                    v-model="form.hidden"
+                    style="width: 100%"
+                    placeholder="是否在列表隐藏"
                   >
-                    <el-icon><QuestionFilled /></el-icon>
-                  </el-tooltip>
-                </div>
-              </template>
-
-              <el-select
-                v-model="form.meta.defaultMenu"
-                style="width: 100%"
-                placeholder="是否为基础页面"
-              >
-                <el-option :value="false" label="否" />
-                <el-option :value="true" label="是" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item>
-              <template #label>
-                <div>
-                  <span> 路由切换动画 </span>
-                  <el-tooltip
-                      content="如果设置了路由切换动画，在本路由下的动画优先级高于全局动画切换优先级。"
-                      placement="top"
-                      effect="light"
+                    <el-option :value="false" label="否" />
+                    <el-option :value="true" label="是" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+        </el-form>
+      </div>
+        
+      <!-- 高级配置区域 -->
+      <div class="border-b border-gray-200">
+        <h3 class="font-semibold text-gray-700 mb-4">高级配置</h3>
+        <el-form
+          :inline="true"
+          :model="form"
+          :rules="rules"
+          label-position="top"
+        >
+            <el-row class="w-full">
+              <el-col :span="12">
+                <el-form-item prop="meta.activeName">
+                  <template #label>
+                    <div class="label-with-tooltip">
+                      <span>高亮菜单</span>
+                      <el-tooltip
+                        content="注：当到达此路由时候，指定左侧菜单指定name会处于活跃状态（亮起），可为空，为空则为本路由Name。"
+                        placement="top"
+                        effect="light"
+                      >
+                        <el-icon><QuestionFilled /></el-icon>
+                      </el-tooltip>
+                    </div>
+                  </template>
+                  <el-input
+                    v-model="form.meta.activeName"
+                    :placeholder="form.name || '请输入高亮菜单名称'"
+                    autocomplete="off"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="KeepAlive" prop="meta.keepAlive">
+                  <el-select
+                    v-model="form.meta.keepAlive"
+                    style="width: 100%"
+                    placeholder="是否keepAlive缓存页面"
                   >
-                    <el-icon><QuestionFilled /></el-icon>
-                  </el-tooltip>
-                </div>
-              </template>
-
-              <el-select
-                  v-model="form.meta.transitionType"
-                  style="width: 100%"
-                  placeholder="跟随全局"
-                  clearable
-              >
-                <el-option value="fade" label="淡入淡出" />
-                <el-option value="slide" label="滑动" />
-                <el-option value="zoom" label="缩放" />
-                <el-option value="none" label="无动画" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div>
-        <div class="flex items-center gap-2">
-          <el-button type="primary" icon="edit" @click="addParameter(form)">
+                    <el-option :value="false" label="否" />
+                    <el-option :value="true" label="是" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+             <el-row class="w-full">
+               <el-col :span="8">
+                 <el-form-item label="CloseTab" prop="meta.closeTab">
+                   <el-select
+                     v-model="form.meta.closeTab"
+                     style="width: 100%"
+                     placeholder="是否自动关闭tab"
+                   >
+                     <el-option :value="false" label="否" />
+                     <el-option :value="true" label="是" />
+                   </el-select>
+                 </el-form-item>
+               </el-col>
+               <el-col :span="8">
+                 <el-form-item>
+                   <template #label>
+                     <div class="label-with-tooltip">
+                       <span>是否为基础页面</span>
+                       <el-tooltip
+                         content="此项选择为是，则不会展示左侧菜单以及顶部信息。"
+                         placement="top"
+                         effect="light"
+                       >
+                         <el-icon><QuestionFilled /></el-icon>
+                       </el-tooltip>
+                     </div>
+                   </template>
+                   <el-select
+                     v-model="form.meta.defaultMenu"
+                     style="width: 100%"
+                     placeholder="是否为基础页面"
+                   >
+                     <el-option :value="false" label="否" />
+                     <el-option :value="true" label="是" />
+                   </el-select>
+                 </el-form-item>
+               </el-col>
+               <el-col :span="8">
+                 <el-form-item>
+                   <template #label>
+                     <div class="label-with-tooltip">
+                       <span>路由切换动画</span>
+                       <el-tooltip
+                         content="如果设置了路由切换动画，在本路由下的动画优先级高于全局动画切换优先级。"
+                         placement="top"
+                         effect="light"
+                       >
+                         <el-icon><QuestionFilled /></el-icon>
+                       </el-tooltip>
+                     </div>
+                   </template>
+                   <el-select
+                     v-model="form.meta.transitionType"
+                     style="width: 100%"
+                     placeholder="跟随全局"
+                     clearable
+                   >
+                     <el-option value="fade" label="淡入淡出" />
+                     <el-option value="slide" label="滑动" />
+                     <el-option value="zoom" label="缩放" />
+                     <el-option value="none" label="无动画" />
+                   </el-select>
+                 </el-form-item>
+               </el-col>
+             </el-row>
+        </el-form>
+      </div>
+          
+      <!-- 菜单参数配置区域 -->
+      <div class="border-b border-gray-200">
+        <div class="flex justify-between items-center mb-4">
+          <h3 class="font-semibold text-gray-700">菜单参数配置</h3>
+          <el-button type="primary" size="small" @click="addParameter(form)">
             新增菜单参数
           </el-button>
         </div>
-        <el-table :data="form.parameters" style="width: 100%; margin-top: 12px">
-          <el-table-column
-            align="left"
-            prop="type"
-            label="参数类型"
-            width="180"
-          >
-            <template #default="scope">
-              <el-select v-model="scope.row.type" placeholder="请选择">
-                <el-option key="query" value="query" label="query" />
-                <el-option key="params" value="params" label="params" />
-              </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column align="left" prop="key" label="参数key" width="180">
-            <template #default="scope">
-              <div>
-                <el-input v-model="scope.row.key" />
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column align="left" prop="value" label="参数值">
-            <template #default="scope">
-              <div>
-                <el-input v-model="scope.row.value" />
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column align="left">
-            <template #default="scope">
-              <div>
-                <el-button
-                  type="danger"
-                  icon="delete"
-                  @click="deleteParameter(form.parameters, scope.$index)"
-                >
-                  删除
-                </el-button>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <div class="flex items-center gap-2 mt-3">
-          <el-button type="primary" icon="edit" @click="addBtn(form)">
-            新增可控按钮
-          </el-button>
-          <el-icon
-            class="cursor-pointer"
-            @click="
-              toDoc('https://www.gin-vue-admin.com/guide/web/button-auth.html')
-            "
-          >
-            <QuestionFilled />
-          </el-icon>
-        </div>
-
-        <el-table :data="form.menuBtn" style="width: 100%; margin-top: 12px">
-          <el-table-column
-            align="left"
-            prop="name"
-            label="按钮名称"
-            width="180"
-          >
-            <template #default="scope">
-              <div>
-                <el-input v-model="scope.row.name" />
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column align="left" prop="name" label="备注" width="180">
-            <template #default="scope">
-              <div>
-                <el-input v-model="scope.row.desc" />
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column align="left">
-            <template #default="scope">
-              <div>
-                <el-button
-                  type="danger"
-                  icon="delete"
-                  @click="deleteBtn(form.menuBtn, scope.$index)"
-                >
-                  删除
-                </el-button>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
+            <el-table 
+              :data="form.parameters" 
+              style="width: 100%"
+              class="parameter-table"
+            >
+              <el-table-column
+                align="center"
+                prop="type"
+                label="参数类型"
+                width="150"
+              >
+                <template #default="scope">
+                  <el-select 
+                    v-model="scope.row.type" 
+                    placeholder="请选择"
+                    size="small"
+                  >
+                    <el-option key="query" value="query" label="query" />
+                    <el-option key="params" value="params" label="params" />
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" prop="key" label="参数key" width="150">
+                <template #default="scope">
+                  <el-input 
+                    v-model="scope.row.key" 
+                    size="small"
+                    placeholder="请输入参数key"
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column align="center" prop="value" label="参数值">
+                <template #default="scope">
+                  <el-input 
+                    v-model="scope.row.value" 
+                    size="small"
+                    placeholder="请输入参数值"
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="操作" width="100">
+                <template #default="scope">
+                  <el-button
+                    type="danger"
+                    size="small"
+                    @click="deleteParameter(form.parameters, scope.$index)"
+                  >
+                    <el-icon><Delete /></el-icon>
+                  </el-button>
+                </template>
+              </el-table-column>
+            </el-table>
       </div>
+           
+      <!-- 可控按钮配置区域 -->
+      <div class="mb-2 mt-2">
+        <div class="flex justify-between items-center mb-4">
+          <h3 class="font-semibold text-gray-700">可控按钮配置</h3>
+          <div class="flex items-center gap-2">
+            <el-button type="primary" size="small" @click="addBtn(form)">
+              新增可控按钮
+            </el-button>
+            <el-tooltip
+              content="点击查看按钮权限配置文档"
+              placement="top"
+              effect="light"
+            >
+              <el-icon
+                class="cursor-pointer text-blue-500 hover:text-blue-700"
+                @click="toDoc('https://www.gin-vue-admin.com/guide/web/button-auth.html')"
+              >
+                <QuestionFilled />
+              </el-icon>
+            </el-tooltip>
+          </div>
+        </div>
+             <el-table 
+               :data="form.menuBtn" 
+               style="width: 100%"
+               class="button-table"
+             >
+               <el-table-column
+                 align="center"
+                 prop="name"
+                 label="按钮名称"
+                 width="150"
+               >
+                 <template #default="scope">
+                   <el-input 
+                     v-model="scope.row.name" 
+                     size="small"
+                     placeholder="请输入按钮名称"
+                   />
+                 </template>
+               </el-table-column>
+               <el-table-column align="center" prop="desc" label="备注">
+                 <template #default="scope">
+                   <el-input 
+                     v-model="scope.row.desc" 
+                     size="small"
+                     placeholder="请输入按钮备注"
+                   />
+                 </template>
+               </el-table-column>
+               <el-table-column align="center" label="操作" width="100">
+                 <template #default="scope">
+                   <el-button
+                     type="danger"
+                     size="small"
+                     @click="deleteBtn(form.menuBtn, scope.$index)"
+                   >
+                     <el-icon><Delete /></el-icon>
+                   </el-button>
+                 </template>
+               </el-table-column>
+             </el-table>
+       </div>
     </el-drawer>
   </div>
 </template>
@@ -445,7 +524,7 @@
   import { canRemoveAuthorityBtnApi } from '@/api/authorityBtn'
   import { reactive, ref } from 'vue'
   import { ElMessage, ElMessageBox } from 'element-plus'
-  import { QuestionFilled } from '@element-plus/icons-vue'
+  import { QuestionFilled, InfoFilled, Delete } from '@element-plus/icons-vue'
   import { toDoc } from '@/utils/doc'
   import { toLowerCase } from '@/utils/stringFun'
   import ComponentsCascader from '@/view/superAdmin/menu/components/components-cascader.vue'
@@ -705,4 +784,52 @@
       margin-right: 8px;
     }
   }
+
+
+  
+  .form-tip {
+    margin-top: 8px;
+    font-size: 12px;
+    color: #909399;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    
+    .el-icon {
+      color: #409eff;
+    }
+  }
+  
+  .label-with-tooltip {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+    
+    .el-icon {
+      color: #909399;
+      cursor: help;
+      
+      &:hover {
+        color: #409eff;
+      }
+    }
+  }
+  
+  .parameter-table,
+  .button-table {
+    border: 1px solid #ebeef5;
+    border-radius: 6px;
+    
+    :deep(.el-table__header) {
+      background-color: #fafafa;
+    }
+    
+    :deep(.el-table__body) {
+      .el-table__row {
+        &:hover {
+          background-color: #f5f7fa;
+        }
+      }
+    }
+  }
 </style>