From 7e239a0c732f06cd818761e63f8d9675fc241fb3 Mon Sep 17 00:00:00 2001
From: chenxing <chenxing@bestsch.com>
Date: Fri, 2 Oct 2026 08:44:06 +0800
Subject: [PATCH] =?UTF-8?q?style(settings):=20=E8=BE=B9=E6=A0=8F=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=20pane=20=E5=88=97=E5=AE=BD=E4=B8=8E=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E5=BE=AE=E8=B0=83=E2=80=94=E2=80=94=E6=9C=AA=E8=AE=BE?=
 =?UTF-8?q?=E5=AE=BD=E5=88=97=E8=A1=A5=20width/minWidth=EF=BC=88=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0120/=E5=9B=BE=E6=A0=8770/=E5=9C=B0=E5=9D=80220/?=
 =?UTF-8?q?=E6=89=93=E5=BC=80=E6=96=B9=E5=BC=8F100=EF=BC=89=EF=BC=8C?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E5=88=97=20tooltip=20=E8=B6=85=E9=95=BF?=
 =?UTF-8?q?=E7=9C=81=E7=95=A5=EF=BC=8C=E6=93=8D=E4=BD=9C=E5=88=97=E5=9B=BA?=
 =?UTF-8?q?=E5=AE=9A=E5=8F=B3=E4=BE=A7=EF=BC=8C=E5=B7=A5=E5=85=B7=E6=A0=8F?=
 =?UTF-8?q?=E5=8A=A0=E5=88=86=E9=9A=94=E7=BA=BF=E6=94=B6=E7=B4=A7=E9=97=B4?=
 =?UTF-8?q?=E8=B7=9D=EF=BC=9BHeader=E3=80=8C=E8=BE=B9=E6=A0=8F=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E3=80=8D=E8=8F=9C=E5=8D=95=E6=94=B9=E8=B7=B3=20/setti?=
 =?UTF-8?q?ngs=3Fpane=3Dsidebar=20=E5=B9=B6=E7=A7=BB=E9=99=A4=20test=20?=
 =?UTF-8?q?=E6=AE=8B=E7=95=99=E6=8C=89=E9=92=AE=E4=B8=8E=E6=97=A7=20MenuBa?=
 =?UTF-8?q?rModal=20=E6=8C=82=E8=BD=BD=EF=BC=88=E7=BB=84=E4=BB=B6=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=BF=9D=E7=95=99=EF=BC=89=EF=BC=88=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?D=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Header.vue | 15 ++++++---------
 src/views/Settings.vue    | 19 +++++++++++++------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/components/Header.vue b/src/components/Header.vue
index 9783867..69f211e 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -2,9 +2,6 @@
     <header :class="headerClass">
         <img v-if="!!logoUrl" :src="baseUrl + '/image/default-logo.png'" v-real-img="logoUrl" class="logo-box" alt="" />
         <ul class="operate-container fix">
-            <!-- <li>
-                <Button @click="settingsMenu">test</Button>
-            </li> -->
             <li v-if="isWidgetIconShow" :class="{ active: isWidgetShow }">
                 <div class="icon-box" v-wave @click="toggleWidgetShow">
                     <SvgIcon name="header-4" color="#333333" />
@@ -103,7 +100,9 @@
                                 <img :src="requireImg('userinfo/icon3.png')" alt="" />
                                 <span>设置LOGO</span>
                             </li>
-                            <li @click="settingsMenu" v-if="!!store.getIsAdmin">
+                            <!-- 边栏设置已迁设置中心（/settings?pane=sidebar，2026-09-30 二轮迁入真实管理），
+                                 此处仅跳转不再开旧 MenuBarModal（组件保留未挂载） -->
+                            <li @click="linkSidebarSetting" v-if="!!store.getIsAdmin">
                                 <img :src="requireImg('userinfo/icon6.png')" alt="" />
                                 <span>边栏设置</span>
                             </li>
@@ -225,7 +224,6 @@
     <!-- 审批直批弹窗（B3 §2）已抽共享组件（消息对接 2026-09-30），供 /msg 页复用；Header 内已无直批入口 -->
     <MsgApprovalModal ref="refMsgApproval" />
 
-    <MenuBarModal ref="refMenuBarModal" />
     <StatsBarModal ref="refStatsBarModal" />
     <TeacherCopilotModal ref="refTeacherCopilotModal" />
 </template>
@@ -240,7 +238,6 @@ import { storeToRefs } from "pinia";
 import { useRoute, useRouter } from "vue-router";
 import { requireImg } from "@/utils/hook/useImg";
 import ContextMenu from "@/components/ContextMenu.vue";
-import MenuBarModal from "@/components/MenuBarModal.vue";
 import StatsBarModal from "@/components/StatsBarModal.vue";
 import TeacherCopilotModal from "@/components/TeacherCopilotModal.vue";
 import BaseApi from "@/api/BaseApi";
@@ -264,7 +261,6 @@ const baseUrl = computed(() => $conf.fileHost);
 const { unreadCount } = storeToRefs(store);
 
 const refSearchInput = ref<any>();
-const refMenuBarModal = ref<any>();
 const refStatsBarModal = ref<any>();
 const refTeacherCopilotModal = ref<any>();
 
@@ -473,9 +469,10 @@ async function settingsWallpaper() {
     isWallpaperShow.value = true;
 }
 
-async function settingsMenu() {
+/** 边栏设置入口改跳设置中心 pane（原 settingsMenu 开旧 MenuBarModal 的能力已于 2026-09-30 迁入 Settings.vue sidebar pane） */
+function linkSidebarSetting() {
     isUserInfoShow.value = false;
-    refMenuBarModal.value.show();
+    router.push("/settings?pane=sidebar");
 }
 
 async function settingsStats() {
diff --git a/src/views/Settings.vue b/src/views/Settings.vue
index b75b201..dd80893 100644
--- a/src/views/Settings.vue
+++ b/src/views/Settings.vue
@@ -927,11 +927,12 @@ const sidebarAllChecked = computed(() => sidebarForm.roleIds.length == RoleTypeD
 const sidebarIndeterminate = computed(() => sidebarForm.roleIds.length > 0 && sidebarForm.roleIds.length < RoleTypeDict.length);
 
 const sidebarColumns = ref([
-    { title: "名称", key: "name" },
-    { title: "图标", slot: "icon" },
+    { title: "名称", key: "name", minWidth: 120 },
+    { title: "图标", slot: "icon", width: 70, align: "center" },
     { title: "角色", width: 150, slot: "roleIds" },
-    { title: "地址", key: "url", width: 150, tooltip: true },
-    { title: "打开方式", key: "linkType" },
+    // 地址可能很长：minWidth 保证基础宽度 + tooltip 超长省略号悬浮全显（不撑爆表格）
+    { title: "地址", key: "url", minWidth: 220, tooltip: true },
+    { title: "打开方式", key: "linkType", width: 100, align: "center" },
     {
         title: "系统页面",
         key: "isNative",
@@ -946,6 +947,7 @@ const sidebarColumns = ref([
     {
         title: "操作",
         width: 110,
+        fixed: "right",
         align: "center",
         render: (h: any, params: any) => {
             const disabled = !params.row.isEdit,
@@ -1600,9 +1602,14 @@ function openBackend() {
     }
 }
 
-/* 边栏管理（2026-09-30 二轮自 MenuBarModal 迁入） */
+/* 边栏管理（2026-09-30 二轮自 MenuBarModal 迁入；列宽微调 2026-10-02 任务D） */
 .side-toolbar {
-    padding: 2px 0 10px;
+    /* 与下方表格以细分隔线区隔（同 sec-card 内表单分行的 #eef0f3 口径），间距收紧 */
+    display: flex;
+    align-items: center;
+    padding: 4px 0 10px;
+    border-bottom: 1px solid #eef0f3;
+    margin-bottom: 8px;
 }
 .sidebar-table {
     width: 100%;